diff --git a/community/akregator/APKBUILD b/community/akregator/APKBUILD
index c63258bbc04b0619c8ee392b3b06463b9e1eb593..b536791ed67898866fde8971f3d8cb34b93e6ee4 100644
--- a/community/akregator/APKBUILD
+++ b/community/akregator/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akregator
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -31,6 +31,7 @@ makedepends="
 	pimcommon-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	syndication-dev
 	"
 checkdepends="xvfb-run"
@@ -38,7 +39,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/akregator-$p
 subpackages="$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/alkimia/APKBUILD b/community/alkimia/APKBUILD
index 11747a07de4a7030023ce1455a8e68b0db7e1404..670599b3f035507bebf737a4b587c12fa7ddea0c 100644
--- a/community/alkimia/APKBUILD
+++ b/community/alkimia/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=alkimia
 pkgver=8.1.0
-pkgrel=2
+pkgrel=3
 # armhf blocked by qt5-qtdeclarative
 # armhf, ppc64le, riscv64, s390x blocked by qt5-qtwebengine
 # s390x and riscv64 blocked by polkit -> kio
@@ -32,13 +32,14 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/alkimia/$pkgver/alkimia-$pkgver.tar.xz"
 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/alligator/APKBUILD b/community/alligator/APKBUILD
index 06599518952947b5c9efb2c0b885272a910b0f34..b6948ef3ee355f6548e9e719448ca37dc37268bc 100644
--- a/community/alligator/APKBUILD
+++ b/community/alligator/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=alligator
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="A convergent RSS/Atom feed reader"
 url="https://invent.kde.org/plasma-mobile/alligator/"
 # armhf blocked by extra-cmake-modules
@@ -18,13 +18,14 @@ makedepends="
 	ki18n-dev
 	qt5-qtbase-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	syndication-dev
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/alligator-$pkgver.tar.xz"
 options="!check" # No tests
 
 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/analitza/APKBUILD b/community/analitza/APKBUILD
index 6d1f898bcc7ae2f61b9ccd52c7140ff476b759b8..ec2b2a42f214478cb39d6cf3d7e0691c0763c825 100644
--- a/community/analitza/APKBUILD
+++ b/community/analitza/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=analitza
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by qt5-qtbase-x11
 arch="all !armhf !s390x"
@@ -16,13 +16,14 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtsvg-dev
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/analitza-$pkgver.tar.xz"
 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/angelfish/APKBUILD b/community/angelfish/APKBUILD
index 2b956b78e5dfd3d0afc952073d3822f9cb55f108..04c082b038113328258064bd85201044cc20e395 100644
--- a/community/angelfish/APKBUILD
+++ b/community/angelfish/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=angelfish
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Small Webbrowser for Plasma Mobile"
 # armhf blocked by extra-cmake-modules
 # ppc64le and s390x blocked by qt5-qtwebengine
@@ -29,6 +29,7 @@ makedepends="
 	purpose-dev
 	qt5-qtfeedback-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/angelfish-$pkgver.tar.xz"
@@ -38,8 +39,8 @@ provides="plasma-angelfish=$pkgver-r$pkgrel" # Backwards compatibility
 replaces="plasma-angelfish" # Backwards compatibility
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True
diff --git a/community/ark/APKBUILD b/community/ark/APKBUILD
index f3edb6378d115b55db024422898a0a3180c06538..b85b59c78cb56b20fc4ee11cff61624e68239fa3 100644
--- a/community/ark/APKBUILD
+++ b/community/ark/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ark
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Graphical file compression/decompression utility with support for multiple formats"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -34,6 +34,7 @@ makedepends="
 	libarchive-dev
 	libzip-dev
 	qt5-qtbase-dev
+	samurai
 	shared-mime-info
 	xz-dev
 	"
@@ -49,7 +50,7 @@ subpackages="$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/artikulate/APKBUILD b/community/artikulate/APKBUILD
index a1a177a3fa72863980b50bef083a5c872bd4b897..3bbcdde5858c54934431b1ab9d904fde67d4960e 100644
--- a/community/artikulate/APKBUILD
+++ b/community/artikulate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=artikulate
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> knewstuff
 arch="all !armhf !s390x !riscv64"
@@ -24,12 +24,13 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtmultimedia-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/artikulate-$pkgver.tar.xz"
 subpackages="$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/audiocd-kio/APKBUILD b/community/audiocd-kio/APKBUILD
index c88fa838d5549e6dd3862c9791167de6d2085f08..d57b85b3c94186732496c922079425a729d421ab 100644
--- a/community/audiocd-kio/APKBUILD
+++ b/community/audiocd-kio/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=audiocd-kio
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -22,13 +22,14 @@ makedepends="
 	libkcompactdisc-dev
 	libvorbis-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/audiocd-kio-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 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/audiotube/APKBUILD b/community/audiotube/APKBUILD
index 288b00f78664cb15a4337c0116cd0d3c03ca303f..aab4071867b069bee26dec2c32f9a1c409f010f1 100644
--- a/community/audiotube/APKBUILD
+++ b/community/audiotube/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=audiotube
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Client for YouTube Music"
 url="https://invent.kde.org/plasma-mobile/audiotube"
 # armhf blocked by extra-cmake-modules
@@ -24,13 +24,14 @@ makedepends="
 	py3-pybind11-dev
 	python3-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/audiotube-$pkgver.tar.xz"
 options="!check" # No tests
 
 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/aura-browser/APKBUILD b/community/aura-browser/APKBUILD
index 3a06c9a7dc98bbd2ad7995c76b9ab953d8de0b40..1a7bddfbc6285881440191b4c4a85c0febb9e243 100644
--- a/community/aura-browser/APKBUILD
+++ b/community/aura-browser/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=aura-browser
 pkgver=0_git20210423
-pkgrel=3
+pkgrel=4
 _commit="e93d8de146384697bf586346488395680a1dd217"
 pkgdesc="Browser for a fully immersed Big Screen experience allowing you to navigate the world wide web using just your remote control"
 url="https://invent.kde.org/plasma-bigscreen/aura-browser"
@@ -22,13 +22,14 @@ makedepends="
 	qt5-qtmultimedia-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 source="https://invent.kde.org/plasma-bigscreen/aura-browser/-/archive/$_commit/aura-browser-$_commit.tar.gz"
 options="!check" # No tests
 builddir="$srcdir/$pkgname-$_commit"
 
 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/baloo-widgets/APKBUILD b/community/baloo-widgets/APKBUILD
index 7db853a165393a613134adc8423a9df9818277d5..25f8c8cd14f64b7ab142b41b85557728d833b9dc 100644
--- a/community/baloo-widgets/APKBUILD
+++ b/community/baloo-widgets/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=baloo-widgets
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Widgets for Baloo"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -16,6 +16,7 @@ depends_dev="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
@@ -23,7 +24,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/baloo-widget
 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/blinken/APKBUILD b/community/blinken/APKBUILD
index 910c1460fce09c166c805517703d56f31554e881..cc784a1e269e5ce9c71ce738e46743b8bfc064db 100644
--- a/community/blinken/APKBUILD
+++ b/community/blinken/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=blinken
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -20,13 +20,14 @@ makedepends="
 	phonon-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/blinken-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 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/bluedevil/APKBUILD b/community/bluedevil/APKBUILD
index 778985622c93f70365b1511817d874052bd4a748..4c0911b9c1e15e5887259d69b00bb737ae633c26 100644
--- a/community/bluedevil/APKBUILD
+++ b/community/bluedevil/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=bluedevil
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Integrate the Bluetooth technology within KDE workspace and applications"
 # armhf blocked by qt5-qtdeclarative
 # armhf, s390x and riscv64 blocked by polkit -> kio
@@ -30,6 +30,7 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	shared-mime-info
 	"
 
@@ -41,7 +42,7 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/bluedevil-$pkgver.tar.xz"
 subpackages="$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/bovo/APKBUILD b/community/bovo/APKBUILD
index 60318bfb2b26a48fad66c3a0648702b5d35b3eda..ca2f03c65505031df46ce06ccce0b5e086992ee9 100644
--- a/community/bovo/APKBUILD
+++ b/community/bovo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=bovo
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A Gomoku like game for two players"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -19,12 +19,13 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/bovo-$pkgver.tar.xz"
 subpackages="$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/breeze-gtk/APKBUILD b/community/breeze-gtk/APKBUILD
index a9c4a9adbeb55c8c49aa93b5ae6a84be706db7ea..e0c7a49ff8411fe020230c222d5620c8f363677b 100644
--- a/community/breeze-gtk/APKBUILD
+++ b/community/breeze-gtk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=breeze-gtk
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A GTK Theme Built to Match KDE's Breeze"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> breeze
@@ -15,6 +15,7 @@ makedepends="
 	breeze-dev
 	extra-cmake-modules
 	py3-cairo
+	samurai
 	sassc
 	"
 
@@ -25,7 +26,7 @@ esac
 source="https://download.kde.org/$_rel/plasma/$pkgver/breeze-gtk-$pkgver.tar.xz"
 
 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/breeze-plymouth/APKBUILD b/community/breeze-plymouth/APKBUILD
index a218dbbf7eb8f363334374d317255404754b624c..0bd357c50d0a5966068a77b6056468d5a5ae1a65 100644
--- a/community/breeze-plymouth/APKBUILD
+++ b/community/breeze-plymouth/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=breeze-plymouth
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by extra-cmake-modules
 url="https://kde.org/"
 pkgdesc="Breeze theme for Plymouth"
@@ -10,6 +10,7 @@ license="GPL-2.0-or-later"
 makedepends="
 	extra-cmake-modules
 	plymouth-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -20,7 +21,7 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/breeze-plymouth-$pkgver.ta
 options="!check" # No tests
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DDISTRO_NAME="$(grep PRETTY_NAME /etc/os-release | awk -F  = '{ print $2 }')" \
diff --git a/community/breeze/APKBUILD b/community/breeze/APKBUILD
index 0967d961f1b62204633e0e4281451ec48707a016..e2a58bff85adf9aac58ef7cc0c96d0544afc7619 100644
--- a/community/breeze/APKBUILD
+++ b/community/breeze/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=breeze
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Artwork, styles and assets for the Breeze visual style for the Plasma Desktop"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kconfigwidgets
@@ -20,6 +20,7 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 
 case "$pkgver" in
@@ -30,7 +31,7 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/breeze-$pkgver.tar.xz"
 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/buho/APKBUILD b/community/buho/APKBUILD
index 2a77b1e1b6d7862038613b22e469ea95bfb6e5d7..dc4d129d60085cb8362f46e44beb0cb0824dc9c1 100644
--- a/community/buho/APKBUILD
+++ b/community/buho/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=buho
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Note taking app based on MauiKit"
 # armhf blocked by qt5-qtdeclarative
 # s390x, ppc64le and riscv64 blocked by qt5-qtwebview
@@ -29,13 +29,14 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
 	qt5-qtwebview-dev
+	samurai
 	syntax-highlighting-dev
 	"
 source="https://download.kde.org/stable/maui/buho/$pkgver/buho-$pkgver.tar.xz"
 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/calendarsupport/APKBUILD b/community/calendarsupport/APKBUILD
index 94361aa60784ead3eb50e91d08599789c8299140..eea8845f5e17b205d141eb007f796a57f8261814 100644
--- a/community/calendarsupport/APKBUILD
+++ b/community/calendarsupport/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=calendarsupport
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Library providing calendar support"
 # armhf blocked by extra-cmake-modules
 # ppc64le blocked by akonadi-calendar
@@ -26,6 +26,7 @@ depends_dev="
 	kmime-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -36,7 +37,7 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/calendarsupp
 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/calindori/APKBUILD b/community/calindori/APKBUILD
index cacb03037bf09239e57c783baf6273d3ca6e2761..59177830ce6554e257299efd3ef63e1aa78f1d18 100644
--- a/community/calindori/APKBUILD
+++ b/community/calindori/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=calindori
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Calendar for Plasma Mobile"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> plasma-framework
@@ -27,13 +27,14 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
 	qt5-qttools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/calindori-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
diff --git a/community/calligra/APKBUILD b/community/calligra/APKBUILD
index 8d912685b9aeb22b3a3f5f771d0ebde4d2d6a5be..f6e16fe27e506eeefd953cbfa94e150d76929d04 100644
--- a/community/calligra/APKBUILD
+++ b/community/calligra/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=calligra
 pkgver=3.2.1
-pkgrel=22
+pkgrel=23
 pkgdesc="Office and graphic art suite by KDE"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !ppc64le !riscv64"
-url="https://calligra.org"
+url="https://calligra.org/"
 license="GPL-2.0-or-later AND LGPL-2.0-only"
 makedepends="
 	attica-dev
@@ -48,6 +48,7 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
 	qt5-qtx11extras-dev
+	samurai
 	sonnet-dev
 	threadweaver-dev
 	"
@@ -70,7 +71,7 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # Broken tests https://bugs.kde.org/show_bug.cgi?id=423989
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_CXX_STANDARD=17 \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
@@ -88,6 +89,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 e53a939aa1b277c2291cfd626868c77085fc9cc7774df160b5b1afceb33314b4381fa8ffe03636cbde6e35cc2abd170a51e7f9c1a99191339313b9c9c3b1526f  calligra-3.2.1.tar.xz
 101cafc43865afa7097cf5ba5b754ec6566fefb9084a3589dd5b482231cf991fcea0b4ee4a42159b4ccc3f1234a75854af1008a1f8fa79872d61d3bd73030d1d  poppler-22.03.patch
diff --git a/community/cantor/APKBUILD b/community/cantor/APKBUILD
index a0afdd4cb5daa24bfb45fba65044d2c207c7692e..255cc9777a1554c0643ef9b204cbf4685c3fc49d 100644
--- a/community/cantor/APKBUILD
+++ b/community/cantor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=cantor
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 # ppc64le blocked by qt5-qtwebengine
@@ -35,6 +35,7 @@ makedepends="
 	qt5-qtsvg-dev
 	qt5-qtwebengine-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	syntax-highlighting-dev
 	"
 checkdepends="xvfb-run"
@@ -42,8 +43,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/cantor-$pkgv
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/cervisia/APKBUILD b/community/cervisia/APKBUILD
index 3a6b9ecc098f810752435fab972f484631aed4c9..4c4bc886b3676e881d20000d28ab12237b406883 100644
--- a/community/cervisia/APKBUILD
+++ b/community/cervisia/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=cervisia
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kparts
 arch="all !armhf !s390x !riscv64"
@@ -20,14 +20,15 @@ makedepends="
 	kparts-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/cervisia-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/choqok/APKBUILD b/community/choqok/APKBUILD
index 5153792740c8b3531eabebb6acd74ce823bdc022..66c21068c86530cee6f20db915eb7bafffde6766 100644
--- a/community/choqok/APKBUILD
+++ b/community/choqok/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=choqok
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A micro-blogging client"
 url="https://choqok.kde.org/"
 # armhf blocked by extra-cmake-modules
@@ -32,14 +32,15 @@ makedepends="
 	qca-dev
 	qt5-qtbase-dev
 	qt5-qtnetworkauth-dev
+	samurai
 	sonnet-dev
 	"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/choqok/${pkgver%.*}/src/choqok-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/clazy/APKBUILD b/community/clazy/APKBUILD
index 9b80bfb75cb5e1e9a97c0a846ca99cde619bd5b7..497fb33e0d70a52607441987f7d302e7c0c2094d 100644
--- a/community/clazy/APKBUILD
+++ b/community/clazy/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: André Klitzing <aklitzing@gmail.com>
 pkgname=clazy
 pkgver=1.11
-pkgrel=2
+pkgrel=3
 pkgdesc="Qt oriented code checker based on clang framework"
 url="https://invent.kde.org/sdk/clazy"
 arch="all"
@@ -11,13 +11,14 @@ makedepends="
 	clang-dev
 	cmake
 	llvm-dev
+	samurai
 	"
 options="!check" # cannot run tests without installation
 subpackages="$pkgname-doc"
 source="https://download.kde.org/stable/clazy/$pkgver/src/clazy-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_INSTALL_PREFIX=/usr
diff --git a/community/communicator/APKBUILD b/community/communicator/APKBUILD
index 006f82c5f1279d27fc7e67b9955519b13678048a..201467e232b11e5e733277c05169b19a5f9f9b37 100644
--- a/community/communicator/APKBUILD
+++ b/community/communicator/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=communicator
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Contacts and dialer application"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by mauikit
@@ -25,12 +25,13 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	"
 source="https://download.kde.org/stable/maui/communicator/$pkgver/communicator-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
+	cmake -B build -G Ninja \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
diff --git a/community/discover/APKBUILD b/community/discover/APKBUILD
index 44a0828c6d058dffb116253e95fde1dafe1c8ecc..dac75799fd2d75b7d4f666c4f81a9ca36d0bd0e4 100644
--- a/community/discover/APKBUILD
+++ b/community/discover/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=discover
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -34,6 +34,7 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 
@@ -66,8 +67,8 @@ case "$CARCH" in
 esac
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_DISABLE_FIND_PACKAGE_Snapd=ON \
diff --git a/community/dolphin-plugins/APKBUILD b/community/dolphin-plugins/APKBUILD
index 224b4bf73dbb3d7589e9d46aea688a6a8e68d6dc..cc8e2c56fc93b970ac6e471020c660af9e0f3560 100644
--- a/community/dolphin-plugins/APKBUILD
+++ b/community/dolphin-plugins/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=dolphin-plugins
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 url="https://www.kde.org/applications/system/dolphin/"
 pkgdesc="Extra Dolphin plugins"
 # armhf blocked by extra-cmake-modules
@@ -18,13 +18,14 @@ makedepends="
 	ktextwidgets-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/dolphin-plugins-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_svn=OFF # Broken "error: expected unqualified-id before '(' token"
diff --git a/community/dragon/APKBUILD b/community/dragon/APKBUILD
index 80ffb8ce139239b81feba2539f2aec8d6774ef60..ad2e1a110a8058d19dfc910c8976a10e3ca79dba 100644
--- a/community/dragon/APKBUILD
+++ b/community/dragon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=dragon
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -28,6 +28,7 @@ makedepends="
 	kxmlgui-dev
 	phonon-dev
 	qt5-qtbase-dev
+	samurai
 	solid-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/dragon-$pkgver.tar.xz"
@@ -35,8 +36,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/drkonqi/APKBUILD b/community/drkonqi/APKBUILD
index 53dccf9c8cf69d19c6e28d84b927f23d740d24d9..77b2b32ebde03085b71b353ec08ac1ed891668d6 100644
--- a/community/drkonqi/APKBUILD
+++ b/community/drkonqi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=drkonqi
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="The KDE crash handler"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -26,6 +26,7 @@ makedepends="
 	kxmlrpcclient-dev
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	syntax-highlighting-dev
 	"
 
@@ -38,8 +39,8 @@ subpackages="$pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_TESTING=OFF # Broken
diff --git a/community/elisa/APKBUILD b/community/elisa/APKBUILD
index 79f6273e2c9547348d5c6188d602da3e2f3032e7..f347a8dc7915c4b0d7bbf3537ff6ea303b52d244 100644
--- a/community/elisa/APKBUILD
+++ b/community/elisa/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=elisa
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -30,6 +30,7 @@ makedepends="
 	kirigami2-dev
 	kpackage-dev
 	kxmlgui-dev
+	samurai
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtmultimedia-dev
@@ -45,8 +46,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/elisa-$pkgve
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/eventviews/APKBUILD b/community/eventviews/APKBUILD
index 3ea4160b88d50aa828e0aa82405d71b1d36f7b53..91711d7a98487704cea5fcb426bbd31c69fb6baa 100644
--- a/community/eventviews/APKBUILD
+++ b/community/eventviews/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=eventviews
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for creating events"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by polkit -> akonadi
@@ -26,6 +26,7 @@ depends_dev="
 	kservice-dev
 	libkdepim-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 makedepends="$depends_dev extra-cmake-modules"
@@ -33,8 +34,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/eventviews-$
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/falkon/APKBUILD b/community/falkon/APKBUILD
index ff997c67a50781337925213375826b59fcb19fae..98e572ead8bb5626b097a6b8318b5ed9cedcca4e 100644
--- a/community/falkon/APKBUILD
+++ b/community/falkon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=falkon
 pkgver=3.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Cross-platform Qt Web Browser"
 url="https://github.com/KDE/falkon"
 # armhf blocked by qt5-qtdeclarative
@@ -26,6 +26,7 @@ makedepends="
 	qt5-qttools-dev
 	qt5-qtwebengine-dev
 	qt5-qtx11extras-dev
+	samurai
 	xcb-util-dev
 	"
 checkdepends="xvfb-run"
@@ -33,8 +34,8 @@ subpackages="$pkgname-lang $pkgname-bash-completion:bashcomp:noarch"
 source="https://download.kde.org/stable/falkon/$pkgver/falkon-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_SHARED_LIBS=True \
diff --git a/community/filelight/APKBUILD b/community/filelight/APKBUILD
index c67442dfd4426298bdf1bb163a27db282a0ce3d1..0313511716ffbd9650e23f7d9fa6cb93b4760de1 100644
--- a/community/filelight/APKBUILD
+++ b/community/filelight/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=filelight
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kio
 arch="all !armhf !s390x !riscv64"
@@ -16,14 +16,15 @@ makedepends="
 	kio-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/filelight-$pkgver.tar.xz"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/granatier/APKBUILD b/community/granatier/APKBUILD
index 17629bff39c3946eefa57e86e8f25697a5552bb1..844d48f1b906b4583fbe3ba10a78373245422459 100644
--- a/community/granatier/APKBUILD
+++ b/community/granatier/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=granatier
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -25,13 +25,14 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/granatier-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/grantlee-editor/APKBUILD b/community/grantlee-editor/APKBUILD
index 3eec72b6e430a89983315edac5d47032ae7046e5..2559f28101905b35eaa11802253046bf964893af 100644
--- a/community/grantlee-editor/APKBUILD
+++ b/community/grantlee-editor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=grantlee-editor
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Utilities and tools to manage themes in KDE PIM applications "
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
@@ -28,14 +28,15 @@ makedepends="
 	qgpgme
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	syntax-highlighting-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/grantlee-editor-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/grantleetheme/APKBUILD b/community/grantleetheme/APKBUILD
index c005fe32c253e8f15e25d612ba95f7be0007353d..ce07caa8b610323728a13feddcfe8c3cbb6b1fe9 100644
--- a/community/grantleetheme/APKBUILD
+++ b/community/grantleetheme/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=grantleetheme
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM mail related libraries"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by knewstuff
@@ -14,14 +14,15 @@ makedepends="
 	grantlee-dev
 	ki18n-dev
 	knewstuff-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/grantleetheme-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/gwenview/APKBUILD b/community/gwenview/APKBUILD
index e4f46934a4153853caf0e7b55a29401d914ea4fd..c4f376c454aa5d0c706fc9d4fc3bb7dd5f2de442 100644
--- a/community/gwenview/APKBUILD
+++ b/community/gwenview/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=gwenview
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 # ppc64le blocked by qt5-qtwebengine -> purpose
@@ -32,14 +32,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qtx11extras-dev
+	samurai
 	"
 checkdepends="xvfb-run kinit dbus"
 source="https://download.kde.org/stable/release-service/$pkgver/src/gwenview-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ikona/APKBUILD b/community/ikona/APKBUILD
