kde-*: reorder sections.

2026-04-09 05:10:05 +02:00 · 2018-08-09 09:56:15 +02:00
parent f38aa621d9
commit 9c42229dbd
68 changed files with 192 additions and 193 deletions
--- a/kde-apps/libkomparediff2/libkomparediff2-17.12.0.recipe
+++ b/kde-apps/libkomparediff2/libkomparediff2-17.12.0.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libKF5Auth$secondaryArchSuffix
+	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5ConfigCore$secondaryArchSuffix
 	lib:libKF5ConfigWidgets$secondaryArchSuffix
 	lib:libKF5CoreAddons$secondaryArchSuffix
-	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
@@ -43,15 +43,15 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.39
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
-	devel:libKF5Completion$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
+	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
@@ -61,9 +61,9 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Xml$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
--- a/kde-apps/libksane/libksane-18.07.80.recipe
+++ b/kde-apps/libksane/libksane-18.07.80.recipe
@@ -56,8 +56,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.47
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.47
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
--- a/kde-base/gwenview/gwenview-18.04.0.recipe
+++ b/kde-base/gwenview/gwenview-18.04.0.recipe
@@ -33,12 +33,9 @@ REQUIRES="
 	lib:libiconv$secondaryArchSuffix
 	lib:libintl$secondaryArchSuffix
 	lib:libjpeg$secondaryArchSuffix
-	lib:liblcms2$secondaryArchSuffix
-	lib:libphonon4qt5$secondaryArchSuffix
-	lib:libpng$secondaryArchSuffix
 	lib:libKF5Activities$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
+	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -50,8 +47,8 @@ REQUIRES="
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5KIOFileWidgets$secondaryArchSuffix
@@ -66,6 +63,9 @@ REQUIRES="
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	lib:libphonon4qt5$secondaryArchSuffix
+	lib:libpng$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -77,32 +77,29 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.45
 	devel:libexiv2$secondaryArchSuffix
 	devel:libexpat$secondaryArchSuffix
 	devel:libiconv$secondaryArchSuffix
 	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
-	devel:liblcms2$secondaryArchSuffix
-	devel:libphonon4qt5$secondaryArchSuffix
-	devel:libpng$secondaryArchSuffix
 	devel:libKF5Activities$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5DocTools$secondaryArchSuffix
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
 	devel:libKF5KIOFileWidgets$secondaryArchSuffix
@@ -117,6 +114,9 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
+	devel:liblcms2$secondaryArchSuffix
+	devel:libphonon4qt5$secondaryArchSuffix
+	devel:libpng$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libz$secondaryArchSuffix
 	"
--- a/kde-base/kate/kate-18.04.0.recipe
+++ b/kde-base/kate/kate-18.04.0.recipe
@@ -74,8 +74,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
+	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -88,8 +88,8 @@ REQUIRES="
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5KIOFileWidgets$secondaryArchSuffix
@@ -115,24 +115,24 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
-	devel:libKF5Auth$secondaryArchSuffix
+	extra_cmake_modules >= 5.45
 	devel:libKF5Archive$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Crash$secondaryArchSuffix
 	devel:libKF5DBusAddons$secondaryArchSuffix
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
 	devel:libKF5KIOFileWidgets$secondaryArchSuffix
--- a/kde-base/kolourpaint/kolourpaint-18.07.80.recipe
+++ b/kde-base/kolourpaint/kolourpaint-18.07.80.recipe
@@ -32,8 +32,10 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
+	lib:libkdeinit5_kded5$secondaryArchSuffix
+	lib:libkdeinit5_klauncher$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
+	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -48,10 +50,8 @@ REQUIRES="
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libkdeinit5_klauncher$secondaryArchSuffix
-	lib:libkdeinit5_kded5$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KDELibs4Support$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
@@ -78,17 +78,19 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.47
 	haiku${secondaryArchSuffix}_devel
-	devel:libKF5Auth$secondaryArchSuffix
+	extra_cmake_modules >= 5.47
+	devel:libkdeinit5_kded5$secondaryArchSuffix
+	devel:libkdeinit5_klauncher$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Crash$secondaryArchSuffix
 	devel:libKF5DBusAddons$secondaryArchSuffix
 	devel:libKF5DesignerPlugin$secondaryArchSuffix
