Update sys-devel/llvm-3.7.1-r3, sys-devel/llvm-5.0.1

4 files changed, 81 insertions, 50 deletions

diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 05d68d90..5942d577 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -65,6 +65,7 @@ AUX 3.9.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.
 AUX 3.9.1/lldb/six.patch 766 BLAKE2B 389940b54d94c883d90617c7d89a26b0331dcd5e992b933cba9a1b54de768fcbdbeb3cbe0c4438c49248827397eea0203823bcc71f672787f48c4701248d95eb SHA512 5c3096eb168ac9a37d980d7253317de5c89abd78672e3afbe93a8b3f47a30aa87670f6b01e8a0480f930dd572fbb46bb6ad2c41e8bb11f2059db77aa229be8c2
 AUX 3.9.1/llvm-config-r1.patch 3310 BLAKE2B 17a7c49902a1cdb0b4ff30fb07afe47d637c7e27dab8eec96ed892d49d02c2f71958d9f754e0f35f0c3e09ea2588e2feb0931a1db88fb18cfeb5a537ce311b5c SHA512 4c77807a509ba4d7549ea11eaa5cb6e8d8c01eb8479b9d2128f6afd42fd8b1cb2d0bf5ae86470df94027f855f5fa0050c08612ca8dcb3ac08fc7848aa5f5fd5f
 AUX 4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch 2408 BLAKE2B 92f396663629d0f1bc65833d4050f8e28044c25dec961981edac768b374c543d9084eb70ac51435554acfc5430c45035e4acae6e02f453bc679a3458979b53f3 SHA512 0424f35f12054a7e3e20d948c714979cfcf01200e8aac1cfab1b9fdd08718b4f4143a635eca9500e7ac77993ff390358cb630b8d97029cd9ec1e14c9cfaedfd2
+AUX 6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch 1575 BLAKE2B 3a650b244c2b97fa6e76327348a7bb00ace08b18441a59af238ccf0cdea4409e2d0b46c0a381737d7d0879dbc5eb0f71007fee0c9f0f5b92369453223d25397d SHA512 f09bf2b2bbac1f875f32f8761697717fbbfda2939fcccb8b03ecb8e4e65377c875355a3523d54f81c53d11bfaf3557f80000918bea003cfdba0662469283563a
 AUX 9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch 2626 BLAKE2B 6c3afe6941568119b6bbce1c66be913a29a2ac7853a881804c1c22e981075f1677ca7e4744738ad858f58a58c1a7295aeb5f1d87b3a2b2adfb971a54d76c04fb SHA512 34a84427c34fa8886f55e05cf0ffce258cdee8e98190e070eb40dc555a30784c49ebe4f946f7ea51b7d00fceb8071fc745007250dc5b5a61c4d2bb9910672ec5
 AUX 9999/musl-fixes.patch 1258 BLAKE2B fe275412bc908884239ea71de9a9ddf1d2f64debaa1a9ada18170195a7775c41571600ed3666343bf967aff5f9117900f73155f60de5077bc4584cfc2f782f53 SHA512 314dcbe846a66312c9f1634f4ff3f4670b3db1d3210bb550f1d3877a423333ba042da2e90c8736918a36be4d4faf58dab8d3236d4f26df5af7f7f019b0e0ec8f
 AUX clang-3.1-gentoo-runtime-gcc-detection-v3.patch 1457 BLAKE2B 9e85e90f418a9ac479b73efc568e045f76d3bdb229d6bbdff9b95bdf36ffeef8f15c9f8f27438e8f0fa05e89c9bc40d7ddfa514ef22b7ace50515e07df498914 SHA512 81c582791f4b0b1ccfcf3e8c82fbb68312320c5287402236d8c6d2d76767bbba031094c26d2b7bd9581c473896b78dda5a6284c5a87726e1bc0c539ae9294763
