gentoo resync : 23.12.2017

18 files changed, 14 insertions, 821 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index d396304cd192..a6b762efeef6 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index 95c46f30a15d..3659a78f36a5 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -3,6 +3,5 @@ EBUILD clang-runtime-3.9.1.ebuild 569 BLAKE2B 58fa2d4ee5d80c7540e8030015fe085ad6
 EBUILD clang-runtime-4.0.1.ebuild 639 BLAKE2B 62665ccfdb77a3635995b6ec9a59589e3d5e5b39c3940b378acc314fc9fcb4af23f7d44fba89f61eceb4055622b9d7c35ae26724b3cc207c06ac60bd2eda5a75 SHA512 b42d5fbf0082e194f4fc4ddf987a2d1dd0f06fc673b590ec278b45cacb8854c207b26cd159fe4cccdd1a123884037fff7c9e5908d0f329b93ff4ef0238e550da
 EBUILD clang-runtime-5.0.0.ebuild 641 BLAKE2B 24567f5faca4a1f0304c418661e4abaab161a86ebbd3467f6159e33b44976ef4bb17d9fffb50bb717662fcf572ea9bcc243cd82ed638532e670f438ea1ddc5d8 SHA512 4d0c4791a6ef8925dd1d7a834f8a3d020fcb50f63bd78195707aac174d29a619808ae80ab2bd2f18a38057dd906d36664f79b00a038a04811d339304a65b817f
 EBUILD clang-runtime-5.0.1.ebuild 641 BLAKE2B 24567f5faca4a1f0304c418661e4abaab161a86ebbd3467f6159e33b44976ef4bb17d9fffb50bb717662fcf572ea9bcc243cd82ed638532e670f438ea1ddc5d8 SHA512 4d0c4791a6ef8925dd1d7a834f8a3d020fcb50f63bd78195707aac174d29a619808ae80ab2bd2f18a38057dd906d36664f79b00a038a04811d339304a65b817f
-EBUILD clang-runtime-5.0.9999.ebuild 664 BLAKE2B 26eab8c84d4414e67c67c1d679c6424fd52eef66ba49c838ae1e2605a37850de24308191bd044985ed268dbac21e0996ce4149c8c74896594e0fa76ed46d1a8c SHA512 9130a2868b8e37b1e20d57ec151ad8560d8fdc487b1d0e086f95d4c9edeee802efaec1a9e7c2e5cb06093b3127c9199eebfcf93a287fef535a79ca59b69dc9d0
 EBUILD clang-runtime-9999.ebuild 664 BLAKE2B 8d142b940d9204b7c64ddd8d97ebe981df6cc7a3080276ebdea5b7e7c0abfa376ef838fc21532eb696d92c990f2fe6195f4a2fa466ace0644414bb48de25ddd3 SHA512 e1e29618485e3153042f366c2ee178d1befb4fa2ecf52fe70e50d97e50bb3d7bb3fc51430f762106ddba77f050cf47d721fe9bbde14c5f8c0fc596e000c067d8
 MISC metadata.xml 578 BLAKE2B d58a4d1a7bf88a0d5640a02f3acb7e491f275b3bb66a8583aa057b8daae93bb1dbb80f6150bc326228c6ab8c8f8498b46bf72a3fb5e97d0eeea2fb39f87660e3 SHA512 822f56b33d991088ad5e51c3dd96e2e36f544b68c57e45ed8365835d1ef6d0eb797f9de1f8f33b59fbbaf085e245079ca767d5e8b773261cf9ad2c5629b7b16a
diff --git a/sys-devel/clang-runtime/clang-runtime-5.0.9999.ebuild b/sys-devel/clang-runtime/clang-runtime-5.0.9999.ebuild
deleted file mode 100644
index f7f004201f60..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-5.0.9999.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-build
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-SRC_URI=""
-
-LICENSE="metapackage"
-# Note: keep it matching clang-9999 version
-SLOT="5.0.1"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}
-		sanitize? ( ~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT} )
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )"
-
-REQUIRED_USE="sanitize? ( compiler-rt )"
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index b9abe57055a1..7157568c704b 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -18,11 +18,10 @@ DIST llvm-manpages-5.0.0.tar.bz2 94240 BLAKE2B 1657edefa2e839f401b7c30ba1c0cfde4
 EBUILD clang-3.4.2-r100.ebuild 972 BLAKE2B b11888e71750e7de7363d0e74a43999b31baf54dd43438c98d037b5b49d4043a74fdda70dd2b0eb405451c2579ee0285404b28792cc525c1c26e81a07bfd2dc9 SHA512 b42ec4379b4a70eb638ae6a6d45a287cd83f5ac339ac25ade2c6c77bd8d05c208d389d6f09e4cfe567e67d3e616adfbaffa1b1a9a7f35f5ecb7a0e7ccdc720fc
 EBUILD clang-3.5.2-r100.ebuild 972 BLAKE2B 0f17918969ee1034e1febc34afe95a29dddcf6056caa53920ade66a887b57939933f31b022fb68fb29bf8a5e387f659f6e3b618594cda4cd50f913ec14d0f0de SHA512 1e9a9f67ecd1cea111599376e676c665c6c1e731514a06065751502d221f8c6d7033dc23376f21850a63d036a33fbf241845a9127beca6ee8549348866cdce3e
 EBUILD clang-3.6.2-r100.ebuild 972 BLAKE2B 865d1b2ca82dc3e4965f676adee77bcebb285fd3071caa37a399795426f541cbfb4a380e615673a2a1ca6c2832becd21e6252b678f2c1047a0605fdb5db2845c SHA512 604f7551a0081e7de09875f54a64502e8d2e97341bd44e4d2ae35ecd2392b22b7aea5fdf4923cf196cde1de5711f05868943d3f802d975118426ee43d0877f6f
