*/*: put samurai/cmake in makedepends not depends_dev

41 files changed, 130 insertions, 94 deletions

diff --git a/community/akonadi-calendar/APKBUILD b/community/akonadi-calendar/APKBUILD
index 9c3d93b411e..b53df1d2e4a 100644
--- a/community/akonadi-calendar/APKBUILD
+++ b/community/akonadi-calendar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-calendar
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Akonadi calendar integration"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by kmailtransport -> libkgapi -> qt5-qtwebengine
@@ -23,10 +23,10 @@ depends_dev="
 	kmailtransport-dev
 	kwidgetsaddons-dev
 	kxmlgui-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-calendar-$pkgver.tar.xz"
diff --git a/community/akonadi-contacts/APKBUILD b/community/akonadi-contacts/APKBUILD
index c560556fbbb..03dbf3c964c 100644
--- a/community/akonadi-contacts/APKBUILD
+++ b/community/akonadi-contacts/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-contacts
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement Contact Management in Akonadi"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by akonadi
@@ -31,10 +31,10 @@ depends_dev="
 	libkleo-dev
 	prison-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-contacts-$pkgver.tar.xz"
diff --git a/community/akonadi-mime/APKBUILD b/community/akonadi-mime/APKBUILD
index fef32b6aacf..d7b47adccad 100644
--- a/community/akonadi-mime/APKBUILD
+++ b/community/akonadi-mime/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-mime
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement basic email handling"
 # armhf blocked by extra-cmake-modules
 # s390x and riscv64 blocked by akonadi
@@ -22,11 +22,11 @@ depends_dev="
 	kxmlgui-dev
 	libxslt-dev
 	qt5-qtbase-dev
-	samurai
 	shared-mime-info
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-mime-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/akonadi-notes/APKBUILD b/community/akonadi-notes/APKBUILD
index 1f8932423a6..74d82910410 100644
--- a/community/akonadi-notes/APKBUILD
+++ b/community/akonadi-notes/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-notes
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement management of notes"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -12,10 +12,10 @@ depends_dev="
 	ki18n-dev
 	kmime-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-notes-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/akonadi-search/APKBUILD b/community/akonadi-search/APKBUILD
index 29511688288..ed039d7bcaf 100644
--- a/community/akonadi-search/APKBUILD
+++ b/community/akonadi-search/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi-search
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Libraries and daemons to implement searching in Akonadi"
 # armhf blocked by extra-cmake-modules
 # riscv64 blocked by akonadi
@@ -25,11 +25,11 @@ depends_dev="
 	kmime-dev
 	krunner-dev
 	qt5-qtbase-dev
-	samurai
 	xapian-core-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/akonadi-search-$pkgver.tar.xz"
diff --git a/community/akonadi/APKBUILD b/community/akonadi/APKBUILD
index 8d4924600bd..cb5813f404c 100644
--- a/community/akonadi/APKBUILD
+++ b/community/akonadi/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=akonadi
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="A cross-desktop storage service for PIM data and meta data providing concurrent read, write, and query access"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by kaccounts-integration
@@ -34,13 +34,13 @@ depends_dev="
 	libaccounts-qt-dev
 	libxml2-dev
 	qt5-qtbase-dev
-	samurai
 	shared-mime-info
 	sqlite-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="
 	cmd:dbus-run-session
diff --git a/community/baloo-widgets/APKBUILD b/community/baloo-widgets/APKBUILD
index 5204747ed4d..cff89ff4474 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.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Widgets for Baloo"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -15,10 +15,10 @@ depends_dev="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/baloo-widgets-$pkgver.tar.xz"
diff --git a/community/baloo/APKBUILD b/community/baloo/APKBUILD
index 2ae7c552596..2aadb938c76 100644
--- a/community/baloo/APKBUILD
+++ b/community/baloo/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=baloo
 pkgver=5.103.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A framework for searching and managing metadata"
 # armhf blocked by qt5-qtdeclarative
 arch="all !armhf"
@@ -23,12 +23,12 @@ depends_dev="
 	kservice-dev
 	lmdb-dev
 	qt5-qtdeclarative-dev
-	samurai
 	solid-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
 	qt5-qtbase-dev
+	samurai
 	"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/baloo-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/calendarsupport/APKBUILD b/community/calendarsupport/APKBUILD
index 31749532b3c..13203e04843 100644
--- a/community/calendarsupport/APKBUILD
+++ b/community/calendarsupport/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=calendarsupport
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Library providing calendar support"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> akonadi
@@ -25,11 +25,11 @@ depends_dev="
 	kmime-dev
 	pimcommon-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/calendarsupport-$pkgver.tar.xz"
diff --git a/community/dolphin/APKBUILD b/community/dolphin/APKBUILD
index ba1c2b66a42..f78379169a7 100644
--- a/community/dolphin/APKBUILD
+++ b/community/dolphin/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=dolphin
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
 url="https://kde.org/applications/system/dolphin"
@@ -37,10 +37,14 @@ depends_dev="
 	kwindowsystem-dev
 	phonon-dev
 	qt5-qtbase-dev
-	samurai
 	solid-dev
 	"
-makedepends="$depends_dev extra-cmake-modules ruby-test-unit"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
+	ruby-test-unit
+	samurai
+	"
 checkdepends="
 	xvfb-run
 	dbus
diff --git a/community/eventviews/APKBUILD b/community/eventviews/APKBUILD
index 948b7c10634..5344bb096b6 100644
--- a/community/eventviews/APKBUILD
+++ b/community/eventviews/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=eventviews
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for creating events"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> akonadi
@@ -26,10 +26,13 @@ depends_dev="
 	kservice-dev
 	libkdepim-dev
 	qt5-qtbase-dev
-	samurai
 	"
 checkdepends="xvfb-run"
-makedepends="$depends_dev extra-cmake-modules"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
+	samurai
+	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/eventviews-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 
diff --git a/community/frameworkintegration/APKBUILD b/community/frameworkintegration/APKBUILD
index bd276679e7e..26557d75966 100644
--- a/community/frameworkintegration/APKBUILD
+++ b/community/frameworkintegration/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=frameworkintegration
 pkgver=5.103.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Framework providing components to allow applications to integrate with a KDE Workspace"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -19,10 +19,10 @@ depends_dev="
 	kpackage-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/frameworkintegration-$pkgver.tar.xz"
diff --git a/community/incidenceeditor/APKBUILD b/community/incidenceeditor/APKBUILD
index 8e0638a34ba..d0e37deba9e 100644
--- a/community/incidenceeditor/APKBUILD
+++ b/community/incidenceeditor/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=incidenceeditor
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM incidence editor"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> akonadi
@@ -26,10 +26,10 @@ depends_dev="
 	kmime-dev
 	libkdepim-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/incidenceeditor-$pkgver.tar.xz"
diff --git a/community/kaccounts-integration/APKBUILD b/community/kaccounts-integration/APKBUILD
index 04c77ba28bd..804fff8e831 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.12.2
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 # s390x, ppc64le and riscv64 blocked by signon-ui -> qt5-qtwebengine
 arch="all !armhf !s390x !ppc64le !riscv64"
@@ -21,11 +21,11 @@ depends_dev="
 	ki18n-dev
 	libaccounts-qt-dev
 	qt5-qtbase-dev
-	samurai
 	signond-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kaccounts-integration-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/kcalutils/APKBUILD b/community/kcalutils/APKBUILD
index 78a17264b45..3310d450340 100644
--- a/community/kcalutils/APKBUILD
+++ b/community/kcalutils/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kcalutils
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="The KDE calendar utility library"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -19,9 +19,12 @@ depends_dev="
 	kiconthemes-dev
 	kidentitymanagement-dev
 	kwidgetsaddons-dev
+	"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
 	samurai
 	"
-makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kcalutils-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/kdav/APKBUILD b/community/kdav/APKBUILD
index 6457159bea1..9f8a46c7e59 100644
--- a/community/kdav/APKBUILD
+++ b/community/kdav/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdav
 pkgver=5.103.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A DAV protocol implementation with KJobs"
 url="https://community.kde.org/Frameworks"
 # armhf blocked by qt5-qtdeclarative
@@ -14,12 +14,12 @@ depends_dev="
 	kio-dev
 	qt5-qtbase-dev
 	qt5-qtxmlpatterns-dev
-	samurai
 	"
 makedepends="$depends_dev
 	doxygen
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdav-$pkgver.tar.xz"
diff --git a/community/kdav2/APKBUILD b/community/kdav2/APKBUILD
index b3bdf65efed..5d2fd8e1213 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=1
+pkgrel=2
 pkgdesc="DAV protocol implementation with KJobs"
 arch="all !armhf" # qtdeclarative
 url="https://community.kde.org/KDE_PIM"
@@ -11,9 +11,12 @@ depends_dev="
 	kcoreaddons-dev
 	qt5-qtbase-dev
 	qt5-qtxmlpatterns-dev
+	"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
 	samurai
 	"
-makedepends="$depends_dev extra-cmake-modules"
 subpackages="$pkgname-dev"
 #source="https://download.kde.org/unstable/kdav2/$pkgver/src/kdav2-$pkgver.tar.xz"
 source="https://invent.kde.org/pim/kdav2/-/archive/v$pkgver/kdav2-v$pkgver.tar.gz"
diff --git a/community/kdeclarative/APKBUILD b/community/kdeclarative/APKBUILD
index 59559ad187a..1b5f4d0e834 100644
--- a/community/kdeclarative/APKBUILD
+++ b/community/kdeclarative/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdeclarative
 pkgver=5.103.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Provides integration of QML and KDE Frameworks"
 # armhf blocked by qt5-qtdeclarative
 arch="all !armhf"
@@ -20,12 +20,12 @@ depends_dev="
 	kwindowsystem-dev
 	libepoxy-dev
 	qt5-qtdeclarative-dev
-	samurai
 	"
 makedepends="$depends_dev
 	doxygen
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kdeclarative-$pkgver.tar.xz"
diff --git a/community/kdeplasma-addons/APKBUILD b/community/kdeplasma-addons/APKBUILD
index f1d55183233..62dc8cf2eaf 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.27.1
-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
@@ -33,11 +33,11 @@ depends_dev="
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
 	qt5-qtwebengine-dev
-	samurai
 	sonnet-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 
diff --git a/community/khealthcertificate/APKBUILD b/community/khealthcertificate/APKBUILD
index ce0960cd4b3..5461569975e 100644
--- a/community/khealthcertificate/APKBUILD
+++ b/community/khealthcertificate/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khealthcertificate
 pkgver=23.01.0
-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
@@ -15,11 +15,11 @@ depends_dev="
 	openssl-dev>3
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
-	samurai
 	zlib-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/plasma-mobile/$pkgver/khealthcertificate-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
diff --git a/community/khtml/APKBUILD b/community/khtml/APKBUILD
index 51f1c7010c2..2822e01127f 100644
--- a/community/khtml/APKBUILD
+++ b/community/khtml/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=khtml
 pkgver=5.103.0
-pkgrel=0
+pkgrel=1
 pkgdesc="The KDE HTML library, ancestor of WebKit"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -27,7 +27,6 @@ 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 7b9c07e7a9b..5d15497e7d7 100644
--- a/community/kidentitymanagement/APKBUILD
+++ b/community/kidentitymanagement/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kidentitymanagement
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM libraries"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -19,9 +19,12 @@ depends_dev="
 	ktextwidgets-dev
 	kxmlgui-dev
 	qt5-qtbase-dev
+	"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
 	samurai
 	"
-makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kidentitymanagement-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/kimap/APKBUILD b/community/kimap/APKBUILD
index f62fa9468e5..9a6c394d448 100644
--- a/community/kimap/APKBUILD
+++ b/community/kimap/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kimap
 pkgver=22.12.2
-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,10 +16,10 @@ depends_dev="
 	kio-dev
 	kmime-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kimap-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
diff --git a/community/kitinerary/APKBUILD b/community/kitinerary/APKBUILD
index 3b382c1ad54..eb5ffccb19a 100644
--- a/community/kitinerary/APKBUILD
+++ b/community/kitinerary/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kitinerary
 pkgver=22.12.2
-pkgrel=1
+pkgrel=2
 # armhf blocked by qt5-qtdeclarative
 # ppc64le FTBFS
 arch="all !armhf !ppc64le"
@@ -15,7 +15,6 @@ depends_dev="
 	kmime-dev
 	kpkpass-dev
 	libphonenumber-dev
-	samurai
 	zxing-cpp-dev
 	"
 makedepends="$depends_dev
diff --git a/community/kontactinterface/APKBUILD b/community/kontactinterface/APKBUILD
index 83f8b0820a4..351be087ee0 100644
--- a/community/kontactinterface/APKBUILD
+++ b/community/kontactinterface/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kontactinterface
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
 url="https://kontact.kde.org/"
@@ -15,9 +15,12 @@ depends_dev="
 	kparts-dev
 	kwindowsystem-dev
 	kxmlgui-dev
+	"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
 	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"
 
diff --git a/community/kpimtextedit/APKBUILD b/community/kpimtextedit/APKBUILD
index 24986b07ae3..ddb79a9a902 100644
--- a/community/kpimtextedit/APKBUILD
+++ b/community/kpimtextedit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kpimtextedit
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Advanced text editor which provide advanced html feature"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -22,11 +22,15 @@ depends_dev="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qtspeech-dev
-	samurai
 	sonnet-dev
 	syntax-highlighting-dev
 	"
-makedepends="$depends_dev extra-cmake-modules qt5-qttools-dev"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
+	qt5-qttools-dev
+	samurai
+	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/kpimtextedit-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/kross/APKBUILD b/community/kross/APKBUILD
index f81f9ab9a53..49dfe84874a 100644
--- a/community/kross/APKBUILD
+++ b/community/kross/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kross
 pkgver=5.103.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Framework for scripting KDE applications"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -19,7 +19,6 @@ depends_dev="
 	kxmlgui-dev
 	qt5-qtbase-dev
 	qt5-qttools-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
diff --git a/community/kscreenlocker/APKBUILD b/community/kscreenlocker/APKBUILD
index 9a031aa65b6..628da66d0ca 100644
--- a/community/kscreenlocker/APKBUILD
+++ b/community/kscreenlocker/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kscreenlocker
 pkgver=5.27.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Library and components for secure lock screen architecture"
 # armhf blocked by extra-cmake-modules
 arch="all !armhf"
@@ -31,12 +31,13 @@ depends_dev="
 	linux-pam-dev
 	qt5-qtbase-dev
 	qt5-qtx11extras-dev
-	samurai
 	solid-dev
 	xcb-util-keysyms-dev
 	"
-makedepends="$depends_dev
+makedepends="
+	$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 
diff --git a/community/ksmtp/APKBUILD b/community/ksmtp/APKBUILD
index 435a7302d92..f10c1d495be 100644
--- a/community/ksmtp/APKBUILD
+++ b/community/ksmtp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=ksmtp
 pkgver=22.12.2
-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,10 +15,10 @@ depends_dev="
 	ki18n-dev
 	kio-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/ksmtp-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/ktp-common-internals/APKBUILD b/community/ktp-common-internals/APKBUILD
index 065c2aa4cd2..8a3be1976f3 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.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Library for KTp"
 url="https://github.com/kde/ktp-common-internals"
 # armhf blocked by extra-cmake-modules
@@ -24,10 +24,14 @@ depends_dev="
 	kwindowsystem-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
-	samurai
 	telepathy-qt-dev
 	"
-makedepends="$depends_dev extra-cmake-modules doxygen"
+makedepends="
+	$depends_dev
+	doxygen
+	extra-cmake-modules
+	samurai
+	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/ktp-common-internals-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
 options="!check" # No tests
diff --git a/community/libgravatar/APKBUILD b/community/libgravatar/APKBUILD
index 229433f402b..56740e2dabb 100644
--- a/community/libgravatar/APKBUILD
+++ b/community/libgravatar/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libgravatar
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM library providing Gravatar support"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> pimcommon
@@ -17,10 +17,10 @@ depends_dev="
 	kwidgetsaddons-dev
 	pimcommon-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libgravatar-$pkgver.tar.xz"
diff --git a/community/libkdepim/APKBUILD b/community/libkdepim/APKBUILD
index 2f32c1b71f8..3daf6ca09a4 100644
--- a/community/libkdepim/APKBUILD
+++ b/community/libkdepim/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=libkdepim
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Lib for common KDEPim apps"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> akonadi
@@ -28,11 +28,11 @@ depends_dev="
 	kwallet-dev
 	kwidgetsaddons-dev
 	qt5-qtbase-dev
-	samurai
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
 	qt5-qttools-dev
+	samurai
 	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/libkdepim-$pkgver.tar.xz"
diff --git a/community/mailcommon/APKBUILD b/community/mailcommon/APKBUILD
index ca295a72d64..5a30bf119f1 100644
--- a/community/mailcommon/APKBUILD
+++ b/community/mailcommon/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mailcommon
 pkgver=22.12.2
-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,10 +34,13 @@ depends_dev="
 	messagelib-dev
 	qt5-qtbase-dev
 	qt5-qttools-dev
-	samurai
 	syntax-highlighting-dev
 	"
-makedepends="$depends_dev extra-cmake-modules"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
+	samurai
+	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/mailcommon-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/mailimporter/APKBUILD b/community/mailimporter/APKBUILD
index c088794a5a5..1f054e0db58 100644
--- a/community/mailimporter/APKBUILD
+++ b/community/mailimporter/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mailimporter
 pkgver=22.12.2
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE PIM library providing support for mail applications"
 # armhf blocked by extra-cmake-modules
 # ppc64le, s390x and riscv64 blocked by qt5-qtwebengine -> akonadi
@@ -20,9 +20,12 @@ depends_dev="
 	libkdepim-dev
 	pimcommon-dev
 	qt5-qtbase-dev
+	"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
 	samurai
 	"
-makedepends="$depends_dev extra-cmake-modules"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/release-service/$pkgver/src/mailimporter-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-lang"
diff --git a/community/marble/APKBUILD b/community/marble/APKBUILD
index 8f5b0a23fa0..e5fbd9aba0d 100644
--- a/community/marble/APKBUILD
+++ b/community/marble/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=marble
 pkgver=22.12.2
-pkgrel=1
+pkgrel=2
 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,11 +29,11 @@ depends_dev="
 	qt5-qtsvg-dev
 	qt5-qttools-dev
 	qt5-qtwebengine-dev
-	samurai
 	shared-mime-info
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/release-service/$pkgver/src/marble-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang"
diff --git a/community/mauikit/APKBUILD b/community/mauikit/APKBUILD
index 3ab04cfb2ad..1e3f09eb6c9 100644
--- a/community/mauikit/APKBUILD
+++ b/community/mauikit/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mauikit
 pkgver=2.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Kit for developing MAUI Apps"
 # armhf blocked by qt5-qtdeclarative
 arch="all !armhf"
@@ -25,12 +25,12 @@ depends_dev="
 	qt5-qtdeclarative-dev
 	qt5-qtquickcontrols2-dev
 	qt5-qtsvg-dev
-	samurai
 	syntax-highlighting-dev
 	xcb-util-wm-dev
 	"
 makedepends="$depends_dev
 	extra-cmake-modules
+	samurai
 	"
 source="https://download.kde.org/stable/maui/mauikit/$pkgver/mauikit-$pkgver.tar.xz"
 subpackages="$pkgname-dev"
diff --git a/community/poppler-qt5/APKBUILD b/community/poppler-qt5/APKBUILD
index b70c2198c9f..47c24c54f87 100644
--- a/community/poppler-qt5/APKBUILD
+++ b/community/poppler-qt5/APKBUILD
@@ -6,7 +6,7 @@
 pkgname=poppler-qt5
 _pkgname=poppler
 pkgver=23.02.0
-pkgrel=0
+pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="https://poppler.freedesktop.org/"
 arch="all"
@@ -14,9 +14,8 @@ license="GPL-2.0-only"
 replaces="poppler-glib"
 provides="poppler-qt4=$pkgver-r$pkgrel"
 options="!check" # Requires dl of testfiles and only checks qt5 libs
-makedepends="
+depends_dev="
 	cairo-dev
-	cmake
 	fontconfig-dev
 	jpeg-dev
 	lcms2-dev
@@ -25,13 +24,16 @@ makedepends="
 	libxml2-dev
 	openjpeg-dev
 	poppler-dev>=$pkgver
+	tiff-dev
+	zlib-dev
+	"
+makedepends="
+	$depends_dev
+	cmake
 	qt5-qtbase-dev
 	qt6-qtbase-dev
 	samurai
-	tiff-dev
-	zlib-dev
 	"
-depends_dev="$makedepends"
 subpackages="poppler-qt6:_qt6 $pkgname-dev"
 source="https://poppler.freedesktop.org/poppler-$pkgver.tar.xz"
 builddir="$srcdir/$_pkgname-$pkgver"
diff --git a/community/sink/APKBUILD b/community/sink/APKBUILD
index 8db6d05666b..08990cc2f34 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=3
+pkgrel=4
 pkgdesc="Offline caching, synchronization and indexing system for PIM data"
 arch="all !armhf !s390x" # limited by flatbuffers
 url="https://community.kde.org/KDE_PIM"
@@ -19,10 +19,13 @@ depends_dev="
 	kmime-dev
 	lmdb-dev
 	qt5-qtbase-dev
-	samurai
 	xapian-core-dev
 	"
-makedepends="$depends_dev extra-cmake-modules"
+makedepends="
+	$depends_dev
+	extra-cmake-modules
+	samurai
+	"
 checkdepends="xvfb-run"
 source="https://invent.kde.org/pim/sink/-/archive/v$pkgver/sink-v$pkgver.tar.gz"
 subpackages="$pkgname-dev"
diff --git a/community/soxr/APKBUILD b/community/soxr/APKBUILD
index 831eb1d90de..b921f0032b1 100644
--- a/community/soxr/APKBUILD
+++ b/community/soxr/APKBUILD
@@ -2,13 +2,12 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=soxr
 pkgver=0.1.3
-pkgrel=3
+pkgrel=4
 pkgdesc="High quality, one-dimensional sample-rate conversion library"
 url="https://sourceforge.net/projects/soxr"
 arch="all"
 license="LGPL-2.1-or-later"
-depends_dev="cmake"
-makedepends="$depends_dev samurai"
+makedepends="cmake samurai"
 subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
 source="$pkgname-$pkgver.tar.xz::https://sourceforge.net/projects/soxr/files/soxr-$pkgver-Source.tar.xz/download"
 builddir="$srcdir/$pkgname-$pkgver-Source"
diff --git a/main/meson/APKBUILD b/main/meson/APKBUILD
index 1c07f46f2dc..5310031421a 100644
--- a/main/meson/APKBUILD
+++ b/main/meson/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=meson
 pkgver=1.0.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast and user friendly build system"
 url="https://mesonbuild.com"
 arch="noarch"
@@ -79,6 +79,7 @@ package() {
 
 vim() {
 	pkgdesc="$pkgdesc (vim support)"
+	depends=
 	install_if="vim $pkgname=$pkgver-r$pkgrel"
 	cd "$builddir"
 	for kind in ftdetect ftplugin indent syntax
diff --git a/testing/mapserver/APKBUILD b/testing/mapserver/APKBUILD
index 9b1b9872346..c7d76c2dd69 100644
--- a/testing/mapserver/APKBUILD
+++ b/testing/mapserver/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bjoern Schilberg <bjoern@intevation.de>
 pkgname=mapserver
 pkgver=8.0.0
-pkgrel=2
+pkgrel=3
 pkgdesc="CGI-based platform for publishing spatial data and interactive mapping applications to the web"
 url="https://mapserver.org/"
 # s390x: blocked by exempi-dev
@@ -10,7 +10,6 @@ arch="all !s390x"
 license="MIT"
 depends_dev="
 	cairo-dev
-	cmake
 	curl-dev
 	exempi-dev
 	fcgi-dev
@@ -27,10 +26,11 @@ depends_dev="
 	pixman-dev
 	proj-dev
 	protobuf-c-dev
-	samurai
 	"
 makedepends="
 	$depends_dev
+	cmake
+	samurai
 	"
 subpackages="
 	$pkgname-dev