@@ -164,6 +165,7 @@ DIST llvm-3.6.0.src.tar.xz 12750908 BLAKE2B d3eee56f80f7a85c08e6428a3878ef23ae22
 DIST llvm-3.6.1-manpages.tar.bz2 38338 BLAKE2B d5d385e55c3817e8b25dd33178929d9bcbf59cb8390ecfb44c83c58c3bc1e7c2aae2b0969da4f4f5dbe6b052ab802e00c48f3fb68c6548bc4c8647f5fe4687f9 SHA512 a47aeb0b4632329eaaa1d6c774446fea5822d7692d81533a9a5c5de1c6a3b37fdd6b7c1fc6433339649f4d3a53a753065e73afb30fd84f253ad31d5fb3d48662
 DIST llvm-3.6.1.src.tar.xz 12798852 BLAKE2B 0c585229b252f31157605551fe66c0c32dc05b3cd03cf57516485973aa2a714edac5dc27c134542a193e0388fdcf3311619fd0e9512172ec53f24d8786b7a76a SHA512 fa07d0fe6c527d86c0b91b1b62597f949d777e3609e4e8ca2ea5e07931e1ebc7a363273cc705cf4a13b45e7ab00716b76de26688d077c1b51341d9dd2972de3f
 DIST llvm-3.7.0-manpages.tar.bz2 38095 BLAKE2B 67be777ceba745fee8a2128de05d2e22b1eeec275afb24376891dcda90dbd2486e58456248934b1cfaf907a80954c7ee537fe0d69bb87db167401f41c404212a SHA512 ea70ac15dbaef3740b31f66aa798338f7f9b82484586582aa62e0364f9d74bf175be2f4f29721df253b8157c1cbc146ab9045c0656c42a6375434e994786b643
+DIST llvm-3.7.1-patchset.tar.gz 17234 BLAKE2B 93e3676c9b1a34462435a376e35f0768d57e4db1001d136864f99b569c0235be7f51c21491f9792e7169e221de1e9faeb728928b8963420bbb36234ff28b4eb7 SHA512 030dc7f72d11fcd53307f707d5dde321054feb0f0977601c3e188a37f2be6c14bfd05482d1c1e5f435aaf32ca7c7e3701cf5f1375fbd0cf83cf8afbad7f4f6be
 DIST llvm-3.7.1.src.tar.xz 14592544 BLAKE2B f3a197dec9a397be02d2c55d73624352cf1474d935ca6dac466f8f44de0990c3f37b10a598fa2e871dfa27d3506087826dfcd23cb19bbd700cec54141c7d35fb SHA512 ac521debc02f6deba96ef975d6a546b0c5c77299c1dbf5e1b87a7974ff5e7fd715bd7e384b92d9adf572ce47130bdbf6d3c648eb0d7f72f16f976292e4909e90
 DIST llvm-3.8.0-manpages.tar.bz2 37889 BLAKE2B ea40c9317d6b901297d612a8120aa9fb8e15b564472233e61feb833b6a5dbf540f84f373e3df39e3d3a11fa20c69f42204ead2093735795dcf90b44f96c9b529 SHA512 a93ed7a25b75c237a0967ba7a501c71af3e7e9292ebabf69733bc637e9a4534dcaee539c6b1f6b2df7a87103c2371b1cf130fac05b88047100988c814e89ab0f
 DIST llvm-3.8.0.src.tar.xz 16580932 BLAKE2B 6560a8c67e9a19ec6c76ab234687fc1ea90ba292a88aaa99b307d6ee445e187cb5f68f1bd6eb123b9cfb8c4447997c7c5625dba7babf1e0094ea55c596e6c4ee SHA512 2c76e79d803768ed20af6ca1801cf2518071bf9835c54580ea3eb6219a66cdcf8b4c575f192c15082cc18d2468b7611dacb57950b605813a2317125c2d33c138