index 98cda4743a85d43f2c009e0c4efa48563d92e7b1..d080897c5f6d2bb3b79e6311e7ec2197e679e652 100644
--- a/community/ikona/APKBUILD
+++ b/community/ikona/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ikona
 pkgver=1.0
-pkgrel=1
+pkgrel=2
 pkgdesc="An icon preview utility designed for KDE Plasma"
 url="https://invent.kde.org/kde/ikona/"
 # ppc64le and s390x blocked by qt5-qtwebengine-dev
@@ -20,6 +20,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 source="https://download.kde.org/stable/ikona/$pkgver/ikona-$pkgver.tar.xz"
 subpackages="
@@ -31,8 +32,8 @@ subpackages="
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc
diff --git a/community/incidenceeditor/APKBUILD b/community/incidenceeditor/APKBUILD
index 223622a0c591d37783df3cf244dc431697458ef3..3dee6d48a3aac82fcc4e71e27958af5658d5b634 100644
--- a/community/incidenceeditor/APKBUILD
+++ b/community/incidenceeditor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=incidenceeditor
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM incidence editor"
 # armhf blocked by extra-cmake-modules
 # ppc64le blocked by kmailtransport -> qt5-qtwebengine
@@ -27,6 +27,7 @@ depends_dev="
 	kmime-dev
 	libkdepim-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -36,8 +37,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/incidenceedi
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/index/APKBUILD b/community/index/APKBUILD
index dafb5a78ca7b0c760001a9a5a9f0b076a785566e..a9964d5038c7c855bd9cbc0a787ae85a8974182b 100644
--- a/community/index/APKBUILD
+++ b/community/index/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=index
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Index file manager based on MauiKit"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by mauikit
@@ -22,14 +22,15 @@ makedepends="
 	mauikit-filebrowsing-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/maui/index/$pkgver/index-fm-$pkgver.tar.xz"
 options="!check" # No tests available
 builddir="$srcdir/$pkgname-fm-$pkgver"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
diff --git a/community/isoimagewriter/APKBUILD b/community/isoimagewriter/APKBUILD
index 4e20f47fa196469cfdbc6c8e9f7827c07a986773..24da81f2c16b9a2ec7566d22d74b09f0c06942f3 100644
--- a/community/isoimagewriter/APKBUILD
+++ b/community/isoimagewriter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=isoimagewriter
 pkgver=0.8
-pkgrel=1
+pkgrel=2
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kauth
 arch="all !armhf !s390x !riscv64"
@@ -20,13 +20,14 @@ makedepends="
 	kiconthemes-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/unstable/isoimagewriter/$pkgver/isoimagewriter-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/itinerary/APKBUILD b/community/itinerary/APKBUILD
index 4ead2812364bc6bf0b8f4e067d1985155717f9d8..0f736d07df4db987b302f86e382ba850d7917c6b 100644
--- a/community/itinerary/APKBUILD
+++ b/community/itinerary/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=itinerary
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # ppc64le blocked by kitinerary
 # s390x blocked by qt5-qtdeclarative
@@ -34,6 +34,7 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtlocation-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	shared-mime-info
 	solid-dev
 	zlib-dev
@@ -42,8 +43,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/itinerary-$p
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/juk/APKBUILD b/community/juk/APKBUILD
index cb96766f5a5a6e5ccb7d5af9f0982bbda15115cc..08ab317f42daca2e09369a02270f3356a5b051cd 100644
--- a/community/juk/APKBUILD
+++ b/community/juk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=juk
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -31,14 +31,15 @@ makedepends="
 	phonon-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	taglib-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/juk-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kaccounts-integration/APKBUILD b/community/kaccounts-integration/APKBUILD
index ca007ee82a4d6c00e17ef19ef8707d9fdde81a89..fa4e0a4b81e9cd485d412012835ff66f907a5dbe 100644
--- a/community/kaccounts-integration/APKBUILD
+++ b/community/kaccounts-integration/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kaccounts-integration
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x, ppc64le and riscv64 blocked by signon-ui and kdeclarative
 arch="all !armhf !s390x !ppc64le !riscv64"
@@ -21,6 +21,7 @@ depends_dev="
 	ki18n-dev
 	libaccounts-qt-dev
 	qt5-qtbase-dev
+	samurai
 	signond-dev
 	"
 makedepends="$depends_dev
@@ -31,8 +32,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kaccounts-providers/APKBUILD b/community/kaccounts-providers/APKBUILD
index 4b8effafff1f112c1d8ba5719dbd04e3dcab7a89..b8580b4c2933c3f5e914e30b3495cb4c1e126700 100644
--- a/community/kaccounts-providers/APKBUILD
+++ b/community/kaccounts-providers/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kaccounts-providers
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x, ppc64le and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kaccounts-providers-$pkgver.tar.xz"
 options="!check" # No tests
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kactivitymanagerd/APKBUILD b/community/kactivitymanagerd/APKBUILD
index 19b86a85aad029464202d57b2436ff5e8ac06ac6..bf9df37ee3d16c9feb08c54c7fe06b6a045aa385 100644
--- a/community/kactivitymanagerd/APKBUILD
+++ b/community/kactivitymanagerd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kactivitymanagerd
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="System service to manage user's activities and track the usage patterns"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
@@ -22,6 +22,7 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -32,8 +33,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kactivitymanagerd-$pkgver.
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kaddressbook/APKBUILD b/community/kaddressbook/APKBUILD
index 792fd6cde8b4e47b52d0e2a58213a95302d688e0..01b582a506cb5e61cb98d1efc2522bfa2527af68 100644
--- a/community/kaddressbook/APKBUILD
+++ b/community/kaddressbook/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kaddressbook
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -29,13 +29,14 @@ makedepends="
 	pimcommon-dev
 	prison-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kaddressbook-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja\
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kaidan/APKBUILD b/community/kaidan/APKBUILD
index 452a3a1a5e3ae9ae68f8c89240afa238381c4727..ae231b895d1accf4299e9ff4aac8f799c498ff52 100644
--- a/community/kaidan/APKBUILD
+++ b/community/kaidan/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kaidan
 pkgver=0.8.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Kaidan, a simple and user-friendly Jabber/XMPP client for every device and platform"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://invent.kde.org/kde/kaidan"
@@ -24,14 +24,15 @@ makedepends="
 	qt5-qtsvg-dev
 	qt5-qttools-dev
 	qxmpp-dev
+	samurai
 	zxing-cpp-dev
 	"
 source="https://download.kde.org/unstable/kaidan/$pkgver/kaidan-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DQUICK_COMPILER=TRUE \
diff --git a/community/kajongg/APKBUILD b/community/kajongg/APKBUILD
index 2633b27981c6e0867cb93ee9d830cb5d2b644052..481edb40127c2b5327ec5d8a2cced91042123cbf 100644
--- a/community/kajongg/APKBUILD
+++ b/community/kajongg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kajongg
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kconfigwidgets
 arch="noarch !armhf !s390x !riscv64"
@@ -21,13 +21,14 @@ makedepends="
 	libkmahjongg-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kajongg-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kalarm/APKBUILD b/community/kalarm/APKBUILD
index b6e6879e0f4b2b1da727e901841b8ad7add85481..aa8038026ea4169487dd7fe8375a04fe7b6f6bfc 100644
--- a/community/kalarm/APKBUILD
+++ b/community/kalarm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kalarm
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -53,14 +53,15 @@ makedepends="
 	qgpgme
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kalarm-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # Tests are broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja\
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kalgebra/APKBUILD b/community/kalgebra/APKBUILD
index cfc1b6c8f9d3895dcf861ca1941f686d2ad9d4b1..46f74a404f5515dbc943ebf72f2674114a28ddbf 100644
--- a/community/kalgebra/APKBUILD
+++ b/community/kalgebra/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kalgebra
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtsvg-dev
 	readline-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kalgebra-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kalk/APKBUILD b/community/kalk/APKBUILD
index 3aa55c55107d6db2393587c1c7fee1bcc72c91df..a06a222fffe38bc0a9d6563585d37cc22cf4668f 100644
--- a/community/kalk/APKBUILD
+++ b/community/kalk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kalk
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="A powerful cross-platfrom calculator application"
 arch="all !armhf" # Blocked by qt5-qtdeclarative
 url="https://invent.kde.org/plasma-mobile/kalk"
@@ -21,12 +21,13 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtfeedback-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/kalk-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
@@ -41,6 +42,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 150463e69ae012a44a6c522bcbaa6662c86e6568957baf7b740d015ba4da2dc8716c9fd6e8cfde61d07fd83230fdf6282309fdd3d1491f726f733a89c9182fc9  kalk-22.04.tar.xz
 "
diff --git a/community/kalzium/APKBUILD b/community/kalzium/APKBUILD
index 26764ad5db9f430a4f2ae6d9039dc2e79136a7ce..1f02ff0ead177f57d0490948891dab171628b384 100644
--- a/community/kalzium/APKBUILD
+++ b/community/kalzium/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kalzium
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> khtml
 arch="all !armhf !s390x !riscv64"
@@ -25,6 +25,7 @@ makedepends="
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	solid-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kalzium-$pkgver.tar.xz"
@@ -32,8 +33,8 @@ subpackages="$pkgname-doc $pkgname-lang $pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kamera/APKBUILD b/community/kamera/APKBUILD
index 31b035814227d23e84cb5bafafb115609a78a579..b5d932ac5fb2232bfc3621966b2ca702041662d9 100644
--- a/community/kamera/APKBUILD
+++ b/community/kamera/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kamera
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by exif
 # riscv64 blocked by polkit -> kio
@@ -20,14 +20,15 @@ makedepends="
 	kxmlgui-dev
 	libgphoto2-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kamera-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kamoso/APKBUILD b/community/kamoso/APKBUILD
index b26ae794eadd3b75bc17aad5395e6f3fa794bd5a..3e6f3e5b704dad1d2906bbecb6b11f2cf9eae831 100644
--- a/community/kamoso/APKBUILD
+++ b/community/kamoso/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kamoso
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 # ppc64le blocked by qt5-qtwebengine -> purpose
@@ -29,14 +29,15 @@ makedepends="
 	knotifications-dev
 	purpose-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kamoso-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kanagram/APKBUILD b/community/kanagram/APKBUILD
index a7683394be0011785d192388f2cc1f7f3b42912f..4b19ffa44e552682ed625d5b39391abd0c7aad05 100644
--- a/community/kanagram/APKBUILD
+++ b/community/kanagram/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kanagram
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -23,6 +23,7 @@ makedepends="
 	libkeduvocdocument-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	sonnet-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kanagram-$pkgver.tar.xz"
@@ -30,8 +31,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kapman/APKBUILD b/community/kapman/APKBUILD
index 0c01cbefc4715948ca19f8ed96d4342a45a8427b..82a767a2630f43462bd43b59d205e3a79084b704 100644
--- a/community/kapman/APKBUILD
+++ b/community/kapman/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kapman
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kapman-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kapptemplate/APKBUILD b/community/kapptemplate/APKBUILD
index de6a3859261dca10d06a579a8516c229f23b220e..90d7f737fdb39ee198641138c88a48ea6c345c2d 100644
--- a/community/kapptemplate/APKBUILD
+++ b/community/kapptemplate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kapptemplate
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kio
 arch="all !armhf !s390x !riscv64"
@@ -19,13 +19,14 @@ makedepends="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kapptemplate-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kasts/APKBUILD b/community/kasts/APKBUILD
index 806b78d4d88aa48ab46a060d4921c8ec89adca99..c780322d7539be47698f9e3805ff1e2b9f0b8f99 100644
--- a/community/kasts/APKBUILD
+++ b/community/kasts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kasts
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Kirigami-based podcast player"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by networkmanager-qt
@@ -28,6 +28,7 @@ makedepends="
 	qt5-qtmultimedia-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	syndication-dev
 	taglib-dev
 	"
@@ -36,8 +37,8 @@ source="https://download.kde.org/stable/plasma-mobile/$pkgver/kasts-$pkgver.tar.
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kasync/APKBUILD b/community/kasync/APKBUILD
index eaff5bcc71640cc3b5b52ca7a5bad1539fb449e9..ef56c6826d397aae9fa8b3563649e39ff79ec738 100644
--- a/community/kasync/APKBUILD
+++ b/community/kasync/APKBUILD
@@ -2,21 +2,21 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kasync
 pkgver=0.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ library for controlling asynchronous tasks"
 arch="all !armhf" # qtdeclarative
 url="https://community.kde.org/KDE_PIM"
 license="LGPL-2.0-or-later AND GPL-2.0-or-later"
 depends_dev="qt5-qtbase-dev"
-makedepends="$depends_dev extra-cmake-modules"
+makedepends="$depends_dev extra-cmake-modules samurai"
 source="https://download.kde.org/unstable/kasync/$pkgver/src/kasync-$pkgver.tar.xz
 	fix-qt-macro-usage.patch
 	"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -30,6 +30,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --build build --target install
 }
+
 sha512sums="
 a521862bafdff2931a3f01ef4393c6ae8f3c4655bb58dc2ddb4fde5f443d67b1a23d0c21491b2099ad6dae53d8894588b49299c45d334956b36ccedf94b17f9d  kasync-0.3.0.tar.xz
 b6813f54515080a2633af536f655a7b68b62f2cdc5879a8ec201a8430da126083749a86727527774ed175c2ab2b1cb4d57938f4f4363cc10ab85121adbdeffec  fix-qt-macro-usage.patch
diff --git a/community/kate/APKBUILD b/community/kate/APKBUILD
index 23ee55aee24f0ad54d5b6b777ff7e064c607ca65..d16b317517567cb31ad19693391b98326b6a2fed 100644
--- a/community/kate/APKBUILD
+++ b/community/kate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kate
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kio
 arch="all !armhf !s390x !riscv64"
@@ -28,6 +28,7 @@ makedepends="
 	kxmlgui-dev
 	plasma-framework-dev
 	qt5-qtbase-dev
+	samurai
 	threadweaver-dev
 	"
 checkdepends="xvfb-run"
@@ -35,14 +36,14 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kate-$pkgver
 subpackages="kwrite:kwrite kwrite-doc:kwrite_doc kwrite-lang:kwrite_lang $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build/kate \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build/kate -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_kwrite=FALSE
 	cmake --build build/kate
-	cmake -B build/kwrite \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build/kwrite -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_kate=FALSE \
diff --git a/community/katomic/APKBUILD b/community/katomic/APKBUILD
index d74f7e5e13f7a181b7b00532f8ac9c815223e00b..3546a188c2bb3ce6bf7100d49c2e7d2de0c46e4e 100644
--- a/community/katomic/APKBUILD
+++ b/community/katomic/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=katomic
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -22,14 +22,15 @@ makedepends="
 	kdoctools-dev
 	kdbusaddons-dev
 	libkdegames-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/katomic-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kbackup/APKBUILD b/community/kbackup/APKBUILD
index 5193778b56c3be27012ca573c1c4aa3fed67447d..d1d37de7a4c791b1137f95071bba37f6659ae7ce 100644
--- a/community/kbackup/APKBUILD
+++ b/community/kbackup/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kbackup
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -20,6 +20,7 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	shared-mime-info
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kbackup-$pkgver.tar.xz"
@@ -27,8 +28,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kblackbox/APKBUILD b/community/kblackbox/APKBUILD
index e77801197b35916847d64bf5e84a23279114e785..d0bc05eaa92dfaacc98df941016a880bfcb5ed4c 100644
--- a/community/kblackbox/APKBUILD
+++ b/community/kblackbox/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kblackbox
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kblackbox-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kblocks/APKBUILD b/community/kblocks/APKBUILD
index 27841635542314d93ba03b5df0d146a79e040111..5a0110d8bfcf4edfc5a3457dadb99891e9a51b1b 100644
--- a/community/kblocks/APKBUILD
+++ b/community/kblocks/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kblocks
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kblocks-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kbounce/APKBUILD b/community/kbounce/APKBUILD
index 008a0313d1fc58d35cd399c1432792b88cd47af0..8796843014bc04a902d92864c082de7f96b2985f 100644
--- a/community/kbounce/APKBUILD
+++ b/community/kbounce/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kbounce
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -25,13 +25,14 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kbounce-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kbreakout/APKBUILD b/community/kbreakout/APKBUILD
index 711228a2e4902584bec5d773965fe195aeb38fe2..68a74b8629340849fc793b4467cac55802835ec4 100644
--- a/community/kbreakout/APKBUILD
+++ b/community/kbreakout/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kbreakout
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -23,13 +23,14 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kbreakout-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kbruch/APKBUILD b/community/kbruch/APKBUILD
index 35ed146aaaa6424fcaa5383006cee90b70d55b15..3883baef199d060fe3876bf639dd836df002bf39 100644
--- a/community/kbruch/APKBUILD
+++ b/community/kbruch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kbruch
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit
 arch="all !armhf !s390x !riscv64"
@@ -18,14 +18,15 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kbruch-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kcachegrind/APKBUILD b/community/kcachegrind/APKBUILD
index 0e228395d52c03cd00ff0bfe7dadfb3c4c911612..456aad1b0638d0104ad924f5063dcb8ad392e32a 100644
--- a/community/kcachegrind/APKBUILD
+++ b/community/kcachegrind/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcachegrind
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and risc64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -22,14 +22,15 @@ makedepends="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qttools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kcachegrind-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kcalc/APKBUILD b/community/kcalc/APKBUILD
index be0bb12fa4d403c694d8bb7dae614d21045f1abb..25250b37a6ce3b049a5e08e4b4cb4d9af8f078f9 100644
--- a/community/kcalc/APKBUILD
+++ b/community/kcalc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcalc
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -23,13 +23,14 @@ makedepends="
 	kxmlgui-dev
 	mpfr-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kcalc-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kcalutils/APKBUILD b/community/kcalutils/APKBUILD
index a9984150d894aa93f7868b23c9a9df96f3b681b0..5f900676ec4c606393ebf96e1b85869576cb22de 100644
--- a/community/kcalutils/APKBUILD
+++ b/community/kcalutils/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcalutils
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="The KDE calendar utility library"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kconfigwidgets
@@ -20,6 +20,7 @@ depends_dev="
 	kiconthemes-dev
 	kidentitymanagement-dev
 	kwidgetsaddons-dev
+	samurai
 	"
 makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
@@ -27,8 +28,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kcalutils-$p
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -44,6 +45,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 a4b44261655e900fb84238bd0db6bf44806bbb296f64f821038533d98af567c85235c9a1054be8ab8a88e9de71ba91b8b7cec0d695da162bf314f48b6af8eaea  kcalutils-22.04.0.tar.xz
 "
diff --git a/community/kcharselect/APKBUILD b/community/kcharselect/APKBUILD
index 1c525985077632411024b42093e48082b11fae5d..4c1614e96aad741e218eaee3b7b3fc4e9e7e8bee 100644
--- a/community/kcharselect/APKBUILD
+++ b/community/kcharselect/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcharselect
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -18,14 +18,15 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kcharselect-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kclock/APKBUILD b/community/kclock/APKBUILD
index bcd9ab744bb953e006da887a76afbf73193aa6d7..e15bdcb385fc5b698bdeaeb8964508705091a04a 100644
--- a/community/kclock/APKBUILD
+++ b/community/kclock/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kclock
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Clock app for Plasma Mobile"
 url="https://invent.kde.org/plasma-mobile/kclock"
 # armhf blocked by qt5-qtdeclarative
@@ -28,13 +28,14 @@ makedepends="
 	qt5-qtmultimedia-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/kclock-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kcolorchooser/APKBUILD b/community/kcolorchooser/APKBUILD
index 0826461fe21193a0403f6a418dea06c22959f122..577466becd7372cedb3cf16fa17d108096205b34 100644
--- a/community/kcolorchooser/APKBUILD
+++ b/community/kcolorchooser/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcolorchooser
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -14,14 +14,15 @@ makedepends="
 	ki18n-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kcolorchooser-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kcron/APKBUILD b/community/kcron/APKBUILD
index 76182edbfa26f371c75fc07870078de4f7aa2607..041450d2e095e1db841faa2cb55955ce36787750 100644
--- a/community/kcron/APKBUILD
+++ b/community/kcron/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcron
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -17,13 +17,14 @@ makedepends="
 	kiconthemes-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kcron-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdav2/APKBUILD b/community/kdav2/APKBUILD
index b88919e4cdf8e4d9ef2d3b6a11dc38c968a83288..b3bdf65efed97fbab1e7d6743bb60c089e506c81 100644
--- a/community/kdav2/APKBUILD
+++ b/community/kdav2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdav2
 pkgver=0.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="DAV protocol implementation with KJobs"
 arch="all !armhf" # qtdeclarative
 url="https://community.kde.org/KDE_PIM"
@@ -11,6 +11,7 @@ depends_dev="
 	kcoreaddons-dev
 	qt5-qtbase-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 makedepends="$depends_dev extra-cmake-modules"
 subpackages="$pkgname-dev"
@@ -19,8 +20,8 @@ source="https://invent.kde.org/pim/kdav2/-/archive/v$pkgver/kdav2-v$pkgver.tar.g
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdb/APKBUILD b/community/kdb/APKBUILD
index fab9591c5eeea7a03d28b074cf71e47b6c6939e8..ee8f3a143671a6635401ae05a91be5930f5bd9ae 100644
--- a/community/kdb/APKBUILD
+++ b/community/kdb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdb
 pkgver=3.2.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Database connectivity and creation framework for various database vendors"
 url="https://community.kde.org/KDb"
 # armhf blocked by extra-cmake-modules
@@ -17,6 +17,7 @@ makedepends="
 	python3
 	qt5-qtbase-dev
 	qt5-qttools-dev
+	samurai
 	sqlite-dev
 	"
 subpackages="$pkgname-dev $pkgname-lang $pkgname-sqlite $pkgname-mysql $pkgname-postgresql"
@@ -27,8 +28,8 @@ source="https://download.kde.org/stable/kdb/src/kdb-$pkgver.tar.xz
 	"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DPYTHON_EXECUTABLE=/usr/bin/python3
diff --git a/community/kde-cli-tools/APKBUILD b/community/kde-cli-tools/APKBUILD
index 8542499ad722cc03821a28f972f537031897d277..b5ae5bb44110d525695a079460e96341fb897ec1 100644
--- a/community/kde-cli-tools/APKBUILD
+++ b/community/kde-cli-tools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kde-cli-tools
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Tools based on KDE Frameworks 5 to better interact with the system"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -27,6 +27,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qtx11extras-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 
@@ -42,8 +43,8 @@ options="!check" # Broken
 install_if="plasma-workspace"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kde-dev-scripts/APKBUILD b/community/kde-dev-scripts/APKBUILD
index 8827817b3c22edc9b1df3a1484d6d4062a934ea0..1866bed4d309aff29bb40647a17616a813e47427 100644
--- a/community/kde-dev-scripts/APKBUILD
+++ b/community/kde-dev-scripts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kde-dev-scripts
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 arch="all !armhf !s390x"
 url="https://kde.org/applications/development/"
@@ -11,14 +11,15 @@ license="GPL-2.0-or-later AND GFDL-1.2-only"
 makedepends="
 	extra-cmake-modules
 	kdoctools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kde-dev-scripts-$pkgver.tar.xz"
 subpackages="$pkgname-doc"
 options="!check" # No code to test
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kde-dev-utils/APKBUILD b/community/kde-dev-utils/APKBUILD
index 60d9dd34de40df7579a30374b317bb98201fb3b2..0c583c3664ef8ce4db0ed39954df834c297da42e 100644
--- a/community/kde-dev-utils/APKBUILD
+++ b/community/kde-dev-utils/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kde-dev-utils
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kparts-dev
 arch="all !armhf !s390x !riscv64"
