From a592f6d4f3b2291406185954c4313013f620b23d Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 25 Jul 2019 19:56:08 +0200
Subject: [PATCH] llvm: move libclang to libs package

This library is used by youcompleteme and it should not need the whole
clang package (which is big) to be installed.
---
 sys-devel/llvm/llvm7-7.0.1.recipe | 7 ++++---
 sys-devel/llvm/llvm8-8.0.0.recipe | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sys-devel/llvm/llvm7-7.0.1.recipe b/sys-devel/llvm/llvm7-7.0.1.recipe
index fef281a26..2dc959572 100644
--- a/sys-devel/llvm/llvm7-7.0.1.recipe
+++ b/sys-devel/llvm/llvm7-7.0.1.recipe
@@ -31,7 +31,7 @@ other than the ones listed above.
 HOMEPAGE="https://www.llvm.org/"
 COPYRIGHT="2003-2018 University of Illinois at Urbana-Champaign"
 LICENSE="UIUC"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://releases.llvm.org/$portVersion/llvm-$portVersion.src.tar.xz"
 CHECKSUM_SHA256="a38dfc4db47102ec79dcc2aa61e93722c5f6f06f0a961073bd84b78fb949419b"
 SOURCE_DIR="llvm-$portVersion.src"
@@ -349,10 +349,10 @@ PROVIDES_clang="
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libclangtoolinginclusions$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingrefactor$secondaryArchSuffix = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion compat >= 7
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
+	lib:libclang$secondaryArchSuffix
 	lib:libLLVM_7$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -379,6 +379,7 @@ CONFLICTS_clang_analysis="
 
 PROVIDES_libs="
 	llvm7${secondaryArchSuffix}_libs = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion compat >= 7
 	lib:libLLVM_7$secondaryArchSuffix = 7.0.0 compat >= 7.0
 	lib:libLTO$secondaryArchSuffix = 7.0.0 compat >= 7
 	"
@@ -485,7 +486,6 @@ INSTALL()
 		$binDir/modularize \
 		$dataDir/clang \
 		$includeDir/clang* \
-		$libDir/libclang* \
 		$libDir/clang \
 		$libDir/cmake/clang \
 		$developLibDir/libclang*
@@ -502,6 +502,7 @@ INSTALL()
 
 	# libs package
 	packageEntries libs \
+		$libDir/libclang* \
 		$libDir/libLLVM* \
 		$libDir/libLTO*
 }
diff --git a/sys-devel/llvm/llvm8-8.0.0.recipe b/sys-devel/llvm/llvm8-8.0.0.recipe
index 9ed8359ec..b8b30549b 100644
--- a/sys-devel/llvm/llvm8-8.0.0.recipe
+++ b/sys-devel/llvm/llvm8-8.0.0.recipe
@@ -365,10 +365,10 @@ PROVIDES_clang="
 	devel:libclangtoolingcore$secondaryArchSuffix = $portVersion
 	devel:libclangtoolinginclusions$secondaryArchSuffix = $portVersion
 	devel:libclangtoolingrefactor$secondaryArchSuffix = $portVersion
-	lib:libclang$secondaryArchSuffix = $portVersion compat >= 8
 	"
 REQUIRES_clang="
 	haiku$secondaryArchSuffix
+	lib:libclang$secondaryArchSuffix
 	lib:libLLVM_8$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -397,6 +397,7 @@ CONFLICTS_clang_analysis="
 
 PROVIDES_libs="
 	llvm8${secondaryArchSuffix}_libs = $portVersion
+	lib:libclang$secondaryArchSuffix = $portVersion compat >= 8
 	lib:libLLVM_8$secondaryArchSuffix = 8.0.0 compat >= 8.0
 	lib:libLTO$secondaryArchSuffix = 8.0.0 compat >= 8
 	lib:libOptRemarks$secondaryArchSuffix = 8.0.0 compat >= 8
@@ -505,7 +506,6 @@ INSTALL()
 		$binDir/modularize \
 		$dataDir/clang \
 		$includeDir/clang* \
-		$libDir/libclang* \
 		$libDir/clang \
 		$libDir/cmake/clang \
 		$developLibDir/libclang*
@@ -522,6 +522,7 @@ INSTALL()
 
 	# libs package
 	packageEntries libs \
+		$libDir/libclang* \
 		$libDir/libLLVM* \
 		$libDir/libLTO* \
 		$libDir/libOptRemarks*