-EBUILD clang-3.7.1-r100.ebuild 1136 BLAKE2B 0eb8dcaf4b936a60333e020762502efbc0cbdea99eecb36394dda87967903fdad2b8452c2198aecd15165e16941b78a03b48ee625837087dc1bf5c9268a64568 SHA512 6cf313c813f93b93ea76d53006684912feff171d0738f6d202d996052f9eae731583ed1616fc21d8d493292028577c7e1bbeabc3aee21650653638cdba7e541d
+EBUILD clang-3.7.1-r100.ebuild 1121 BLAKE2B 9cf6e15e5a2fa9d400731747105f65c8ef14d20e5a982f02b53a13ad1f269b86c298603e6625340670fffd74e434c92df7fb22cfb4cd7af4d75501a0520b5106 SHA512 5280504ce38eba8da79cf1c31b21bcbd07ad9ecb3db59a7054f829ed43d48744d16760cbaab9ef32f01345a9e7f54f8a63091dda3687115654a110f5a0e227bf
 EBUILD clang-3.9.1-r100.ebuild 1534 BLAKE2B b269b09553ec5559ad90ffdfcaa20604c10fbe394651b7a9e037a9aaac878a6ef6cc2702a1cc6123cffa0ece705b851e908ac275f7fa854d099ec2ab8bafc9ed SHA512 84a3c016f9db31c6cbcee7620330b76af97702be3e92bd0db6e58883ccc054a792003a374cb5bf9d69b8f7c89165a2853ba495d58cd02d98524cf8025e99bcf0
 EBUILD clang-4.0.1.ebuild 9440 BLAKE2B 9ccc82a8f57e8c2e7a7ad1b55b0b6e8f88ad4da2b4d71bbdfaf5312e95d35abf08b31ee38114c7f31c435881ba06d5793bcff287c6dcd11e52e78e9ac90f1d9a SHA512 3b1ead95ef28a4f126e3111297c5c8682b34d74caf369db0d52ce92b334a5025f7894103b1bd4aa820e90368c3a8796139e663da8dc6e4c01683b6f4a84f9bd1
 EBUILD clang-5.0.0.ebuild 9394 BLAKE2B 70854a48bede330b76467f83d3adf52d05ffb629982ecdb38cff9585d9df9d4378f907191dc672ab62be669e77c203702c7a97e67a9082e41d55a021b60c4029 SHA512 99f117c00837dbf364e3070b4c51bccbfa3646f07a51c89494a79162b36901de3119a332af757cd1c1e15f37b9f64fe19e9d274a8ecacf5fcc8816d0c9e1a88b
 EBUILD clang-5.0.1.ebuild 9447 BLAKE2B aee4c4ea80e46e1972e343360fb348b83fb04b5d29a822e0d933465975320be915e84640d55e8af77a4f9acf600302d0d00ac10b30b7830cf1c6d6c29b91bf22 SHA512 4b03eaa47f4f56a47c7786044eb1ec86ff4b2590207b28f0b7900c92ee2c78f38216dd31a0d7393341c1496181003ecfb3a6b2cfe6ed6f757788ac2330d652d5
-EBUILD clang-5.0.9999.ebuild 9062 BLAKE2B 4825e0b71a07855a7bb347096a13bbadc2fcd6f1f349cc9859a36e455a9a791021afcfe25d1955f03edd80abbfcc9f9a6bd22ca676734386dd32975d9faff421 SHA512 a757603cb42636ee968a17315481ab119c384ff86d22d513060a7a13bde0d275c7828f60074f33cbe5f0031becdf73c042b454945374535cb65a3270b1bf70b1
 EBUILD clang-9999.ebuild 8854 BLAKE2B 1f9a2120a08a299ff32282ac034b840b7c2bf12957d3418cd59304ac9d0b911dcad6fdfda1ea3f5c21f3b274793667c1cd6c0cdb797b9647f4e251cd1f1e0db2 SHA512 558f8fbe97e6b29b6db18e36799561fea600cbbb89a95423eba92d527a6028fe727408a51d24b4711e5a9154b9547703d0e341e058640a431b1806e9ebb2e9f4
 MISC metadata.xml 1455 BLAKE2B 9dd88bba7158dfdc83bfc48fa4134e1f5a3357ab778cad400a51e348bbb4b44d2740ec417fdc888df0b4fd820441649e92b7adffdd4db558a2f4c3f4830a83a1 SHA512 369a87bd551e483e81ff56f5167177b1bcfedf9bc97f501ef2b07bfdfea3a25532f5e86af062568b3b22a53fe07318fd93dc55bd83b453dd10a0f4d3e88cb932
diff --git a/sys-devel/clang/clang-3.7.1-r100.ebuild b/sys-devel/clang/clang-3.7.1-r100.ebuild
index d231d61133ab..0fa158a374a5 100644
--- a/sys-devel/clang/clang-3.7.1-r100.ebuild
+++ b/sys-devel/clang/clang-3.7.1-r100.ebuild
@@ -11,7 +11,7 @@ SRC_URI=""
 
 LICENSE="UoI-NCSA"
 SLOT="0/3.7"
