From 91402e195c4cdf6cea94bc5d544c8fddd65f775d Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sun, 19 Nov 2017 17:38:47 +1000
Subject: [PATCH] Krita: fix boost dependence, cleanup recipe

---
 kde-base/krita/krita-3.3.1.recipe | 80 +++++++++++++++----------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/kde-base/krita/krita-3.3.1.recipe b/kde-base/krita/krita-3.3.1.recipe
index 9a2b3b097..9d4bf6168 100644
--- a/kde-base/krita/krita-3.3.1.recipe
+++ b/kde-base/krita/krita-3.3.1.recipe
@@ -6,7 +6,7 @@ layers and masks, group-based layer management, vector artwork support and switc
 HOMEPAGE="http://www.krita.org/"
 COPYRIGHT="2010-2017 KDE Organisation"
 LICENSE="GNU LGPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://download.kde.org/stable/krita/$portVersion/krita-$portVersion.tar.gz"
 CHECKSUM_SHA256="5fb86577753b28b8915ae993c80a417f388977d04159feb69f5afc0e592bfee9"
 ADDITIONAL_FILES="krita.rdef.in"
@@ -21,16 +21,25 @@ PROVIDES="
 	"
 
 REQUIRES="
-	haiku$secondaryArchSuffix	
-	lib:libkf5archive$secondaryArchSuffix
-	lib:libKF5Auth$secondaryArchSuffix	
+	haiku$secondaryArchSuffix
+	lib:libboost_system$secondaryArchSuffix
+	lib:libexiv2$secondaryArchSuffix
+	lib:libexpat$secondaryArchSuffix
+	lib:libfftw3$secondaryArchSuffix
+	lib:libgsl$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libilmimf$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:liblcms2$secondaryArchSuffix
+	lib:libKF5Archive$secondaryArchSuffix
+	lib:libKF5Auth$secondaryArchSuffix
 	lib:libKF5Bookmarks$secondaryArchSuffix
 	lib:libKF5Codecs$secondaryArchSuffix
 	lib:libKF5Completion$secondaryArchSuffix
 	lib:libKF5ConfigCore$secondaryArchSuffix
 	lib:libKF5ConfigGui$secondaryArchSuffix
 	lib:libKF5ConfigWidgets$secondaryArchSuffix
-	lib:libkf5coreaddons$secondaryArchSuffix
+	lib:libKF5CoreAddons$secondaryArchSuffix
 	lib:libKF5Crash$secondaryArchSuffix
 	lib:libKF5GuiAddons$secondaryArchSuffix
 	lib:libKF5I18n$secondaryArchSuffix
@@ -52,43 +61,43 @@ REQUIRES="
 	lib:libKF5WidgetsAddons$secondaryArchSuffix
 	lib:libKF5WindowSystem$secondaryArchSuffix
 	lib:libKF5XmlGui$secondaryArchSuffix
-	lib:libQt5Svg$secondaryArchSuffix
-	lib:libpng16$secondaryArchSuffix
-	lib:libQt5Core$secondaryArchSuffix
-	lib:libQt5Multimedia$secondaryArchSuffix
-	lib:libQt5PrintSupport$secondaryArchSuffix
-	lib:libQt5Widgets$secondaryArchSuffix
-	lib:libQt5Gui$secondaryArchSuffix
-	lib:libQt5Xml$secondaryArchSuffix
-	lib:libQt5Concurrent$secondaryArchSuffix
-	lib:libQt5Network$secondaryArchSuffix
-	lib:libiconv$secondaryArchSuffix
-	lib:liblcms2$secondaryArchSuffix
-	lib:libexpat$secondaryArchSuffix
-	lib:libintl$secondaryArchSuffix
-	lib:libexiv2$secondaryArchSuffix
-	lib:libz$secondaryArchSuffix
 	lib:libopencolorio$secondaryArchSuffix
-	lib:libraw$secondaryArchSuffix
-	lib:libilmimf$secondaryArchSuffix
-	lib:libboost_system$secondaryArchSuffix
-	lib:libfftw3$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
 	lib:libpoppler${secondaryArchSuffix}_qt5
-	lib:libgsl$secondaryArchSuffix
+	lib:libQt5Concurrent$secondaryArchSuffix
+	lib:libQt5Core$secondaryArchSuffix
+	lib:libQt5Gui$secondaryArchSuffix
+	lib:libQt5Multimedia$secondaryArchSuffix
+	lib:libQt5Network$secondaryArchSuffix
+	lib:libQt5PrintSupport$secondaryArchSuffix
+	lib:libQt5Svg$secondaryArchSuffix
+	lib:libQt5Widgets$secondaryArchSuffix
+	lib:libQt5Xml$secondaryArchSuffix
+	lib:libraw$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
 	"
 
 BUILD_REQUIRES="
 	extra_cmake_modules >= 5.39
 	haiku${secondaryArchSuffix}_devel
-	devel:libkf5archive$secondaryArchSuffix
-	devel:libKF5Auth$secondaryArchSuffix	
+	devel:eigen$secondaryArchSuffix
+	devel:libboost_system$secondaryArchSuffix
+	devel:libexpat$secondaryArchSuffix
+	devel:libexiv2$secondaryArchSuffix
+	devel:libfftw3$secondaryArchSuffix
+	devel:libgsl$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libilmimf$secondaryArchSuffix
+	devel:liblcms2$secondaryArchSuffix
+	devel:libKF5Archive$secondaryArchSuffix
+	devel:libKF5Auth$secondaryArchSuffix
 	devel:libKF5Bookmarks$secondaryArchSuffix
 	devel:libKF5Codecs$secondaryArchSuffix
-	devel:libKF5Completion$secondaryArchSuffix
 	devel:libKF5ConfigCore$secondaryArchSuffix
 	devel:libKF5ConfigGui$secondaryArchSuffix
 	devel:libKF5ConfigWidgets$secondaryArchSuffix
-	devel:libkf5coreaddons$secondaryArchSuffix
+	devel:libKF5Completion$secondaryArchSuffix
+	devel:libKF5CoreAddons$secondaryArchSuffix
 	devel:libKF5Crash$secondaryArchSuffix
 	devel:libKF5GuiAddons$secondaryArchSuffix
 	devel:libKF5I18n$secondaryArchSuffix
@@ -110,19 +119,10 @@ BUILD_REQUIRES="
 	devel:libKF5WidgetsAddons$secondaryArchSuffix
 	devel:libKF5WindowSystem$secondaryArchSuffix
 	devel:libKF5XmlGui$secondaryArchSuffix
-	devel:libQt5Core$secondaryArchSuffix  >= 5.7
-	devel:libiconv$secondaryArchSuffix
-	devel:liblcms2$secondaryArchSuffix
-	devel:libexpat$secondaryArchSuffix
-	devel:eigen$secondaryArchSuffix
-	devel:libexiv2$secondaryArchSuffix
 	devel:libopencolorio$secondaryArchSuffix
+	devel:libQt5Core$secondaryArchSuffix  >= 5.7
 	devel:libraw$secondaryArchSuffix
-	devel:libilmimf$secondaryArchSuffix	
-	devel:libfftw3$secondaryArchSuffix	
 	devel:libpoppler${secondaryArchSuffix}_qt5
-	devel:libgsl$secondaryArchSuffix
-	boost${secondaryArchSuffix}_devel
 	"
 BUILD_PREREQUIRES="
 	cmd:cmake