@@ -97,10 +99,8 @@ BUILD_REQUIRES="
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libkdeinit5_klauncher$secondaryArchSuffix
-	devel:libkdeinit5_kded5$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KDELibs4Support$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
--- a/kde-base/kstars/kstars-2.9.7.recipe
+++ b/kde-base/kstars/kstars-2.9.7.recipe
@@ -25,9 +25,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libkdeinit5_kded5$secondaryArchSuffix
+	lib:libkdeinit5_klauncher$secondaryArchSuffix
+	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Attica$secondaryArchSuffix
 	lib:libKF5Auth$secondaryArchSuffix
-	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -42,8 +44,8 @@ REQUIRES="
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KDELibs4Support$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
@@ -62,32 +64,32 @@ REQUIRES="
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libkdeinit5_klauncher$secondaryArchSuffix
-	lib:libkdeinit5_kded5$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Xml$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.47
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.47
 	devel:eigen$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
+	devel:libkdeinit5_kded5$secondaryArchSuffix
+	devel:libkdeinit5_klauncher$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Attica$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Crash$secondaryArchSuffix
 	devel:libKF5DBusAddons$secondaryArchSuffix
 	devel:libKF5DesignerPlugin$secondaryArchSuffix
@@ -96,8 +98,8 @@ BUILD_REQUIRES="
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KDELibs4Support$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
@@ -116,16 +118,14 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libkdeinit5_klauncher$secondaryArchSuffix
-	devel:libkdeinit5_kded5$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
-	cmd:pkg_config$secondaryArchSuffix
 	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
 	cmd:python2
 	"

--- a/kde-base/kwrite/kwrite-18.04.0.recipe
+++ b/kde-base/kwrite/kwrite-18.04.0.recipe
@@ -67,8 +67,8 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
+	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -81,8 +81,8 @@ REQUIRES="
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
 	lib:libKF5KIOFileWidgets$secondaryArchSuffix
@@ -108,24 +108,24 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
-	devel:libKF5Auth$secondaryArchSuffix
+	extra_cmake_modules >= 5.45
 	devel:libKF5Archive$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Crash$secondaryArchSuffix
 	devel:libKF5DBusAddons$secondaryArchSuffix
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
 	devel:libKF5KIOFileWidgets$secondaryArchSuffix
--- a/kde-base/marble/marble-18.04.0.recipe
+++ b/kde-base/marble/marble-18.04.0.recipe
@@ -24,10 +24,11 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku${secondaryArchSuffix}
-	lib:libphonon4qt5$secondaryArchSuffix
+	lib:libkdeinit5_kded5$secondaryArchSuffix
+	lib:libkdeinit5_klauncher$secondaryArchSuffix
+	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Attica$secondaryArchSuffix
 	lib:libKF5Auth$secondaryArchSuffix
-	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -40,8 +41,8 @@ REQUIRES="
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5ItemModels$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5KDELibs4Support$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
@@ -56,8 +57,7 @@ REQUIRES="
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libkdeinit5_klauncher$secondaryArchSuffix
-	lib:libkdeinit5_kded5$secondaryArchSuffix
+	lib:libphonon4qt5$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Network$secondaryArchSuffix
@@ -70,12 +70,13 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
-	devel:libphonon4qt5$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix
+	extra_cmake_modules >= 5.45
+	devel:libkdeinit5_kded5$secondaryArchSuffix
+	devel:libkdeinit5_klauncher$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Attica$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
 	devel:libKF5Completion$secondaryArchSuffix
@@ -88,8 +89,8 @@ BUILD_REQUIRES="
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
-	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5ItemModels$secondaryArchSuffix
+	devel:libKF5ItemViews$secondaryArchSuffix
 	devel:libKF5JobWidgets$secondaryArchSuffix
 	devel:libKF5KDELibs4Support$secondaryArchSuffix
 	devel:libKF5KIOCore$secondaryArchSuffix
@@ -104,8 +105,7 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libkdeinit5_klauncher$secondaryArchSuffix
-	devel:libkdeinit5_kded5$secondaryArchSuffix
+	devel:libphonon4qt5$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Network$secondaryArchSuffix
@@ -117,12 +117,12 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:qmake$secondaryArchSuffix >= 5
-	cmd:make
+	cmd:cmake
 	cmd:g++$secondaryArchSuffix
+	cmd:make
 	cmd:perl
 	cmd:pkg_config$secondaryArchSuffix
-	cmd:cmake
+	cmd:qmake$secondaryArchSuffix >= 5
 	"

 BUILD()