@@ -188,7 +190,7 @@ EBUILD llvm-3.6.0.ebuild 15718 BLAKE2B cd82e722f2e676cebefc56b1f99a885c6b2252232
 EBUILD llvm-3.6.1.ebuild 15970 BLAKE2B d4e4bdb897685e707b838681223629ef46aa46639c5e332c9ae0ee7fb45d05877d4f9ccfcfe38c422db6d693717526247f1a14efce7d38a5d7545073b13360b2 SHA512 10f58036be1d6e4967e683e8c73da38b8083eaf13fad0367ab16e0ccc66a0f93fcc332263e8d4adc8f7102e091adc499374ee00663a3997eff40a830a0c76c7c
 EBUILD llvm-3.7.1-r1.ebuild 16156 BLAKE2B 7ee72c4dc483e93e5c992b7080326cfac440f8dc98f9ab50d6ba4b9a440fd3ee26c5c127a05fc83b58ad7f289f339f3f3f09f6bbc4df833b188485fdd4d5797b SHA512 bf82d1850bab723539c66ae8a6ae1bf60c727c0f0f5b6dc1973025f0bfb1db9c92c5179c4acfd4ba6d66edd45b3fb1bc1bdf4a30ff897017fd7969100074dc87
 EBUILD llvm-3.7.1-r2.ebuild 16308 BLAKE2B a1755a23cd5aa380c3c6efbe0bea327d8174a40f521cc61c8db7382b3fc8717b69b3e3bb9911cbed488a66bc63b8992472de112e48e719a25b7887f4a4fe0f87 SHA512 7a62faa31d87a175668567ea4d7282a979337949383fa8fa31f2e09ca419fe21ae47b4ffd711b4cb3aaa09ef7d4a8e54447760068b03583bc64645f6ff995816
-EBUILD llvm-3.7.1-r3.ebuild 16958 BLAKE2B bfd3bf9602bea6cd40719545b1461c4db472467186e28d04f05369c2c296450b3010fd6d4a8f7a20da9c1e10997708cebc902243c7697fbd9f8b6bbb5c1cd401 SHA512 74597c893fef771d80962514e55e94716cf1b5753650fb60c045ebac3b87c99ae45ad6c5325d439cfaee154a42134d980a57e61689c070f9c72212e0c20fb84c
+EBUILD llvm-3.7.1-r3.ebuild 16686 BLAKE2B c296c0bed3d8f5eda00750658d6d0bd845520149983265b6189c56c3c03c8962664ccc1e43e06f73de79bff5f95b610ce19319623b524372767fd84d2c708548 SHA512 5be1f2ac24f5613ed1fdad6e0d835570982fa0b8cc1754b2711c4d34be16b292e2baaca822dd7210acb137bccc40e99bee4d843f4a9b363d26239ce4b99264b2
 EBUILD llvm-3.7.1.ebuild 16125 BLAKE2B b122a423fc21bd1be26a8612a0e9d04dc81cc267d3dfacc7fc7677a13e9683043e9e303edffc8dcc929b3a512efc1e8cd282756c9bc551e7ee892be81c9e1cda SHA512 dd3c7495e66b50d6b72ae3d8745c0ae3b965cbbeac56775f28148de484f0c781ac821ca730b031be7d9a77d6bbed63323747c2bfcdb4c74e59921bb38ae476ba
 EBUILD llvm-3.8.0-r2.ebuild 15483 BLAKE2B 3b659850427432966979ba9fc3f8c835e28333c375899ae36179df629d96683fec0a73a9504cca2b7425126b4b9ac3d87ca27497f0ce600795e6543df534389f SHA512 4b92381ed484697b8df5d3b4e18e7ccf9e96e1fa9af8ba560fe542d86f7eeffb1599d15dacedacd15e5b98750c608d83c2796cf3d1e017bff9c922c03cbe5943
 EBUILD llvm-3.8.0-r3.ebuild 16527 BLAKE2B c7ec517b6e03ff408b71f4ceb5a143c5eeebd565ccff31aa75f72914d1787e25c3b372beda62fc57c35785bb50b9121a3b76bb4d0c03312c449afef3979b76d8 SHA512 cd7627e79c5391a84e1b34337c85d72d334ac9bbff54c700ca9e2e9bc018d485f5dbbfd74723a57a5b103ec996fddb2c463dab9af1638d1294df7340f055fa9f
