From 99dd5e14e1b97d84d6a91be3ead40779aed49bc4 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Mon, 8 Oct 2018 20:10:15 +0200
Subject: [PATCH] qt5: split tools from the dev package.

* only qdoc depends on libclang.
---
 dev-qt/qt5/qt5-5.11.2.recipe | 77 ++++++++++++++++++++++--------------
 1 file changed, 47 insertions(+), 30 deletions(-)

diff --git a/dev-qt/qt5/qt5-5.11.2.recipe b/dev-qt/qt5/qt5-5.11.2.recipe
index de64de355..a3946074e 100644
--- a/dev-qt/qt5/qt5-5.11.2.recipe
+++ b/dev-qt/qt5/qt5-5.11.2.recipe
@@ -7,7 +7,7 @@ HOMEPAGE="https://qt.io/"
 COPYRIGHT="2015-2018 The Qt Company Ltd."
 LICENSE="GNU LGPL v2.1
 	GNU LGPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://download.qt.io/official_releases/qt/5.11/${portVersion/\~/-}/single/qt-everywhere-src-${portVersion/\~/-}.tar.xz"
 CHECKSUM_SHA256="c6104b840b6caee596fa9a35bc5f57f67ed5a99d6a36497b6fe66f990a53ca81"
 SOURCE_DIR="qt-everywhere-src-${portVersion/\~/-}"
@@ -259,25 +259,10 @@ PROVIDES_devel="
 	devel:libQt5ThemeSupport$secondaryArchSuffix = $portVersion compat >= 5
 	devel:libQt5UiTools$secondaryArchSuffix = $portVersion compat >= 5
 
-	cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:canbusutil$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:designer$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:fixqt4headers.pl$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:linguist$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:lupdate$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:moc$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:pixeltool$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qcollectiongenerator$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qdbus$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qdbuscpp2xml$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qdbusviewer$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qdbusxml2cpp$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qdoc$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qgltf$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qhelpconverter$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qhelpgenerator$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qlalr$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qmake$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qml$secondaryArchSuffix = $portVersion compat >= 5
@@ -291,10 +276,6 @@ PROVIDES_devel="
 	cmd:qmlscene$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qmltestrunner$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qscxmlc$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qtattributionsscanner$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qtdiag$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qtpaths$secondaryArchSuffix = $portVersion compat >= 5
-	cmd:qtplugininfo$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:qvkgen$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:rcc$secondaryArchSuffix = $portVersion compat >= 5
 	cmd:repc$secondaryArchSuffix = $portVersion compat >= 5
@@ -310,7 +291,6 @@ PROVIDES_devel="
 REQUIRES_devel="
 	qt5$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
-	lib:libclang$secondaryArchSuffix
 	lib:libcrypto$secondaryArchSuffix
 	lib:libgl$secondaryArchSuffix
 	lib:libglu$secondaryArchSuffix
@@ -335,6 +315,35 @@ REQUIRES_examples="
 	qt5${secondaryArchSuffix}_devel == $portVersion base
 	"
 
+PROVIDES_tools="
+	qt5${secondaryArchSuffix}_tools = $portVersion compat >= 5
+	cmd:assistant$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:designer$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:lconvert$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:linguist$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:lrelease$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:lupdate$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:pixeltool$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qcollectiongenerator$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qdbus$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qdbuscpp2xml$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qdbusviewer$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qdbusxml2cpp$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qdoc$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qhelpconverter$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qhelpgenerator$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qtattributionsscanner$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qtdiag$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qtpaths$secondaryArchSuffix = $portVersion compat >= 5
+	cmd:qtplugininfo$secondaryArchSuffix = $portVersion compat >= 5
+	"
+REQUIRES_tools="
+	qt5$secondaryArchSuffix == $portVersion base
+	haiku$secondaryArchSuffix
+	lib:libclang$secondaryArchSuffix
+	lib:libgl$secondaryArchSuffix
+	"
+
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libclang$secondaryArchSuffix
@@ -377,7 +386,7 @@ BUILD_PREREQUIRES="
 	cmd:gperf
 	cmd:grep
 	cmd:ld$secondaryArchSuffix
-	cmd:llvm_config
+	cmd:llvm_config >= 6
 	cmd:ninja
 	cmd:make
 	cmd:orcc$secondaryArchSuffix
@@ -476,18 +485,23 @@ INSTALL()
 	# fix mkspec for static libs
 	grep -rl $dataDir/Qt5/mkspecs/modules/*.pri -e "staticlib" | xargs sed -i 's%$$QT_MODULE_LIB_BASE%'${developLibDir}'%g'
 
-	devCommands="assistant canbusutil designer fixqt4headers.pl lconvert
-		linguist lrelease lupdate moc pixeltool qcollectiongenerator qdbus
-		qdbuscpp2xml qdbusviewer qdbusxml2cpp qdoc qgltf qhelpconverter
-		qhelpgenerator qlalr qmake qml qmlcachegen qmleasing qmlimportscanner
+	devCommands="canbusutil fixqt4headers.pl
+		moc qgltf qlalr qmake qml qmlcachegen qmleasing qmlimportscanner
 		qmllint qmlmin qmlplugindump qmlprofiler qmlscene qmltestrunner
-		qscxmlc qtattributionsscanner qtdiag qtpaths qtplugininfo qvkgen
-		rcc repc syncqt.pl uic xmlpatterns xmlpatternsvalidator"
-
+		qscxmlc qvkgen rcc repc syncqt.pl uic xmlpatterns xmlpatternsvalidator"
 	for i in $devCommands; do
 		devPackageCommands="$devPackageCommands $binDir/$i"
 	done
 
+	toolsCommands="assistant designer lconvert
+		linguist lrelease lupdate pixeltool qcollectiongenerator qdbus
+		qdbuscpp2xml qdbusviewer qdbusxml2cpp qdoc qhelpconverter
+		qhelpgenerator qtattributionsscanner qtdiag qtpaths qtplugininfo"
+
+	for i in $toolsCommands; do
+		toolsPackageCommands="$toolsPackageCommands $binDir/$i"
+	done
+
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
 	local MINOR="`echo "$portVersion" | cut -d. -f3`"
@@ -523,7 +537,10 @@ INSTALL()
 	packageEntries devel \
 		$developDir \
 		$devPackageCommands \
-		${DIR_QT_DEVELOP_DESKBAR} \
 		$libDir/cmake \
 		$dataDir/Qt5/mkspecs
+
+	packageEntries tools \
+		$toolsPackageCommands \
+		${DIR_QT_DEVELOP_DESKBAR}
 }