--- a/kde-frameworks/attica/attica-5.47.0.recipe
+++ b/kde-frameworks/attica/attica-5.47.0.recipe
@@ -32,13 +32,13 @@ PROVIDES_devel="
 	devel:libKF5Attica$secondaryArchSuffix = $portVersion
 	"
 REQUIRES_devel="
-	haiku$secondaryArchSuffix
 	attica$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="	
--- a/kde-frameworks/breeze-icons/breeze_icons-5.47.0.recipe
+++ b/kde-frameworks/breeze-icons/breeze_icons-5.47.0.recipe
@@ -21,8 +21,8 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.47.0.recipe
+++ b/kde-frameworks/extra-cmake-modules/extra_cmake_modules-5.47.0.recipe
@@ -29,9 +29,9 @@ BUILD_REQUIRES="
 BUILD_PREREQUIRES="
 	cmd:cmake
 	cmd:g++$secondaryArchSuffix
+	cmd:linguist$secondaryArchSuffix
 	cmd:make
 	cmd:qcollectiongenerator$secondaryArchSuffix
-	cmd:linguist$secondaryArchSuffix
 	"

 BUILD()
--- a/kde-frameworks/kactivities/kactivities-5.47.0.recipe
+++ b/kde-frameworks/kactivities/kactivities-5.47.0.recipe
@@ -47,13 +47,13 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
+	devel:libboost_system$secondaryArchSuffix
 	devel:libkf5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libkf5coreaddons$secondaryArchSuffix == $portVersion
 	devel:libkf5windowsystem$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
-	devel:libboost_system$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
--- a/kde-frameworks/karchive/karchive-5.47.0.recipe
+++ b/kde-frameworks/karchive/karchive-5.47.0.recipe
@@ -24,9 +24,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

@@ -39,8 +39,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libbz2$secondaryArchSuffix
 	devel:liblzma$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/kauth/kauth-5.47.0.recipe
+++ b/kde-frameworks/kauth/kauth-5.47.0.recipe
@@ -38,8 +38,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
--- a/kde-frameworks/kbookmarks/kbookmarks-5.47.0.recipe
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.47.0.recipe
@@ -49,8 +49,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kcmutils/kcmutils-5.47.0.recipe
+++ b/kde-frameworks/kcmutils/kcmutils-5.47.0.recipe
@@ -51,17 +51,17 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF5Declarative$secondaryArchSuffix == $portVersion
-	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
-	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
+	devel:libKF5Declarative$secondaryArchSuffix == $portVersion
+	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5Iconthemes$secondaryArchSuffix == $portVersion
+	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
 	devel:libKF5Package$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kcodecs/kcodecs-5.47.0.recipe
+++ b/kde-frameworks/kcodecs/kcodecs-5.47.0.recipe
@@ -37,15 +37,15 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
+	cmd:g++$secondaryArchSuffix
 	cmd:gperf
 	cmd:make
-	cmd:g++$secondaryArchSuffix
 	"

 BUILD()
--- a/kde-frameworks/kcompletion/kcompletion-5.47.0.recipe
+++ b/kde-frameworks/kcompletion/kcompletion-5.47.0.recipe
@@ -42,8 +42,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5ConfigGui$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/kconfig/kconfig-5.47.0.recipe
+++ b/kde-frameworks/kconfig/kconfig-5.47.0.recipe
@@ -48,8 +48,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.47.0.recipe
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.47.0.recipe
@@ -43,8 +43,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.47.0.recipe
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.47.0.recipe
@@ -35,8 +35,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kcrash/kcrash-5.47.0.recipe
+++ b/kde-frameworks/kcrash/kcrash-5.47.0.recipe
@@ -38,8 +38,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.47.0.recipe
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.47.0.recipe
@@ -35,8 +35,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libQt5DBus$secondaryArchSuffix >= 5.7
 	"
--- a/kde-frameworks/kdeclarative/kdeclarative-5.47.0.recipe
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.47.0.recipe
@@ -59,8 +59,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
@@ -78,8 +78,8 @@ BUILD_REQUIRES="
 	devel:libKF5Package$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5Solid$secondaryArchSuffix == $portVersion
-	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
+	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libKF5XmlGui$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
--- a/kde-frameworks/kded/kded-5.47.0.recipe
+++ b/kde-frameworks/kded/kded-5.47.0.recipe
@@ -57,14 +57,14 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
-	devel:libKF5DBusAddons$secondaryArchSuffix == $portVersion
+	extra_cmake_modules >= $portVersion
+	devel:libkdeinit5_klauncher$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5Crash$secondaryArchSuffix == $portVersion
+	devel:libKF5DBusAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
-	devel:libkdeinit5_klauncher$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.47.0.recipe
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.47.0.recipe
@@ -37,8 +37,8 @@ GLOBAL_WRITABLE_FILES="

 PROVIDES="
 	kdelibs4support$secondaryArchSuffix = $portVersion