@@ -16,14 +16,15 @@ makedepends="
 	kparts-dev
 	kwidgetsaddons-dev
 	qt5-qttools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kde-dev-utils-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kde-gtk-config/APKBUILD b/community/kde-gtk-config/APKBUILD
index b2e19f1abc6165771ae6fff37cc797c22eaa6487..470f83ad49672732e8b8abd5e7b5bf1f5df19160 100644
--- a/community/kde-gtk-config/APKBUILD
+++ b/community/kde-gtk-config/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kde-gtk-config
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="GTK2 and GTK3 Configurator for KDE"
 # armhf blocked by qt5-qtdeclarative
 # s390x, riscv64 blocked by polkit -> kio
@@ -25,6 +25,7 @@ makedepends="
 	knewstuff-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	sassc
 	"
 
@@ -35,8 +36,8 @@ esac
 source="https://download.kde.org/$_rel/plasma/$pkgver/kde-gtk-config-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -50,6 +51,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 ac2df456007925879027bb44b28aedab50d1cefd3c493e3688764dad90536958fb27990cc340e1956434bf6fd1440f46bc5e8a95f7f9f5b7e33420d4c32e42b1  kde-gtk-config-5.24.4.tar.xz
 "
diff --git a/community/kdebugsettings/APKBUILD b/community/kdebugsettings/APKBUILD
index c04db5ba207d419a0091c2fe10119f866fb57460..84a9affe92c0ab013d74dd7c51cad1446ab17f56 100644
--- a/community/kdebugsettings/APKBUILD
+++ b/community/kdebugsettings/APKBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdebugsettings
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf"
 url="https://kde.org/applications/utilities/"
 pkgdesc="An application to enable/disable qCDebug"
 license="GPL-2.0-or-later"
-makedepends="extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kconfig-dev kdbusaddons-dev ki18n-dev kwidgetsaddons-dev kitemviews-dev kcompletion-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kconfig-dev kdbusaddons-dev ki18n-dev kwidgetsaddons-dev kitemviews-dev kcompletion-dev samurai"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdebugsettings-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdeconnect/APKBUILD b/community/kdeconnect/APKBUILD
index 42287747de586431595d7528676c9b259da66581..d05d036502a125151e0fb8e2d65b844182e8cf86 100644
--- a/community/kdeconnect/APKBUILD
+++ b/community/kdeconnect/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdeconnect
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Adds communication between KDE and your smartphone"
 url="https://community.kde.org/KDEConnect"
 # armhf blocked by extra-cmake-modules
@@ -35,6 +35,7 @@ makedepends="
 	qqc2-desktop-style-dev
 	qt5-qtbase-dev
 	qt5-qtmultimedia-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-nftables"
@@ -48,8 +49,8 @@ builddir="$srcdir/$pkgname-kde-$pkgver"
 #     - CVE-2020-26164
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_INSTALL_LIBEXECDIR=lib
diff --git a/community/kdecoration/APKBUILD b/community/kdecoration/APKBUILD
index 56296e3281073d0cac7da06e6c724f17607dedd9..32c75c810a68689caf0956eeaec33cdf05f4c63b 100644
--- a/community/kdecoration/APKBUILD
+++ b/community/kdecoration/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdecoration
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Plugin based library to create window decorations"
 arch="all !armhf"
 url="https://kde.org/plasma-desktop/"
@@ -14,6 +14,7 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 
@@ -25,8 +26,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kdecoration-$pkgver.tar.xz
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -40,6 +41,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 2c8d3a276c71be757b333de58aa5b667cf182b606e8553f75db51414c51a5b38adc140da9c11b9753b1c0ba438ca267d3c32023d9c3c4eec43a2ed88c9fc56a8  kdecoration-5.24.4.tar.xz
 "
diff --git a/community/kdeedu-data/APKBUILD b/community/kdeedu-data/APKBUILD
index a77743fcc7fcde006c59bfb5c3e3ddb0a9536621..f46f382b62d451213fd0ca405a76f95bf4de547f 100644
--- a/community/kdeedu-data/APKBUILD
+++ b/community/kdeedu-data/APKBUILD
@@ -2,18 +2,18 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdeedu-data
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="noarch !armhf" # armhf blocked by extra-cmake-modules
 url="https://kde.org/applications/education"
 pkgdesc="Common data for KDE Edu applications"
 license="GPL-2.0-only"
-makedepends="extra-cmake-modules"
+makedepends="extra-cmake-modules samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdeedu-data-$pkgver.tar.xz"
 options="!check" # No code to test"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdegraphics-mobipocket/APKBUILD b/community/kdegraphics-mobipocket/APKBUILD
index 29df424c09146a90fe7e8f0de7c3171384e59bcd..f85e255998c92d30aaccac82e25fa824fb419292 100644
--- a/community/kdegraphics-mobipocket/APKBUILD
+++ b/community/kdegraphics-mobipocket/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdegraphics-mobipocket
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A collection of plugins to handle mobipocket files"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -15,14 +15,15 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdegraphics-mobipocket-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdegraphics-thumbnailers/APKBUILD b/community/kdegraphics-thumbnailers/APKBUILD
index 359fbe99f5b2d019407910f1caee4aa1589e20a4..233c01a3539c4ac948a38cc7aabfb99906d1f92c 100644
--- a/community/kdegraphics-thumbnailers/APKBUILD
+++ b/community/kdegraphics-thumbnailers/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdegraphics-thumbnailers
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kio -> polkit
 arch="all !armhf !s390x !riscv64"
@@ -17,15 +17,16 @@ makedepends="
 	libkdcraw-dev
 	libkexiv2-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdegraphics-thumbnailers-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_INSTALL_LIBDIR=lib	
+		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
 }
 
diff --git a/community/kdenetwork-filesharing/APKBUILD b/community/kdenetwork-filesharing/APKBUILD
index 2dad97a99b410c7dc66ae45096137378541f269c..485f6c2129a1c0214db1ef22418c4b2ad722b2ac 100644
--- a/community/kdenetwork-filesharing/APKBUILD
+++ b/community/kdenetwork-filesharing/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdenetwork-filesharing
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # armhf, s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -20,14 +20,15 @@ makedepends="
 	kio-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdenetwork-filesharing-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DSAMBA_INSTALL=OFF
diff --git a/community/kdenlive/APKBUILD b/community/kdenlive/APKBUILD
index 4451f94cf083be444ce2015e012d8ff1588514e4..f50e1e74793cea0baba3284463e857bfc13ae40d 100644
--- a/community/kdenlive/APKBUILD
+++ b/community/kdenlive/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdenlive
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # s390x and riscv64 blocked by polkit -> kxmlgui
 # ppc64le mlt uses 64bit long double while libgcc uses 128bit long double
 arch="all !armhf !s390x !ppc64le !riscv64"
@@ -29,6 +29,7 @@ makedepends="
 	qt5-qtnetworkauth-dev
 	qt5-qtsvg-dev
 	rttr-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdenlive-$pkgver.tar.xz"
@@ -36,8 +37,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdepim-addons/APKBUILD b/community/kdepim-addons/APKBUILD
index ba05251a2c3158c3f1c62c9cf0c795ae8544a679..9514c463dcccb99a0c28dc343d12b5f0db92dc91 100644
--- a/community/kdepim-addons/APKBUILD
+++ b/community/kdepim-addons/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdepim-addons
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -53,6 +53,7 @@ makedepends="
 	prison-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	syntax-highlighting-dev
 	"
 checkdepends="
@@ -64,8 +65,8 @@ subpackages="$pkgname-lang"
 options="!check" # Require OpenGL and running dbus
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DKDEPIMADDONS_BUILD_EXAMPLES=OFF
diff --git a/community/kdepim-runtime/APKBUILD b/community/kdepim-runtime/APKBUILD
index 754cde71628d3fde28c70bb9c799d01513759c92..44951e5a4eb5ddaa33893d032c13a39c7991d662 100644
--- a/community/kdepim-runtime/APKBUILD
+++ b/community/kdepim-runtime/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdepim-runtime
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Extends the functionality of kdepim"
 url="https://kontact.kde.org/"
 # armhf blocked by extra-cmake-modules
@@ -45,14 +45,15 @@ makedepends="
 	qt5-qtnetworkauth-dev
 	qt5-qtspeech-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	shared-mime-info
 	"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdepim-runtime-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdeplasma-addons/APKBUILD b/community/kdeplasma-addons/APKBUILD
index 322983b122a50c2df1ed7b171fa69520d219a75c..7541134018ba9c2eea7314db96c6323bb80e0390 100644
--- a/community/kdeplasma-addons/APKBUILD
+++ b/community/kdeplasma-addons/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdeplasma-addons
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="All kind of addons to improve your Plasma experience"
 # armhf blocked by qt5-qtdeclarative
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
@@ -31,6 +31,7 @@ depends_dev="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtwebengine-dev
+	samurai
 	sonnet-dev
 	"
 makedepends="$depends_dev
@@ -46,8 +47,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kdeplasma-addons-$pkgver.t
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -62,6 +63,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 0adae68e67615838dc61a718ee1bd210aeda56e013193e311f330e92b0e13b8d7055c1884cfeebf31a68bbfb4b36f9746cbef03656c3db85d9978b5bca542ad4  kdeplasma-addons-5.24.4.tar.xz
 "
diff --git a/community/kdesdk-kioslaves/APKBUILD b/community/kdesdk-kioslaves/APKBUILD
index 85e7f3feb14aa4791bd6f13b3b2650ef05558a83..ddfeefe2131eddd19d450449f35e0dcd4119378e 100644
--- a/community/kdesdk-kioslaves/APKBUILD
+++ b/community/kdesdk-kioslaves/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdesdk-kioslaves
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -15,14 +15,15 @@ makedepends="
 	kio-dev
 	perl-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdesdk-kioslaves-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdesdk-thumbnailers/APKBUILD b/community/kdesdk-thumbnailers/APKBUILD
index f877980711f8c04af00bd0b2dfdd761c76153c6f..171c624111a9676708e353261ba9637678a8baa7 100644
--- a/community/kdesdk-thumbnailers/APKBUILD
+++ b/community/kdesdk-thumbnailers/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdesdk-thumbnailers
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -16,14 +16,15 @@ makedepends="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdesdk-thumbnailers-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdesrc-build/APKBUILD b/community/kdesrc-build/APKBUILD
index 5ab429cff8b99faae654439752dd75a82dfd27bb..fe69cf4ce25125d91869bc8bf450049a031a2d0f 100644
--- a/community/kdesrc-build/APKBUILD
+++ b/community/kdesrc-build/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdesrc-build
 pkgver=20.06
-pkgrel=1
+pkgrel=2
 arch="noarch !armhf" # armhf blocked by extra-cmake-modules
 url="https://invent.kde.org/sdk/kdesrc-build"
 pkgdesc="Script to streamline setting up and maintaining KDE software development environment"
@@ -19,14 +19,15 @@ depends="
 makedepends="
 	extra-cmake-modules
 	kdoctools-dev
+	samurai
 	"
 source="https://invent.kde.org/sdk/kdesrc-build/-/archive/v$pkgver/kdesrc-build-v$pkgver.tar.gz"
 subpackages="$pkgname-doc"
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdevelop/APKBUILD b/community/kdevelop/APKBUILD
index d87e97a64bd9bb1e4cb2ea956f237730f753726f..16b1a490cdc4a027f599e30e037f53166c93300d 100644
--- a/community/kdevelop/APKBUILD
+++ b/community/kdevelop/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdevelop
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -46,6 +46,7 @@ makedepends="
 	"
 makedepends="$makedepends
 	llvm-dev>=12
+	samurai
 	" # Should always install the version of llvm that contains /usr/bin/llvm-config
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdevelop-$pkgver.tar.xz
@@ -55,8 +56,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdf/APKBUILD b/community/kdf/APKBUILD
index 886c1e67196ee8061a6056dbdb963c04aa7b44e0..b18751376aef4d893e7b111f3986ec6353e953a4 100644
--- a/community/kdf/APKBUILD
+++ b/community/kdf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdf
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -22,13 +22,14 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdf-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdiagram/APKBUILD b/community/kdiagram/APKBUILD
index a2b6aec6890444ac0463947302ca7967d0722b03..3ba5d9eba6dd2f665fbf119af6f5464fdd954e87 100644
--- a/community/kdiagram/APKBUILD
+++ b/community/kdiagram/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdiagram
 pkgver=2.8.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Powerful libraries (KChart, KGantt) for creating business diagrams"
 arch="all !armhf"
 url="https://kontact.kde.org/"
@@ -15,14 +15,15 @@ depends_dev="
 makedepends="$depends_dev
 	doxygen
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/kdiagram/$pkgver/kdiagram-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_QCH=ON
@@ -38,4 +39,5 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="d981bce4feeb65038772125e5af1c096537ec87991fdb93d9a91dd5c9f089b1001647c8a63b209683a67b2d7b3aadeb7dd6279261eefaf6b6e046d0ab72723ec  kdiagram-2.8.0.tar.xz"
diff --git a/community/kdialog/APKBUILD b/community/kdialog/APKBUILD
index c4b685e504eea5783d8f5f6b577ed1f2b617ea3d..68eb1f62c0a0e10d80476edf7f60b388937c60cb 100644
--- a/community/kdialog/APKBUILD
+++ b/community/kdialog/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdialog
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -19,13 +19,14 @@ makedepends="
 	ktextwidgets-dev
 	kwindowsystem-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdialog-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdiamond/APKBUILD b/community/kdiamond/APKBUILD
index 741f39e7923ecbbddaca79dc6b63625467fead75..7112be817735fbc92c2941214bf18b0491642b72 100644
--- a/community/kdiamond/APKBUILD
+++ b/community/kdiamond/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdiamond
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A single player puzzle game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -24,14 +24,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kdiamond-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kdiff3/APKBUILD b/community/kdiff3/APKBUILD
index 4605e8d74b21097eca710daf26102e3474d7bacf..7c1bbe7d9bbe95402529bce081cbbe93a53f32e2 100644
--- a/community/kdiff3/APKBUILD
+++ b/community/kdiff3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdiff3
 pkgver=1.9.5
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x, riscv64 blocked by polkit -> kparts
 arch="all !armhf !s390x !riscv64"
@@ -20,14 +20,15 @@ makedepends="
 	kparts-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/kdiff3/kdiff3-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/keditbookmarks/APKBUILD b/community/keditbookmarks/APKBUILD
index 6682d1b443a0067bfa5b7e799f7bb50e4960bf49..01bbbf0d7e469ea3379ebf71ed41e32d4f9719ea 100644
--- a/community/keditbookmarks/APKBUILD
+++ b/community/keditbookmarks/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=keditbookmarks
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -19,14 +19,15 @@ makedepends="
 	kparts-dev
 	kwindowsystem-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/keditbookmarks-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/keysmith/APKBUILD b/community/keysmith/APKBUILD
index ab5fae79c260f6808fa72e9e380e08ff6697ae48..2adceff3222653a464c7e0271a156345f79f32a7 100644
--- a/community/keysmith/APKBUILD
+++ b/community/keysmith/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=keysmith
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="OTP client for Plasma Mobile and Desktop"
 url="https://invent.kde.org/kde/keysmith"
 arch="all !armhf"
@@ -17,13 +17,14 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/keysmith-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
diff --git a/community/kfind/APKBUILD b/community/kfind/APKBUILD
index 8b33e04b870891cdde1d7ed6418b8608e3d6fce0..674b00ca9be6ea0433447f6bb70c7197d088cb5d 100644
--- a/community/kfind/APKBUILD
+++ b/community/kfind/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kfind
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -19,14 +19,15 @@ makedepends="
 	kio-dev
 	ktextwidgets-dev
 	kwidgetsaddons-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kfind-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kfloppy/APKBUILD b/community/kfloppy/APKBUILD
index 29fb8f81ffe4d250ad49de24f0943d6ad1daffda..30918f428b70cbd2ced44952a5e363628d526fb2 100644
--- a/community/kfloppy/APKBUILD
+++ b/community/kfloppy/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kfloppy
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -24,14 +24,15 @@ makedepends="
 	ki18n-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kfloppy-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kfourinline/APKBUILD b/community/kfourinline/APKBUILD
index ca3d5eeef19ba8e4bbaa39667092f12f44e0e264..efb0514b8e27e6283dc62b0f8d7594c028ce2bf1 100644
--- a/community/kfourinline/APKBUILD
+++ b/community/kfourinline/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kfourinline
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A four-in-a-row game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -23,14 +23,15 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kfourinline-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kgamma5/APKBUILD b/community/kgamma5/APKBUILD
index 1231ccabfaab78deb7be57c3649bf025a3f9b6fe..e2efddb2023f2f2ede83d2d4adc0824f68df5623 100644
--- a/community/kgamma5/APKBUILD
+++ b/community/kgamma5/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kgamma5
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Adjust your monitor's gamma settings"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kconfigwidgets
@@ -16,6 +16,7 @@ makedepends="
 	kdoctools-dev
 	ki18n-dev
 	qt5-qtbase-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -26,8 +27,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kgamma5-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kgeography/APKBUILD b/community/kgeography/APKBUILD
index ba23ed745f03d1d1d98b849d19c893ab66109dd9..c1d00ced0ff99ab388310ecafd8783cf6d2226df 100644
--- a/community/kgeography/APKBUILD
+++ b/community/kgeography/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kgeography
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -21,14 +21,15 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kgeography-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kget/APKBUILD b/community/kget/APKBUILD
index 8c344182a1100b1f42cb36b6ca786cc9788b3f48..edb1929091aa2f83e2f8b5054ba1f56e388d9409 100644
--- a/community/kget/APKBUILD
+++ b/community/kget/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kget
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # ppc64le, s390x and riscv64 blocked by polkit -> kio
 # armhf blocked by extra-cmake-modules
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -40,6 +40,7 @@ makedepends="
 	plasma-workspace-dev
 	qca-dev
 	qt5-qtbase-dev
+	samurai
 	sqlite-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kget-$pkgver.tar.xz"
@@ -47,8 +48,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kgoldrunner/APKBUILD b/community/kgoldrunner/APKBUILD
index 221d5cd9c8a638fcc6e74804b0b80978e1826096..cf1d4c22bdebbde7cba9ce0cf9a479e5da65d4da 100644
--- a/community/kgoldrunner/APKBUILD
+++ b/community/kgoldrunner/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kgoldrunner
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	libkdegames-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kgoldrunner-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kgpg/APKBUILD b/community/kgpg/APKBUILD
index c60ea9b7edc9885f2dc9fdd0a1d02b142225b751..a70dd08827d30703690e3547258631ff07bc2927 100644
--- a/community/kgpg/APKBUILD
+++ b/community/kgpg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kgpg
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 # ppc64le blocked by qt5-qtwebengine -> kaccounts-integration
@@ -32,13 +32,14 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kgpg-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/khangman/APKBUILD b/community/khangman/APKBUILD
index feeb4c6862fd18c027301c2f6bbd89b90e1c4955..d59a39a172e50675a627fdb7660eea039b08ad9c 100644
--- a/community/khangman/APKBUILD
+++ b/community/khangman/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khangman
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -27,14 +27,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/khangman-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/khealthcertificate/APKBUILD b/community/khealthcertificate/APKBUILD
index aa2dea942f1fbf58b3f3c5a1d7cf3db10343d62c..89e0bbac85e47d01743a9c017267ccb9acf30868 100644
--- a/community/khealthcertificate/APKBUILD
+++ b/community/khealthcertificate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khealthcertificate
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Handling of digital vaccination, test and recovery certificates"
 url="https://invent.kde.org/pim/khealthcertificate"
 # armhf blocked by extra-cmake-modules
@@ -14,6 +14,7 @@ depends_dev="
 	openssl-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	zlib-dev
 	"
 makedepends="$depends_dev
@@ -24,8 +25,8 @@ subpackages="$pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/khelpcenter/APKBUILD b/community/khelpcenter/APKBUILD
index c54a423c7b0134c6a33affc7abc91f0e1fe318b2..e452cf4dd3b14f63a5732d5108c4b3237227b2e2 100644
--- a/community/khelpcenter/APKBUILD
+++ b/community/khelpcenter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khelpcenter
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Application to show KDE Applications' documentation"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> khtml
@@ -25,14 +25,15 @@ makedepends="
 	kwindowsystem-dev
 	libxml2-dev
 	qt5-qtbase-dev
+	samurai
 	xapian-core-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/khelpcenter-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/khotkeys/APKBUILD b/community/khotkeys/APKBUILD
index 26c919e8855fa0bf74bb1f1566e82aeccce79418..834a6f1ec0d8692bc5d2357ff6f6d60d091cdaa7 100644
--- a/community/khotkeys/APKBUILD
+++ b/community/khotkeys/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khotkeys
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by libksysguard
 arch="all !armhf !s390x !riscv64"
@@ -23,6 +23,7 @@ makedepends="
 	plasma-workspace-dev
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -34,8 +35,8 @@ subpackages="$pkgname-doc $pkgname-lang $pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/khtml/APKBUILD b/community/khtml/APKBUILD
index 4198ec8584640664d7f73bc119a80d980a13ca4b..ee56592144eaf786b66b58f4586885b1f6b3570f 100644
--- a/community/khtml/APKBUILD
+++ b/community/khtml/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khtml
 pkgver=5.93.0
-pkgrel=0
+pkgrel=1
 pkgdesc="The KDE HTML library, ancestor of WebKit"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit
@@ -28,6 +28,7 @@ depends_dev="
 	libjpeg-turbo-dev
 	perl-dev
 	qt5-qtbase-dev
+	samurai
 	sonnet-dev
 	"
 makedepends="$depends_dev
diff --git a/community/kidentitymanagement/APKBUILD b/community/kidentitymanagement/APKBUILD
index 25e23880241df4fac82eef6ea74ff1a6ebb1d0c4..101d8dfa83aec68a96ee97eaa87f2f3b30f628de 100644
--- a/community/kidentitymanagement/APKBUILD
+++ b/community/kidentitymanagement/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kidentitymanagement
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM libraries"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -20,6 +20,7 @@ depends_dev="
 	ktextwidgets-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
@@ -27,8 +28,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kidentityman
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -44,6 +45,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 fd5bbc2dfdd9ad931ec0f22a95d6886259117f377efb19c837551444b98a6259640c43294c9ee4c672cd6aa6cfaa53604dc1de3aad419f7495ac23d57ee4cb8e  kidentitymanagement-22.04.0.tar.xz
 "
diff --git a/community/kig/APKBUILD b/community/kig/APKBUILD
index 63adb5f1943bce0e0ff3a85ed411fedf1c49aff0..642b2c90825a5a7221673f34b41402b1868ce4d4 100644
--- a/community/kig/APKBUILD
+++ b/community/kig/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kig
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kig-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kigo/APKBUILD b/community/kigo/APKBUILD
index 98bd0cb05653f077a746e38aac56e0d76bbd3eda..e9f038e8eff673584a6eb302854eb0d645d0d49d 100644
--- a/community/kigo/APKBUILD
+++ b/community/kigo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kigo
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="An open-source implementation of the popular Go game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -25,14 +25,15 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kigo-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kile/APKBUILD b/community/kile/APKBUILD
index 51e61d633c22d2c3f1ccb4181d6531d670e73967..4dfaeb94fc08349f015a0035be8a86186cb35d72 100644
--- a/community/kile/APKBUILD
+++ b/community/kile/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kile
 pkgver=2.9.93