@@ -197,4 +199,4 @@ EBUILD llvm-3.8.1.ebuild 16561 BLAKE2B 3b3416ddd507b3acb85ae911b01370ab07d3e1c1a
 EBUILD llvm-3.9.1-r1.ebuild 16724 BLAKE2B f1e37dfca489588151ffc949e8b266d1391ae1e3dd3b7dcea4b4772dbf86573fe17a5f221c3bb3a4d4b2200dd35d8e2f3f7c280e9ea5fffeebeafea495b4e23e SHA512 7a7a25baaa85c21cc9ac44da2e73a953a410b82691a71666290a0080febbe2464f737df2ec1a9ee37c0b2e63deaa803ced07b485e2ea0e5dc47ed3d51a839b54
 EBUILD llvm-3.9.1.ebuild 16379 BLAKE2B cc654a499947332bd8c7e87e1124a3657c60430a5f3522b343d0129d3b554e8e775954b95c15b782467559aad5a8580487b846c28833e9b8060b2f42fe48b3be SHA512 6dc6904c38d83595e781a7cfd6789c97f33c1d2d9560a8d7e8aa65e7f12229d1dd47577fd34ac073fa9b6e2802909672a4384f5dea3d0a8852f5af0d671cd4f4
 EBUILD llvm-4.0.1-r1.ebuild 6844 BLAKE2B 600984caa6ddc1562342baec7dd3e58fd00b859937c797c2230c595016e297b3b6bc2a01375e18fadcc1ba373c3cbe2d54ce188266ceece76de3f2a41661ad69 SHA512 3975f4b4fed1ccf36996cadfee5db5c62c4f64668141c89cb225d53e3b358f67f9afa992ad99464c733e057cd1e1de50517f07fe4326b99946b54a8e7df7a1d0
-EBUILD llvm-5.0.1.ebuild 7240 BLAKE2B 02f5b369ef635d2060125fba37dadbe8fdb120112688b8a64a3e31e9fa645c46d1d3c40b68141e82d7c34bff17dc5250d7fa00daefd0dae2d44f0002868284e0 SHA512 c4191ec068be48e762198c60b900516f6737ec70b6cf32efdef2668a0300b93d168392478b52ca181d79a004bfc81d82c2911afadd2e9946bb43af563dde2c4d
+EBUILD llvm-5.0.1.ebuild 7393 BLAKE2B 8aa855679e59bb4b8a7d584e0ce0fa3d7ef5fd5285fe0378d5dc52eeab306f883a0b82fb4041175e747a429a2274b561476dc83cf31a58f925e444337373a70f SHA512 3e9a968450a27a2e3bb4c6b4db086be7431e92bad262ca05f86c9cc30ec7f3f1a98c59161b53b65f8c8d628f32672be4672b98da04d63aae8a614db85a24ecd6
diff --git a/sys-devel/llvm/files/6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch b/sys-devel/llvm/files/6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
new file mode 100644
index 00000000..5d1f0421
--- /dev/null
+++ b/sys-devel/llvm/files/6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
@@ -0,0 +1,38 @@
+From a7c94b20187a60cf1508ce882ee37b3a056eb0bd Mon Sep 17 00:00:00 2001
+From: Michal Gorny <mgorny@gentoo.org>
+Date: Thu, 8 Mar 2018 15:09:38 +0000
+Subject: [PATCH] [cmake] Append -Wl,-rpath-link conditionally to GNULD
+
+Append -Wl,-rpath-link conditionally to whether GNU ld.bfd is used
+rather than the Linux+!gold conditionals. Also move it out of 'else'
+branch of *BSD handling. This fixes build failures with ld.bfd
+on Gentoo/FreeBSD, and should cause no harm on other systems using
+ld.bfd.
+
+This patch improves the original logic by reusing results of linker
+detection introduced in r307852.
+
+Differential Revision: https://reviews.llvm.org/D43751
+
+git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@327007 91177308-0d34-0410-b5e6-96231b3b80d8
+---
+ cmake/modules/AddLLVM.cmake | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake
+index 20166d2cd30..95d47d00e51 100644
+--- a/cmake/modules/AddLLVM.cmake
++++ b/cmake/modules/AddLLVM.cmake
+@@ -1589,7 +1589,8 @@ function(llvm_setup_rpath name)
+     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
+       set_property(TARGET ${name} APPEND_STRING PROPERTY
+                    LINK_FLAGS " -Wl,-z,origin ")
+-    elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT LLVM_LINKER_IS_GOLD)
++    endif()
++    if(LLVM_LINKER_IS_GNULD)
+       # $ORIGIN is not interpreted at link time by ld.bfd
+       set_property(TARGET ${name} APPEND_STRING PROPERTY
+                    LINK_FLAGS " -Wl,-rpath-link,${LLVM_LIBRARY_OUTPUT_INTDIR} ")
+-- 
+2.16.2
+
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index 7388510d..218687fd 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -1,6 +1,5 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: a594b6a9d71f942a1dff345a9e4336be58dfe670 $
 
 EAPI=6
 