-	cmd:kf5_config$secondaryArchSuffix = $portVersion
 	cmd:kdebugdialog5$secondaryArchSuffix = $portVersion
+	cmd:kf5_config$secondaryArchSuffix = $portVersion
 	lib:libKF5KDELibs4Support$secondaryArchSuffix = $portVersion compat >= 5
 	"
 REQUIRES="
@@ -91,9 +91,10 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	uri
+	devel:libkdeinit5_kded5$secondaryArchSuffix == $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
@@ -103,11 +104,10 @@ BUILD_REQUIRES="
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5Crash$secondaryArchSuffix == $portVersion
 	devel:libKF5DBusAddons$secondaryArchSuffix == $portVersion
-	devel:libkdeinit5_kded5$secondaryArchSuffix == $portVersion
 	devel:libKF5DesignerPlugin$secondaryArchSuffix == $portVersion
-	devel:libKF5GlobalAccel$secondaryArchSuffix == $portVersion
 	devel:libKF5DocTools$secondaryArchSuffix == $portVersion
 	devel:libKF5Emoticons$secondaryArchSuffix == $portVersion
+	devel:libKF5GlobalAccel$secondaryArchSuffix == $portVersion
 	devel:libKF5GuiAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5IconThemes$secondaryArchSuffix == $portVersion
@@ -118,8 +118,8 @@ BUILD_REQUIRES="
 	devel:libKF5Parts$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5Solid$secondaryArchSuffix == $portVersion
-	devel:libKF5TextWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
+	devel:libKF5TextWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5UnitConversion$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.47.0.recipe
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.47.0.recipe
@@ -19,19 +19,19 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libKF5ConfigCore$secondaryArchSuffix
-	lib:libKF5CoreAddons$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
+	lib:libKF5ConfigCore$secondaryArchSuffix
 	lib:libKF5ConfigWidgets$secondaryArchSuffix
+	lib:libKF5CoreAddons$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libkf5kiocore$secondaryArchSuffix
 	lib:libkf5itemviews$secondaryArchSuffix
+	lib:libkf5kiocore$secondaryArchSuffix
+	lib:libkf5sonnetcore$secondaryArchSuffix
+	lib:libkf5sonnetui$secondaryArchSuffix
 	lib:libKF5textwidgets$secondaryArchSuffix
 	lib:libkf5widgetsaddons$secondaryArchSuffix
 	lib:libkf5xmlgui$secondaryArchSuffix
-	lib:libkf5sonnetcore$secondaryArchSuffix
-	lib:libkf5sonnetui$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -43,20 +43,20 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
+	devel:libkf5completion$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
+	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5DocTools$secondaryArchSuffix == $portVersion
-	devel:libkf5completion$secondaryArchSuffix == $portVersion
-	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5IconThemes$secondaryArchSuffix == $portVersion
-	devel:libkf5kiocore$secondaryArchSuffix == $portVersion
 	devel:libkf5itemviews$secondaryArchSuffix == $portVersion
+	devel:libkf5kiocore$secondaryArchSuffix == $portVersion
+	devel:libkf5sonnetcore$secondaryArchSuffix == $portVersion
 	devel:libkf5textwidgets$secondaryArchSuffix == $portVersion
 	devel:libkf5widgetsaddons$secondaryArchSuffix == $portVersion
 	devel:libkf5xmlgui$secondaryArchSuffix == $portVersion
-	devel:libkf5sonnetcore$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kdoctools/kdoctools-5.47.0.recipe
+++ b/kde-frameworks/kdoctools/kdoctools-5.47.0.recipe
@@ -20,10 +20,10 @@ PROVIDES="
 REQUIRES="
 	haiku$secondaryArchSuffix
 	lib:libexslt$secondaryArchSuffix
-	lib:libxslt$secondaryArchSuffix
-	lib:libxml2$secondaryArchSuffix
 	lib:libKF5Archive$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
+	lib:libxml2$secondaryArchSuffix
+	lib:libxslt$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -35,13 +35,13 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets >= 1.79.2
 	extra_cmake_modules >= $portVersion
-	haiku${secondaryArchSuffix}_devel
+	uri
 	devel:libKF5archive$secondaryArchSuffix == $portVersion
 #	devel:libKF5i18n$secondaryArchSuffix == $portVersion # breaks the build