-pkgrel=1
+pkgrel=2
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by texlive
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -30,13 +30,14 @@ makedepends="
 	okular-dev
 	poppler-qt5-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://downloads.sourceforge.net/kile/kile-$pkgver.tar.bz2"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/killbots/APKBUILD b/community/killbots/APKBUILD
index b5ce831d2601fc28b20f1df07c75951e267d036a..eac0e0e30143e60f4b7864acb60076f870e7a58c 100644
--- a/community/killbots/APKBUILD
+++ b/community/killbots/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=killbots
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple game of evading killer robots"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -23,14 +23,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/killbots-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kimagemapeditor/APKBUILD b/community/kimagemapeditor/APKBUILD
index 805ed4e6a7d7dd72df9abf47ae9bfb70f453b52f..f41cb74772fbc71632623925e89b6655c0483335 100644
--- a/community/kimagemapeditor/APKBUILD
+++ b/community/kimagemapeditor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kimagemapeditor
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -26,14 +26,15 @@ makedepends="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kimagemapeditor-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kimap/APKBUILD b/community/kimap/APKBUILD
index 199617358b4d0bb587f97c84a1f24d57aa08cd9e..1081379644179ee413d08739bc25b6c3bea191dc 100644
--- a/community/kimap/APKBUILD
+++ b/community/kimap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kimap
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Job-based API for interacting with IMAP servers"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kio-dev
@@ -16,6 +16,7 @@ depends_dev="
 	kio-dev
 	kmime-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -24,8 +25,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kimap-$pkgve
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -41,6 +42,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 9c36f4271b6deab05ce197b54163bdeeea3a73382b16ced10e9645e9f6f004d8bea6067f269ea92eb39ebd9d115e2d5a3d2bc94ad05f8469567299eeaa334460  kimap-22.04.0.tar.xz
 "
diff --git a/community/kimap2/APKBUILD b/community/kimap2/APKBUILD
index 155fd65ea16d149bd82b42d595623cf72bffda63..a34133bcfb08b5a1785d4a5124b6d9b53bff8a00 100644
--- a/community/kimap2/APKBUILD
+++ b/community/kimap2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kimap2
 pkgver=0.4.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Next-generation IMAP library"
 arch="all !armhf" # qtdeclarative
 url="https://community.kde.org/KDE_PIM"
@@ -16,14 +16,15 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://invent.kde.org/pim/kimap2/-/archive/v$pkgver/kimap2-v$pkgver.tar.gz"
 subpackages="$pkgname-dev"
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kinfocenter/APKBUILD b/community/kinfocenter/APKBUILD
index 41e05506b127ddb85a5416fc7f5e51e125456d79..b47c505d76312d5a497f4256d0faf504a9fbf9f0 100644
--- a/community/kinfocenter/APKBUILD
+++ b/community/kinfocenter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kinfocenter
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A utility that provides information about a computer system"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -31,6 +31,7 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	solid-dev
 	solid-dev
 	"
@@ -43,8 +44,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kinfocenter-$pkgver.tar.xz
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kio-extras/APKBUILD b/community/kio-extras/APKBUILD
index e061de2079b97773de04a7a9847e05e81276fe88..88527ed693c2f8d4081b451f48cb8a4fa85a5020 100644
--- a/community/kio-extras/APKBUILD
+++ b/community/kio-extras/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kio-extras
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -36,6 +36,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	samba-dev
+	samurai
 	shared-mime-info
 	solid-dev
 	syntax-highlighting-dev
@@ -46,8 +47,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # Requires running dbus-server
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kio-fuse/APKBUILD b/community/kio-fuse/APKBUILD
index c14d6ee27e13d983e8a03b038aadb43e60d9e260..c0336806e5bbe7f8da0eeb7f9eed62cea9538c7c 100644
--- a/community/kio-fuse/APKBUILD
+++ b/community/kio-fuse/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kio-fuse
 pkgver=5.0.1
-pkgrel=1
+pkgrel=2
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -16,6 +16,7 @@ makedepends="
 	kdbusaddons-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="dbus"
 source="https://download.kde.org/stable/kio-fuse/$pkgver/kio-fuse-$pkgver.tar.xz
@@ -26,8 +27,8 @@ install="$pkgname.post-install"
 options="!check" # Only test is broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kio-gdrive/APKBUILD b/community/kio-gdrive/APKBUILD
index 01daa04e51748d842bf20f911dd06a230c42010b..087c4e9c876720cfdbdfa040218d681fdd20c4ef 100644
--- a/community/kio-gdrive/APKBUILD
+++ b/community/kio-gdrive/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kio-gdrive
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> libkgapi
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -23,13 +23,14 @@ makedepends="
 	kio-dev
 	libkgapi-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service//$pkgver/src/kio-gdrive-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kipi-plugins/APKBUILD b/community/kipi-plugins/APKBUILD
index 3bdd79cb43953be1f524dead86556ca53140dec8..f41b0867905ee6babfc68736d3e03df97ece8f66 100644
--- a/community/kipi-plugins/APKBUILD
+++ b/community/kipi-plugins/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kipi-plugins
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A collection of plugins extending the KDE graphics and image applications"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -21,14 +21,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kipi-plugins-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kirigami-addons/APKBUILD b/community/kirigami-addons/APKBUILD
index b91d21c817d1042cbd0a33027399a7b375fcba8a..919763551f3fe4db6e558c6200ae1cb68c87daa1 100644
--- a/community/kirigami-addons/APKBUILD
+++ b/community/kirigami-addons/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kirigami-addons
 pkgver=0.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Add-ons for the Kirigami framework"
 url="https://invent.kde.org/libraries/kirigami-addons"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
@@ -13,12 +13,13 @@ makedepends="
 	ki18n-dev
 	kirigami2-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	"
 source="https://download.kde.org/unstable/kirigami-addons/$pkgver/kirigami-addons-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_QCH=ON
diff --git a/community/kirigami-gallery/APKBUILD b/community/kirigami-gallery/APKBUILD
index 13af7572d5c85ef47a17a86ed06740ab25d17319..7e7ed1204cd45407d82eeb1ab2ba9b9787b334ce 100644
--- a/community/kirigami-gallery/APKBUILD
+++ b/community/kirigami-gallery/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kirigami-gallery
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by kirigami2 -> qt5-qtdeclarative
 url="https://kde.org/applications/development/org.kde.kirigami2.gallery"
 pkgdesc="Gallery application built using Kirigami"
@@ -16,13 +16,14 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
 	qt5-qttools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kirigami-gallery-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kiriki/APKBUILD b/community/kiriki/APKBUILD
index dab0fd3edfb744bc0dda204565768310691a6054..6547c909bc0a34158cf3925194a67e2675b8fcd6 100644
--- a/community/kiriki/APKBUILD
+++ b/community/kiriki/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kiriki
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="An addictive and fun dice game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -22,14 +22,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kiriki-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kiten/APKBUILD b/community/kiten/APKBUILD
index 8a6005107de26ceca6284f008ca3d216cdda920c..b67a50dbde3f72274c6728b2b22d49e38145e308 100644
--- a/community/kiten/APKBUILD
+++ b/community/kiten/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kiten
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kconfigwidgets
 arch="all !armhf !s390x !riscv64"
@@ -23,14 +23,15 @@ makedepends="
 	knotifications-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kiten-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kitinerary/APKBUILD b/community/kitinerary/APKBUILD
index 43d77db1f75aa1600b8770d3ce3fd798508304a6..280cf858fbfa4ae5955ddfa1f9fb634ef33396b5 100644
--- a/community/kitinerary/APKBUILD
+++ b/community/kitinerary/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kitinerary
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # ppc64le FTBFS
 arch="all !armhf !ppc64le"
@@ -25,6 +25,7 @@ makedepends="$depends_dev
 	poppler-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	shared-mime-info
 	zlib-dev
 	"
diff --git a/community/kjumpingcube/APKBUILD b/community/kjumpingcube/APKBUILD
index 7acfee17c2c6fc0d52b66263b7d0d1c01841456a..3b5cb58644d4abd656a36bd01bba76b92916c323 100644
--- a/community/kjumpingcube/APKBUILD
+++ b/community/kjumpingcube/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kjumpingcube
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple tactical game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -24,14 +24,15 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kjumpingcube-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kldap/APKBUILD b/community/kldap/APKBUILD
index 0c71d8ed1ac6b48142aea91edd341dec0a675a7d..eeccf042fa0ef99d05d5e01684dbc2ce0acc4458 100644
--- a/community/kldap/APKBUILD
+++ b/community/kldap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kldap
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="LDAP access API for KDE"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -21,13 +21,14 @@ depends_dev="
 makedepends="$depends_dev
 	extra-cmake-modules
 	cyrus-sasl-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kldap-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -41,6 +42,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --build build --target install
 }
+
 sha512sums="
 bda1f463e8249e4ed83c9a4348c343ef936f03822563496180a361de1faa9e4f05d626f108e2ca786149289ee8fc73a5a7974deecd192d3da081e09407ab557c  kldap-22.04.0.tar.xz
 "
diff --git a/community/kleopatra/APKBUILD b/community/kleopatra/APKBUILD
index fb4a20d288c3387065ab830a4ee516dfd12c9851..7614d2a3d0df2f6800e2bb0acb368ec2c5caaa8d 100644
--- a/community/kleopatra/APKBUILD
+++ b/community/kleopatra/APKBUILD
@@ -2,21 +2,21 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kleopatra
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # riscv64 disabled due to missing rust in recursive dependency
 arch="all !armhf !s390x !riscv64"
 url="https://www.kde.org/applications/utilities/kleopatra/"
 pkgdesc="Certificate Manager and Unified Crypto GUI"
 license="GPL-2.0-or-later AND GFDL-1.2-only"
 depends="gnupg pinentry-qt"
-makedepends="extra-cmake-modules qt5-qtbase-dev kcmutils-dev kwidgetsaddons-dev kconfigwidgets-dev kcoreaddons-dev kcodecs-dev kconfig-dev ki18n-dev kiconthemes-dev kitemmodels-dev kxmlgui-dev kwindowsystem-dev kdoctools-dev kcrash-dev kdoctools-dev kdbusaddons-dev gpgme-dev qgpgme libkleo-dev kmime-dev libassuan-dev boost-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev kcmutils-dev kwidgetsaddons-dev kconfigwidgets-dev kcoreaddons-dev kcodecs-dev kconfig-dev ki18n-dev kiconthemes-dev kitemmodels-dev kxmlgui-dev kwindowsystem-dev kdoctools-dev kcrash-dev kdoctools-dev kdbusaddons-dev gpgme-dev qgpgme libkleo-dev kmime-dev libassuan-dev boost-dev samurai"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kleopatra-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/klettres/APKBUILD b/community/klettres/APKBUILD
index f1a5d4ee8c6403285bbaa00bfe7af33bcf6708db..0c27f96949a5cf28c65229d4e70c467883e8d4aa 100644
--- a/community/klettres/APKBUILD
+++ b/community/klettres/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=klettres
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> knewstuff
 arch="all !armhf !s390x !riscv64"
@@ -21,14 +21,15 @@ makedepends="
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/klettres-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/klickety/APKBUILD b/community/klickety/APKBUILD
index 90388123557ae460ca93cd47f4a20e6a9ee60391..1078435e279953c1c135861df4534959d9764217 100644
--- a/community/klickety/APKBUILD
+++ b/community/klickety/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=klickety
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="An adaptation of the Clickomania game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -23,14 +23,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/klickety-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/klines/APKBUILD b/community/klines/APKBUILD
index b84ba4237f7a8f31863e133ef0ead449ce300e2b..d73971006efe189087beb664121b7a6fe90099c6 100644
--- a/community/klines/APKBUILD
+++ b/community/klines/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=klines
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -22,14 +22,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/klines-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmag/APKBUILD b/community/kmag/APKBUILD
index 28932a4626d3c6afe547acffecd0fabbd6878430..7c0df23fba0d8c0e20613a61b2ee09a7b55d7d85 100644
--- a/community/kmag/APKBUILD
+++ b/community/kmag/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmag
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -16,13 +16,14 @@ makedepends="
 	kio-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmag-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmail-account-wizard/APKBUILD b/community/kmail-account-wizard/APKBUILD
index efbfbbf05b072ff8de62d2074a6c51f7e6620d2b..bd3bb1c05a21e210cb98f1efe17d1147056b718a 100644
--- a/community/kmail-account-wizard/APKBUILD
+++ b/community/kmail-account-wizard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmail-account-wizard
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> kmailtransport
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -35,14 +35,15 @@ makedepends="
 	libkleo-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	samurai
 	shared-mime-info
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmail-account-wizard-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmail/APKBUILD b/community/kmail/APKBUILD
index 86dde98048015a5969834262ce77c4710c237c27..8ada1483a03fdd38b440e083f719f0beec38fa57 100644
--- a/community/kmail/APKBUILD
+++ b/community/kmail/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmail
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -60,6 +60,7 @@ makedepends="
 	pimcommon-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	sonnet-dev
 	"
 checkdepends="xvfb-run"
@@ -67,8 +68,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kmail-$pkgve
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmailtransport/APKBUILD b/community/kmailtransport/APKBUILD
index 04e6ff51c3c21fa9298cba03e4501a0e30fe8689..8872a58bd0104d192f660d65d8e3ffe65da4cb7b 100644
--- a/community/kmailtransport/APKBUILD
+++ b/community/kmailtransport/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmailtransport
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Manage mail transport"
 # armhf blocked by extra-cmake-modules
 # ppc64le and s390x blocked by libkgapi
@@ -24,6 +24,7 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmailtransport-$pkgver.tar.xz"
@@ -31,8 +32,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Requires OpenGL and running dbus
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -46,6 +47,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 60eea713f8ae51e72c2e4252f09ae3f80a7d58dfc1daf06d5de52384fcaaac8321f8ec536ff2eb2427451e75c3d080b93f14005d440148d0ccf722a9557137ab  kmailtransport-22.04.0.tar.xz
 "
diff --git a/community/kmbox/APKBUILD b/community/kmbox/APKBUILD
index d5e7b3874ef6ae28d6be69f15e37210bcc96dfb3..825162cff00f10b89f8c8ac6e93f44de032ef1b7 100644
--- a/community/kmbox/APKBUILD
+++ b/community/kmbox/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmbox
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for accessing mail storages in MBox format"
 # armhf blocked by extra-cmake-modules
 # s390x blocked by kmime
@@ -10,13 +10,13 @@ arch="all !armhf !s390x"
 url="https://kontact.kde.org/"
 license="LGPL-2.0-or-later"
 depends_dev="kmime-dev"
-makedepends="$depends_dev extra-cmake-modules"
+makedepends="$depends_dev extra-cmake-modules samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmbox-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -30,6 +30,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --build build --target install
 }
+
 sha512sums="
 e7f332f013b25feba209465e48e7fc2d1527e1e655976bdb8bb7071921f2416540b8e3e63f12512400990968b3d0365eee8dc18cfe6a11a59296e53bc50aaba1  kmbox-22.04.0.tar.xz
 "
diff --git a/community/kmenuedit/APKBUILD b/community/kmenuedit/APKBUILD
index 2f25d744533e1b0ab3bc59a569f5f0d0c3bbeabc..1007d9ed1795a1c123e7153ef5e3a91eb1f578f3 100644
--- a/community/kmenuedit/APKBUILD
+++ b/community/kmenuedit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmenuedit
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE menu editor"
 # armhf blocked by qt5-qtdeclarative
 # s390x blocked by polkit -> kio
@@ -21,6 +21,7 @@ makedepends="
 	kitemviews-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	sonnet-dev
 	"
 
@@ -32,8 +33,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kmenuedit-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmime/APKBUILD b/community/kmime/APKBUILD
index 79f35c051948313a678003a2af00238b77053d0e..45b42bb9f4a73a412d1ed6d05cd69d3028934bcb 100644
--- a/community/kmime/APKBUILD
+++ b/community/kmime/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmime
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for handling mail messages and newsgroup articles"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -15,13 +15,14 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmime-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -37,6 +38,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --build build --target install
 }
+
 sha512sums="
 172c1e597228ed2b194ed529c496014e19f762c97295a5adb0ee3bfd09193010ecdd6f48b9eca13a5bfa95bbfcec960bf26967a3ec380d9fa98e15f8c60c5bc4  kmime-22.04.0.tar.xz
 "
diff --git a/community/kmix/APKBUILD b/community/kmix/APKBUILD
index e2cd8e5f3e9aeeadaf076ac2b8436f4a6674d9ec..186c28b6c7089e964bc56250b62f314b9b875c0c 100644
--- a/community/kmix/APKBUILD
+++ b/community/kmix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmix
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -29,6 +29,7 @@ makedepends="
 	plasma-framework-dev
 	pulseaudio-dev
 	qt5-qtbase-dev
+	samurai
 	solid-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmix-$pkgver.tar.xz"
@@ -36,8 +37,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmousetool/APKBUILD b/community/kmousetool/APKBUILD
index aeb16b2e2de0b2c624efd59e2ee4958f08105853..e6a50fe48b624bb7ce61d9a8286500dcbc748a70 100644
--- a/community/kmousetool/APKBUILD
+++ b/community/kmousetool/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmousetool
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -21,13 +21,14 @@ makedepends="
 	phonon-dev
 	libxt-dev
 	libxtst-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmousetool-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmouth/APKBUILD b/community/kmouth/APKBUILD
index 0fe36f25aa6d766056120927e078e3e97d8cc5b4..49b9d3db4efab5cf4df35c0c196ef3e7e6e6c18a 100644
--- a/community/kmouth/APKBUILD
+++ b/community/kmouth/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmouth
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -23,13 +23,14 @@ makedepends="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtspeech-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmouth-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DKF_IGNORE_PLATFORM_CHECK=ON
diff --git a/community/kmplot/APKBUILD b/community/kmplot/APKBUILD
index 4e48b1d0007aea40a92e0ae866d9f079232b3d8a..97ceba6781745dad8e85b707842721b01369abec 100644
--- a/community/kmplot/APKBUILD
+++ b/community/kmplot/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmplot
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kparts
 arch="all !armhf !s390x !riscv64"
@@ -20,14 +20,15 @@ makedepends="
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kmplot-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kmymoney/APKBUILD b/community/kmymoney/APKBUILD
index 2cff0cba884f548cc4e57f7200ed1369b92d88a0..cd7d43ab363caa7935fb55227913444fabb47a86 100644
--- a/community/kmymoney/APKBUILD
+++ b/community/kmymoney/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kmymoney
 pkgver=5.1.2
-pkgrel=2
+pkgrel=3
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 # armhf, ppc64le, s390x, riscv64 blocked by qt5-qtwebengine
@@ -41,6 +41,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/kmymoney/$pkgver/src/kmymoney-$pkgver.tar.xz
@@ -52,8 +53,8 @@ case $CARCH in
 esac
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_WEBENGINE=ON
diff --git a/community/knavalbattle/APKBUILD b/community/knavalbattle/APKBUILD
index f8b14e490216b5aa314e4399a1e24ca688b5cea9..f9ba8c4e43087fb43da72de1579ad8b7e0c1a496 100644
--- a/community/knavalbattle/APKBUILD
+++ b/community/knavalbattle/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knavalbattle
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -21,14 +21,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/knavalbattle-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/knetwalk/APKBUILD b/community/knetwalk/APKBUILD
index 85da50172f87973cc66320f832d34e9f59a0833e..6c2abeffa56a30a5182e0b9efad96780d7db782f 100644
--- a/community/knetwalk/APKBUILD
+++ b/community/knetwalk/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knetwalk
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Connect all the terminals to the server, in as few turns as possible"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -25,13 +25,14 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/knetwalk-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/knights/APKBUILD b/community/knights/APKBUILD
index f9524372484e60f514177f62974412b59c25618c..ce548c597fa89e05805cc79a0f2b47cbccb0b27e 100644
--- a/community/knights/APKBUILD
+++ b/community/knights/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knights
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Chess board by KDE with XBoard protocol support"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -24,14 +24,15 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/knights-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/knotes/APKBUILD b/community/knotes/APKBUILD
index 9188e09d89ab33c3828a885a1ef1c03dc707801f..0ad5f36d410245c33d704529f263aba4bf6efb8a 100644
--- a/community/knotes/APKBUILD
+++ b/community/knotes/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=knotes
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le and s390x blocked by kdepim-runtime
 # riscv64 disabled due to missing rust in recursive dependency
@@ -11,14 +11,14 @@ url="https://kontact.kde.org/"
 pkgdesc="Popup notes"
 license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only"
 depends="kdepim-runtime"
-makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev grantlee-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdnssd-dev kdoctools-dev kglobalaccel-dev kiconthemes-dev kitemmodels-dev kitemviews-dev kcmutils-dev knewstuff-dev knotifications-dev knotifyconfig-dev kparts-dev ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev knotifications-dev akonadi-dev akonadi-notes-dev kcalutils-dev kontactinterface-dev libkdepim-dev kmime-dev pimcommon-dev kpimtextedit-dev grantleetheme-dev akonadi-search-dev libxslt-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev grantlee-dev kcompletion-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kdnssd-dev kdoctools-dev kglobalaccel-dev kiconthemes-dev kitemmodels-dev kitemviews-dev kcmutils-dev knewstuff-dev knotifications-dev knotifyconfig-dev kparts-dev ktextwidgets-dev kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev knotifications-dev akonadi-dev akonadi-notes-dev kcalutils-dev kontactinterface-dev libkdepim-dev kmime-dev pimcommon-dev kpimtextedit-dev grantleetheme-dev akonadi-search-dev libxslt-dev samurai"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/knotes-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/koko/APKBUILD b/community/koko/APKBUILD
index 368a29b130d91075d6e5281ccc9b7fce1f591407..caba3426b634ede70fc84183875b83bfa0fd43b1 100644
--- a/community/koko/APKBUILD
+++ b/community/koko/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=koko
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 _geonames_pkgver=2020.06.25
 pkgdesc="Image gallery application for Plasma Mobile"
 url="https://invent.kde.org/graphics/koko"
@@ -33,6 +33,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtlocation-dev
+	samurai
 	"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/koko-$pkgver.tar.xz
@@ -49,8 +50,8 @@ prepare() {
 }
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kolf/APKBUILD b/community/kolf/APKBUILD
index b88693f3bf1bfba1f0fa357b9919c93638b7fca6..cc38d260b52a02d3979c648f7a7334dbed7ff422 100644
--- a/community/kolf/APKBUILD
+++ b/community/kolf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kolf
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A miniature golf game with 2d top-down view"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -25,14 +25,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kolf-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kollision/APKBUILD b/community/kollision/APKBUILD
index 0273302dd48cd328402b2ebb9149a2598a52e602..321602e7dbc978d3d2f80d35a234654a0ba9e060 100644
--- a/community/kollision/APKBUILD
+++ b/community/kollision/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kollision
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A simple ball dodging game"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -21,14 +21,15 @@ makedepends="
 	kxmlgui-dev
 	libkdegames-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kollision-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kolourpaint/APKBUILD b/community/kolourpaint/APKBUILD
index 9b019432e7c31e106163f50ef0fbb5d81cbc959e..509a7500601e93c63c7817e9feced3048b660843 100644
--- a/community/kolourpaint/APKBUILD
+++ b/community/kolourpaint/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kolourpaint
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -23,13 +23,14 @@ makedepends="
 	kxmlgui-dev
 	libksane-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kolourpaint-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kompare/APKBUILD b/community/kompare/APKBUILD