-KEYWORDS="amd64 arm ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug multitarget python +static-analyzer"
 
 RDEPEND="~sys-devel/llvm-${PV}[clang(-),debug=,multitarget?,python?,static-analyzer?,${MULTILIB_USEDEP}]"
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild
deleted file mode 100644
index 458f5359014e..000000000000
--- a/sys-devel/clang/clang-5.0.9999.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic git-r3 llvm \
-	multilib-minimal pax-utils python-single-r1 toolchain-funcs
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/clang.git
-	https://github.com/llvm-mirror/clang.git"
-EGIT_BRANCH="release_50"
-
-# Keep in sync with sys-devel/llvm
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="UoI-NCSA"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug default-compiler-rt default-libcxx doc +static-analyzer
-	test xml z3 kernel_FreeBSD ${ALL_LLVM_TARGETS[*]}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	~sys-devel/llvm-${PV}:${SLOT}=[debug=,${LLVM_TARGET_USEDEPS// /,},${MULTILIB_USEDEP}]
-	static-analyzer? (
-		dev-lang/perl:*
-		z3? ( sci-mathematics/z3:0= )
-	)
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	${PYTHON_DEPS}"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	doc? ( dev-python/sphinx )
-	xml? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-RDEPEND="${RDEPEND}
-	!<sys-devel/llvm-4.0.0_rc:0
-	!sys-devel/clang:0"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	default-compiler-rt? ( =sys-libs/compiler-rt-${PV%_*}* )
-	default-libcxx? ( sys-libs/libcxx )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-# We need extra level of indirection for CLANG_RESOURCE_DIR
-S=${WORKDIR}/x/y/${P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-PATCHES=(
-	# fix finding compiler-rt libs
-	"${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
-)
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${SLOT} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	# create extra parent dir for CLANG_RESOURCE_DIR
-	mkdir -p x/y || die
-	cd x/y || die
-
-	git-r3_fetch "https://git.llvm.org/git/clang-tools-extra.git
-		https://github.com/llvm-mirror/clang-tools-extra.git"
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	git-r3_checkout https://llvm.org/git/clang-tools-extra.git \
-		"${S}"/tools/extra
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' utils/{lit,llvm-lit,unittest}
-	fi
-	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
-}
-
-multilib_src_configure() {
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-3 "${llvm_version}")
-
-	local mycmakeargs=(
-		# ensure that the correct llvm-config is used
-		-DLLVM_CONFIG="$(type -P "${CHOST}-llvm-config")"
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${clang_version}"
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# these are not propagated reliably, so redefine them
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# override default stdlib and rtlib
-		-DCLANG_DEFAULT_CXX_STDLIB=$(usex default-libcxx libc++ "")
-		-DCLANG_DEFAULT_RTLIB=$(usex default-compiler-rt compiler-rt "")
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-		# z3 is not multilib-friendly
-		-DCLANG_ANALYZER_BUILD_Z3=$(multilib_native_usex z3)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-	)
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			# normally copied from LLVM_INCLUDE_DOCS but the latter
-			# is lacking value in stand-alone builds
-			-DCLANG_INCLUDE_DOCS=$(usex doc)
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=$(usex doc)
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=ON
-			-DLLVM_ENABLE_SPHINX=ON
-			-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use z3 && mycmakeargs+=(
-			-DZ3_INCLUDE_DIR="${EPREFIX}/usr/include/z3"
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		[[ -x "/usr/bin/clang-tblgen" ]] \
-			|| die "/usr/bin/clang-tblgen not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DCLANG_TABLEGEN=/usr/bin/clang-tblgen
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-clang
-	# clang-tidy requires [static-analyzer] and tests are not split
-	# correctly, so they are all disabled when static-analyzer is off
-	if multilib_is_native_abi && use static-analyzer; then
-		cmake-utils_src_make check-clang-tools
-	fi
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED%/}"/usr/include/clangrt "${ED%/}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	# note: we use two version components here (vs 3 in runtime path)
-	local llvm_version=$(llvm-config --version) || die
-	local clang_version=$(ver_cut 1-2 "${llvm_version}")
-	local clang_full_version=$(ver_cut 1-3 "${llvm_version}")
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X.Y
-	# - clang -> clang-X.Y
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X.Y
-	# - clang++-X.Y, clang-cl-X.Y, clang-cpp-X.Y -> clang-X.Y
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X.Y
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED%/}/usr/lib/llvm/${SLOT}/bin/${i}" || die
-		dosym "clang-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}-${clang_version}"
-		dosym "${i}-${clang_version}" "/usr/lib/llvm/${SLOT}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}-${clang_version}"
-			dosym "${abi_chost}-${i}-${clang_version}" \
-				"/usr/lib/llvm/${SLOT}/bin/${abi_chost}-${i}"
-		done
-	done
-
-	# Remove unnecessary headers on FreeBSD, bug #417171
-	if use kernel_FreeBSD; then
-		rm "${ED}"usr/lib/clang/${clang_full_version}/include/{std,float,iso,limits,tgmath,varargs}*.h || die
-	fi
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/$(get_libdir)/clang "${ED%/}"/usr/include/clangrt || die
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"usr/lib/llvm/${SLOT}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${SLOT}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-}
-
-pkg_postrm() {
-	if [[ ${ROOT} == / && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/dev86/Manifest b/sys-devel/dev86/Manifest
index 8a0f53f59633..5dcf0bc64c38 100644
--- a/sys-devel/dev86/Manifest
+++ b/sys-devel/dev86/Manifest
@@ -4,7 +4,6 @@ AUX dev86-0.16.21-non-void-return-clang.patch 425 BLAKE2B e781f5f38fb5cd4c427aac
 AUX dev86-pic.patch 574 BLAKE2B e6566a39aad0a48b2b1c626630fce8071567c98efd06a37105e5012c6a0c06341a801809efb3d4b3da9ff2313bdbf14c14d885b9eed37ae6ca93011ec3b9edd3 SHA512 44f0649fbb4b2514ecdd54c988db1a5547d68afed2bff7ebe15163ff287fd4be81bc2d700ed92414caea5c967b7455817fdefd1d19a86609221940a495b5ceda
 DIST Dev86src-0.16.19.tar.gz 713688 BLAKE2B c62a552be801ff109ee30c403d43586e2601342bd6fe0902d287849a88778338764216663c5302e7401e2b09962e116f2e3569c144846e5fcec87523d69ff206 SHA512 4077f7ac800330eb4658ffaa53dc8cc982792b1dcd7a59625cba4a5dac494117c6bd4ec5307bf02349ad6ae3d0c0903ab2e41123a8df94373e469092fa005cd3
 DIST Dev86src-0.16.21.tar.gz 717215 BLAKE2B 977353422937f57d2046f151a53008dcec90f4060d60675dcb81fa58af5f1ed758a1950dcbd211cda57c84b55bf58ffbad28195ff115db50a7a1108d434b8b4e SHA512 6d35dc3c7f9735cf7967cdb2bc0f7bee967ae26667cd8cef56bbdf7d7855ef1d35057db4c0031ff86b9b95d3c8ee44aff408446115b35b6c10cf207a33838016
-EBUILD dev86-0.16.19.ebuild 1820 BLAKE2B a19ad399d7d406958ebf8540b5d925e59db71bd03c2c90169034992764dc75769311a76a3afc202d5436772d4d1c2737ec7dc02c9e17bae7c18be84dff6ca902 SHA512 cd093d1ebea014f8f842ee5a70dbec7aa25c636211c56caf11e89b37a6625110488ba72a8cbdf10796c2b64b4d1a1d5831f3a99bfd7788bfcf6245a4d25f2c80
-EBUILD dev86-0.16.21-r2.ebuild 1843 BLAKE2B f3f9aa92e7bb0ed01bb28f8c6915866e3a3a1471ec908e5f4d706741710fc2959439490b27c20d859dab590794250c2073bb3f338cef848cc734ea7dbc2dd141 SHA512 1b7d8213232bded080c8f78df9b16931b0d22493c4510963ee9e98ea6b142d008a046496e580d25e77f96dde1453838dbd6d6c847020e41dbc993a921b17dfde
-EBUILD dev86-0.16.21.ebuild 1780 BLAKE2B fddd798d7bf71c6a77bafee7ee8b5914c3fd70ca2948fabf0d9bf44f11dfbf3a13e20ead5787c2ff76000711f6436f39af26edb756503d72de52c780e8da5950 SHA512 0ac3ea2a1768b57f5999006d88f0b7620993b8dd4c8c55cf04f7d24231899fe8492264ff1f040b443d5ff4a46d242212490ba110839d5ec7bb914af6ee37babd
+EBUILD dev86-0.16.19.ebuild 1854 BLAKE2B 49f3ee0daa8a7b1410aadd978a733862cd6a40556bc49f89b3921da2a64d1bd5217c1455ef97e87bd62a0a17a6b35436923fc2e62b05c35eec39925a65b24548 SHA512 17d24085519121a56639ce740c315faaa2815731e63420c5ad164b148acfa507a14a2caa6651dc13c597de2d008adbf07c6a7995cac7fdf300c13d98881459e5
+EBUILD dev86-0.16.21-r2.ebuild 1872 BLAKE2B 691192c6fb7c6db1552a7b22849c4c9e3a851631e634f29427779fd312b436ad839b68a6f04a25f7b0809295a28de9dd7aa7a3c8704ac24fa5f67c4231b8c234 SHA512 5ebefb8e0b0b8ae26dbd345f237c12429922425d330354770988da597f058edf7bae9990b172f0fdd9819a9d5938995f6605a9cab93a41a25a911444a3e455a2
 MISC metadata.xml 269 BLAKE2B 52fbe2001fcfbc7e12accb112937522d10be0763440ba36e3377bfab21d75b4a4e9507d7974c3434bf8c01bb24e939f91023d31909bc962aa3ead89c607f6ff1 SHA512 fc49c52f63fc653414208095ec460b4d991d1710b0ea92ca8ab598bca9316b42144e498503b79e7f1db22e3a8c26c009f51cf2d5eb0163a6afc18ed40d4541f2
diff --git a/sys-devel/dev86/dev86-0.16.19.ebuild b/sys-devel/dev86/dev86-0.16.19.ebuild
index 194de6a5b686..835423c7e4d1 100644
--- a/sys-devel/dev86/dev86-0.16.19.ebuild
+++ b/sys-devel/dev86/dev86-0.16.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="4"
@@ -6,7 +6,7 @@ EAPI="4"
 inherit eutils multilib
 
 DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://www.debath.co.uk/"
+HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86"
 SRC_URI="http://www.debath.co.uk/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-devel/dev86/dev86-0.16.21-r2.ebuild b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
index 39d5b5977db4..701d48499a53 100644
--- a/sys-devel/dev86/dev86-0.16.21-r2.ebuild
+++ b/sys-devel/dev86/dev86-0.16.21-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
+HOMEPAGE="http://www.debath.co.uk/ https://github.com/lkundrak/dev86"
 SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/sys-devel/dev86/dev86-0.16.21.ebuild b/sys-devel/dev86/dev86-0.16.21.ebuild
deleted file mode 100644
index ea917c7d3292..000000000000
--- a/sys-devel/dev86/dev86-0.16.21.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils multilib
-
-DESCRIPTION="Bruce's C compiler - Simple C compiler to generate 8086 code"
-HOMEPAGE="http://v3.sk/~lkundrak/dev86/"
-SRC_URI="http://v3.sk/~lkundrak/dev86/Dev86src-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="sys-devel/bin86"
-DEPEND="${RDEPEND}
-	dev-util/gperf"
-
-STRIP_MASK="/usr/*/bcc/lib*.a /usr/*/i386/libc.a"
-
-src_prepare() {
-	# elksemu doesn't compile under amd64
-	if use amd64; then
-		einfo "Not compiling elksemu on amd64"
-		sed -i \
-			-e 's,alt-libs elksemu,alt-libs,' \
-			-e 's,install-lib install-emu,install-lib,' \
-			makefile.in || die
-	fi
-
-	epatch "${FILESDIR}"/dev86-pic.patch
-	epatch "${FILESDIR}"/${PN}-0.16.19-fortify.patch
-	sed -i \
-		-e "s:-O2 -g:${CFLAGS}:" \
-		-e '/INEXE=/s:-s::' \
-		makefile.in || die
-	sed -i \
-		-e "s:/lib/:/$(get_libdir)/:" \
-		bcc/bcc.c || die
-	sed -i -e '/INSTALL_OPTS=/s:-s::' bin86/Makefile || die
-	sed -i -e '/install -m 755 -s/s:-s::' dis88/Makefile || die
-}
-
-src_compile() {
-	# Don't mess with CPPFLAGS as they tend to break compilation
-	# (bug #343655).
-	CPPFLAGS=""
-
-	# First `make` is also a config, so set all the path vars here
-	emake -j1 \
-		DIST="${D}" \
-		CC="$(tc-getCC)" \
-		LIBDIR="/usr/$(get_libdir)/bcc" \
-		INCLDIR="/usr/$(get_libdir)/bcc"
-
-	export PATH=${S}/bin:${PATH}
-	cd bin
-	ln -s ncc bcc
-	cd ..
-	cd bootblocks
-	ln -s ../bcc/version.h .
-	emake DIST="${D}"
-}
-
-src_install() {
-	emake -j1 install-all DIST="${D}"
-	dobin bootblocks/makeboot
-	# remove all the stuff supplied by bin86
-	cd "${D}"
-	rm usr/bin/{as,ld,nm,objdump,size}86 || die
-	rm usr/man/man1/{as,ld}86.1 || die
-	dodir /usr/share/man
-	mv usr/man usr/share/
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index a25c51008d8d..6f6ab1f66957 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -9,6 +9,5 @@ DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412
 EBUILD lld-4.0.1.ebuild 1721 BLAKE2B f3e848199052fbec33376e9630afd80c031cd729457d1e3c302d78c42a128cc7d8baa626ed294bdde19dc2ec00683a01e4e9d5d0f6d893e24a575024b9e92556 SHA512 e971195cbf8976a0bd5140c62c3c4d9a375beaf3813119342f3f8f28db9843e53dc9804cb13b6f1a49a1b7dc60cd631cd69f742faf1de56001f59230625dbef1
 EBUILD lld-5.0.0.ebuild 1349 BLAKE2B 410821548a8e388b72017eb34bb3b83fe82675d8d8082d04a49cdeb1213d00a0e1910b4a936b94971a3ffc807cde791948ca2e71ed24457c46361117ed6ea5a0 SHA512 243c72cb2e712392d9fad06b19090f276356d1f99739bec7cb65cb7eafaa98c5627ec6816872db69594c77203c2fc21bb004144161e31069604c85fc58fd8d7c
 EBUILD lld-5.0.1.ebuild 1589 BLAKE2B ce6f2b7d0b095223600a236432966cbc44d89d781f6fe20b699aeb77b859bbcdf65bab0b1ad37df63918ce95f75c018a5eb9d56605e5d56d057e062399427271 SHA512 16b397e9d580a52fa430b07788a1c73aabfdc3dec87ed8ee12807e231c9590f637966f412a0657a574476b3b27b0a952718c61de955246cc1f585ab4526d49cc
-EBUILD lld-5.0.9999.ebuild 1566 BLAKE2B eb5711dff179944d401b54d4a7eebbcd9e5156d4dfe6352f2dddca8ee253634393db40b588636974ccdb6c690774ede0aa289050b01b8515291a67749bc10ee6 SHA512 ca8239968a21a176155c666c4e6359951209ed16d32eb4423387f46f7b2a7714adcd4b8d394bb8a043eca62e871cdde96db25cba2cb4bded4a8a31cf0961eb1c
 EBUILD lld-9999.ebuild 1547 BLAKE2B 412347828e4f73c4a0c8481dc6e4e6a89421d25874131b3f95db1863d91a92af19f498b73dc3ce028c0d0b79786568d39653b14e81d1dd8a1673540de0d56d0e SHA512 63f3a8fcf6a52ca31131db36c4b6efe45bd913d44e62a9ef773ceb02f39d721e0e81149b7dc7304bb2b93f42485f184b734bdebf5243027a1822d30cf33c7278
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/lld/lld-5.0.9999.ebuild b/sys-devel/lld/lld-5.0.9999.ebuild
deleted file mode 100644
index 018ca4024705..000000000000
--- a/sys-devel/lld/lld-5.0.9999.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils git-r3 llvm python-any-r1
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lld.git
-	https://github.com/llvm-mirror/lld.git"
-EGIT_BRANCH="release_50"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="~sys-devel/llvm-${PV}"
-DEPEND="${RDEPEND}
-	test? ( $(python_gen_any_dep "~dev-python/lit-${PV}[\${PYTHON_USEDEP}]") )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-python_check_deps() {
-	has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	if use test; then
-		# needed for patched gtest
-		git-r3_fetch "https://git.llvm.org/git/llvm.git
-			https://github.com/llvm-mirror/llvm.git"
-	fi
-	git-r3_fetch
-
-	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' utils/{lit,unittest}
-	fi
-	git-r3_checkout
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=ON
-
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 72e4e348ab00..0ee1961f7f8c 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -4,6 +4,5 @@ DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412
 EBUILD llvm-common-4.0.1.ebuild 642 BLAKE2B 52922fd0d0f331670cae15a48d691db72507f97c40e87182cfb583a902d694c17d5a654b50b2870701cc74ec0bea73b9397a5b5a6ae9ecb4f328921e3cc0a617 SHA512 8a361dbe22d8352b07bc531e32a18bf6aaa0dfc752f5ef63086653f346d87771600fbcefb23186f13c0682b6a07ed6ecec2fd52b4a3d05d78b6df9af2548ea19
 EBUILD llvm-common-5.0.0.ebuild 644 BLAKE2B 5e9f29726a23575238cfccda31343001f3f1d0b5101d628379d9ab863b5447a128963f01c8f64052e7fc75b17e9ff625c8b76b48ad5afb8d026a4b1d654608b8 SHA512 036b41ba0bfe661a3970bd703a8d02afd6cebb80f7e44c0a4a8b4fde0327a72364c8175ee01c67f05a3f37d3969505706e64f929b3b8e170ce80efd1cd09a20e
 EBUILD llvm-common-5.0.1.ebuild 777 BLAKE2B 8c42d6ba3a03cbe80cfbce319fae885bbe273ef8aa4573ab4c8804a662060b99baf469764a05f7b2c29014a6ae66f44b5d4322afeaa7c7e9999c51894fda7572 SHA512 5c72567e83fe8b333cdcc59e75567666d1ca3c6a7661c06bde7a1dd579e1429ac8f730b46fc5452d65490c03044c40af10b59c479619c3fb7b4860b9385bd128
-EBUILD llvm-common-5.0.9999.ebuild 729 BLAKE2B 7a9b82a95d343bfddd56e44e7ebf44646c8049d84fbfc5daa07dca8df5267cfeea662c5d91db55f62203325f93f0d4c61099552a63bdfa622cc42e68cd592a12 SHA512 57bc9c8c2b77dc56e6b7861d5866b5b3bedc85301de18f1ae952ca291a86d51a3d93629ef9f1a271eda9042da7c8b4eacb33cd7399a220c375d619b9958c7fe6
 EBUILD llvm-common-9999.ebuild 704 BLAKE2B bfcd46a0c3754d0c5542eb1b03c8696ef355ebe34e94c98ab6a23442a88bc6b9a8aa8d2c89b18ed0ceea47bd2adcd7df67c8d201876a04ba7816257f83c53706 SHA512 4a7fd7260e93fa3b44a565c915a8be2e207085a506018b97263740851fd78dacf88e582b73d74a06aa36de2975b751c258ceb7997a5e6ee7db4d404fbed865bf
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild b/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild
deleted file mode 100644
index cc7ed2a71228..000000000000
--- a/sys-devel/llvm-common/llvm-common-5.0.9999.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit git-r3
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_50"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="!sys-devel/llvm:0"
-
-src_unpack() {
-	git-r3_fetch
-	git-r3_checkout '' '' '' utils/vim
-}
-
-src_configure() { :; }
-src_compile() { :; }
-src_test() { :; }
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r utils/vim/*/
-	# some users may find it useful
-	newdoc utils/vim/README README.vim
-	dodoc utils/vim/vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 335942b3f01c..4c5d79a0e21f 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -1,5 +1,4 @@
 AUX 4.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch 2408 BLAKE2B 92f396663629d0f1bc65833d4050f8e28044c25dec961981edac768b374c543d9084eb70ac51435554acfc5430c45035e4acae6e02f453bc679a3458979b53f3 SHA512 0424f35f12054a7e3e20d948c714979cfcf01200e8aac1cfab1b9fdd08718b4f4143a635eca9500e7ac77993ff390358cb630b8d97029cd9ec1e14c9cfaedfd2
-AUX 5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch 3055 BLAKE2B 4087d3b68bfb2023ef0dc43aaa696ed12b02c776e702e1aaa6a32b6c44f9194df7e8bb78068f03cd23165ba5ad8f9b2451a228a9b77c0b2c08757fc660eb2e00 SHA512 2493369dfc8bee58c8f92215aba9b91fb718562f9fa040c1132269e538040e9baa3c0a50e888033c3805a1aa7ce40443c6e7ff52ecc791b8c86140cd34b3f751
 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
 DIST cfe-3.4.2.src.tar.gz 10612313 BLAKE2B 6a5d9f20d181b217f3ca72b6585bd953150cc0d207a203feb24aa9cb9b2e341ac6a2e152a1c40baf2d53e5a52c4e4e86a518a329bdda39c08986b3437b04cee8 SHA512 e01fa8e312e9b3b7b3cb572ac21349161aaa50078ecfe7bded273b75db4a0c44acde524f8fdfcbeec54c61eeeb8339e9917d1f205a8fda18e34fe7ccbe89c36d
@@ -34,6 +33,7 @@ DIST llvm-3.9.1.src.tar.xz 18130436 BLAKE2B 90afd2c06e612132bbc84c29fed59abdfdae
 DIST llvm-4.0.1.src.tar.xz 21065652 BLAKE2B 6327eed2d1feb108440f22d2581d1ff86c10a10c29793538d8d899c7e2dc83d3f7b147d3fd4bcce2bd2bf57c071b08c624aeafe40a3e7a3914506e7751727e6c SHA512 16adc39b34ddb628f81b171119a8e2a0e9138b25011e803ef0b688e2fbea116fc4953d3a1b61b90a98a75e33619f81566b7cb06a9a2ea4d04ac5e0eb303a2d1d
 DIST llvm-5.0.0.src.tar.xz 23411980 BLAKE2B bc3d8b75b766c83912252b51d6b57c8151c9d83415eff7bc771923d35138ed253a788d6c8e0a384c5e78ce1a1065f10d66ef5004df163b4c3b0c6274bb3aa6b7 SHA512 e6d8fdcb5bf27bded814d02f39f69c6171bc3a512d5957c03e5ac2e231f903b7de87634b059bd5c5da670f7c3a8f7a538f6299225799f15f921857f1452f6b3a
 DIST llvm-5.0.1-manpages.tar.bz2 94004 BLAKE2B 34eb29361ad7aa881e64d1dd2992fd89ce44adafd2521284c27b6ffe7082bc7e70458204e6f34d582b704bf7c5dad93c6a6dc41fc7abc41862aab8f5ec53ed07 SHA512 3444cc8e06009f5dd2669b92af662a1049d9294c8ca0dcf45486e1dc1aaf10160860b7856d30ad70bbe5864b21d1539316e89f5237549f5653954e23baf64334
+DIST llvm-5.0.1-patchset.tar.bz2 4204 BLAKE2B e7282e84578631d88549bdf34e5a44e0294e47ef1fee29c0cb954d7afd160d4b6a0f39bb3bd53791ea53503a60eaa0ada0a512a63d696ff096dc6f21f4aecdc7 SHA512 395ea2b13008e222c034e2bdd8c2bb033b9c01e61fb89c840f009f6cddb499b317df8b061d29f40968d8f0df5540a2f4a9de31eef1de886796c8c334f37254eb
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-manpages-4.0.1.tar.bz2 87981 BLAKE2B 79ffd254ee5c6e09159c954913ef820f74107d4fcea5e3ed82592dc36af8fdfbf1e850547ba8bfc20aa9a5ecdd26c50329e6a6d558ae3aa5475a930789ce3e01 SHA512 d5b3213567c25db58ef364d272314a79c311a80fc21d98c09a5540af45a8190a38f489228663fe9a9b63bf0f2b952c460c4196a8fc8d6f221619f6e7ed2fc415
 DIST llvm-manpages-5.0.0.tar.bz2 94240 BLAKE2B 1657edefa2e839f401b7c30ba1c0cfde45bcb0fa9bcfc3ea6070bc0addc237be898c5a79e54b2120f98b2a9550ab286cfd0bc835751a4e8cc30005d4081fb9f9 SHA512 0bccfb00caa0796bed8ea4e591616e025e43d304f05589180820c17f8567fa3a1f1f76c323098ed0d0e4590765415b1c1c272a94c6e2e7544788f4088ef0ffea
@@ -44,7 +44,6 @@ EBUILD llvm-3.7.1-r3.ebuild 16958 BLAKE2B fd7a7890b0041c216fe4b21937a578b2a00da2
 EBUILD llvm-3.9.1-r1.ebuild 16507 BLAKE2B 83692ac24d5df082c1eab87ef85353a44a485332fa5720414a5965d379939e82aa6bfccb2fb513bc8c18872184d4ef99a02dc4766dad5bd555f887b2a9122589 SHA512 1234349f89c1d2b07e1918075b52f2866e56cc742d3f3da233dd8465c559c765c7cb256f1d6eb77ee61fede9be2c84bd6236c42e5672d5130f0e7730ee24de96
 EBUILD llvm-4.0.1-r1.ebuild 6761 BLAKE2B 62f83ec333027a67e3635dbde1cb324b08819fd22491591b39dd3cd57930790df2ef117b6cbce56ce2db04789773d0f3cd71d93e64bfc12d35bc7bd60f15d8d8 SHA512 d32f436e48854839f6ec146c4a1d0f44f15f3e73563c33eef370b62049142401bf6aabbf2cd96f6f550ef2e05c220cc5abbbb486b062d85b268c2885666d9fbe
 EBUILD llvm-5.0.0.ebuild 6802 BLAKE2B cdaba58a9e17e67d239c931fc7f2e93464b341772fa806fc776b2010f17f1d40251616f11222c753a2c6b7689b18dba2c1189ef242b581e1989eee4b876e8146 SHA512 35d8e14da0f5a1baa60643e3c04663eb044201665ef2ff0faf53ab98f6c5634ff5f099e11d9d3d02a0f16a051540829ee275e1099b6652f7a25469480f617dee
-EBUILD llvm-5.0.1.ebuild 6888 BLAKE2B c566e61b4c16c7cc4e2ea3c8f7f485480bea994657d910e6c937f8d95ea819078585a65cf048d3e412e4fa7352e2f640f7681efb012880312191513114bf39ed SHA512 f27f579a6030a06d6dd810447a135c1a3337372496a00dfb93eeb6238d1a6f6fa0120d0eea467092817b67925962ea34f539e27427f3f1bc71ab98587f1414ff
-EBUILD llvm-5.0.9999.ebuild 6667 BLAKE2B 05cc207eddb9088d1f85c85c4dcc6657f62eb33b05f3a2ec9116260e0431fee2019045ba554d1f14c9214cf84bfa24030fb8119e64181bbff1471dc67ae7e3c0 SHA512 166611b3896cbeb91db37851fe61939cea7a86b31e8c1f86eaf0446cfdb213b870f08e812c675edd090bc47fb3e35db8fe0e813e3fee2c266881f9f32535d7e2
+EBUILD llvm-5.0.1.ebuild 6985 BLAKE2B 60d2a1b0711f611c336343cc7f99302c3dbaad37df9a7be37cb0b92be9f6020c3795e94ea2120510af66d35b00a37e860a6777eba33846b67206a2009747d9c8 SHA512 5988422fc72edf517360123b7e383af24c10099d6f65133fda9af9e89aae6d4fdbf75ae47a88f9413ba200037935670fe1260710503d765a16dc6a0f88d19509
 EBUILD llvm-9999.ebuild 6662 BLAKE2B 1fc2fd66640cb3fd433bc355f880f8718535b5c500726cf121f70aae87708dc4068ed0c3fbecb61ab86c813d3808411d657c492e22e492518a7b3cf04a2bc953 SHA512 3abb4a1a689994902cdf8eef9bdb60214f6a5482c7cefe8ee0eacdb8e0c5d0db3c3d1b63ac04862194ca7a7de3b22f9d8db30c6f40a55c72c3b61f5b8ee76a04
 MISC metadata.xml 2747 BLAKE2B 0684b3ae235b762c8c365ac0da29d285781cb7aae25250664704385c3326c07097a6061907b1bc2417b90db39745745bfbbab887d53a7fa1024e62bcded2d0be SHA512 cbb82ddab3a19f9103ed1f72bdae2b50dd3bd906b377ff6004dc7b85e9ec8852fd9d03f7f9e7015363454b86680ec5fdb756b08bc6a7c2743669ee4ff3b4aa08
diff --git a/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch b/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
deleted file mode 100644
index 21702748893c..000000000000
--- a/sys-devel/llvm/files/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 937b23b5fffa59deb1dc342cc5602d387d84a762 Mon Sep 17 00:00:00 2001
-From: Michal Gorny <mgorny@gentoo.org>
-Date: Mon, 27 Nov 2017 22:23:09 +0000
-Subject: [PATCH] [cmake] Pass -Wl,-z,nodelete on Linux to prevent unloading
-
-Prevent unloading shared libraries on Linux when dlclose() is called.
-This is necessary since command-line option parsing API relies on
-registering the global option instances in the option parser instance
-which can be loaded in a different shared library.
-
-Given that we can't reliably remove those options when a library is
-unloaded, the parser ends up containing dangling references. Since glibc
-has relatively complex library unloading rules, some of the LLVM
-libraries can be unloaded while others (including the Support library)
-stay loaded causing quite a mayhem. To reliably prevent that, just
-forbid unloading all libraries -- it's a very bad idea anyway.
-
-While the issue arguably happens only with BUILD_SHARED_LIBS, it may
-affect any library reusing llvm::cl interface.
-
-Based on patch provided Ross Hayward on https://bugs.gentoo.org/617154.
-Previously hit by Fedora back in Feb 2016:
-https://lists.freedesktop.org/archives/mesa-dev/2016-February/107242.html
-
-Differential Revision: https://reviews.llvm.org/D40459
-
-git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@319105 91177308-0d34-0410-b5e6-96231b3b80d8
----
- cmake/modules/HandleLLVMOptions.cmake           | 8 ++++++++
- unittests/Support/DynamicLibrary/CMakeLists.txt | 7 +++++++
- 2 files changed, 15 insertions(+)
-
-diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
-index c5390371845..b5059a8a60e 100644
---- a/cmake/modules/HandleLLVMOptions.cmake
-+++ b/cmake/modules/HandleLLVMOptions.cmake
-@@ -151,6 +151,14 @@ if(NOT (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" OR WIN32 OR CYGWIN OR
-   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,defs")
- endif()
- 
-+# Pass -Wl,-z,nodelete. This makes sure our shared libraries are not unloaded
-+# by dlclose(). We need that since the CLI API relies on cross-references
-+# between global objects which became horribly broken when one of the libraries
-+# is unloaded.
-+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,nodelete")
-+endif()
-+
- 
- function(append value)
-   foreach(variable ${ARGN})
-diff --git a/unittests/Support/DynamicLibrary/CMakeLists.txt b/unittests/Support/DynamicLibrary/CMakeLists.txt
-index 9355979221a..c6201b1ad31 100644
---- a/unittests/Support/DynamicLibrary/CMakeLists.txt
-+++ b/unittests/Support/DynamicLibrary/CMakeLists.txt
-@@ -24,5 +24,12 @@ function(dynlib_add_module NAME)
-   add_dependencies(DynamicLibraryTests ${NAME})
- endfunction(dynlib_add_module)
- 
-+# Revert -Wl,-z,nodelete on this test since it relies on the file
-+# being unloaded.
-+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-+  string(REPLACE "-Wl,-z,nodelete" "" CMAKE_SHARED_LINKER_FLAGS
-+    ${CMAKE_SHARED_LINKER_FLAGS})
-+endif()
-+
- dynlib_add_module(PipSqueak)
- dynlib_add_module(SecondLib)
--- 
-2.15.1
-
diff --git a/sys-devel/llvm/llvm-5.0.1.ebuild b/sys-devel/llvm/llvm-5.0.1.ebuild
index ca00fa16d34d..07f074168c8d 100644
--- a/sys-devel/llvm/llvm-5.0.1.ebuild
+++ b/sys-devel/llvm/llvm-5.0.1.ebuild
@@ -14,6 +14,7 @@ inherit cmake-utils eapi7-ver flag-o-matic multilib-minimal \
 DESCRIPTION="Low Level Virtual Machine"
 HOMEPAGE="https://llvm.org/"
 SRC_URI="https://releases.llvm.org/${PV/_//}/${P/_/}.src.tar.xz
+	https://dev.gentoo.org/~mgorny/dist/llvm/${P}-patchset.tar.bz2
 	!doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/${P}-manpages.tar.bz2 )"
 
 # Keep in sync with CMakeLists.txt
@@ -75,9 +76,10 @@ src_prepare() {
 	# https://bugs.gentoo.org/show_bug.cgi?id=565358
 	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
 
-	# Backport the fix for dlclose() causing option parser mess
-	# e.g. https://bugs.gentoo.org/617154
-	eapply "${FILESDIR}"/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
+	# Apply the backported patches
+	eapply "${WORKDIR}/${P}-patchset"
+	# 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
 
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
diff --git a/sys-devel/llvm/llvm-5.0.9999.ebuild b/sys-devel/llvm/llvm-5.0.9999.ebuild
deleted file mode 100644
index f41a0c96c02a..000000000000
--- a/sys-devel/llvm/llvm-5.0.9999.ebuild
+++ /dev/null
@@ -1,230 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-# (needed due to CMAKE_BUILD_TYPE != Gentoo)
-CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eapi7-ver flag-o-matic git-r3 multilib-minimal \
-	pax-utils python-any-r1 toolchain-funcs
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/llvm.git
-	https://github.com/llvm-mirror/llvm.git"
-EGIT_BRANCH="release_50"
-
-# Keep in sync with CMakeLists.txt
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. ARM backend: LLVM Software Grant by ARM.
-# 3. MD5 code: public-domain.
-# 4. Tests (not installed):
-#  a. gtest: BSD.
-#  b. YAML tests: MIT.
-
-LICENSE="UoI-NCSA rc BSD public-domain
-	llvm_targets_ARM? ( LLVM-Grant )"
-SLOT="$(ver_cut 1)"
-KEYWORDS=""
-IUSE="debug doc gold libedit +libffi ncurses test
-	kernel_Darwin ${ALL_LLVM_TARGETS[*]}"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=
-	gold? ( >=sys-devel/binutils-2.22:*[cxx] )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=virtual/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )"
-# configparser-3.2 breaks the build (3.3 or none at all are fine)
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	|| ( >=sys-devel/gcc-3.0 >=sys-devel/llvm-3.5
-		( >=sys-freebsd/freebsd-lib-9.1-r10 sys-libs/libcxx )
-	)
-	|| ( >=sys-devel/binutils-2.18 >=sys-devel/binutils-apple-5.1 )
-	kernel_Darwin? ( <sys-libs/libcxx-$(ver_cut 1-3).9999 )
-	doc? ( dev-python/sphinx )
-	gold? ( sys-libs/binutils-libs )
-	libffi? ( virtual/pkgconfig )
-	!!<dev-python/configparser-3.3.0.2
-	${PYTHON_DEPS}"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="${RDEPEND}
-	!sys-devel/llvm:0"
-PDEPEND="sys-devel/llvm-common
-	gold? ( sys-devel/llvmgold )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-src_prepare() {
-	# Fix llvm-config for shared linking and sane flags
-	# https://bugs.gentoo.org/show_bug.cgi?id=565358
-	eapply "${FILESDIR}"/9999/0007-llvm-config-Clean-up-exported-values-update-for-shar.patch
-
-	# Backport the fix for dlclose() causing option parser mess
-	# e.g. https://bugs.gentoo.org/617154
-	eapply "${FILESDIR}"/5.0.1/0001-cmake-Pass-Wl-z-nodelete-on-Linux-to-prevent-unloadi.patch
-
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# User patches + QA
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${SLOT}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DWITH_POLLY=OFF # TODO
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-#	Note: go bindings have no CMake rules at the moment
-#	but let's kill the check in case they are introduced
-#	if ! multilib_is_native_abi || ! use go; then
-		mycmakeargs+=(
-			-DGO_EXECUTABLE=GO_EXECUTABLE-NOTFOUND
-		)
-#	fi
-
-	if multilib_is_native_abi; then
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=$(usex doc)
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=$(usex doc)
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use doc && mycmakeargs+=(
-			-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-			-DSPHINX_WARNINGS_AS_ERRORS=OFF
-		)
-		use gold && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		local tblgen="${EPREFIX}/usr/lib/llvm/${SLOT}/bin/llvm-tblgen"
-		[[ -x "${tblgen}" ]] \
-			|| die "${tblgen} not found or usable"
-		mycmakeargs+=(
-			-DCMAKE_CROSSCOMPILING=ON
-			-DLLVM_TABLEGEN="${tblgen}"
-		)
-	fi
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${SLOT}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED%/}"/usr/include "${ED%/}"/usr/lib/llvm/${SLOT}/include || die
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED%/}"/usr/include || die
-	mv "${ED%/}"/usr/lib/llvm/${SLOT}/include "${ED%/}"/usr/include || die
-
-	# install fuzzer libraries for clang (cmake rules were added in 6)
-	# https://bugs.gentoo.org/636840
-	into "/usr/lib/llvm/${SLOT}"
-	dolib.a "$(get_libdir)"/libLLVMFuzzer*.a
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${SLOT}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${SLOT} ))
-	cat <<-_EOF_ > "${T}/10llvm-${revord}" || die
-		PATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${SLOT}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-_EOF_
-	doenvd "${T}/10llvm-${revord}"
-
-	docompress "/usr/lib/llvm/${SLOT}/share/man"
-}