-	uri
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
--- a/kde-frameworks/kemoticons/kemoticons-5.47.0.recipe
+++ b/kde-frameworks/kemoticons/kemoticons-5.47.0.recipe
@@ -36,8 +36,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.47.0.recipe
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.47.0.recipe
@@ -39,8 +39,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.47.0.recipe
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.47.0.recipe
@@ -35,8 +35,8 @@ REQUIRES="
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Test$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -48,8 +48,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5Crash$secondaryArchSuffix == $portVersion
@@ -61,8 +61,8 @@ BUILD_REQUIRES="
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libQt5DBus$secondaryArchSuffix >= 5.7
 	devel:libQt5Test$secondaryArchSuffix >= 5.7
-	devel:libQt5Xml$secondaryArchSuffix >= 5.7
 	devel:libQt5Widgets$secondaryArchSuffix >= 5.7
+	devel:libQt5Xml$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
--- a/kde-frameworks/kguiaddons/kguiaddons-5.47.0.recipe
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.47.0.recipe
@@ -30,8 +30,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libQt5Gui$secondaryArchSuffix >= 5.7
 	"
--- a/kde-frameworks/kholidays/kholidays-5.47.0.recipe
+++ b/kde-frameworks/kholidays/kholidays-5.47.0.recipe
@@ -17,9 +17,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
 	lib:libbz2$secondaryArchSuffix
 	lib:liblzma$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

@@ -32,8 +32,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libbz2$secondaryArchSuffix
 	devel:liblzma$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/khtml/khtml-5.47.0.recipe
+++ b/kde-frameworks/khtml/khtml-5.47.0.recipe
@@ -39,19 +39,19 @@ REQUIRES="
 	lib:libKF5GlobalAccel$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
+	lib:libKF5ItemViews$secondaryArchSuffix
+	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5JS$secondaryArchSuffix
 	lib:libKF5JSApi$secondaryArchSuffix
 	lib:libKF5KIOCore$secondaryArchSuffix
-	lib:libKF5ItemViews$secondaryArchSuffix
-	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5Notifications$secondaryArchSuffix
 	lib:libKF5NotifyConfig$secondaryArchSuffix
 	lib:libKF5Parts$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
-	lib:libKF5SonnetUi$secondaryArchSuffix
 	lib:libKF5SonnetCore$secondaryArchSuffix
+	lib:libKF5SonnetUi$secondaryArchSuffix
 	lib:libKF5TextWidgets$secondaryArchSuffix
 	lib:libKF5Wallet$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
@@ -78,8 +78,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libcrypto$secondaryArchSuffix >= 1.0.0
 	devel:libgif$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
@@ -105,8 +105,8 @@ BUILD_REQUIRES="
 	devel:libKF5Parts$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5Solid$secondaryArchSuffix == $portVersion
-	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
 	devel:libKF5SonnetCore$secondaryArchSuffix == $portVersion
+	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
 	devel:libKF5TextWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5Wallet$secondaryArchSuffix	 == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/ki18n/ki18n-5.47.0.recipe
+++ b/kde-frameworks/ki18n/ki18n-5.47.0.recipe
@@ -37,8 +37,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kiconthemes/kiconthemes-5.47.0.recipe
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.47.0.recipe
@@ -22,8 +22,8 @@ SECONDARY_ARCHITECTURES="x86"

 PROVIDES="
 	kiconthemes$secondaryArchSuffix = $portVersion
-	lib:libKF5IconThemes$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:kiconfinder5$secondaryArchSuffix = $portVersion
+	lib:libKF5IconThemes$secondaryArchSuffix = $portVersion compat >= 5
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
@@ -53,8 +53,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kidletime/kidletime-5.47.0.recipe
+++ b/kde-frameworks/kidletime/kidletime-5.47.0.recipe
@@ -33,8 +33,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
--- a/kde-frameworks/kimageformats/kimageformats-5.47.0.recipe
+++ b/kde-frameworks/kimageformats/kimageformats-5.47.0.recipe
@@ -25,8 +25,8 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kinit/kinit-5.47.0.recipe
+++ b/kde-frameworks/kinit/kinit-5.47.0.recipe
@@ -57,8 +57,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kio/kio-5.47.0.recipe
+++ b/kde-frameworks/kio/kio-5.47.0.recipe
@@ -52,8 +52,8 @@ REQUIRES="
 	lib:libKF5DBusAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