@@ -11,13 +10,14 @@ inherit check-reqs cmake-utils eutils flag-o-matic multilib \
 	multilib-minimal python-single-r1 toolchain-funcs pax-utils prefix
 
 DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="http://llvm.org/"
-SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
-	clang? ( http://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
-		http://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
-	lldb? ( http://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
-	!doc? ( http://dev.gentoo.org/~voyageur/distfiles/${PN}-3.7.0-manpages.tar.bz2 )"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://llvm.org/releases/${PV}/${P}.src.tar.xz
+	clang? ( https://llvm.org/releases/${PV}/compiler-rt-${PV}.src.tar.xz
+		https://llvm.org/releases/${PV}/cfe-${PV}.src.tar.xz
+		https://llvm.org/releases/${PV}/clang-tools-extra-${PV}.src.tar.xz )
+	lldb? ( https://llvm.org/releases/${PV}/lldb-${PV}.src.tar.xz )
+	!doc? ( https://dev.gentoo.org/~voyageur/distfiles/${PN}-3.7.0-manpages.tar.bz2 )
+	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.gz"
 
 # Additional licenses:
 # 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
@@ -30,13 +30,12 @@ SRC_URI="http://llvm.org/releases/${PV}/${P}.src.tar.xz
 
 LICENSE="UoI-NCSA rc BSD public-domain
 	arm? ( LLVM-Grant )
-	arm64? ( LLVM-Grant )
 	multitarget? ( LLVM-Grant )"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="arm ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="clang debug doc gold libedit +libffi lldb multitarget ncurses ocaml
 	python +static-analyzer test xml video_cards_radeon
-	kernel_Darwin kernel_FreeBSD"
+	kernel_Darwin"
 
 COMMON_DEPEND="
 	sys-libs/zlib:0=
@@ -157,21 +156,21 @@ src_prepare() {
 	# Make ocaml warnings non-fatal, bug #537308
 	sed -e "/RUN/s/-warn-error A//" -i test/Bindings/OCaml/*ml  || die
 	# Fix libdir for ocaml bindings install, bug #559134
-	eapply "${FILESDIR}"/3.9.1/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
+	eapply "${WORKDIR}/${P}-patchset"/0001-cmake-Install-OCaml-modules-into-correct-package-loc.patch
 	# Do not build/install ocaml docs with USE=-doc, bug #562008
-	eapply "${FILESDIR}"/3.9.1/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
+	eapply "${WORKDIR}/${P}-patchset"/0002-cmake-Make-OCaml-docs-dependent-on-LLVM_BUILD_DOCS.patch
 
 	# Make it possible to override Sphinx HTML install dirs
 	# https://llvm.org/bugs/show_bug.cgi?id=23780
-	eapply "${FILESDIR}"/3.9.1/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
+	eapply "${WORKDIR}/${P}-patchset"/0003-cmake-Support-overriding-Sphinx-HTML-doc-install-dir.patch
 
 	# Prevent race conditions with parallel Sphinx runs
 	# https://llvm.org/bugs/show_bug.cgi?id=23781
-	eapply "${FILESDIR}"/3.8.1/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
+	eapply "${WORKDIR}/${P}-patchset"/0004-cmake-Add-an-ordering-dep-between-HTML-man-Sphinx-ta.patch
 
 	# Prevent installing libgtest
 	# https://llvm.org/bugs/show_bug.cgi?id=18341
-	eapply "${FILESDIR}"/3.8.1/0005-cmake-Do-not-install-libgtest.patch
+	eapply "${WORKDIR}/${P}-patchset"/0005-cmake-Do-not-install-libgtest.patch
 
 	# Fix llvm-config for shared linking, sane flags and return values
 	# in order:
@@ -181,49 +180,49 @@ src_prepare() {
 	# - backported r260343 that fixes cross-compilation
 	# combination of backported upstream r252532 with our patch
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/3.7.1/llvm-config-0.patch
-	eapply "${FILESDIR}"/3.7.1/llvm-config-1.patch
-	eapply "${FILESDIR}"/3.7.1/llvm-config-2.patch
-	eapply "${FILESDIR}"/3.7.1/llvm-config-3.patch
+	eapply "${WORKDIR}/${P}-patchset"/llvm-config-0.patch
+	eapply "${WORKDIR}/${P}-patchset"/llvm-config-1.patch
+	eapply "${WORKDIR}/${P}-patchset"/llvm-config-2.patch
+	eapply "${WORKDIR}/${P}-patchset"/llvm-config-3.patch
 
 	# Fix msan with newer kernels, #569894
-	eapply "${FILESDIR}"/3.7.1/msan-fix.patch
+	eapply "${WORKDIR}/${P}-patchset"/msan-fix.patch
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
 	if use clang; then
 		# Automatically select active system GCC's libraries, bugs #406163 and #417913
-		eapply "${FILESDIR}"/3.9.0/clang/gentoo-runtime-gcc-detection-v3.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/gentoo-runtime-gcc-detection-v3.patch
 
 		# Support gcc4.9 search paths
 		# https://github.com/llvm-mirror/clang/commit/af4db76e059c1a3
-		eapply "${FILESDIR}"/3.8.1/clang/gcc4.9-search-path.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/gcc4.9-search-path.patch
 
-		eapply "${FILESDIR}"/3.7.1/clang/gentoo-install.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/gentoo-install.patch
 
-		eapply "${FILESDIR}"/3.9.1/clang/darwin_prefix-include-paths.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/darwin_prefix-include-paths.patch
 		eprefixify tools/clang/lib/Frontend/InitHeaderSearch.cpp
 
 		# Fix -isystem support in ccc-analyzer
-		eapply "${FILESDIR}"/3.7.1/clang/ccc-analyzer-isystem.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/ccc-analyzer-isystem.patch
 
 		sed -i -e "s^@EPREFIX@^${EPREFIX}^" \
 			tools/clang/tools/scan-build/scan-build || die
 
 		# Install clang runtime into /usr/lib/clang
 		# https://llvm.org/bugs/show_bug.cgi?id=23792
-		eapply "${FILESDIR}"/3.7.1/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
-		eapply "${FILESDIR}"/3.8.1/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/0001-Install-clang-runtime-into-usr-lib-without-suffix.patch
+		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/0001-cmake-Install-compiler-rt-into-usr-lib-without-suffi.patch
 
 		# Do not force -march flags on arm platforms
 		# https://bugs.gentoo.org/show_bug.cgi?id=562706
-		eapply "${FILESDIR}"/3.7.1/compiler-rt/arm_march_flags.patch
+		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/arm_march_flags.patch
 
 		# Make it possible to override CLANG_LIBDIR_SUFFIX
 		# (that is used only to find LLVMgold.so)
 		# https://llvm.org/bugs/show_bug.cgi?id=23793
-		eapply "${FILESDIR}"/3.9.1/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
+		eapply "${WORKDIR}/${P}-patchset"/clang/0002-cmake-Make-CLANG_LIBDIR_SUFFIX-overridable.patch
 
 		# Fix git-clang-format shebang, bug #562688
 		python_fix_shebang tools/clang/tools/clang-format/git-clang-format
@@ -231,7 +230,7 @@ src_prepare() {
 		pushd projects/compiler-rt >/dev/null || die
 
 		# Fix msan with newer kernels, compiler-rt part, #569894
-		eapply "${FILESDIR}"/3.7.1/compiler-rt/msan-fix.patch
+		eapply "${WORKDIR}/${P}-patchset"/compiler-rt/msan-fix.patch
 
 		# Fix WX sections, bug #421527
 		find lib/builtins -type f -name '*.S' -exec sed \
@@ -248,17 +247,17 @@ src_prepare() {
 			-i tools/lldb/scripts/Python/modules/CMakeLists.txt || die
 
 		# Fix Python paths, bugs #562436 and #562438
-		eapply "${FILESDIR}"/3.7.1/lldb/python.patch
+		eapply "${WORKDIR}/${P}-patchset"/lldb/python.patch
 		sed -e "s/GENTOO_LIBDIR/$(get_libdir)/" \
 			-i tools/lldb/scripts/Python/finishSwigPythonLLDB.py || die
 
 		# Fix build with ncurses[tinfo], #560474
-		# http://llvm.org/viewvc/llvm-project?view=revision&revision=247842
-		eapply "${FILESDIR}"/3.7.1/lldb/tinfo.patch
+		# https://llvm.org/viewvc/llvm-project?view=revision&revision=247842
+		eapply "${WORKDIR}/${P}-patchset"/lldb/tinfo.patch
 	fi
 
-	# User patches
-	eapply_user
+	# User patches + QA
+	cmake-utils_src_prepare
 
 	# Native libdir is used to hold LLVMgold.so
 	NATIVE_LIBDIR=$(get_libdir)
@@ -461,11 +460,6 @@ src_install() {
 	fi
 
 	multilib-minimal_src_install
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD && use clang; then
-		rm "${ED}"usr/lib/clang/${PV}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
 }
 
 multilib_src_install() {
@@ -573,9 +567,3 @@ multilib_src_install_all() {
 		fi
 	fi
 }
-
-pkg_postinst() {
-	if use clang && ! has_version sys-libs/libomp; then
-		elog "To enable OpenMP support in clang, install sys-libs/libomp."
-	fi
-}
diff --git a/sys-devel/llvm/llvm-5.0.1.ebuild b/sys-devel/llvm/llvm-5.0.1.ebuild
index 37cfeaa7..055d2f35 100644
--- a/sys-devel/llvm/llvm-5.0.1.ebuild
+++ b/sys-devel/llvm/llvm-5.0.1.ebuild
@@ -83,6 +83,9 @@ src_prepare() {
 	# Copy the new binary file (we don't support git binary patches)
 	cp {"${WORKDIR}/${P}-patchset",.}/test/tools/llvm-symbolizer/Inputs/print_context.o || die
 
+	# Fix appending -Wl,-rpath-link on non-Linux (-> FreeBSD).
+	eapply "${FILESDIR}"/6.0.9999/0001-cmake-Append-Wl-rpath-link-conditionally-to-GNULD.patch
+
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die