index 0d54f0324cdb706d62b0a4c615edada814784f2d..314a62498d940d1bdaf6b753fbf5ca6d8eaabb6c 100644
--- a/community/kompare/APKBUILD
+++ b/community/kompare/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kompare
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kiconthemes
 arch="all !armhf !s390x !riscv64"
@@ -22,14 +22,15 @@ makedepends="
 	kwidgetsaddons-dev
 	libkomparediff2-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kompare-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -44,7 +45,6 @@ package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
 
-
 sha512sums="
 d1c08b76d8ec9598c920e9976b69206e65f9b56b36dfa6ac3a0236abe0f9fddd4467b1d83b489e51b62de749defcc3dd3df28b96994fbfd99c4e0998a38fb5c0  kompare-22.04.0.tar.xz
 "
diff --git a/community/kongress/APKBUILD b/community/kongress/APKBUILD
index ede997d380a66664f731c741de8e228e89b2c04a..5db3b5f5e785b5b0c65c0c2f852524e440d1b0fb 100644
--- a/community/kongress/APKBUILD
+++ b/community/kongress/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kongress
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Companion application for conferences"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -24,14 +24,15 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
 	qt5-qttools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/kongress-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
diff --git a/community/konqueror/APKBUILD b/community/konqueror/APKBUILD
index f3af5e71df4a6f233053ae79f9e1499cf306f9f5..33bdd09f64064c50f573dc5d64f8c75211feb202 100644
--- a/community/konqueror/APKBUILD
+++ b/community/konqueror/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=konqueror
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE File Manager & Web Browser"
 # armhf blocked by extra-cmake-modules
 # s390x, ppc64le and riscv64 blocked by qt5-qtwebengine
@@ -25,6 +25,7 @@ makedepends="
 	kwindowsystem-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/konqueror-$pkgver.tar.xz"
@@ -32,8 +33,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 options="!check" # Requires OpenGL and running D-Bus server
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/konsole/APKBUILD b/community/konsole/APKBUILD
index 1ca1d0d003345f91a7dee1fdb87e35051216da7f..10940754423f779c966467242990a18c723416ff 100644
--- a/community/konsole/APKBUILD
+++ b/community/konsole/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=konsole
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -37,6 +37,7 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/konsole-$pkgver.tar.xz
@@ -45,8 +46,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/konsole-$pkg
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_PLUGIN_SSHMANAGER=ON
diff --git a/community/kontact/APKBUILD b/community/kontact/APKBUILD
index aebf67d6e436ba0afe2576eb381da1ca7c767f69..57bd1aa141c0496a77d3ef2274e6c22837484701 100644
--- a/community/kontact/APKBUILD
+++ b/community/kontact/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kontact
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 # riscv64 disabled due to missing rust in recursive dependency
@@ -26,13 +26,14 @@ makedepends="
 	pimcommon-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kontact-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kontactinterface/APKBUILD b/community/kontactinterface/APKBUILD
index 2f922261590383c1b110587177e4fe0f2dc2a838..561f3b09983f74dde28ad40df1b806e5f41e35f1 100644
--- a/community/kontactinterface/APKBUILD
+++ b/community/kontactinterface/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kontactinterface
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kparts
 arch="all !armhf !s390x !riscv64"
@@ -16,14 +16,15 @@ depends_dev="
 	kparts-dev
 	kwindowsystem-dev
 	kxmlgui-dev
+	samurai
 	"
 makedepends="$depends_dev extra-cmake-modules"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kontactinterface-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kontrast/APKBUILD b/community/kontrast/APKBUILD
index fb75168de4a46fc61208766b25b8a2135876029c..967c45d4fe9fdcab1cb82511f6d7ebbdc7d2709d 100644
--- a/community/kontrast/APKBUILD
+++ b/community/kontrast/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kontrast
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool to check contrast for colors that allows verifying that your colors are correctly accessible"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kdeclarative
@@ -21,14 +21,15 @@ makedepends="
 	ki18n-dev
 	kcoreaddons-dev
 	kdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kontrast-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
@@ -36,6 +37,7 @@ build() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 cf8103b28b0e2658c251af2e9adcc7099a55655d4f59a6d410bfbf12fe20830f6be80ab28bd80534e0a20d7ad6b8f83740bb022b1c1602f9c24a0cd94198cbfd  kontrast-22.04.0.tar.xz
 "
diff --git a/community/konversation/APKBUILD b/community/konversation/APKBUILD
index 82ff5dcc65ef0b687f4c2cda976c61a0a09f9bf3..2ec645473f210d40d15f5162d6e8ac3e50183fc3 100644
--- a/community/konversation/APKBUILD
+++ b/community/konversation/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=konversation
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -36,6 +36,7 @@ makedepends="
 	qca-dev
 	qt5-qtbase-dev
 	qt5-qtmultimedia-dev
+	samurai
 	solid-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/konversation-$pkgver.tar.xz"
@@ -43,8 +44,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kookbook/APKBUILD b/community/kookbook/APKBUILD
index 8aea0b7cfb8121d4037f3234c0dbc0c1ec1b7c2a..76f7287b64c9fc58abce3fbb03be9c03dca4b0b2 100644
--- a/community/kookbook/APKBUILD
+++ b/community/kookbook/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kookbook
 pkgver=0.2.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple recipe manager taking structured markdown for recipes"
 url="https://github.com/KDE/kookbook/blob/master/doc/intro.md"
 arch="all !armhf"
 license="MIT"
 depends="$pkgname-common"
-makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev discount-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev discount-dev samurai"
 subpackages="$pkgname-common $pkgname-touch:ktouch"
 source="https://download.kde.org/unstable/kookbook/kookbook-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kopete/APKBUILD b/community/kopete/APKBUILD
index 9fee3df3937a3d97a71da822a6dc2b172e3b7141..e88f5d440077dca8d537495dbcbef13e1367b8a6 100644
--- a/community/kopete/APKBUILD
+++ b/community/kopete/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kopete
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kcmutils
 arch="all !armhf !s390x !riscv64"
@@ -32,14 +32,15 @@ makedepends="
 	kwallet-dev
 	libkleo-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kopete-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/korganizer/APKBUILD b/community/korganizer/APKBUILD
index b9a8bbe587bb4fc40ad810fe636acb0b1d85c6a6..cfdd5d292e29d32ab939626e43d8d90796980d96 100644
--- a/community/korganizer/APKBUILD
+++ b/community/korganizer/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=korganizer
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> kmailtransport
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -55,14 +55,15 @@ makedepends="
 	phonon-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/korganizer-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kosmindoormap/APKBUILD b/community/kosmindoormap/APKBUILD
index 6fb371c274120f21dae14e2c0c047d5a2e85c65b..ea6b771cfa62296051e3ed9322b3e1325611c929 100644
--- a/community/kosmindoormap/APKBUILD
+++ b/community/kosmindoormap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kosmindoormap
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 arch="all !armhf"
 url="https://invent.kde.org/libraries/kosmindoormap"
@@ -20,13 +20,14 @@ makedepends="$depends_dev
 	bison
 	extra-cmake-modules
 	flex
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kosmindoormap-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kpat/APKBUILD b/community/kpat/APKBUILD
index 83e203f416c838c2be457fd0e2f1e2ed7dc4f92a..e369d2ea2b3d74a0b99aeb9065b7e6a78f6d4082 100644
--- a/community/kpat/APKBUILD
+++ b/community/kpat/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpat
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KPatience offers a selection of solitaire card games"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -29,6 +29,7 @@ makedepends="
 	libkdegames-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kpat-$pkgver.tar.xz"
@@ -37,8 +38,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kpeoplesink/APKBUILD b/community/kpeoplesink/APKBUILD
index 11479d7602e4bd1a604474dbffa732399484efd7..a1e37964d4d087ddc9e77ae057b5f39c11d12628 100644
--- a/community/kpeoplesink/APKBUILD
+++ b/community/kpeoplesink/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpeoplesink
 pkgver=0_git20210224
-pkgrel=0
+pkgrel=1
 _commit="6f382e619e22f9f34b0760fc19a23eb1863bf45b"
 pkgdesc="Expose Sink contacts to KPeople"
 url="https://invent.kde.org/pim/kpeoplesink"
@@ -18,6 +18,7 @@ makedepends="
 	kcoreaddons-dev
 	kpeople-dev
 	qt5-qtbase-dev
+	samurai
 	sink-dev
 	"
 source="https://invent.kde.org/pim/kpeoplesink/-/archive/$_commit/kpeoplesink-$_commit.tar.gz"
@@ -25,8 +26,8 @@ options="!check" # Broken tests
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kphotoalbum/APKBUILD b/community/kphotoalbum/APKBUILD
index 02ee550af0ddf7a7bf99b37d92ffd75cbcf1bd01..f22252e8eb39f1e924cd01a68f889fafc1853849 100644
--- a/community/kphotoalbum/APKBUILD
+++ b/community/kphotoalbum/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kphotoalbum
 pkgver=5.8.1
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE Photo Album, picture collection manager"
 url="https://kphotoalbum.org"
 # armhf blocked my extra-cmake-modules
@@ -31,14 +31,15 @@ makedepends="
 	phonon-dev
 	purpose-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/kphotoalbum/$pkgver/kphotoalbum-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kpimtextedit/APKBUILD b/community/kpimtextedit/APKBUILD
index e1a78e4106f2e6a44e51af551828252d61355a64..f47903cdfc82d96f1f17ad5e1f081c3bc4cf1b83 100644
--- a/community/kpimtextedit/APKBUILD
+++ b/community/kpimtextedit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpimtextedit
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Advanced text editor which provide advanced html feature"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit
@@ -23,6 +23,7 @@ depends_dev="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtspeech-dev
+	samurai
 	sonnet-dev
 	syntax-highlighting-dev
 	"
@@ -32,8 +33,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_DESIGNERPLUGIN=ON
diff --git a/community/kpkpass/APKBUILD b/community/kpkpass/APKBUILD
index 3d4ab19c8f8229ad57364dc4c5f8606bbdefb9bf..77072050eab488ec21ab5c267e4c74eef292fb99 100644
--- a/community/kpkpass/APKBUILD
+++ b/community/kpkpass/APKBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpkpass
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf"
 url="https://kontact.kde.org/"
 pkgdesc="Apple Wallet Pass reader"
 license="GPL-2.0-or-later"
 depends_dev="qt5-qtbase-dev karchive-dev"
-makedepends="$depends_dev extra-cmake-modules shared-mime-info"
+makedepends="$depends_dev extra-cmake-modules shared-mime-info samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kpkpass-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kpmcore/APKBUILD b/community/kpmcore/APKBUILD
index 84d647ddcfdb0ab3b479ca5e2b263c8db9d5ca23..302b47b0ea514c59bd333429a7c073430101e431 100644
--- a/community/kpmcore/APKBUILD
+++ b/community/kpmcore/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpmcore
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kauth
 arch="all !armhf !s390x !riscv64"
@@ -22,6 +22,7 @@ makedepends="
 	kwidgetsaddons-dev
 	qca-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kpmcore-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
@@ -32,8 +33,8 @@ options="!check" # Requires running dbus server
 #     - CVE-2020-27187
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kpublictransport/APKBUILD b/community/kpublictransport/APKBUILD
index cb39c00c06f3ae23372785ae3b74fb17154bc694..d17be9786cb645a262eccbb3946527b4af52b879 100644
--- a/community/kpublictransport/APKBUILD
+++ b/community/kpublictransport/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpublictransport
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 arch="all !armhf"
 url="https://invent.kde.org/libraries/kpublictransport"
@@ -16,14 +16,15 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kpublictransport-$pkgver.tar.xz"
 options="!check" # Broken for now
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kquickimageeditor/APKBUILD b/community/kquickimageeditor/APKBUILD
index 394322fe8ffac84b41cc14a91891a10892a993be..a7faf7d4d410ac4c75bf6b0bcdea3c3c54a38b2f 100644
--- a/community/kquickimageeditor/APKBUILD
+++ b/community/kquickimageeditor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kquickimageeditor
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Simple image editor for QtQuick applications"
 url="https://invent.kde.org/libraries/kquickimageeditor"
 # armhf blocked by extra-cmake-modules
@@ -14,14 +14,15 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/kquickimageeditor/kquickimageeditor-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/krdc/APKBUILD b/community/krdc/APKBUILD
index 1e094119c962de463caa179086d5567423ab547b..9bfd84b8348b58d077755ace9583d3628c520610 100644
--- a/community/krdc/APKBUILD
+++ b/community/krdc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=krdc
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -29,13 +29,14 @@ makedepends="
 	kxmlgui-dev
 	libssh-dev
 	libvncserver-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/krdc-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/krecorder/APKBUILD b/community/krecorder/APKBUILD
index ab1351c683c61926e7585499b324fba454b42166..108c6c56f4de3c033ee6c712903470a212ff6f3f 100644
--- a/community/krecorder/APKBUILD
+++ b/community/krecorder/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=krecorder
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Audio recorder for Plasma Mobile (and other platforms)"
 url="https://invent.kde.org/plasma-mobile/krecorder"
 arch="all !armhf" # armhf blocked by extra-cmake-modules
@@ -16,13 +16,14 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtmultimedia-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/krecorder-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
diff --git a/community/krename/APKBUILD b/community/krename/APKBUILD
index 8e563ef256d70d2416ab43f7c5aa068d5f22a404..dd821ebbdb05d9d4f14e5dbdd546800850d12dc5 100644
--- a/community/krename/APKBUILD
+++ b/community/krename/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=krename
 pkgver=5.0.1
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -25,13 +25,14 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/krename/$pkgver/src/krename-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/krfb/APKBUILD b/community/krfb/APKBUILD
index b2461bd33266dc33fcd2c1a95cc3e50d366876f2..e1de7990869f55afd9e496fa7aeaf2dbea717965 100644
--- a/community/krfb/APKBUILD
+++ b/community/krfb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=krfb
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf, s390x and riscv64 blocked by kwallet-dev and kxmlgui-dev
 arch="all !armhf !s390x !riscv64"
 url="https://kde.org/applications/internet/org.kde.krfb"
@@ -28,6 +28,7 @@ makedepends="
 	plasma-wayland-protocols
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	xcb-util-dev
 	xcb-util-image-dev
 	"
@@ -36,8 +37,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kross/APKBUILD b/community/kross/APKBUILD
index 2b2ac9b8ab90b44c03726d2a885eb97c2afa900c..b63859e54236d1f93c3e32730df1195bdb64e636 100644
--- a/community/kross/APKBUILD
+++ b/community/kross/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kross
 pkgver=5.93.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Framework for scripting KDE applications"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit
@@ -20,6 +20,7 @@ depends_dev="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qttools-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
diff --git a/community/kruler/APKBUILD b/community/kruler/APKBUILD
index 59f02222b236f1e18b787149095386fe6f32e865..65fec39d0164201c4842210d1b27ccb48e21be47 100644
--- a/community/kruler/APKBUILD
+++ b/community/kruler/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kruler
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -18,14 +18,15 @@ makedepends="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kruler-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kscreen/APKBUILD b/community/kscreen/APKBUILD
index 10fd85026b0e84e607a9901b3c09cce67d650d2f..15b91992dcdc07e758cf4b17f838e651b3179611 100644
--- a/community/kscreen/APKBUILD
+++ b/community/kscreen/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kscreen
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE's screen management software"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kconfigwidgets
@@ -26,6 +26,7 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtsensors-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 
@@ -37,8 +38,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kscreen-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kscreenlocker/APKBUILD b/community/kscreenlocker/APKBUILD
index 5876fea21e295e570b3e6fc62f213c81e4188192..7fc9dcc5994d11c8f04f932e167e64fe65aff056 100644
--- a/community/kscreenlocker/APKBUILD
+++ b/community/kscreenlocker/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kscreenlocker
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Library and components for secure lock screen architecture"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kdeclarative-dev, kcmutils-dev, ktextwidgets-dev, kxmlgui-dev
@@ -31,6 +31,7 @@ depends_dev="
 	linux-pam-dev
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	solid-dev
 	xcb-util-keysyms-dev
 	"
@@ -51,8 +52,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Requires running loginctl
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ksmtp/APKBUILD b/community/ksmtp/APKBUILD
index 7bdda6a4c194c36c443be81d8d3be49bdec3b5c5..24dc8c14fb9f98b5b8986182182ff08dc9fd0373 100644
--- a/community/ksmtp/APKBUILD
+++ b/community/ksmtp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ksmtp
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Job-based library to send email through an SMTP server"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kio
@@ -15,6 +15,7 @@ depends_dev="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -24,8 +25,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -39,6 +40,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 e6d4a451ff50e380e898197191e2cff77a620e2886ad7e0c22d20c68521823751fd83d1ba4cd97444f2199a8b7375c9b1d4852c98875f0a6813f77b77982ad5f  ksmtp-22.04.0.tar.xz
 "
diff --git a/community/ksshaskpass/APKBUILD b/community/ksshaskpass/APKBUILD
index 7332cfbc95511622adab648e0319b4497c4ffcfc..e71a2cdfe6ce126b2ee083eab422f1f94a1f7d86 100644
--- a/community/ksshaskpass/APKBUILD
+++ b/community/ksshaskpass/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ksshaskpass
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="ssh-add helper that uses kwallet and kpassworddialog"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kwallet
@@ -17,6 +17,7 @@ makedepends="
 	kwallet-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -27,8 +28,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/ksshaskpass-$pkgver.tar.xz
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ksysguard/APKBUILD b/community/ksysguard/APKBUILD
index d123426b42eded8a8bac7c0f4df080fd0926fd4c..7d7f2863abbc3a624a6889a8dcc49a7ab2b9b8a0 100644
--- a/community/ksysguard/APKBUILD
+++ b/community/ksysguard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ksysguard
 pkgver=5.22.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Track and control the processes running in your system"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -29,14 +29,15 @@ makedepends="
 	libpcap-dev
 	lm-sensors-dev
 	networkmanager-qt-dev
+	samurai
 	"
 
 source="https://download.kde.org/stable/ksysguard/$pkgver/ksysguard-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kteatime/APKBUILD b/community/kteatime/APKBUILD
index acda0ecfcc2bb6ae35b3ec946cc421579f2fe27c..be95d91ac3f7afdb5e7775f1402a9d8307a4b8cf 100644
--- a/community/kteatime/APKBUILD
+++ b/community/kteatime/APKBUILD
@@ -2,20 +2,20 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kteatime
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # riscv64 disabled due to missing rust in recursive dependency
 arch="all !armhf !s390x !riscv64"
 url="https://kde.org/applications/utilities/org.kde.kteatime"
 pkgdesc="A handy timer for steeping tea"
 license="GPL-2.0-or-later AND GFDL-1.2-only"
-makedepends="extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev knotifyconfig-dev knotifications-dev ktextwidgets-dev kxmlgui-dev kconfig-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev kconfig-dev kcrash-dev kdoctools-dev ki18n-dev kiconthemes-dev knotifyconfig-dev knotifications-dev ktextwidgets-dev kxmlgui-dev kconfig-dev samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kteatime-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ktimer/APKBUILD b/community/ktimer/APKBUILD
index da9cc73d58fdde358cfda3c2a2e6683ea01d6036..963f02e33a867876995634f4811f56706729595d 100644
--- a/community/ktimer/APKBUILD
+++ b/community/ktimer/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktimer
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A little tool to execute programs after some time"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -19,14 +19,15 @@ makedepends="
 	knotifications-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/ktimer-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DKF_IGNORE_PLATFORM_CHECK=ON # does not have metainfo.yaml
diff --git a/community/ktimetracker/APKBUILD b/community/ktimetracker/APKBUILD
index 789cbdb5e071b289a3a220d4b704073299cd82ff..d69ea1f5759b96a7ca7b168b587d7af0ec972bf3 100644
--- a/community/ktimetracker/APKBUILD
+++ b/community/ktimetracker/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktimetracker
 pkgver=5.0.1
-pkgrel=3
+pkgrel=4
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -25,6 +25,7 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/ktimetracker/$pkgver/src/ktimetracker-$pkgver.tar.xz
@@ -33,8 +34,8 @@ source="https://download.kde.org/stable/ktimetracker/$pkgver/src/ktimetracker-$p
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ktnef/APKBUILD b/community/ktnef/APKBUILD
index 4c36df567f6f7718cb4cbc62038e305991b0db69..0ee3f4ce2b46de2dfd0731bd91d5a0e00dc0a702 100644
--- a/community/ktnef/APKBUILD
+++ b/community/ktnef/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktnef
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="API for handling TNEF data"
 # armhf blocked by extra-cmake-modules
 # s390x blocked by kcalendarcore
@@ -19,13 +19,14 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/ktnef-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ktorrent/APKBUILD b/community/ktorrent/APKBUILD
index d2b8867cea31791201b9b9f9eed8ca5439c47452..ec9e10c02b6b73c10e7cf6b6321bd26671134c08 100644
--- a/community/ktorrent/APKBUILD
+++ b/community/ktorrent/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktorrent
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by polkit -> plasma-workspace
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -40,6 +40,7 @@ makedepends="
 	plasma-workspace-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	solid-dev
 	syndication-dev
 	taglib-dev
@@ -50,8 +51,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
 	# The infowidget plugin is disabled due to an incompatibility with musl
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_INFOWIDGET_PLUGIN=FALSE
diff --git a/community/ktouch/APKBUILD b/community/ktouch/APKBUILD
index 7089b3d8d7a5bdd4aff3f8287e63c7966a087ab8..e0552ee23a1924212f5d42f2087023b4b3589812 100644
--- a/community/ktouch/APKBUILD
+++ b/community/ktouch/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktouch
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # riscv64 and s390x blocked by rust
 # armhf blocked by qt5-qtdeclarative
 arch="all !armhf !s390x !riscv64"
@@ -33,14 +33,15 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtx11extras-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/ktouch-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ktp-common-internals/APKBUILD b/community/ktp-common-internals/APKBUILD
index f925e5d0fc123fc6f8b86f3c8fb9281550fca223..c2b201f466e3619636c4bbfb6498975855299ded 100644
--- a/community/ktp-common-internals/APKBUILD
+++ b/community/ktp-common-internals/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktp-common-internals
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for KTp"
 url="https://github.com/kde/ktp-common-internals"
 # armhf blocked by extra-cmake-modules
@@ -25,6 +25,7 @@ depends_dev="
 	kwindowsystem-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	telepathy-qt-dev
 	"
 makedepends="$depends_dev extra-cmake-modules doxygen"
@@ -33,8 +34,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/ktrip/APKBUILD b/community/ktrip/APKBUILD
index 9f6f573680b85bdb101f997f19960935a47c232c..162cb81f3883a7a2f9cc3762365ee13c51a2d4a3 100644
--- a/community/ktrip/APKBUILD
+++ b/community/ktrip/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ktrip
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="A public transport assistant"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by qqc2-desktop-style
@@ -24,13 +24,14 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/ktrip-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DKF_IGNORE_PLATFORM_CHECK=ON
@@ -45,6 +46,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 20b8f7dcc462fe68724761fcef72c53d2ee0a384ea0f58cbfa01cf28c7f51972bced804a79839b108dc7f24eec226def99e209246fd64b5c97c65ddaaf026340  ktrip-22.04.tar.xz
 "