-	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5ItemViews$secondaryArchSuffix
+	lib:libKF5JobWidgets$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
 	lib:libKF5Solid$secondaryArchSuffix
 	lib:libKF5SonnetUi$secondaryArchSuffix
@@ -82,10 +82,9 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 #	devel:libacl$secondaryArchSuffix
-#	GSSAPI
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
@@ -99,21 +98,21 @@ BUILD_REQUIRES="
 #	devel:libKF5DocTools$secondaryArchSuffix == $portVersion
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5IconThemes$secondaryArchSuffix == $portVersion
-	devel:libKF5JobWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
+	devel:libKF5JobWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5Notifications$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5Solid$secondaryArchSuffix == $portVersion
+	devel:libkf5sonnetcore$secondaryArchSuffix == $portVersion
+	devel:libKF5TextWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5Wallet$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libKF5XmlGui$secondaryArchSuffix == $portVersion
-	devel:libkf5sonnetcore$secondaryArchSuffix == $portVersion
-	devel:libKF5TextWidgets$secondaryArchSuffix == $portVersion
 	devel:libQt5Concurrent$secondaryArchSuffix >= 5.7
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
-	devel:libQt5Gui$secondaryArchSuffix >= 5.7
 	devel:libQt5DBus$secondaryArchSuffix >= 5.7
+	devel:libQt5Gui$secondaryArchSuffix >= 5.7
 	devel:libQt5Network$secondaryArchSuffix >= 5.7
 	devel:libxml2$secondaryArchSuffix
 	devel:libxslt$secondaryArchSuffix
--- a/kde-frameworks/kitemmodels/kitemmodels-5.47.0.recipe
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.47.0.recipe
@@ -51,8 +51,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kitemviews/kitemviews-5.47.0.recipe
+++ b/kde-frameworks/kitemviews/kitemviews-5.47.0.recipe
@@ -32,8 +32,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.47.0.recipe
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.47.0.recipe
@@ -38,8 +38,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/kjs/kjs-5.47.0.recipe
+++ b/kde-frameworks/kjs/kjs-5.47.0.recipe
@@ -36,10 +36,10 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
 	docbook_xml_dtd
 	docbook_xsl_stylesheets == 1.79.2
 	extra_cmake_modules >= $portVersion
-	haiku${secondaryArchSuffix}_devel
 	devel:libKF5DocTools$secondaryArchSuffix == $portVersion
 	devel:libpcre$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/knewstuff/knewstuff-5.47.0.recipe
+++ b/kde-frameworks/knewstuff/knewstuff-5.47.0.recipe
@@ -23,9 +23,9 @@ PROVIDES="
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
+	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Attica$secondaryArchSuffix
 	lib:libKF5Auth$secondaryArchSuffix
-	lib:libKF5Archive$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
@@ -67,11 +67,11 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
+	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5Attica$secondaryArchSuffix == $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
-	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5Completion$secondaryArchSuffix == $portVersion
@@ -79,9 +79,9 @@ BUILD_REQUIRES="
 	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5Declarative$secondaryArchSuffix == $portVersion
-	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5Iconthemes$secondaryArchSuffix == $portVersion
+	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
 	devel:libKF5JobWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5KIOCore$secondaryArchSuffix == $portVersion
 	devel:libKF5Package$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/knotifications/knotifications-5.47.0.recipe
+++ b/kde-frameworks/knotifications/knotifications-5.47.0.recipe
@@ -39,8 +39,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.47.0.recipe
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.47.0.recipe
@@ -43,8 +43,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
@@ -52,7 +52,6 @@ BUILD_REQUIRES="
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
-	devel:libKF5XmlGui$secondaryArchSuffix == $portVersion
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
 	devel:libKF5JobWidgets$secondaryArchSuffix == $portVersion
@@ -61,6 +60,7 @@ BUILD_REQUIRES="
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5Solid$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
+	devel:libKF5XmlGui$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kpackage/kpackage-5.47.0.recipe
+++ b/kde-frameworks/kpackage/kpackage-5.47.0.recipe
@@ -38,11 +38,11 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
-	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
+	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kparts/kparts-5.47.0.recipe
+++ b/kde-frameworks/kparts/kparts-5.47.0.recipe
@@ -52,11 +52,11 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
-	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
+	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5Completion$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kplotting/kplotting-5.47.0.recipe
+++ b/kde-frameworks/kplotting/kplotting-5.47.0.recipe
@@ -54,17 +54,17 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
-	devel:libKF5Declarative$secondaryArchSuffix == $portVersion
-	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
-	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
+	devel:libKF5Declarative$secondaryArchSuffix == $portVersion
+	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5Iconthemes$secondaryArchSuffix == $portVersion
+	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
 	devel:libKF5Package$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kross/kross-5.47.0.recipe
+++ b/kde-frameworks/kross/kross-5.47.0.recipe
@@ -59,8 +59,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Bookmarks$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kservice/kservice-5.47.0.recipe
+++ b/kde-frameworks/kservice/kservice-5.47.0.recipe
@@ -43,8 +43,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5Crash$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting-5.47.0.recipe
+++ b/kde-frameworks/ksyntax_highlighting/ksyntax_highlighting-5.47.0.recipe
@@ -41,8 +41,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5CoreAddons$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
--- a/kde-frameworks/ktexteditor/ktexteditor-5.47.0.recipe
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.47.0.recipe
@@ -68,8 +68,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libgit2$secondaryArchSuffix
 	devel:libKF5Archive$secondaryArchSuffix == $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
@@ -89,6 +89,8 @@ BUILD_REQUIRES="
 	devel:libKF5Parts$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
 	devel:libKF5Solid$secondaryArchSuffix == $portVersion
+	devel:libKF5SonnetCore$secondaryArchSuffix == $portVersion
+	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
 	devel:libKF5SyntaxHighlighting$secondaryArchSuffix == $portVersion
 	devel:libKF5TextWidgets$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
@@ -98,8 +100,6 @@ BUILD_REQUIRES="
 	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5TextToSpeech$secondaryArchSuffix
 	devel:libQt5Xml$secondaryArchSuffix
-	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
-	devel:libKF5SonnetCore$secondaryArchSuffix == $portVersion
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.47.0.recipe
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.47.0.recipe
@@ -27,6 +27,8 @@ REQUIRES="
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
 	lib:libKF5Service$secondaryArchSuffix
+	lib:libKF5SonnetCore$secondaryArchSuffix
+	lib:libKF5SonnetUi$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
@@ -34,8 +36,6 @@ REQUIRES="
 	lib:libQt5TextToSpeech$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libQt5Xml$secondaryArchSuffix
-	lib:libKF5SonnetUi$secondaryArchSuffix
-	lib:libKF5SonnetCore$secondaryArchSuffix
 	"

 PROVIDES_devel="
@@ -47,8 +47,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5Completion$secondaryArchSuffix == $portVersion
@@ -59,6 +59,8 @@ BUILD_REQUIRES="
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libKF5IconThemes$secondaryArchSuffix == $portVersion
 	devel:libKF5Service$secondaryArchSuffix == $portVersion
+	devel:libKF5SonnetCore$secondaryArchSuffix == $portVersion
+	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
 	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix
@@ -66,8 +68,6 @@ BUILD_REQUIRES="
 	devel:libQt5TextToSpeech$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libQt5Xml$secondaryArchSuffix
-	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
-	devel:libKF5SonnetCore$secondaryArchSuffix == $portVersion
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake
--- a/kde-frameworks/kunitconversion/kunitconversion-5.47.0.recipe
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.47.0.recipe
@@ -58,8 +58,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5I18n$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libQt5Network$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/kwallet/kwallet-5.47.0.recipe
+++ b/kde-frameworks/kwallet/kwallet-5.47.0.recipe
@@ -55,8 +55,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libgcrypt$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.47.0.recipe
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.47.0.recipe
@@ -37,8 +37,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.47.0.recipe
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.47.0.recipe
@@ -38,8 +38,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/kxmlgui/kxmlgui-5.47.0.recipe
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.47.0.recipe
@@ -37,8 +37,8 @@ REQUIRES="
 	lib:libKF5ItemViews$secondaryArchSuffix
 	lib:libKF5SonnetUi$secondaryArchSuffix
 	lib:libKF5TextWidgets$secondaryArchSuffix
-	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
+	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
 	lib:libQt5DBus$secondaryArchSuffix
 	lib:libQt5Gui$secondaryArchSuffix
@@ -57,8 +57,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libKF5Auth$secondaryArchSuffix == $portVersion
 	devel:libKF5Codecs$secondaryArchSuffix == $portVersion
 	devel:libKF5ConfigCore$secondaryArchSuffix == $portVersion
@@ -71,8 +71,8 @@ BUILD_REQUIRES="
 	devel:libKF5ItemViews$secondaryArchSuffix == $portVersion
 	devel:libKF5SonnetUi$secondaryArchSuffix == $portVersion
 	devel:libkf5textwidgets$secondaryArchSuffix == $portVersion