diff --git a/community/kturtle/APKBUILD b/community/kturtle/APKBUILD
index 5ae34398a9e3e83de2d9c672d9107d8c01fd4296..7163f09ff8f8b7dbce617ad2075b5e87841661f4 100644
--- a/community/kturtle/APKBUILD
+++ b/community/kturtle/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kturtle
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -20,14 +20,15 @@ makedepends="
 	ktextwidgets-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kturtle-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kup/APKBUILD b/community/kup/APKBUILD
index 3230622995874417ac2dd848ab5cd5a16dad4feb..aad76ab20fc0cbd50febc7976da58c4f6903f147 100644
--- a/community/kup/APKBUILD
+++ b/community/kup/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kup
 pkgver=0.9.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A KDE bup backup software for helping people to keep up-to-date backups"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -25,6 +25,7 @@ makedepends="
 	libgit2-dev
 	plasma-framework-dev
 	qt5-qtbase-dev
+	samurai
 	solid-dev
 	"
 source="https://download.kde.org/stable/kup/kup-$pkgver.tar.xz
@@ -34,8 +35,8 @@ options="!check" # No tests
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kuserfeedback/APKBUILD b/community/kuserfeedback/APKBUILD
index 97cd3085288cfedf95c79ccc3041a16f8b031ec3..c29261638dc617ba05610d55ea3df254f5753d5f 100644
--- a/community/kuserfeedback/APKBUILD
+++ b/community/kuserfeedback/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kuserfeedback
 pkgver=1.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Framework for collecting user feedback for applications via telemetry and surveys"
 url="https://kde.org/products/frameworks/"
 arch="all !armhf"
@@ -15,14 +15,15 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 subpackages="$pkgname-dev $pkgname-lang"
 source="https://download.kde.org/stable/kuserfeedback/kuserfeedback-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kwallet-pam/APKBUILD b/community/kwallet-pam/APKBUILD
index 4cfcc6f49e3c0154c0a712e253d36c61ea867745..755efab8f91a611ed878144fa0042a9ab4ed0f9b 100644
--- a/community/kwallet-pam/APKBUILD
+++ b/community/kwallet-pam/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwallet-pam
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KWallet PAM integration"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kwallet
@@ -15,6 +15,7 @@ makedepends="
 	kwallet-dev
 	libgcrypt-dev
 	linux-pam-dev
+	samurai
 	socat
 	"
 
@@ -26,8 +27,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kwallet-pam-$pkgver.tar.xz
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kwalletmanager/APKBUILD b/community/kwalletmanager/APKBUILD
index 5fb70b58fe60ba2e849af472e6c3f6e76a124109..131982d9c1805740c59457c777007485b2d591eb 100644
--- a/community/kwalletmanager/APKBUILD
+++ b/community/kwalletmanager/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwalletmanager
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -31,14 +31,15 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kwalletmanager-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kwave/APKBUILD b/community/kwave/APKBUILD
index bc9611a8056335075b15551cfcfe8d2785ccbfac..78466791c1ef666fcc07c72e614f2be5effa9413 100644
--- a/community/kwave/APKBUILD
+++ b/community/kwave/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwave
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -37,6 +37,7 @@ makedepends="
 	pulseaudio-dev
 	qt5-qtbase-dev
 	qt5-qtmultimedia-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kwave-$pkgver.tar.xz"