-	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libKF5WidgetsAddons$secondaryArchSuffix == $portVersion
+	devel:libKF5WindowSystem$secondaryArchSuffix == $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	devel:libQt5DBus$secondaryArchSuffix >= 5.7
 	devel:libQt5Gui$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/oxygen-icons/oxygen_icons-5.47.0~git.recipe
+++ b/kde-frameworks/oxygen-icons/oxygen_icons-5.47.0~git.recipe
@@ -20,8 +20,8 @@ REQUIRES="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/phonon/phonon-4.10.1.recipe
+++ b/kde-frameworks/phonon/phonon-4.10.1.recipe
@@ -34,8 +34,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix
 	devel:libQt5DBus$secondaryArchSuffix
 	devel:libQt5Gui$secondaryArchSuffix
--- a/kde-frameworks/phonon_gstreamer/phonon_gstreamer-4.9.0.recipe
+++ b/kde-frameworks/phonon_gstreamer/phonon_gstreamer-4.9.0.recipe
@@ -36,8 +36,8 @@ SUPPLEMENTS="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libglib_2.0$secondaryArchSuffix
 	devel:libgstapp_1.0$secondaryArchSuffix
 	devel:libgstaudio_1.0$secondaryArchSuffix
--- a/kde-frameworks/solid/solid-5.47.0.recipe
+++ b/kde-frameworks/solid/solid-5.47.0.recipe
@@ -42,8 +42,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-frameworks/sonnet/sonnet-5.47.0.recipe
+++ b/kde-frameworks/sonnet/sonnet-5.47.0.recipe
@@ -48,8 +48,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	hunspell${secondaryArchSuffix}_devel
 	devel:libaspell$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
--- a/kde-frameworks/threadweaver/threadweaver-5.47.0.recipe
+++ b/kde-frameworks/threadweaver/threadweaver-5.47.0.recipe
@@ -38,8 +38,8 @@ REQUIRES_devel="
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= $portVersion
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= $portVersion
 	devel:libQt5Core$secondaryArchSuffix >= 5.7
 	"
 BUILD_PREREQUIRES="
--- a/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe
+++ b/kde-misc/kdiff3/kdiff3-1.7.0~git.recipe
@@ -56,15 +56,15 @@ REQUIRES="
 	lib:libKF5TextWidgets$secondaryArchSuffix
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.45
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.45
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
@@ -86,15 +86,15 @@ BUILD_REQUIRES="
 	devel:libKF5TextWidgets$secondaryArchSuffix
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5PrintSupport$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake$secondaryArchSuffix
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	cmd:cmake$secondaryArchSuffix
 	"

 BUILD()
--- a/kde-misc/krusader/krusader-2.7.0.recipe
+++ b/kde-misc/krusader/krusader-2.7.0.recipe
@@ -42,8 +42,8 @@ REQUIRES="
 	lib:libKF5ConfigCore$secondaryArchSuffix
 	lib:libKF5ConfigWidgets$secondaryArchSuffix
 	lib:libKF5CoreAddons$secondaryArchSuffix
-	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5DocTools$secondaryArchSuffix
+	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
 	lib:libKF5IconThemes$secondaryArchSuffix
 	lib:libKF5ItemViews$secondaryArchSuffix
@@ -59,16 +59,16 @@ REQUIRES="
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
 	lib:libQt5PrintSupport$secondaryArchSuffix
 	lib:libQt5Widgets$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"

 BUILD_REQUIRES="
-	extra_cmake_modules >= 5.46
 	haiku${secondaryArchSuffix}_devel
+	extra_cmake_modules >= 5.46
 	devel:libKF5Archive$secondaryArchSuffix
 	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
@@ -77,8 +77,8 @@ BUILD_REQUIRES="
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
 	devel:libKF5CoreAddons$secondaryArchSuffix
-	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5DocTools$secondaryArchSuffix
+	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
 	devel:libKF5IconThemes$secondaryArchSuffix
 	devel:libKF5ItemViews$secondaryArchSuffix
@@ -94,16 +94,16 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5Core$secondaryArchSuffix
+	devel:libQt5Gui$secondaryArchSuffix
 	devel:libQt5PrintSupport$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
+	cmd:cmake
 	cmd:g++$secondaryArchSuffix
 	cmd:make
-	cmd:cmake
 	"

 BUILD()