@@ -49,8 +50,8 @@ build() {
 	else
 		doc_opts="-DWITH_DOC=ON"
 	fi
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DWITH_OSS=OFF \
diff --git a/community/kwayland-integration/APKBUILD b/community/kwayland-integration/APKBUILD
index b9a832bb5e91c81275c83b20ce87122f48804057..6d0692c2431c126173555e7db4e09333c04776d3 100644
--- a/community/kwayland-integration/APKBUILD
+++ b/community/kwayland-integration/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwayland-integration
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KWayland integration"
 url="https://kde.org/plasma-desktop/"
 arch="all !armhf" # armhf blocked by extra-cmake-modules
@@ -15,6 +15,7 @@ makedepends="
 	kwayland-dev
 	kwindowsystem-dev
 	qt5-qtbase-dev
+	samurai
 	wayland-protocols
 	"
 
@@ -26,8 +27,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kwayland-integration-$pkgv
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kwayland-server/APKBUILD b/community/kwayland-server/APKBUILD
index b1a17dc1b260b314693ac82b53d6900446a4dece..1ccc809023a7dec250890334791c62d9b292061c 100644
--- a/community/kwayland-server/APKBUILD
+++ b/community/kwayland-server/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwayland-server
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Wayland Server Components built on KDE Frameworks"
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://kde.org/plasma-desktop/"
@@ -17,6 +17,7 @@ makedepends="$depends_dev
 	extra-cmake-modules
 	linux-headers
 	qt5-qttools-dev
+	samurai
 	wayland-protocols
 	"
 
@@ -29,8 +30,8 @@ subpackages="$pkgname-dev $pkgname-dbg $pkgname-doc"
 options="!check" # Requires running wayland compositor
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_QCH=ON
diff --git a/community/kweather/APKBUILD b/community/kweather/APKBUILD
index 0c80d77e9e7c290764555800282ba456b5b4b7cb..dc57fd10d779fb5519dcb9d1086c680bc7e336e7 100644
--- a/community/kweather/APKBUILD
+++ b/community/kweather/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kweather
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Weather application for Plasma Mobile"
 url="https://invent.kde.org/plasma-mobile/kweather"
 # armhf blocked by qt5-qtdeclarative
@@ -29,13 +29,14 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/kweather-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kweathercore/APKBUILD b/community/kweathercore/APKBUILD
index df3e5b09e04fc3e23f338cfab6bf2764592ade3d..3cd9ae46fd7d72e78560baf298f52b44e7af66dd 100644
--- a/community/kweathercore/APKBUILD
+++ b/community/kweathercore/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kweathercore
 pkgver=0.5
-pkgrel=0
+pkgrel=1
 pkgdesc="Library to facilitate retrieval of weather information including forecasts and alerts"
 url="https://invent.kde.org/libraries/kweathercore"
 arch="all !armhf" # armhf blocked by qt5-qtlocation-dev
@@ -12,14 +12,14 @@ depends_dev="
 	qt5-qtbase-dev
 	qt5-qtlocation-dev
 	"
-makedepends="$depends_dev extra-cmake-modules"
+makedepends="$depends_dev extra-cmake-modules samurai"
 source="https://download.kde.org/stable/kweathercore/$pkgver/kweathercore-$pkgver.tar.xz"
 options="!check" # No tests
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -29,7 +29,6 @@ package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
 
-
 sha512sums="
 b11d19d28856c098d219bccdd4868db93707aae4fc98d2e1ac3fe982faf9c8628c86e301e0bb9082b842a80cb8b3995bc3cffdd494e0b653899e13adac70f93e  kweathercore-0.5.tar.xz
 "
diff --git a/community/kwin/APKBUILD b/community/kwin/APKBUILD
index 70fc0c9a8629d13893165fa91d82076751a695f5..39f47e13b8ef775e79a8fcc702410451a6f2ed9c 100644
--- a/community/kwin/APKBUILD
+++ b/community/kwin/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwin
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="An easy to use, but flexible, composited Window Manager"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by kscreenlocker
@@ -71,6 +71,7 @@ makedepends="$depends_dev
 	extra-cmake-modules
 	kdoctools-dev
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 
@@ -83,8 +84,8 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-lang"
 options="!check" # Broken
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kwordquiz/APKBUILD b/community/kwordquiz/APKBUILD
index 51bc565fd2685f09be12fc2960328062139696c8..8557f630ee98209c9574d3b4acd9ed07848e3a18 100644
--- a/community/kwordquiz/APKBUILD
+++ b/community/kwordquiz/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwordquiz
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -27,14 +27,15 @@ makedepends="
 	libkeduvocdocument-dev
 	phonon-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kwordquiz-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/kwrited/APKBUILD b/community/kwrited/APKBUILD
index 6482f4ce5d460d26571579323f22b6de46fb81c2..42524dbf5744a343d203c30362be0d2629dab919 100644
--- a/community/kwrited/APKBUILD
+++ b/community/kwrited/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwrited
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE daemon listening for wall and write messages"
 arch="all !armhf" # qt5-qtdeclarative-dev  unavilable on armhf
 url="https://kde.org/plasma-desktop/"
@@ -15,6 +15,7 @@ makedepends="
 	knotifications-dev
 	kpty-dev
 	qt5-qtbase-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -25,8 +26,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/kwrited-$pkgver.tar.xz"
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/latte-dock/APKBUILD b/community/latte-dock/APKBUILD
index 3da18b8f6d7d4ec1d7b2c133843992a1c9011012..340dd91bc4e784714e8179cdd5390fab78e89ca8 100644
--- a/community/latte-dock/APKBUILD
+++ b/community/latte-dock/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=latte-dock
 pkgver=0.10.8
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 # ppc64le blocked by plasma-desktop
@@ -32,14 +32,15 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	xcb-util-dev
 	"
 source="https://download.kde.org/stable/latte-dock/latte-dock-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/layer-shell-qt/APKBUILD b/community/layer-shell-qt/APKBUILD
index f18f0207d6f4d857975eb4637c6aa676bf214359..d79a1093e8a0b306287e5a46f5b9365239cb1320 100644
--- a/community/layer-shell-qt/APKBUILD
+++ b/community/layer-shell-qt/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=layer-shell-qt
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt component to allow applications to make use of the Wayland wl-layer-shell protocol"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -14,6 +14,7 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	wayland-protocols
 	"
 
@@ -25,8 +26,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/layer-shell-qt-$pkgver.tar
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_TESTING=ON
diff --git a/community/libgravatar/APKBUILD b/community/libgravatar/APKBUILD
index 342823797023c56880d4b9d2a495bd66757110d4..43a38f0bf6b367b810c593186d0b1b72aa05cde2 100644
--- a/community/libgravatar/APKBUILD
+++ b/community/libgravatar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libgravatar
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM library providing Gravatar support"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -18,6 +18,7 @@ depends_dev="
 	kwidgetsaddons-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -28,8 +29,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="net" # net required for tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkcddb/APKBUILD b/community/libkcddb/APKBUILD
index b8f96e78bfd98ea22d412394d012ae9bc55b6e48..fa7fc032c32512c606cfc9764557767d97db199e 100644
--- a/community/libkcddb/APKBUILD
+++ b/community/libkcddb/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkcddb
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -19,14 +19,15 @@ makedepends="
 	kwidgetsaddons-dev
 	libmusicbrainz-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkcddb-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 options="net" # Required for tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_TESTING=ON
diff --git a/community/libkcompactdisc/APKBUILD b/community/libkcompactdisc/APKBUILD
index 9fbfc64fc9b83c0c5e72de9b651f63753542ed83..0bb515715f9ce4b0e5658be1636e409b0c36009d 100644
--- a/community/libkcompactdisc/APKBUILD
+++ b/community/libkcompactdisc/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkcompactdisc
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> solid
 arch="all !armhf !s390x !riscv64"
@@ -15,6 +15,7 @@ makedepends="
 	ki18n-dev
 	phonon-dev
 	qt5-qtbase-dev
+	samurai
 	solid-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkcompactdisc-$pkgver.tar.xz"
@@ -22,8 +23,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkdcraw/APKBUILD b/community/libkdcraw/APKBUILD
index 8ca194abfd6dacd1ab2c8dfc54e628386e13c226..96f5f5d949be67d1fc8c5d09a8242d1598091383 100644
--- a/community/libkdcraw/APKBUILD
+++ b/community/libkdcraw/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkdcraw
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by qt5-qtbase-x11
 arch="all !armhf !s390x"
@@ -12,6 +12,7 @@ license="GPL-2.0-or-later AND LGPL-2.0-or-later"
 depends_dev="
 	libraw-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -20,8 +21,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/libkdcraw-$p
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkdegames/APKBUILD b/community/libkdegames/APKBUILD
index b5a9873b8958a59a6746ca8cb7f57b940b327909..858c0d01ebd05c1cd4d9c7fb8a39939bbb5ad3b9 100644
--- a/community/libkdegames/APKBUILD
+++ b/community/libkdegames/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkdegames
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit
 arch="all !armhf !s390x !riscv64"
@@ -38,14 +38,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkdegames-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang carddecks::noarch"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkdepim/APKBUILD b/community/libkdepim/APKBUILD
index 5abedfa8da852d30a60c1ad038a8249fa0afa911..13b3992c429a4c0fe4de6d3eef81bc0d1dc5a98e 100644
--- a/community/libkdepim/APKBUILD
+++ b/community/libkdepim/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkdepim
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Lib for common KDEPim apps"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -29,6 +29,7 @@ depends_dev="
 	kwallet-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
@@ -39,8 +40,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/libkdepim-$p
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_DESIGNERPLUGIN=ON
diff --git a/community/libkeduvocdocument/APKBUILD b/community/libkeduvocdocument/APKBUILD
index 36127214b2c04ea15be20b3d237d698791393db1..1d08e4f4ad09bbf0cd0afabbe7e18d7a376da146 100644
--- a/community/libkeduvocdocument/APKBUILD
+++ b/community/libkeduvocdocument/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkeduvocdocument
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
 url="https://edu.kde.org"
@@ -14,13 +14,14 @@ makedepends="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkeduvocdocument-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkexiv2/APKBUILD b/community/libkexiv2/APKBUILD
index 0c1e65dfcf4d252aa028de5026ae904610f7276e..3271a3861b8fa90c1a1d4a3f3d449ceb60114ef3 100644
--- a/community/libkexiv2/APKBUILD
+++ b/community/libkexiv2/APKBUILD
@@ -2,18 +2,18 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkexiv2
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A library to manipulate pictures metadata"
 url="https://www.kde.org/applications/graphics"
 arch="all !armhf" # extra-cmake-modules
 license="GPL-2.0-or-later"
-makedepends="extra-cmake-modules qt5-qtbase-dev exiv2-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev exiv2-dev samurai"
 subpackages="$pkgname-dev"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkexiv2-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkgapi/APKBUILD b/community/libkgapi/APKBUILD
index 406ec4038cb67646619646f811094072f7ec92a4..669cf7bbb65551a2de4ea22aa7d8497f1c973c68 100644
--- a/community/libkgapi/APKBUILD
+++ b/community/libkgapi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkgapi
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="LibKGAPI is a KDE-based library for accessing various Google services via their public API"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
@@ -22,6 +22,7 @@ depends_dev="
 makedepends="$depends_dev
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkgapi-$pkgver.tar.xz
@@ -30,8 +31,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/libkgapi-$pk
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -49,6 +50,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 e1f89783b5a754e7f2368ef433c62c365ffcbe63b3e9c93d3ce794bb5eb0a86b60f06d3a2ad9ed4a018c176cd1ea80b2caae268d4aa21eef1f38f8299fc71a6d  libkgapi-22.04.0.tar.xz
 48ba9a974b10be0fe204a50ec15d7e48f17fa3d3211ad9a22ad0ca5742fd6121ed81563f59c57b6d618597c74e6b831dbc5f046baf64e41a4315663e09c5b74f  0001-fix-build.patch
diff --git a/community/libkipi/APKBUILD b/community/libkipi/APKBUILD
index 3004fa206a5dc24482fad1920984559ed34db9bc..3585778a2678b8d0ff45eb873b6beae496a6e3f5 100644
--- a/community/libkipi/APKBUILD
+++ b/community/libkipi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkipi
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE Image Plugin Interface library"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by kxmlgui
@@ -19,6 +19,7 @@ makedepends="$depends_dev
 	extra-cmake-modules
 	libjpeg-turbo-dev
 	libkexiv2-dev
+	samurai
 	tiff-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkipi-$pkgver.tar.xz"
@@ -26,8 +27,8 @@ subpackages="$pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -36,6 +37,7 @@ build() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 eff8519b493310ed3f0e412e546622fbea2d27a259bc137e1e5a42654978016f624d85a64bf18429bd8c6144f6cfaa66eaacb68c1b6b3d96eb71844a2e6ef6bb  libkipi-22.04.0.tar.xz
 "
diff --git a/community/libkleo/APKBUILD b/community/libkleo/APKBUILD
index dff35de179a53ddef43841a116359aa499e50845..9509cbaf62e2504d3cf1b7de6d38a0b9df6ee51f 100644
--- a/community/libkleo/APKBUILD
+++ b/community/libkleo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkleo
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM cryptographic library"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kpimtextedit
@@ -25,14 +25,15 @@ makedepends="
 	kwidgetsaddons-dev
 	kwindowsystem-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkleo-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -40,12 +41,13 @@ build() {
 
 check() {
 	cd build
-	CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest
+	CTEST_OUTPUT_ON_FAILURE=TRUE xvfb-run ctest -E "newkeyapprovaldialogtest"
 }
 
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 09a7a7caee06440c25688624e6c8517c8ef663eb7fea85c56623f6f9d0f22ac800858164300aa3c023a3dc2ee9aacdbc69f5f5eccc763a4fa5b8f663b71049fc  libkleo-22.04.0.tar.xz
 "
diff --git a/community/libkmahjongg/APKBUILD b/community/libkmahjongg/APKBUILD
index 31d89981b6630300a34895b47ebe80d475486fb3..9a6e539fb23ff8d73531da5b10c3cc8574e38b3b 100644
--- a/community/libkmahjongg/APKBUILD
+++ b/community/libkmahjongg/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkmahjongg
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked polkit -> kconfigwidgets
 arch="all !armhf !s390x !riscv64"
@@ -19,14 +19,15 @@ makedepends="
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkmahjongg-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # No tests found
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkomparediff2/APKBUILD b/community/libkomparediff2/APKBUILD
index e3ec08a2b0c8258ce8566e0e6445ccafa93feb28..e4d8c92852fa04a55e41acb8994be190aeb90594 100644
--- a/community/libkomparediff2/APKBUILD
+++ b/community/libkomparediff2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkomparediff2
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -18,13 +18,14 @@ makedepends="
 	kio-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkomparediff2-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libksane/APKBUILD b/community/libksane/APKBUILD
index 138a1531612608747db62fd21fe9d1a8271ea6c3..a8570f348309d7413f483fe09dbe9d22ff356a1a 100644
--- a/community/libksane/APKBUILD
+++ b/community/libksane/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libksane
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by ktextwidgest, kwallet
 arch="all !armhf !s390x !riscv64"
@@ -16,14 +16,15 @@ makedepends="
 	kwallet-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
+	samurai
 	sane-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libksane-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libkscreen/APKBUILD b/community/libkscreen/APKBUILD
index 9c90bda5ec94d4cf65140f241d567e5d8c969501..78956c9265b4c324024b2f9c768b5b6f01c15a3d 100644
--- a/community/libkscreen/APKBUILD
+++ b/community/libkscreen/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkscreen
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE screen management software"
 arch="all !armhf" # armhf blocked by extra-cmake-modules
 url="https://kde.org/plasma-desktop/"
@@ -18,6 +18,7 @@ makedepends="$depends_dev
 	graphviz
 	plasma-wayland-protocols
 	qt5-qttools-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -29,8 +30,8 @@ subpackages="$pkgname-dev $pkgname-doc"
 options="!check" # Fails due to requiring dbus-x11 and it running
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_QCH=ON
@@ -45,6 +46,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 72be6b77f5fe4d77ef29c07d8bab2d1c5a94cd9aa31a324cf6d883a2e6132ee923c0fa02a4bc2432df7da4171dfbdd3a608117eeccfafe9155002cc8d50b3020  libkscreen-5.24.4.tar.xz
 "
diff --git a/community/libksieve/APKBUILD b/community/libksieve/APKBUILD
index 6c41269c6d998281e8f31130f9905f4cfb54b242..4f413726aaec4b47acd9cd03f493e22947325e94 100644
--- a/community/libksieve/APKBUILD
+++ b/community/libksieve/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libksieve
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM library for managing sieves"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
@@ -30,14 +30,15 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libksieve-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -53,6 +54,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 72592106ff734787d82878608ae4ac4b2ee11ed50755acf1dca69040d333d11b23c2359988dae2fa1fc8f650ce2e4cb760c363c3a49eef818db2f72300a6d5a7  libksieve-22.04.0.tar.xz
 "
diff --git a/community/libksysguard/APKBUILD b/community/libksysguard/APKBUILD
index 2ed902a9964bd97deffbabbcfb00f2159533a0a0..c60f19e68b83966cc1e79d2544918103fb34ec53 100644
--- a/community/libksysguard/APKBUILD
+++ b/community/libksysguard/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libksysguard
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE system monitor library"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kauth
@@ -34,6 +34,7 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 
@@ -47,8 +48,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 replaces="ksysguard<5.22"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libktorrent/APKBUILD b/community/libktorrent/APKBUILD
index 3e9a9548cb2a703efec606839b98e7a971c5e7a9..27e7164d158df1f1735bc414b40fb8890cffbb16 100644
--- a/community/libktorrent/APKBUILD
+++ b/community/libktorrent/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libktorrent
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -24,14 +24,15 @@ makedepends="$depends_dev
 	doxygen
 	extra-cmake-modules
 	graphviz
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libktorrent-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/libqaccessibilityclient/APKBUILD b/community/libqaccessibilityclient/APKBUILD
index f1c8bf9d615d5585ec555bfcb8b3e09a6e5f4e86..ef964841a18b3daa97ba9a39a0d424d5c66aa5df 100644
--- a/community/libqaccessibilityclient/APKBUILD
+++ b/community/libqaccessibilityclient/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libqaccessibilityclient
 pkgver=0.4.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Accessibilty tools helper library, used e.g. by screen readers"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -11,6 +11,7 @@ license="LicenseRef-KDE-Accepted-LGPL AND LGPL-2.1-only AND LGPL-3.0-only"
 makedepends="
 	extra-cmake-modules
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/libqaccessibilityclient/libqaccessibilityclient-$pkgver.tar.xz"
@@ -18,8 +19,8 @@ subpackages="$pkgname-dev"
 options="!check" # Requires running DBus server
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -33,4 +34,5 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="d5c168ff39f4bb67f18120eea50f8e02a85d464a5bb6479c48dfdb02ea9bf0cc379cbed4da7d882b718a1e1723d3a00528fcb26903b617b43029fde25e82cb3c  libqaccessibilityclient-0.4.1.tar.xz"
diff --git a/community/lokalize/APKBUILD b/community/lokalize/APKBUILD
index 14eef4269630a214bf948d24957b87b23e27b542..53b060137f8f9be2909edb514431f8e48816e473 100644
--- a/community/lokalize/APKBUILD
+++ b/community/lokalize/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=lokalize
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Computer-Aided Translation System"
 url="https://apps.kde.org/lokalize/"
 # armhf blocked by extra-cmake-modules
@@ -23,6 +23,7 @@ makedepends="
 	kross-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	sonnet-dev
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/lokalize-$pkgver.tar.xz"
@@ -30,8 +31,8 @@ subpackages="$pkgname-doc $pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/mailcommon/APKBUILD b/community/mailcommon/APKBUILD
index 9edfa282a5b82b32471a4b92ba06e2e2f7aa758d..2f28f1faa47746752ad6dd6ad40d8c0a6b21bebe 100644
--- a/community/mailcommon/APKBUILD
+++ b/community/mailcommon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mailcommon
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM library providing support for mail applications"
 # riscv64 disabled due to missing rust in recursive dependency
 arch="all !ppc64le !s390x !armhf !riscv64" # Limited by messagelib -> qt5-qtwebengine
@@ -34,6 +34,7 @@ depends_dev="
 	messagelib-dev
 	qt5-qtbase-dev
 	qt5-qttools-dev
+	samurai
 	syntax-highlighting-dev
 	"
 makedepends="$depends_dev extra-cmake-modules"
@@ -43,8 +44,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Requires running dbus server
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -58,6 +59,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 226f2526f3b95a39b4a0414c4de37731ad2d4b220eb97aac1d769ff2f6c033e1198d67c1c6b648f5ee171fd55df0a0ffdd7b2ed0e4d7155dc10abc467b041cd9  mailcommon-22.04.0.tar.xz
 "
diff --git a/community/mailimporter/APKBUILD b/community/mailimporter/APKBUILD
index e93951619a6eb839e4a12140d8f21a80128a0a03..3eae187c214905742eebd521b21e0fb57d088bfc 100644
--- a/community/mailimporter/APKBUILD
+++ b/community/mailimporter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mailimporter
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM library providing support for mail applications"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> pimcommon
@@ -21,6 +21,7 @@ depends_dev="
 	libkdepim-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	samurai
 	"
 makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
@@ -28,8 +29,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/mailimporter
 subpackages="$pkgname-dev $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -43,6 +44,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 85e799bc4867d87eef6b2af0086bc141dff855108fd8d97831eac5e41849e19df179f4d3e3fd27e3d5a60c9ac6c124b324995e99175634411875028697c3e574  mailimporter-22.04.0.tar.xz
 "
diff --git a/community/marble/APKBUILD b/community/marble/APKBUILD
index a4d00721d134e38eb178ba508c8d4d86c43a990c..3d1a15fc6f1340ea14d28a5394c804c4dd4b4dc9 100644
--- a/community/marble/APKBUILD
+++ b/community/marble/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=marble
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A Virtual Globe and World Atlas that you can use to learn more about Earth"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
@@ -29,6 +29,7 @@ depends_dev="
 	qt5-qtsvg-dev
 	qt5-qttools-dev
 	qt5-qtwebengine-dev
+	samurai
 	shared-mime-info
 	"
 makedepends="$depends_dev
@@ -39,8 +40,8 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 options="!check" # Requires itself to be installed
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DCMAKE_INSTALL_SYSCONFDIR=/etc \
@@ -57,6 +58,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 7e379ae58b3729c38217ea5f1133d726b22005b5b314bfd9477791913ce8f6ad62316074cdd0ded0a340c53b43c08782b124c9881348ce296520e006468cc43e  marble-22.04.0.tar.xz
 "
diff --git a/community/massif-visualizer/APKBUILD b/community/massif-visualizer/APKBUILD
index 2accf58c58e235282f5ec467070a455b7ff071b7..0340e990f99ca07e46f4d0b96e5155b36495149e 100644
--- a/community/massif-visualizer/APKBUILD
+++ b/community/massif-visualizer/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=massif-visualizer
 pkgver=0.7.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Visualizer for Valgrind Massif data files"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -21,6 +21,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/massif-visualizer/$pkgver/src/massif-visualizer-$pkgver.tar.xz"
@@ -28,8 +29,8 @@ subpackages="$pkgname-lang"
 
 build() {
 	# The infowidget plugin is disabled due to an incompatibility with musl
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DENABLE_INFOWIDGET_PLUGIN=FALSE
diff --git a/community/mauikit-accounts/APKBUILD b/community/mauikit-accounts/APKBUILD
index 661f3807d902f8f2c632a4d89db77783e5abeafa..6ce8196ca4ae47d0afc7b1f0015c677815932bf8 100644
--- a/community/mauikit-accounts/APKBUILD
+++ b/community/mauikit-accounts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mauikit-accounts
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="MauiKit Utilities to handle User Accounts"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by mauikit
@@ -22,13 +22,14 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/maui/mauikit-accounts/$pkgver/mauikit-accounts-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -42,6 +43,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 110516f52b8b95efcb7a71e3a6f32d7a568f1a4e7cffe7e5efd752693a68c2c4bcd0491cf8b3fd38595b573cb87a7a4b038ef3a8d768d0ad948f31f0560f3517  mauikit-accounts-2.1.1.tar.xz
 "
diff --git a/community/mauikit-filebrowsing/APKBUILD b/community/mauikit-filebrowsing/APKBUILD
index e336def4e15a9e1be1f2462a55f818fb6a0c337b..ade3e53b02d4372664e7bee5a47e781bf46ac341 100644
--- a/community/mauikit-filebrowsing/APKBUILD
+++ b/community/mauikit-filebrowsing/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mauikit-filebrowsing
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="MauiKit File Browsing utilities and controls"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by mauikit
@@ -19,13 +19,14 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/maui/mauikit-filebrowsing/$pkgver/mauikit-filebrowsing-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -39,6 +40,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 ab6ca3cd0337d32425b1de493383e833fe39b5aebe517ff010126d11617da31cf5e7523ba33bf1a5b0be7a8acab8dc2c92e04fa97e84976658f5931c77671fef  mauikit-filebrowsing-2.1.1.tar.xz
 "
diff --git a/community/mauikit-imagetools/APKBUILD b/community/mauikit-imagetools/APKBUILD
index 25787282eea4e7f040860eb0eed0d8bf83c81115..e6e01782c3ad60f75f6c14f72fc137ddfdfa1122 100644
--- a/community/mauikit-imagetools/APKBUILD
+++ b/community/mauikit-imagetools/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mauikit-imagetools
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="MauiKit Image Tools Components"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by mauikit
@@ -24,13 +24,14 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/maui/mauikit-imagetools/$pkgver/mauikit-imagetools-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -44,6 +45,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 daef28487d0d2ef0d43173ffaafe82d7fe47856280de1ff27d1c4a00a8f9bbdca50c936e063f15033236530090587a5ae468875cb59146edc5c379aed74a8254  mauikit-imagetools-2.1.1.tar.xz
 "
diff --git a/community/mauikit-texteditor/APKBUILD b/community/mauikit-texteditor/APKBUILD
index 7fac83cc2664cd185bcf3b5f902ed4e5283dc694..aec651a4c71948be284080378a324a0281c0846f 100644
--- a/community/mauikit-texteditor/APKBUILD
+++ b/community/mauikit-texteditor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mauikit-texteditor
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="MauiKit Text Editor components"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by mauikit
@@ -19,12 +19,13 @@ makedepends="
 	mauikit-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/maui/mauikit-texteditor/$pkgver/mauikit-texteditor-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -38,6 +39,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 01b0ec78ca5c9545fa9939de403a6b6c0f4d7937b1e0eaf2b592f29f6f7ea1f7021550c558778e0bd2c2b4b1b8225b77da9b81428b21777d42ad22c6502673ba  mauikit-texteditor-2.1.1.tar.xz
 "
diff --git a/community/mauikit/APKBUILD b/community/mauikit/APKBUILD
index 0258d51834abd01649e11e4d9dba5d8137299798..892a4621a77b5d1fdab194392dadcd8cf255ed07 100644
--- a/community/mauikit/APKBUILD
+++ b/community/mauikit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mauikit
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Kit for developing MAUI Apps"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by plasma-framework
@@ -25,6 +25,7 @@ depends_dev="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	syntax-highlighting-dev
 	xcb-util-wm-dev
 	"
@@ -35,8 +36,8 @@ source="https://download.kde.org/stable/maui/mauikit/$pkgver/mauikit-$pkgver.tar
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -50,6 +51,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 afecbaa85cae06cab42c661ea5e6b2e9b343376bde0c452a8b85c1d8efe191831631e5412aff3d42d7218cfc63c136bf2a47413cef98da57ab5ebe1138fc59e4  mauikit-2.1.1.tar.xz
 "
diff --git a/community/messagelib/APKBUILD b/community/messagelib/APKBUILD
index 7261c7780f181613691b0243b903f4319b526ed4..8e4e74a9d30f58ad1f67f0250ca211d9e63ccc66 100644
--- a/community/messagelib/APKBUILD
+++ b/community/messagelib/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=messagelib
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM messaging library"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
@@ -53,6 +53,7 @@ depends_dev="
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/messagelib-$pkgver.tar.xz"
@@ -60,8 +61,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # Requires OpenGL and running dbus server
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -75,6 +76,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 12f1d5ff973719deb12f6c24f94c071a97ae412638a3986906ba0fa44d7b350d9d8c425859f94cfc94c3a18c4d2366457ea7f22a3c94ee6d7ca62c4bd251305d  messagelib-22.04.0.tar.xz
 "
diff --git a/community/milou/APKBUILD b/community/milou/APKBUILD
index 6260c627f594ed974fafbb7dc696f775bf08dadf..b9920c2a66d9fb321b00e0dd5d4c06c629fbff70 100644
--- a/community/milou/APKBUILD
+++ b/community/milou/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=milou
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="A dedicated search application built on top of Baloo"
 # armhf blocked by qt5-qtdeclarative
 # s390x blocked by polkit -> kdeclarative
@@ -20,6 +20,7 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -30,8 +31,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/milou-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -45,6 +46,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 ef41d274970e38f45e26bc986948e3ba49d0ef54a907e64fc36f15ed9369d3c4cd5e2566b25a2d3499b123cb0ec20eca9c777ab3a66248e6a5a824d7b7c4ae96  milou-5.24.4.tar.xz
 "
diff --git a/community/minuet/APKBUILD b/community/minuet/APKBUILD
index 239122d2e434c796ce84eb19346f544b7816b6f2..90d5504bb89723b640d2082b77bafecf2bce8111 100644
--- a/community/minuet/APKBUILD
+++ b/community/minuet/APKBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=minuet
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://minuet.kde.org/"
 pkgdesc="Minuet Music Education"
 license="GPL-2.0-or-later AND GFDL-1.2-only"
-makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev kcrash-dev kdoctools-dev fluidsynth-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtdeclarative-dev qt5-qtquickcontrols2-dev qt5-qtsvg-dev kcoreaddons-dev ki18n-dev kcrash-dev kdoctools-dev fluidsynth-dev samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/minuet-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/mycroft-plasmoid/APKBUILD b/community/mycroft-plasmoid/APKBUILD
index 776a98c00246ddf7be2776f8dbd4371b8cd13334..5706bb2279e0f854af7fe75e121a5cfb89129aa1 100644
--- a/community/mycroft-plasmoid/APKBUILD
+++ b/community/mycroft-plasmoid/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mycroft-plasmoid
 pkgver=0_git20210201
-pkgrel=0
+pkgrel=1
 _commit="70f84636da63b00d114747e440e4a15aa7d5b019"
 pkgdesc="Plasma integration of different Mycroft AI services"
 url="https://invent.kde.org/utilities/mycroft-plasmoid"
@@ -19,6 +19,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtwebsockets-dev
+	samurai
 	"
 source="https://invent.kde.org/utilities/mycroft-plasmoid/-/archive/$_commit/mycroft-plasmoid-$_commit.tar.gz"
 options="!check" # No tests
@@ -28,8 +29,8 @@ provides="plasma-mycroft=$pkgver-r$pkgrel" # Backwards compatibility
 replaces="plasma-mycroft" # Backwards compatibility
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/nota/APKBUILD b/community/nota/APKBUILD
index dc900471cf011bba4751de112bc234c8ec46135c..7dc8d985ba0dc951c74fd538c573be88a5ace53a 100644
--- a/community/nota/APKBUILD
+++ b/community/nota/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=nota
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Nota is a simple and convergent text editor"
 # armhf blocked by qt5-qtdeclarative
 # s390x, ppc64le and riscv64 blocked by qt5-qtwebengine
@@ -26,14 +26,15 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtsvg-dev
 	qt5-qtwebengine-dev
+	samurai
 	syntax-highlighting-dev
 	"
 source="https://download.kde.org/stable/maui/nota/$pkgver/nota-$pkgver.tar.xz"
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -42,6 +43,7 @@ build() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 2054a812ed9c3272c74774ebb308be020d445c6c9021ac270f3cb7719878d889b1505b0d5ccef4486b11e3ff2d841a408e4cb4651b9697dbaa6553d692e69bce  nota-2.1.1.tar.xz
 "
diff --git a/community/okteta/APKBUILD b/community/okteta/APKBUILD
index 834353f310f124c5d3bbcc5ba5b86b975e8b6bd9..0cace85e07dd291089017147e027f9445822f59b 100644
--- a/community/okteta/APKBUILD
+++ b/community/okteta/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=okteta
 pkgver=0.26.7
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE hex editor for viewing and editing the raw data of files"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -33,6 +33,7 @@ makedepends="
 	qt5-qtscript-dev
 	qt5-qttools-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	shared-mime-info
 	"
 checkdepends="xvfb-run"
@@ -40,8 +41,8 @@ source="https://download.kde.org/stable/okteta/$pkgver/src/okteta-$pkgver.tar.xz
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_DESKTOPPROGRAM=ON
diff --git a/community/okular/APKBUILD b/community/okular/APKBUILD
index 67050d1c4b6cd6c7e060993359ecbf193e5a0542..e2f6006e99f421863ccb1ad2ecef4aefff97b223 100644
--- a/community/okular/APKBUILD
+++ b/community/okular/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=okular
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 # ppc64le blocked by qt5-qtwebengine -> purpose
@@ -43,6 +43,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtspeech-dev
 	threadweaver-dev
+	samurai
 	zlib-dev
 	"
 checkdepends="xvfb-run"
@@ -57,8 +58,8 @@ subpackages="
 	"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DOKULAR_UI=both
diff --git a/community/oxygen/APKBUILD b/community/oxygen/APKBUILD
index bb494e91bdfd373107aadd8a4975a85463bc65b5..5ce33ff8f9aaa94eaed3bc8a2c85a67a69960fcf 100644
--- a/community/oxygen/APKBUILD
+++ b/community/oxygen/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=oxygen
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Artwork, styles and assets for the Oxygen visual style for the Plasma Desktop"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kcmutils
@@ -23,6 +23,7 @@ makedepends="
 	kwidgetsaddons-dev
 	kwindowsystem-dev
 	qt5-qtbase-dev
+	samurai
 	xcb-util-dev
 	"
 
@@ -34,8 +35,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/oxygen-$pkgver.tar.xz"
 subpackages="$pkgname-lang $pkgname-sounds::noarch"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -55,6 +56,7 @@ sounds() {
 
 	amove usr/share/sounds
 }
+
 sha512sums="
 dad2ef40a6daacf36e37bc6f5285229917b68e66c986cd4e73998a1caadfec0b078a2751ad59aa20d41f5a9ac3ebc1b94e5f5a89eba02523fdec3f28b21728cc  oxygen-5.24.4.tar.xz
 "
diff --git a/community/parley/APKBUILD b/community/parley/APKBUILD
index 4262f5c260f38a7a46d6516601b2bbea56eb892e..cc5d0fdbff62d4ffe2d91c012489c2d80d32fce5 100644
--- a/community/parley/APKBUILD
+++ b/community/parley/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=parley
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -28,6 +28,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtmultimedia-dev
 	qt5-qtwebengine-dev
+	samurai
 	sonnet-dev
 	"
 checkdepends="xvfb-run"
@@ -35,8 +36,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/parley-$pkgv
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/partitionmanager/APKBUILD b/community/partitionmanager/APKBUILD
index ccf4ce5a4cd92acfe848f255d6b00965b10d8e22..39712de3e1036423d97c346c44a74c9ddbc53328 100644
--- a/community/partitionmanager/APKBUILD
+++ b/community/partitionmanager/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=partitionmanager
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -25,13 +25,14 @@ makedepends="
 	kwidgetsaddons-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/partitionmanager-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/peruse/APKBUILD b/community/peruse/APKBUILD
index b06e314e6a6866e48f34e0715abdab007f099efd..e8279d75072d0704292b78e72815e1bcf8365f98 100644
--- a/community/peruse/APKBUILD
+++ b/community/peruse/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=peruse
 pkgver=1.80
-pkgrel=0
+pkgrel=1
 pkgdesc="A comic book viewer based on Frameworks 5, for use on multiple form factors"
 # armhf blocked by extra-cmake-modules
 # s390x blocked by kdeclarative
@@ -24,14 +24,15 @@ makedepends="
 	kfilemetadata-dev
 	knewstuff-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/peruse/peruse-$pkgver.tar.xz"
 subpackages="$pkgname-lang $pkgname-creator"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/phonon-backend-gstreamer/APKBUILD b/community/phonon-backend-gstreamer/APKBUILD
index 6b30f4e306f947b7fda2aae819bbc0dac70348bb..1784e487a6daaa72dca607885946248de6d4998b 100644
--- a/community/phonon-backend-gstreamer/APKBUILD
+++ b/community/phonon-backend-gstreamer/APKBUILD
@@ -2,28 +2,35 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=phonon-backend-gstreamer
 pkgver=4.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Phonon gstreamer backend for Qt5"
 url="https://userbase.kde.org/Phonon"
 arch="all !armhf" # armhf blocked by extra-cmake-modules
 license="LGPL-2.1-only OR LGPL-3.0-only"
 makedepends="extra-cmake-modules qt5-qtx11extras-dev gstreamer-dev gst-plugins-base-dev phonon-dev
-	libxml2-dev qt5-qttools-dev"
+	libxml2-dev qt5-qttools-dev samurai"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/phonon/phonon-backend-gstreamer/$pkgver/phonon-backend-gstreamer-$pkgver.tar.xz"
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DPHONON_BUILD_PHONON4QT5=ON
-	make -C build
+	cmake --build build
+}
+
+check() {
+	cd build
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
 }
 
 package() {
-	DESTDIR="$pkgdir" make -C build install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
-sha512sums="3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4  phonon-backend-gstreamer-4.10.0.tar.xz"
+sha512sums="
+3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4  phonon-backend-gstreamer-4.10.0.tar.xz
+"
diff --git a/community/pimcommon/APKBUILD b/community/pimcommon/APKBUILD
index 73d7b674b077fe46cd7ba30b7939a76ab5c38193..71afedce66dc02e179a7dfce923f94c111bf538c 100644
--- a/community/pimcommon/APKBUILD
+++ b/community/pimcommon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=pimcommon
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Common lib for KDEPim"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -40,6 +40,7 @@ depends_dev="
 makedepends="$depends_dev
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/pimcommon-$pkgver.tar.xz"
@@ -47,8 +48,8 @@ subpackages="$pkgname-dev $pkgname-lang"
 options="net" # net required for tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_DESIGNERPLUGIN=ON
diff --git a/community/pix/APKBUILD b/community/pix/APKBUILD
index 7d96c85e2b53cc0c5f834f4f9b44d02d2459d78e..cc1015b4d825d12f851bcbbad921c50327d7e2c4 100644
--- a/community/pix/APKBUILD
+++ b/community/pix/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=pix
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 _geonames_pkgver=2020.06.25
 pkgdesc="Image gallery manager built with MauiKit"
 # armhf blocked by qt5-qtdeclarative
@@ -29,6 +29,7 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtlocation-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/maui/pix/$pkgver/pix-$pkgver.tar.xz
 	https://github.com/pmsourcedump/geonames/archive/$_geonames_pkgver/geonames-$_geonames_pkgver.tar.gz
@@ -42,8 +43,8 @@ prepare() {
 }
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -53,6 +54,7 @@ package() {
 	mv "$builddir"/cities1000.txt build/src/
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 a660148f7473320c5572e207ccbf09748b7b46e61b6dc82734528ca159ec81d96c4a9c55d5a5d6140281fa0231f5cc6c5e4e9627c548b8ded947de256f6d648e  pix-2.1.1.tar.xz
 07485983a5ce0f03f1e12e64c280abe01e81beaa22b2dd43bc1b0e7632298acbfb83f09ef8c01a0915481c8e918a430b97d68f1ed5d43f76506798245345bc14  geonames-2020.06.25.tar.gz
diff --git a/community/plank-player/APKBUILD b/community/plank-player/APKBUILD
index ce4f684a04931bc10065a179e3e9a9697466e864..96771c7fb63d025240b71b33fa10c7142a68a7fb 100644
--- a/community/plank-player/APKBUILD
+++ b/community/plank-player/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plank-player
 pkgver=0_git20210924
-pkgrel=1
+pkgrel=2
 _commit="bb708a8ff3cd75267a8854c44511425ba14ef552"
 pkgdesc="Multimedia Player for playing local files on Plasma Bigscreen"
 url="https://invent.kde.org/plasma-bigscreen/plank-player"
@@ -21,6 +21,7 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtmultimedia-dev
 	qt5-qtquickcontrols2-dev
+	samurai
 	"
 source="https://invent.kde.org/plasma-bigscreen/plank-player/-/archive/$_commit/plank-player-$_commit.tar.gz
 	new-ecm.patch
@@ -29,8 +30,8 @@ options="!check" # No tests
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/plasma-camera/APKBUILD b/community/plasma-camera/APKBUILD
index 93f0ce67abcfa0a6f5a21c9d3f56c291c59e0a57..7ca33f179bb37faede5562423448a8aa56fb92ec 100644
--- a/community/plasma-camera/APKBUILD
+++ b/community/plasma-camera/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-camera
 pkgver=1.0_git20210328
-pkgrel=1
+pkgrel=2
 _commit="78c2e161c31b07be15f67c53bb556c3100a956b6"
 pkgdesc="Camera application for Plasma Mobile"
 # armhf blocked by qt5-qtdeclarative
@@ -46,4 +46,5 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="6b2c187be65f75481e425a3b499bab01034930ee81d15eb2eef99abaa5bef8e4e911c13ee454737d940413729f1c8a69ba5395ce0e672e20f7708fd8b3c7c43f  plasma-camera-78c2e161c31b07be15f67c53bb556c3100a956b6.tar.gz"
diff --git a/community/plasma-framework/APKBUILD b/community/plasma-framework/APKBUILD
index 01854b370213828216f07940a390dc06109e4706..3c34944f9e2cd05bf61554175a187122f6bd686c 100644
--- a/community/plasma-framework/APKBUILD
+++ b/community/plasma-framework/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-framework
 pkgver=5.93.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Plasma library and runtime components based upon KF5 and Qt5"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit
@@ -33,7 +33,6 @@ depends_dev="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
-	samurai
 	"
 makedepends="$depends_dev
 	doxygen
diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD
index 099b3786948cb3cf8fdfbc0edf0454a010afc202..8825379f2d453e9f7e4d25ee6b8ba235fd3c531d 100644
--- a/community/plasma-workspace/APKBUILD
+++ b/community/plasma-workspace/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-workspace
 pkgver=5.24.4
-pkgrel=2
+pkgrel=3
 pkgdesc="KDE Plasma Workspace"
 # armhf blocked by kirigami2
 # s390x and riscv64 blocked by polkit -> kio-extras
@@ -72,6 +72,7 @@ makedepends="$depends_dev
 	extra-cmake-modules
 	kdoctools-dev
 	libxtst-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 
diff --git a/community/plymouth-kcm/APKBUILD b/community/plymouth-kcm/APKBUILD
index 4f1fd4450eaa3b2c271e18aa6e95550dc534ea4a..c7f679dfd61134efb1b522f50b2c9309dc4920c7 100644
--- a/community/plymouth-kcm/APKBUILD
+++ b/community/plymouth-kcm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plymouth-kcm
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -22,6 +22,7 @@ makedepends="
 	knewstuff-dev
 	plymouth-dev
 	qt5-qtbase-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -33,8 +34,8 @@ subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/polkit-kde-agent-1/APKBUILD b/community/polkit-kde-agent-1/APKBUILD
index cc5460d8170a53ae39b207a7948a6c417732ca03..374a591b0c3daa4ae7b31b4ce13dd8477fad88c0 100644
--- a/community/polkit-kde-agent-1/APKBUILD
+++ b/community/polkit-kde-agent-1/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=polkit-kde-agent-1
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Daemon providing a polkit authentication UI for KDE"
 # armhf blocked by extra-cmake-modules
 # s390x, and riscv64 blocked by polkit -> polkit-qt-1
@@ -21,6 +21,7 @@ makedepends="
 	kwindowsystem-dev
 	polkit-qt-1-dev
 	qt5-qtbase-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -32,8 +33,8 @@ subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/polkit-qt-1/APKBUILD b/community/polkit-qt-1/APKBUILD
index 2f73d6c89f590870d0d4691f3b1bbdf623f8bcf0..74a6e15cd3b51a4f99c2122aa271b547d144d1c0 100644
--- a/community/polkit-qt-1/APKBUILD
+++ b/community/polkit-qt-1/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=polkit-qt-1
 pkgver=0.114.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt wrapper around polkit-1 client libraries"
 # s390x and riscv64 blocked by polkit-elogind
 arch="all !s390x !riscv64"
@@ -12,13 +12,14 @@ depends_dev="polkit-elogind-dev"
 makedepends="$depends_dev
 	cmake
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/polkit-qt-1/polkit-qt-1-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/powerdevil/APKBUILD b/community/powerdevil/APKBUILD
index d829510391345ca3237f07e7fb5cac3a0aaac171..434375d7a5d18d86d15d76a27e36386972611df8 100644
--- a/community/powerdevil/APKBUILD
+++ b/community/powerdevil/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=powerdevil
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Manages the power consumption settings of a Plasma Shell"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -35,6 +35,7 @@ depends_dev="
 makedepends="$depends_dev
 	extra-cmake-modules
 	kdoctools-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -45,8 +46,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/powerdevil-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-libs $pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/poxml/APKBUILD b/community/poxml/APKBUILD
index 7f52a5d85dc21230f884e40911fc2a69d9415f3f..be7fca0bc2c5c3e4efe9dba3dc510344cd673a21 100644
--- a/community/poxml/APKBUILD
+++ b/community/poxml/APKBUILD
@@ -2,18 +2,18 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=poxml
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf !riscv64"
 url="https://www.kde.org/applications/development/"
 pkgdesc="Translates DocBook XML files using gettext po files"
 license="GPL-2.0-or-later AND GFDL-1.2-only"
-makedepends="extra-cmake-modules qt5-qtbase-dev kdoctools-dev gettext-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev kdoctools-dev gettext-dev samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/poxml-$pkgver.tar.xz"
 subpackages="$pkgname-doc"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/print-manager/APKBUILD b/community/print-manager/APKBUILD
index f8187bce2aac17a68f3dc93f9b188ee8f115dc0e..2982b2c43fbc2d80a2b47a8f6e08492dcaded86c 100644
--- a/community/print-manager/APKBUILD
+++ b/community/print-manager/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=print-manager
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -26,14 +26,15 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/print-manager-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests available
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/pulseaudio-qt/APKBUILD b/community/pulseaudio-qt/APKBUILD
index 4619629199fae0b05d2c788c6918ce42879cf9df..267931aa3b08a723ae7bbfc53959997204285b89 100644
--- a/community/pulseaudio-qt/APKBUILD
+++ b/community/pulseaudio-qt/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=pulseaudio-qt
 pkgver=1.3
-pkgrel=1
+pkgrel=2
 arch="all !armhf" # armhf blocked by qt5-qtdeclarative
 url="https://invent.kde.org/libraries/pulseaudio-qt"
 pkgdesc="Pulseaudio bindings for Qt"
@@ -18,13 +18,14 @@ makedepends="$depends_dev
 	extra-cmake-modules
 	graphviz
 	qt5-qttools-dev
+	samurai
 	"
 source="https://download.kde.org/stable/pulseaudio-qt/pulseaudio-qt-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_QCH=ON
diff --git a/community/qca/APKBUILD b/community/qca/APKBUILD
index 68d153f583950dffb106b61f8280ed7e161b02bb..28aa6c5c653974d905d4b334ffc20b875322429e 100644
--- a/community/qca/APKBUILD
+++ b/community/qca/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qca
 pkgver=2.3.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Qt cryptographic architecture"
 url="https://userbase.kde.org/QCA"
 arch="all"
@@ -14,13 +14,14 @@ makedepends="$depends_dev
 	cmake
 	doxygen
 	qt5-qtbase-dev
+	samurai
 	"
 subpackages="$pkgname-dev $pkgname-doc lib$pkgname:libs"
 source="https://download.kde.org/stable/qca/$pkgver/qca-$pkgver.tar.xz"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DWITH_cyrus-sasl_PLUGIN=yes
 	cmake --build build
diff --git a/community/qmlkonsole/APKBUILD b/community/qmlkonsole/APKBUILD
index 03acb50da845e706cafdf4698d847f919f78f8b7..fc98f3371bc30d115010bd9ddab7d936ea98724e 100644
--- a/community/qmlkonsole/APKBUILD
+++ b/community/qmlkonsole/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qmlkonsole
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Terminal app for Plasma Mobile"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -20,13 +20,14 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/qmlkonsole-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/qqc2-breeze-style/APKBUILD b/community/qqc2-breeze-style/APKBUILD
index 6fbd87142072c162ed0e90a4b28ae378eff3e8b9..2139372a3e0416d4553033865f64d025c77863b5 100644
--- a/community/qqc2-breeze-style/APKBUILD
+++ b/community/qqc2-breeze-style/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qqc2-breeze-style
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Breeze inspired QQC2 style"
 # armhf blocked by extra-cmake-modules
 # s390x blocked by kconfigwidgets
@@ -22,6 +22,7 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtx11extras-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -33,8 +34,8 @@ subpackages="$pkgname-dev"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/qrca/APKBUILD b/community/qrca/APKBUILD
index f4690dbb61afb8e3d68d7414e601a2afbd62bc25..e0d41bf10a6f62dbc47e7c9fa8378fde24139f8b 100644
--- a/community/qrca/APKBUILD
+++ b/community/qrca/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=qrca
 pkgver=0_git20210401
-pkgrel=0
+pkgrel=1
 _commit="4078952c38715ca59de3916e308bcd60fee00e34"
 pkgdesc="QR-Code scanner for Plasma Mobile"
 # armhf blocked by qt5-qtdeclarative
@@ -26,6 +26,7 @@ makedepends="
 	qt5-qtmultimedia-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	zxing-cpp-dev
 	"
 checkdepends="appstream"
@@ -33,8 +34,8 @@ source="https://invent.kde.org/plasma-mobile/qrca/-/archive/$_commit/qrca-$_comm
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -48,4 +49,5 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="25f7046e2ef318105ee702fb4a1dc41876cd028f853fc9488e78d4ac92313c5604c4e61d015af9b0813d849d64b3c1d19f533c687e781660a85e52a6768a6fef  qrca-4078952c38715ca59de3916e308bcd60fee00e34.tar.gz"
diff --git a/community/rattlesnake/APKBUILD b/community/rattlesnake/APKBUILD
index 12417b694faf54f429e18d54577a80dd5a797bea..7b2390bd4c78c4d8a32c820efe073c411e65c4b1 100644
--- a/community/rattlesnake/APKBUILD
+++ b/community/rattlesnake/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=rattlesnake
 pkgver=0_git20201121
-pkgrel=0
+pkgrel=1
 _commit="841abbdf130084ba132a7283ec8edccb83e78776"
 pkgdesc="A metronome app for mobile and desktop"
 url="https://invent.kde.org/mbruchert/rattlesnake"
@@ -15,14 +15,15 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtmultimedia-dev
 	kirigami2-dev
+	samurai
 	"
 checkdepends="appstream"
 source="https://invent.kde.org/mbruchert/rattlesnake/-/archive/$_commit/rattlesnake-$_commit.tar.gz"
 builddir="$srcdir/$pkgname-$_commit"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/rkward/APKBUILD b/community/rkward/APKBUILD
index 1724aa6f189584792e326887e95e416934f119dd..773d820b6d756971f2e7ab82ad10902b6b244d52 100644
--- a/community/rkward/APKBUILD
+++ b/community/rkward/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=rkward
 pkgver=0.7.2
-pkgrel=1
+pkgrel=2
 # armhf blocked by extra-cmake-modules
 # s390x and ppc64le blocked by qt5-qtwebengine
 # riscv64 disabled due to missing rust in recursive dependency
@@ -26,13 +26,14 @@ makedepends="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtwebengine-dev
+	samurai
 	"
 source="https://download.kde.org/stable/rkward/$pkgver/src/rkward-$pkgver.tar.gz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/rocs/APKBUILD b/community/rocs/APKBUILD
index 93a33149ed9bae2264c5d6a64f9e85772858f5fe..47144c21d562451c7a57c3a5ebf581611dcaff26 100644
--- a/community/rocs/APKBUILD
+++ b/community/rocs/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=rocs
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by kxmlgui
 # riscv64 disabled due to missing rust in recursive dependency
@@ -27,14 +27,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/rocs-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang $pkgname-dev"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/rsibreak/APKBUILD b/community/rsibreak/APKBUILD
index ad26341e32d407c520a94d977319430ff41239a7..d1ba67a694b85b50aa40b59df5c00ee57e059b33 100644
--- a/community/rsibreak/APKBUILD
+++ b/community/rsibreak/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=rsibreak
 pkgver=0.12.14
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kxmlgui
 arch="all !armhf !s390x !riscv64"
@@ -25,14 +25,15 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/rsibreak/${pkgver%.*}/rsibreak-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/sddm-kcm/APKBUILD b/community/sddm-kcm/APKBUILD
index 06fc8db66386cd7671a68b03a3c5c7fc8aecff5b..3c8ccade4fb537b2df77f1a9200259e52ded370e 100644
--- a/community/sddm-kcm/APKBUILD
+++ b/community/sddm-kcm/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=sddm-kcm
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Config module for SDDM"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
@@ -29,6 +29,7 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtx11extras-dev
+	samurai
 	xcb-util-image-dev
 	"
 
@@ -41,8 +42,8 @@ subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/shelf/APKBUILD b/community/shelf/APKBUILD
index 2f5fdebdf48025379874f0d1d55e591bf5dca2cf..5df51ab4e086395e803654cb3e92dc2619c41502 100644
--- a/community/shelf/APKBUILD
+++ b/community/shelf/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=shelf
 pkgver=2.1.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Document and EBook collection manager"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf !s390x !riscv64"
@@ -22,13 +22,14 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtxmlpatterns-dev
+	samurai
 	"
 source="https://download.kde.org/stable/maui/shelf/$pkgver/shelf-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/sink/APKBUILD b/community/sink/APKBUILD
index 27fcce4abee17431e0af3364b257e25ee80ee37c..86562eb29d166bace8b2c54fa40886faf240e2f9 100644
--- a/community/sink/APKBUILD
+++ b/community/sink/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=sink
 pkgver=0.9.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Offline caching, synchronization and indexing system for PIM data"
 arch="all !armhf" # limited by flatbuffers
 url="https://community.kde.org/KDE_PIM"
@@ -20,6 +20,7 @@ depends_dev="
 	libexecinfo-dev
 	lmdb-dev
 	qt5-qtbase-dev
+	samurai
 	xapian-core-dev
 	"
 makedepends="$depends_dev extra-cmake-modules"
@@ -30,8 +31,8 @@ options="!check" # Failing tests
 builddir="$srcdir/$pkgname-v$pkgver"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -45,4 +46,5 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="8f64872827978196178115ea46db655479cf7b88086ff6ec6e60000c5edd57f9cf0d51a8d7cb11660b987a6b3a0f9a8a985e264c6ba988965cfce49a631e428b  sink-v0.9.0.tar.gz"
diff --git a/community/skanlite/APKBUILD b/community/skanlite/APKBUILD
index e1117107c0775a0cfd590a75565122a24f7ad782..76f37c36071ab71681c474521673a265a3d73b56 100644
--- a/community/skanlite/APKBUILD
+++ b/community/skanlite/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=skanlite
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -18,14 +18,15 @@ makedepends="
 	kxmlgui-dev
 	libksane-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/skanlite-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/spacebar/APKBUILD b/community/spacebar/APKBUILD
index c4e5e302befd1fb7c23e12cdf9a35f1cd1333596..28e7c3271b309073de4082906f41bd85201c52de 100644
--- a/community/spacebar/APKBUILD
+++ b/community/spacebar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=spacebar
 pkgver=22.02.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Collection of stuff for running IM on Plasma Mobile"
 url="https://invent.kde.org/plasma-mobile/spacebar"
 # armhf blocked by qt5-qtdeclarative
@@ -22,14 +22,15 @@ makedepends="
 	qcoro-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/${pkgver%.*}/spacebar-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build -j1
diff --git a/community/spectacle/APKBUILD b/community/spectacle/APKBUILD
index d6359d2f8ce6058563a6da3f04f4f20c25a565d6..878c49cf7e421a8e6ee82ba514a75e88d42054f5 100644
--- a/community/spectacle/APKBUILD
+++ b/community/spectacle/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=spectacle
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Application for capturing desktop screenshots"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kdeclarative
@@ -29,6 +29,7 @@ makedepends="
 	purpose-dev
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
+	samurai
 	xcb-util-cursor-dev
 	xcb-util-image-dev
 	xcb-util-renderutil-dev
@@ -39,8 +40,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/spectacle-$p
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/station/APKBUILD b/community/station/APKBUILD
index afc222e9bf08ac4ec4f602fd88d9735ff564ab15..7eed97435375107531f26f63cb7a0185f9a56c78 100644
--- a/community/station/APKBUILD
+++ b/community/station/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=station
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Convergent terminal emulator"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by mauikit
@@ -20,13 +20,14 @@ makedepends="
 	mauikit-filebrowsing-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 source="https://download.kde.org/stable/maui/station/$pkgver/station-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
@@ -39,6 +40,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 c5161d644ae6268cd4754615ab40249dd56ef921ceefb9ff5ff2def0c1634efb3ece7b4f61aae827879d450f56e159d315a2c123d468256b7660311ab91bb074  station-2.1.1.tar.xz
 "
diff --git a/community/step/APKBUILD b/community/step/APKBUILD
index a6225fee8082a46ee78f2a020bab9a03c7b300fc..21eeae5a5d3261e63747674bca4887175f78d721 100644
--- a/community/step/APKBUILD
+++ b/community/step/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=step
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x blocked by khtml
 # riscv64 disabled due to missing rust in recursive dependency
@@ -23,14 +23,15 @@ makedepends="
 	qt5-qtbase-dev
 	qt5-qtsvg-dev
 	qt5-qttools-dev
+	samurai
 	shared-mime-info
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/step-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/sweeper/APKBUILD b/community/sweeper/APKBUILD
index 1e254b05292a4d55aeaf0b61cc6eaebd703e8a71..b858a911aec799d485519f6cbc9842c08d2ccec3 100644
--- a/community/sweeper/APKBUILD
+++ b/community/sweeper/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=sweeper
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -23,13 +23,14 @@ makedepends="
 	ktextwidgets-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/sweeper-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/systemsettings/APKBUILD b/community/systemsettings/APKBUILD
index cc35e26327df95512454ea627e9433b7d9e08bb5..91d84c36f7f4a24e2f577faffda955192a3f7f9d 100644
--- a/community/systemsettings/APKBUILD
+++ b/community/systemsettings/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=systemsettings
 pkgver=5.24.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Plasma system manager for hardware, software, and workspaces"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kio
@@ -34,6 +34,7 @@ makedepends="
 	plasma-workspace-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	"
 
 case "$pkgver" in
@@ -44,8 +45,8 @@ source="https://download.kde.org/$_rel/plasma/$pkgver/systemsettings-$pkgver.tar
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
@@ -59,6 +60,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 4de5b7c8224f0fb376dfa5481c4185d44632485569e3dd1a7f36582751ca15de2382cd8293d684bdb1d771983ad09b53fa36fe7ae776f447ca09f609a6ec13c0  systemsettings-5.24.4.tar.xz
 "
diff --git a/community/tokodon/APKBUILD b/community/tokodon/APKBUILD
index b3959f32d0534e3c5b417994936415f67204e803..bb5bcfe67675b11b53037d98c782f654ae2662be 100644
--- a/community/tokodon/APKBUILD
+++ b/community/tokodon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=tokodon
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="A Mastodon client for Plasma and Plasma Mobile"
 url="https://invent.kde.org/network/tokodon/"
 # armhf blocked by extra-cmake-modules
@@ -25,14 +25,15 @@ makedepends="
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
 	qt5-qtwebsockets-dev
+	samurai
 	"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/tokodon-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
diff --git a/community/umbrello/APKBUILD b/community/umbrello/APKBUILD
index dfcbb7f39e9289fe2bc7b35021af96c9a052c2ec..05187dbf1c16dae1e6e49b141fce3525292cba38 100644
--- a/community/umbrello/APKBUILD
+++ b/community/umbrello/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=umbrello
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf !s390x !riscv64" # Blocked by extra-cmake-modules and rust
 url="https://umbrello.kde.org/"
 pkgdesc="GUI for diagramming Unified Modelling Language (UML)"
@@ -25,6 +25,7 @@ makedepends="
 	kwindowsystem-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/umbrello-$pkgver.tar.xz"
@@ -35,8 +36,8 @@ case "$CARCH" in
 esac
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
 		-DBUILD_KF5=ON
diff --git a/community/vakzination/APKBUILD b/community/vakzination/APKBUILD
index a559fd893b7d57c0dcd4df7f9c6d735fe6c068ed..2b9dbcaffdb3914750940d74536a2d8a729d9889 100644
--- a/community/vakzination/APKBUILD
+++ b/community/vakzination/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=vakzination
 pkgver=22.04
-pkgrel=0
+pkgrel=1
 pkgdesc="Vakzination manages your health certificates like vaccination, test, and recovery certificates"
 url="https://invent.kde.org/plasma-mobile/vakzination"
 # armhf blocked by extra-cmake-modules
@@ -26,14 +26,15 @@ makedepends="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
+	samurai
 	"
 subpackages="$pkgname-lang"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/vakzination-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/vvave/APKBUILD b/community/vvave/APKBUILD
index a78b46438ea5152f5ad0a38ba5785ae76b0d4a4d..97a9ed15bb60b0741bbf5c27e5502b0ebe6046f7 100644
--- a/community/vvave/APKBUILD
+++ b/community/vvave/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=vvave
 pkgver=2.1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="VVAVE Music Player"
 # armhf blocked by qt5-qtdeclarative
 # s390x, ppc64le and riscv64 blocked by qt5-qtwebview
@@ -30,6 +30,7 @@ makedepends="
 	qt5-qtsvg-dev
 	qt5-qtwebsockets-dev
 	qt5-qtwebview-dev
+	samurai
 	syntax-highlighting-dev
 	taglib-dev
 	"
@@ -37,8 +38,8 @@ source="https://download.kde.org/stable/maui/vvave/$pkgver/vvave-$pkgver.tar.xz"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr
 	cmake --build build
 }
@@ -51,6 +52,7 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 }
+
 sha512sums="
 fcf99bfc2a92f9a1d912799b77674185b14dd8b6dd1df45d719110e037f8c2d70e6acf7fccd3d7167c606b15a7f7e34cb48cf8b4d9784f7905a12ceaedd8e117  vvave-2.1.1.tar.xz
 "
diff --git a/community/wacomtablet/APKBUILD b/community/wacomtablet/APKBUILD
index 5da1eeb1d851d7ba0fac8d106fbbddf798a161e7..41306075363627e15963d28d0adcc62bedd29232 100644
--- a/community/wacomtablet/APKBUILD
+++ b/community/wacomtablet/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=wacomtablet
 pkgver=3.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GUI for Wacom Linux drivers that supports different button/pen layout profiles"
 # armhf blocked by qt5-qtdeclarative
 # s390x and riscv64 blocked by polkit -> kxmlgui
@@ -26,6 +26,7 @@ makedepends="
 	plasma-framework-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
+	samurai
 	xf86-input-wacom-dev
 	"
 checkdepends="xvfb-run"
@@ -37,8 +38,8 @@ source="https://download.kde.org/stable/wacomtablet/$pkgver/wacomtablet-$pkgver.
 subpackages="$pkgname-lang $pkgname-doc"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/yakuake/APKBUILD b/community/yakuake/APKBUILD
index e82d7c135c8f359f66e346b94f14306c7527c82e..8784fc66a66de1d6acca410faede1a7e83874cce 100644
--- a/community/yakuake/APKBUILD
+++ b/community/yakuake/APKBUILD
@@ -2,19 +2,19 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=yakuake
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 arch="all !armhf !s390x !riscv64" # blocked by polkit -> kio
 url="https://kde.org/applications/system/org.kde.yakuake"
 pkgdesc="A drop-down terminal emulator based on KDE Konsole technology"
 license="GPL-2.0-only OR GPL-3.0-only"
 depends="konsole"
-makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtx11extras-dev karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev knotifications-dev knotifyconfig-dev kparts-dev kwidgetsaddons-dev kwindowsystem-dev kwayland-dev"
+makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtsvg-dev qt5-qtx11extras-dev karchive-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kglobalaccel-dev ki18n-dev kiconthemes-dev kio-dev knewstuff-dev knotifications-dev knotifyconfig-dev kparts-dev kwidgetsaddons-dev kwindowsystem-dev kwayland-dev samurai"
 source="https://download.kde.org/stable/release-service/$pkgver/src/yakuake-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/zanshin/APKBUILD b/community/zanshin/APKBUILD
index 9cd4355e86ca01365b14c0a6e079927de2005363..f256b04cf80c32b35593016829850ba4744e488a 100644
--- a/community/zanshin/APKBUILD
+++ b/community/zanshin/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=zanshin
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by qt5-qtdeclarative
 # ppc64le and s390x blocked by qt5-qtwebengine -> akonadi-calendar
 arch="all !armhf !ppc64le !s390x !riscv64"
@@ -18,6 +18,7 @@ makedepends="
 	krunner-dev
 	kwindowsystem-dev
 	qt5-qtbase-dev
+	samurai
 	"
 checkdepends="
 	dbus
@@ -27,8 +28,8 @@ source="https://download.kde.org/stable/release-service/$pkgver/src/zanshin-$pkg
 subpackages="$pkgname-lang"
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build
diff --git a/community/zeroconf-ioslave/APKBUILD b/community/zeroconf-ioslave/APKBUILD
index 2d40535a90a580b8253ff9e0c8bc89e20d80605b..c73ae8eeb9deaada95f566f431334051251c6e3b 100644
--- a/community/zeroconf-ioslave/APKBUILD
+++ b/community/zeroconf-ioslave/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=zeroconf-ioslave
 pkgver=22.04.0
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by polkit -> kio
 arch="all !armhf !s390x !riscv64"
@@ -16,14 +16,15 @@ makedepends="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/zeroconf-ioslave-$pkgver.tar.xz"
 subpackages="$pkgname-lang"
 options="!check" # No tests
 
 build() {
-	cmake -B build \
-		-DCMAKE_BUILD_TYPE=None \
+	cmake -B build -G Ninja \
+		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib
 	cmake --build build