gentoo resync : 17.10.2017

16 files changed, 419 insertions, 44 deletions

diff --git a/sys-devel/autoconf-archive/Manifest b/sys-devel/autoconf-archive/Manifest
index fb2386806c80..fb68741eca4b 100644
--- a/sys-devel/autoconf-archive/Manifest
+++ b/sys-devel/autoconf-archive/Manifest
@@ -6,7 +6,7 @@ DIST autoconf-archive-2017.03.21.tar.xz 633132 SHA256 386ad455f12bdeb3a7d1928044
 DIST autoconf-archive-2017.09.28.tar.xz 645388 SHA256 5c9fb5845b38b28982a3ef12836f76b35f46799ef4a2e46b48e2bd3c6182fa01 SHA512 2aa271fdd67fa3caf20e07eb8332d88f7008eefe1df447980d42cb2104313d99947b94ffdb0f6f4b4c8156cfc73d9e0b6c27a5f133c6b73787ef641d9951be90 WHIRLPOOL ae63070d3ff990da6a568e22ab0462f21addeb1f32bd66f1cf1084ea0466ba0cdd100871d1a448b1cbe3e94f8009fd74094ff8fe99be167a9d7ece7f7c0caafd
 EBUILD autoconf-archive-2016.03.20-r1.ebuild 771 SHA256 cc9f9357496cdc936c71ab19a5dfe6ab8f91613a572df4fe3a8eb768935a1739 SHA512 3389dbf76b58e91adbfa55e13c2f2c86d6451765bed33e8eec11e6bf2c2a2a57d1b0a749530f73a55ac0df7af0aff47ca93ae97450add7641ddeceed6e4de700 WHIRLPOOL 8b16271f32e17d6af1eb4fe862868456707b6877a7088244db89be27471cdececfed000f93bdd1a369548f21697714c375d8157cdb088256c244b6e8737a726f
 EBUILD autoconf-archive-2016.09.16.ebuild 700 SHA256 c7fb972f19d9c4d7d10a8ea5889a9ba23e485dca00c81578d2377374dbfdc428 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b WHIRLPOOL c48ccda759fbbb4a9a3b0b7af0e0c5296aa6660dac0fe884ab6e53e7c7155706ff2605c13f8d0ccf4f94e1ac7031e90407ad90ca02ffd843c4effbdce95b23ee
-EBUILD autoconf-archive-2017.03.21.ebuild 700 SHA256 c7fb972f19d9c4d7d10a8ea5889a9ba23e485dca00c81578d2377374dbfdc428 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b WHIRLPOOL c48ccda759fbbb4a9a3b0b7af0e0c5296aa6660dac0fe884ab6e53e7c7155706ff2605c13f8d0ccf4f94e1ac7031e90407ad90ca02ffd843c4effbdce95b23ee
+EBUILD autoconf-archive-2017.03.21.ebuild 695 SHA256 9581eb005afeb3599616e6f91a38f545691d2fc216a4fff4c8b8afaf725dbb23 SHA512 158c2f482543e4c106b0b581a7416e72e5a99587c847f6a792e9d753bc828c6fc4bed557f13d25e3b484ade836b2fd75130d4c5ab12ec606defe2f0047e9ae73 WHIRLPOOL c98799287a740d950c3b837f67ce3b60f591027dbaa8dbecb142923778f64ac90302a0bf995cbb69aee69c839f8c63f75241818d1b9eda09a6f0603e7b4b6022
 EBUILD autoconf-archive-2017.09.28.ebuild 700 SHA256 c7fb972f19d9c4d7d10a8ea5889a9ba23e485dca00c81578d2377374dbfdc428 SHA512 fb129a0026a8799b56676f65b03042add5509ae5bb9c08c6c43b41f9e6a5f4ac9e7584c4e98d22dba41494b7201c8de61c3094ff3035ab245b3f67371720c21b WHIRLPOOL c48ccda759fbbb4a9a3b0b7af0e0c5296aa6660dac0fe884ab6e53e7c7155706ff2605c13f8d0ccf4f94e1ac7031e90407ad90ca02ffd843c4effbdce95b23ee
 MISC ChangeLog 6420 SHA256 051d38a52ee4583c6dbd85324468ff61b3e7beee2593b78f1a6d2801fc9f0bd7 SHA512 bd1be4b6f864ad2cde39aec41802aa3c1454815cb43e2e8f207e0d9074ef5d3c34f0671166c7d4efab02146fe51432cbcabca071373c1168fdd575229c64e0a4 WHIRLPOOL 0e59b74e9886df9f69a683ae80283458de362ec8765ac12e0babe7869c64d65d1bf12cdb040678c4993fa9e163895adfd310be741c4092d4ab02d7a6debe3f8f
 MISC ChangeLog-2015 12464 SHA256 f458fca2f9c58b439a222cf5292f379b06ddb0415a1830e2b49e2a6d6780a49c SHA512 2eab19d82976cf6fc308bc0301d2432cb185b800d16c9de10f5a3ec8d0ce289fba1ca0b6826a473bc267af1c5a476d29e6afeb9bd6b28031874a6c9668a350a2 WHIRLPOOL 46d27043d84b98dd33901be89990bdbe9d7892b9e7aa47dfd6bddbad2e5e1f9227a2c9409241e4687fcb71b833fe9eaad28719f5281c7e719c48eedc87d0813d
diff --git a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild b/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
index 253381968955..0af0c70e3e92 100644
--- a/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
+++ b/sys-devel/autoconf-archive/autoconf-archive-2017.03.21.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 # File collisions. #540246
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index aefdc4fa6084..2b096b57b5ba 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -18,7 +18,7 @@ EBUILD binutils-2.28.1.ebuild 296 SHA256 cadbce3ef1ca2951b99ed95c9b9650b367a8f9b
 EBUILD binutils-2.29.1-r1.ebuild 316 SHA256 c50db8418a0f6f11b6eb21ec83faac7dd9b50542328d7a272b704f1775467a0f SHA512 87a855e2fd09b2eb0ff3088c82f9890143fa28ca5d3a05bcf44e4943c0cfdb65a9645f839e805f1197afae6a4fa040bc93001ce59951d38572e095c0895bd9a1 WHIRLPOOL b67c040396d89203c116f5e3180ceed2f506a58979151818038b2067fda6a8bd1ead4ab77f34f4e8dd26ac6bae96da1f8d1e5221ff514ce7a2897529ef495166
 EBUILD binutils-2.29.1.ebuild 331 SHA256 18f1c53b5ed455c213523587462ec5776f305a5c7f11fcec0309f4ff96ed45f0 SHA512 d51153e907bbd45db7c19545e41da485932d3d51aada2240ba84297f463e324815d1e9e5cc9a7ae307787189aa3b16ec7998f7786f59c812b66ca118f32657b7 WHIRLPOOL ed9a9b32c022f2a463e1ebfecac901a1edb84e919e24fde0644f85c7c30721967d18c6b6eed2139c78f8a2a40c9c5bab635d86e9e0848d311e6048ecae75296c
 EBUILD binutils-2.29.ebuild 305 SHA256 2d264617b186701edd47738c65fdc7da40f23d6db78dbd0e303e9e0577b4c296 SHA512 323b09cda066e602447c642b65dc4aa21656052746229081ce224d9e1ce0d2bbdf18de82534ebcc8e9f12bc1cf56dc774318d11d9b2354a9c72e1fb0cadf428a WHIRLPOOL c5644b2083747a94fa69f65d915afad4953d2f087c24dafa447c293c686cf7057e7b82ef190b21eb88ddfdba198b82ee9d1996e92f67095ccd23cb7deeacb2cf
-EBUILD binutils-9999.ebuild 145 SHA256 4a8014214eb3037cfd56de512b1cd522a218f29b55cedbd5e77a0438cea2fe54 SHA512 d3246d9ab93059b760ef2f05792e9d4910fe022eb2a8e49148481dd521b282178299f29d2529be76756704b213897ffc419c99970ce7f12d661ef60f4ec55d43 WHIRLPOOL 02f7a68a1e2442511f6b1c631eca53bcb32ffc4649b146c43cfbfa5d5313a18416d88360702dc76f4e840100f301e30022267423a7b175308c1446f3c81ff341
+EBUILD binutils-9999.ebuild 10904 SHA256 50c60acf3e53b4e1a7c54fd24e5d15850f159e635c25113be2359975c5c23a79 SHA512 d2b929b494eabd09bd7c22dade89a7a88300e16df1af916705f31b9c9384a9f8bec248b3c0b545e1a3d7a7ddf30f3425be478010ede84dee1ff6e01bcfaaab3f WHIRLPOOL 68ddc412977f4b8605287c15ad15208b1734e0743b0cb98d7df2de35601a686bbfd6081ce947f374936c99e4ffee7f3a899f5cf9285618b7953ed0164e7ff0be
 MISC ChangeLog 6196 SHA256 5174ebc8f6a4f0e961c20111b1acaacb7df3b4cf8829128a8dccb1a524769871 SHA512 c43677b6e48405577f1439262d92546c10e798b4068d82c98bafef05b5f38d98c5a76b1c9eb8334ee1448ef23302c6738f4c3f1079af2e93e6991a8de5753a90 WHIRLPOOL abdc7cae810b7a59e4b0f73890ca56800f8b8873e756face845fa450e2452ebf03e47dad6753d11ebd23f0a7cf34cba45e8e4e9922af86178ce97bccee8b031f
 MISC ChangeLog-2015 86934 SHA256 b5091cb7a03ce5eb673b017c8ebe45ffdd05589017b0d032b8ef5e0a7f294e30 SHA512 f14a5a3e066373ac212f9da4f687543dcf83d474fe589911b4f64b2fcf3a92ba67b9e0310947ea9b814008cd0ca94956a277b1dcd3e0f3c783df39dae3a4ae82 WHIRLPOOL f4ae6afd88ca200e3d2785a8d4277c636b44b8182525224d47270b5b7856ed5065c71f25ab5efa0fbe3025674ba24799fc686506a9c4b1099e139a87b3ec1c0e
 MISC metadata.xml 447 SHA256 28a93b925d6b8a5a92cdca3b68739de43c38f26d1103c3b93583db3eea4a2389 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d WHIRLPOOL e36c9ed9120bafee38e36adc8517af6ab4f60c7946eb7275692984213912845770fe15fe13f38bb9ca3483513483a858a8a440ade107c1faa1ac1667ad554403
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index cf90a61b1d4c..3c7b8b3b06a1 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -1,6 +1,389 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit toolchain-binutils
+inherit eutils libtool flag-o-matic gnuconfig multilib versionator
+
+DESCRIPTION="Tools necessary to build programs"
+HOMEPAGE="https://sourceware.org/binutils/"
+LICENSE="|| ( GPL-3 LGPL-3 )"
+IUSE="cxx multitarget nls static-libs test"
+
+# Variables that can be set here:
+# PATCH_VER          - the patchset version
+#                      Default: empty, no patching
+# PATCH_BINUTILS_VER - the binutils version in the patchset name
+#                    - Default: PV
+# PATCH_DEV          - Use download URI https://dev.gentoo.org/~{PATCH_DEV}/distfiles/...
+#                      for the patchsets
+#                      Default: dilfridge :)
+
+case ${PV} in
+	9999)
+		BVER="git"
+		EGIT_REPO_URI="https://sourceware.org/git/binutils-gdb.git"
+		inherit git-r3
+		S=${WORKDIR}/binutils
+		EGIT_CHECKOUT_DIR=${S}
+		;;
+	*)
+		BVER=${PV}
+		SRC_URI="mirror://gnu/binutils/binutils-${BVER}.tar.xz"
+		;;
+esac
+SLOT="${BVER}"
+
+#
+# The Gentoo patchset
+#
+PATCH_BINUTILS_VER=${PATCH_BINUTILS_VER:-${BVER}}
+PATCH_DEV=${PATCH_DEV:-dilfridge}
+
+[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
+	https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
+
+#
+# The cross-compile logic
+#
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+is_cross() { [[ ${CHOST} != ${CTARGET} ]] ; }
+
+#
+# The dependencies
+#
+RDEPEND="
+	>=sys-devel/binutils-config-3
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}
+	test? ( dev-util/dejagnu )
+	nls? ( sys-devel/gettext )
+	sys-devel/flex
+	virtual/yacc
+"
+if is_cross ; then
+	# The build assumes the host has libiberty and such when cross-compiling
+	# its build tools.  We should probably make binutils itself build a local
+	# copy to use, but until then, be lazy.
+	DEPEND+=" >=sys-libs/binutils-libs-${PV}"
+fi
+
+MY_BUILDDIR=${WORKDIR}/build
+
+src_unpack() {
+	case ${PV} in
+		9999)
+			git-r3_src_unpack;
+			;;
+		*)
+			default
+			;;
+	esac
+	mkdir -p "${MY_BUILDDIR}"
+	[[ -d ${WORKDIR}/patch ]] && mkdir "${WORKDIR}"/patch/skip
+}
+
+src_prepare() {
+	if [[ ! -z ${PATCH_VER} ]] ; then
+		elog "Applying binutils-${PATCH_BINUTILS_VER} patchset ${PATCH_VER}"
+		eapply "${WORKDIR}/patch"/*.patch
+	fi
+
+	# This check should probably go somewhere else, like pkg_pretend.
+	if [[ ${CTARGET} == *-uclibc* ]] ; then
+		if grep -qs 'linux-gnu' "${S}"/ltconfig ; then
+			die "sorry, but this binutils doesn't yet support uClibc :("
+		fi
+	fi
+
+	# Make sure our explicit libdir paths don't get clobbered. #562460
+	sed -i \
+		-e 's:@bfdlibdir@:@libdir@:g' \
+		-e 's:@bfdincludedir@:@includedir@:g' \
+		{bfd,opcodes}/Makefile.in || die
+
+	# Fix locale issues if possible #122216
+	if [[ -e ${FILESDIR}/binutils-configure-LANG.patch ]] ; then
+		einfo "Fixing misc issues in configure files"
+		for f in $(find "${S}" -name configure -exec grep -l 'autoconf version 2.13' {} +) ; do
+			ebegin "  Updating ${f/${S}\/}"
+			patch "${f}" "${FILESDIR}"/binutils-configure-LANG.patch >& "${T}"/configure-patch.log \
+				|| eerror "Please file a bug about this"
+			eend $?
+		done
+	fi
+
+	# Fix conflicts with newer glibc #272594
+	if [[ -e libiberty/testsuite/test-demangle.c ]] ; then
+		sed -i 's:\<getline\>:get_line:g' libiberty/testsuite/test-demangle.c
+	fi
+
+	# Fix po Makefile generators
+	sed -i \
+		-e '/^datadir = /s:$(prefix)/@DATADIRNAME@:@datadir@:' \
+		-e '/^gnulocaledir = /s:$(prefix)/share:$(datadir):' \
+		*/po/Make-in || die "sed po's failed"
+
+	# Apply things from PATCHES and user dirs
+	default
+
+	# Run misc portage update scripts
+	gnuconfig_update
+	elibtoolize --portage --no-uclibc
+}
+
+# Intended for ebuilds to override to set their own versioning information.
+toolchain-binutils_bugurl() {
+	printf "https://bugs.gentoo.org/"
+}
+toolchain-binutils_pkgversion() {
+	printf "Gentoo ${BVER}"
+	[[ -n ${PATCH_VER} ]] && printf " p${PATCH_VER}"
+}
+
+src_configure() {
+	# Setup some paths
+	LIBPATH=/usr/$(get_libdir)/binutils/${CTARGET}/${BVER}
+	INCPATH=${LIBPATH}/include
+	DATAPATH=/usr/share/binutils-data/${CTARGET}/${BVER}
+	if is_cross ; then
+		BINPATH=/usr/${CHOST}/${CTARGET}/binutils-bin/${BVER}
+	else
+		BINPATH=/usr/${CTARGET}/binutils-bin/${BVER}
+	fi
+
+	# Make sure we filter $LINGUAS so that only ones that
+	# actually work make it through #42033
+	strip-linguas -u */po
+
+	# Keep things sane
+	strip-flags
+
+	local x
+	echo
+	for x in CATEGORY CBUILD CHOST CTARGET CFLAGS LDFLAGS ; do
+		einfo "$(printf '%10s' ${x}:) ${!x}"
+	done
+	echo
+
+	cd "${MY_BUILDDIR}"
+	local myconf=()
+
+	# enable gold (installed as ld.gold) and ld's plugin architecture
+	if use cxx ; then
+		myconf+=( --enable-gold )
+		myconf+=( --enable-plugins )
+	fi
+
+	if use nls ; then
+		myconf+=( --without-included-gettext )
+	else
+		myconf+=( --disable-nls )
+	fi
+
+	myconf+=( --with-system-zlib )
+
+	# For bi-arch systems, enable a 64bit bfd.  This matches
+	# the bi-arch logic in toolchain.eclass. #446946
+	# We used to do it for everyone, but it's slow on 32bit arches. #438522
+	case $(tc-arch) in
+		ppc|sparc|x86) myconf+=( --enable-64-bit-bfd ) ;;
+	esac
+
+	use multitarget && myconf+=( --enable-targets=all --enable-64-bit-bfd )
+
+	[[ -n ${CBUILD} ]] && myconf+=( --build=${CBUILD} )
+
+	is_cross && myconf+=(
+		--with-sysroot="${EPREFIX}"/usr/${CTARGET}
+		--enable-poison-system-directories
+	)
+
+	# glibc-2.3.6 lacks support for this ... so rather than force glibc-2.5+
+	# on everyone in alpha (for now), we'll just enable it when possible
+	has_version ">=${CATEGORY}/glibc-2.5" && myconf+=( --enable-secureplt )
+	has_version ">=sys-libs/glibc-2.5" && myconf+=( --enable-secureplt )
+
+	myconf+=(
+		--prefix="${EPREFIX}"/usr
+		--host=${CHOST}
+		--target=${CTARGET}
+		--datadir="${EPREFIX}"${DATAPATH}
+		--infodir="${EPREFIX}"${DATAPATH}/info
+		--mandir="${EPREFIX}"${DATAPATH}/man
+		--bindir="${EPREFIX}"${BINPATH}
+		--libdir="${EPREFIX}"${LIBPATH}
+		--libexecdir="${EPREFIX}"${LIBPATH}
+		--includedir="${EPREFIX}"${INCPATH}
+		--enable-obsolete
+		--enable-shared
+		--enable-threads
+		# Newer versions (>=2.27) offer a configure flag now.
+		--enable-relro
+		# Newer versions (>=2.24) make this an explicit option. #497268
+		--enable-install-libiberty
+		--disable-werror
+		--with-bugurl="$(toolchain-binutils_bugurl)"
+		--with-pkgversion="$(toolchain-binutils_pkgversion)"
+		$(use_enable static-libs static)
+		${EXTRA_ECONF}
+		# Disable modules that are in a combined binutils/gdb tree. #490566
+		--disable-{gdb,libdecnumber,readline,sim}
+		# Strip out broken static link flags.
+		# https://gcc.gnu.org/PR56750
+		--without-stage1-ldflags
+	)
+	echo ./configure "${myconf[@]}"
+	"${S}"/configure "${myconf[@]}" || die
+
+	# Prevent makeinfo from running in releases.  It may not always be
+	# installed, and older binutils may fail with newer texinfo.
+	# Besides, we never patch the doc files anyways, so regenerating
+	# in the first place is useless. #193364
+	# For older versions, it means we don't get any info pages at all.
+	# Oh well, tough luck. #294617
+	if [[ -e ${S}/gas/doc/as.info ]] || ! version_is_at_least 2.24 ; then
+		sed -i \
+			-e '/^MAKEINFO/s:=.*:= true:' \
+			Makefile || die
+	fi
+}
+
+src_compile() {
+	cd "${MY_BUILDDIR}"
+	emake all
+
+	# only build info pages if we user wants them, and if
+	# we have makeinfo (may not exist when we bootstrap)
+	if type -p makeinfo > /dev/null ; then
+		emake info
+	fi
+
+	# we nuke the manpages when we're left with junk
+	# (like when we bootstrap, no perl -> no manpages)
+	find . -name '*.1' -a -size 0 -delete
+}
+
+src_test() {
+	cd "${MY_BUILDDIR}"
+	emake -k check
+}
+
+src_install() {
+	local x d
+
+	cd "${MY_BUILDDIR}"
+	emake DESTDIR="${D}" tooldir="${EPREFIX}${LIBPATH}" install
+	rm -rf "${ED}"/${LIBPATH}/bin
+	use static-libs || find "${ED}" -name '*.la' -delete
+
+	# Newer versions of binutils get fancy with ${LIBPATH} #171905
+	cd "${ED}"/${LIBPATH}
+	for d in ../* ; do
+		[[ ${d} == ../${BVER} ]] && continue
+		mv ${d}/* . || die
+		rmdir ${d} || die
+	done
+
+	# Now we collect everything intp the proper SLOT-ed dirs
+	# When something is built to cross-compile, it installs into
+	# /usr/$CHOST/ by default ... we have to 'fix' that :)
+	if is_cross ; then
+		cd "${ED}"/${BINPATH}
+		for x in * ; do
+			mv ${x} ${x/${CTARGET}-}
+		done
+
+		if [[ -d ${ED}/usr/${CHOST}/${CTARGET} ]] ; then
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/include "${ED}"/${INCPATH}
+			mv "${ED}"/usr/${CHOST}/${CTARGET}/lib/* "${ED}"/${LIBPATH}/
+			rm -r "${ED}"/usr/${CHOST}/{include,lib}
+		fi
+	fi
+	insinto ${INCPATH}
+	local libiberty_headers=(
+		# Not all the libiberty headers.  See libiberty/Makefile.in:install_to_libdir.
+		demangle.h
+		dyn-string.h
+		fibheap.h
+		hashtab.h
+		libiberty.h
+		objalloc.h
+		splay-tree.h
+	)
+	doins "${libiberty_headers[@]/#/${S}/include/}" || die
+	if [[ -d ${ED}/${LIBPATH}/lib ]] ; then
+		mv "${ED}"/${LIBPATH}/lib/* "${ED}"/${LIBPATH}/
+		rm -r "${ED}"/${LIBPATH}/lib
+	fi
+
+	# Generate an env.d entry for this binutils
+	insinto /etc/env.d/binutils
+	cat <<-EOF > "${T}"/env.d
+		TARGET="${CTARGET}"
+		VER="${BVER}"
+		LIBPATH="${EPREFIX}${LIBPATH}"
+	EOF
+	newins "${T}"/env.d ${CTARGET}-${BVER}
+
+	# Handle documentation
+	if ! is_cross ; then
+		cd "${S}"
+		dodoc README
+		docinto bfd
+		dodoc bfd/ChangeLog* bfd/README bfd/PORTING bfd/TODO
+		docinto binutils
+		dodoc binutils/ChangeLog binutils/NEWS binutils/README
+		docinto gas
+		dodoc gas/ChangeLog* gas/CONTRIBUTORS gas/NEWS gas/README*
+		docinto gprof
+		dodoc gprof/ChangeLog* gprof/TEST gprof/TODO gprof/bbconv.pl
+		docinto ld
+		dodoc ld/ChangeLog* ld/README ld/NEWS ld/TODO
+		docinto libiberty
+		dodoc libiberty/ChangeLog* libiberty/README
+		docinto opcodes
+		dodoc opcodes/ChangeLog*
+	fi
+
+	# Remove shared info pages
+	rm -f "${ED}"/${DATAPATH}/info/{dir,configure.info,standards.info}
+
+	# Trim all empty dirs
+	find "${ED}" -depth -type d -exec rmdir {} + 2>/dev/null
+}
+
+pkg_postinst() {
+	# Make sure this ${CTARGET} has a binutils version selected
+	[[ -e ${EROOT}/etc/env.d/binutils/config-${CTARGET} ]] && return 0
+	binutils-config ${CTARGET}-${BVER}
+}
+
+pkg_postrm() {
+	local current_profile=$(binutils-config -c ${CTARGET})
+
+	# If no other versions exist, then uninstall for this
+	# target ... otherwise, switch to the newest version
+	# Note: only do this if this version is unmerged.  We
+	#       rerun binutils-config if this is a remerge, as
+	#       we want the mtimes on the symlinks updated (if
+	#       it is the same as the current selected profile)
+	if [[ ! -e ${EPREFIX}${BINPATH}/ld ]] && [[ ${current_profile} == ${CTARGET}-${BVER} ]] ; then
+		local choice=$(binutils-config -l | grep ${CTARGET} | awk '{print $2}')
+		choice=${choice//$'\n'/ }
+		choice=${choice/* }
+		if [[ -z ${choice} ]] ; then
+			env -i ROOT="${ROOT}" binutils-config -u ${CTARGET}
+		else
+			binutils-config ${choice}
+		fi
+	elif [[ $(CHOST=${CTARGET} binutils-config -c) == ${CTARGET}-${BVER} ]] ; then
+		binutils-config ${CTARGET}-${BVER}
+	fi
+}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index ae61ade1c436..b9231f11bfce 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -17,9 +17,9 @@ EBUILD clang-3.6.2-r100.ebuild 972 SHA256 53853dd1db09fad8943f076aaaa6f4f75347c0
 EBUILD clang-3.7.1-r100.ebuild 1136 SHA256 1d0a5208c02b286ceeaa9fad7811371f34595a53399aeec88422313a77523d17 SHA512 6cf313c813f93b93ea76d53006684912feff171d0738f6d202d996052f9eae731583ed1616fc21d8d493292028577c7e1bbeabc3aee21650653638cdba7e541d WHIRLPOOL 12d32294411e549c1843cb9c6a35077f763cabbfbfe47400d1d70d04e88f6631a36c9810459b92e5251729d082127de1c8f79f16e10e12d8b7e0a93a33345a26
 EBUILD clang-3.8.1-r100.ebuild 1127 SHA256 5b6465d519e47712e96bff101e2c8a116c68e8ed57a2601bbea103294a9c1d73 SHA512 29c01939021f9d73bcf503ec480586fba5660ddd8aa2da00fddd9a8217a63fe83a5e02111720a36192c497e7994e6f400f2e22d258eba9068c29ab4323761ffd WHIRLPOOL 0ac5cd0ea5afcb79261e4b9861c7a6ef19ad26858a65cd55f29024f0c4cb071ef9fa937013d235ee1a67d78d1c9b52270afb4940200f07da1c64289ead0a0ad1
 EBUILD clang-3.9.1-r100.ebuild 1534 SHA256 f47ffa2bc0bf2efc96e5fc8049e3b8d17a6714f196e7391461cb42474a8cb449 SHA512 84a3c016f9db31c6cbcee7620330b76af97702be3e92bd0db6e58883ccc054a792003a374cb5bf9d69b8f7c89165a2853ba495d58cd02d98524cf8025e99bcf0 WHIRLPOOL 36522b37ac7dafbd9a4011f4d9f5daf34dc2e1c2e119f6dcc2775a4e0bb75eeb4ebd6c25ce69c26620f09d9e91d908f3f048b56239ec96e291bee7ae019a110f
-EBUILD clang-4.0.1.ebuild 9523 SHA256 7adfa708e3bbe914f63ed908002a60d19468819e0b2e518de9670d887e22a3ad SHA512 e4fd88774de8671511debd039498b70b640abaaffe49509e4b905950880367560e0cd59c083d3a1ed55fe5be0a46014d7a6264a7db4213a7b29fc4325a8ac2be WHIRLPOOL 8f489c6116926d30a1590571cb7e7a32312d239f4d34327a6dc7e1f0c9b07f572e791a5a64681abcc0d42e8432dc47293d419266d22235ec36bde1fd78ee266d
-EBUILD clang-5.0.0.ebuild 9383 SHA256 349d9e228849c749b39463c12b21b05aa85db97d675b286d0b0c2b78abe28f94 SHA512 100af2724c09bd6645859adf502a4460a8ef06de555a41dd7eca82724980502bfd23225a177333c702d66c11a2565602893a956bce5922950dd013ce49bcca73 WHIRLPOOL c68a6bc993addeca02f08911444d0efec9f7a2be845cb2ac5038c9207e410b5ab370c33f50c41a946fabfb972d0f98370ebd9e20352f91a950248ddd89f7da7c
-EBUILD clang-5.0.9999.ebuild 9330 SHA256 3c81e4b9523db25b85c10e46c36f741dad8323ec509a5532ae83aae1ea76991a SHA512 114eea93b7d4dba8d664d070d9cb6fa667fba1a581930bea469cd4bdb5e0c1797ed3ef1c990305d509a687816f4441a9f5c9b09cb8fd87601fc27bf9bb486b0b WHIRLPOOL 9a6e6d1da94e8b55ced7ca132e37016d7f100f1f1b04f79a257f3a90fa84c1f9ff7668eb60097920fe1d7de77bd16780258fe923fdbaeb9b31b355b9f15b515c
+EBUILD clang-4.0.1.ebuild 9535 SHA256 9596110f320f2aa2d007cb6494e3a312879a4f62dae9d9aadc6c44ec4c8fa965 SHA512 be944895dce359ef642ba21068f168b91aeb4095e662e48eaa5c3768be27969641fc193e794dd53ad9422901efdc320bd7cb9314d0482f6701c238ef36f6dec5 WHIRLPOOL 346ff6754055ce9e394a764b4a98cb85f63e1011725cb5be52c6ce1c62050bcef0d643bbce89607ca34db8ce7368b211439954420ee40e1e9bfbe5a86c86f3de
+EBUILD clang-5.0.0.ebuild 9395 SHA256 4c51bc537acf59077ad69438467122cc978fb808045cc8f67eb59bd80de8a263 SHA512 a1e614f8a8611af3ccc34d1d79efd6ab14ae5319593b2caeb77f8f8d875f1fed03d38b7a489001857602475782012e7825872cde069cc21429a6145e4062d280 WHIRLPOOL 2fd2f3fbc8d1eb718d1d9d520e23ae48d571fafec61705002650169368d22750246fa1ed19b0670a0181c0a7409b767f184d5ca7a16144891ce6bb2dcc5eaf92
+EBUILD clang-5.0.9999.ebuild 9095 SHA256 8cd4cc1ac13fec543db64ab93df69fd0857ab2816410a80354d0882cd3525ec4 SHA512 564a721db6fc023e5a670fc5cb10467bc35c5195eedb4ba09240dcdfa1e84dd61409b086d407e855e1a03050577af6630215e40d9d28c625ee60911878358fb2 WHIRLPOOL 90791adee55818a03d9403573efa49729e20e005884daefa575a2101c29f88e8e865ae4679f4b88fc2e2bf82d14d8ff10445bc8defc38faeede2b072d21a9fb6
 EBUILD clang-9999.ebuild 8893 SHA256 0347d66fbdd794005447c8fb1875e96e90fe9a47559d372d15539620dee34bcd SHA512 84d827e53596b9a5d34185e8ca5335df8668b2cdda3f51810b24fe24a4ef509cdc09859b5fce682fdb9cc1a76c3f878b07b123ece6401038a2c4a5c2768cc8c2 WHIRLPOOL 37f8dc5ab38c0666391d9d625f94cc2d5e81399b301218d9531c9c4dbc179b2e4e6e07173b8ba0656b2159b6b827f2e1e6b8f9dfb3201447962d84650dca460a
 MISC ChangeLog 16828 SHA256 2c73f89e9b1b1f128aa6e6078ba05d23de1b926f52cf6c1658071635efa66bbb SHA512 7ea480154b342f96d8610a0becd2f48332609eba726ef33c913c65ceda9e5831566680f5b1228f705a1e7e4f78a7980519d3190aaa055c56fd346bca49ba669e WHIRLPOOL 1382f3943d43f12929b67c0a8807933b88d920ee75d01515de839689121153f99750b7de37986b0483bdcaebae3f20802f45a5c21eaa843cbf086e333a7940dd
 MISC ChangeLog-2015 22601 SHA256 3d7c0b50e6f54fa67374a5e53363c1557b36631daddb91bc8f4d4915cb0fee6f SHA512 4e9955602b26d91927115ef7f0017cf3223677cb4be6a046276a30d0b881d03045361d9a15f8a174c43f448ea09f0f0edc16e52b2718c0fdcfe328db705afc5c WHIRLPOOL 33a9711b3298387d125d3cb12cd9479d0df7d08bbb72225f9aa3aab1ecd1094026b743007c93a63241c3ba4b1ff5e0acbb25add109c6c535f8d74d6a5390f925
diff --git a/sys-devel/clang/clang-4.0.1.ebuild b/sys-devel/clang/clang-4.0.1.ebuild
index 00c6e7371aec..1c7814d237e0 100644
--- a/sys-devel/clang/clang-4.0.1.ebuild
+++ b/sys-devel/clang/clang-4.0.1.ebuild
@@ -106,7 +106,7 @@ src_prepare() {
 	cd - >/dev/null || die
 
 	# User patches
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/clang/clang-5.0.0.ebuild b/sys-devel/clang/clang-5.0.0.ebuild
index 9761120460e1..966aaf7df53d 100644
--- a/sys-devel/clang/clang-5.0.0.ebuild
+++ b/sys-devel/clang/clang-5.0.0.ebuild
@@ -101,7 +101,7 @@ src_prepare() {
 	cd - >/dev/null || die
 
 	# User patches
-	eapply_user
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/clang/clang-5.0.9999.ebuild b/sys-devel/clang/clang-5.0.9999.ebuild
index 82cff8b91407..b8bfe4b8916a 100644
--- a/sys-devel/clang/clang-5.0.9999.ebuild
+++ b/sys-devel/clang/clang-5.0.9999.ebuild
@@ -62,6 +62,11 @@ 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
@@ -101,19 +106,6 @@ src_unpack() {
 	git-r3_checkout "${EGIT_REPO_URI}" "${S}"
 }
 
-src_prepare() {
-	# fix finding compiler-rt libs
-	eapply "${FILESDIR}"/5.0.0/0001-Driver-Use-arch-type-to-find-compiler-rt-libraries-o.patch
-
-	cd tools/extra || die
-	# fix stand-alone test build for extra tools
-	eapply "${FILESDIR}"/5.0.0/extra/0002-test-Fix-clang-library-dir-in-LD_LIBRARY_PATH-For-st.patch
-	cd - >/dev/null || die
-
-	# User patches
-	eapply_user
-}
-
 multilib_src_configure() {
 	local llvm_version=$(llvm-config --version) || die
 	local clang_version=$(ver_cut 1-3 "${llvm_version}")
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 4c63b02f12f0..544e5bce5ddb 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -43,13 +43,13 @@ DIST llvm-manpages-5.0.0.tar.bz2 94240 SHA256 5082c316cf09e6c15d76f0b184745bf339
 EBUILD llvm-3.4.2-r100.ebuild 7025 SHA256 39af7cb53bdec9ab78e23a1a49faa268b3bc1feef604e0b4b499513b44a99d91 SHA512 9829abe6dbd09d786236ed4b05edbdbdd96c82af22dee5e4d4eb33fa28c80102024eeed057bc15140cf4bb646e84e8ed86e152a10df99b59f9ce84790af53593 WHIRLPOOL de2b921465bf56e090fe272dd3427911bb888b052b85745d4fd363f0a9460841bcf6f372b893e7d77d635e017688a1c407f3a2d57a665d3568d0223b99c10269
 EBUILD llvm-3.5.2-r100.ebuild 7837 SHA256 aef49f649c6389fffbedfe93d3def28ccb3fd31054adcefb705a3bbef4da3018 SHA512 3753dab4281fa0fd5061a9b4231e6fceb567bf40ac89f3bc9b2f52164e21e1b6283d3e6bb48b72dc8dfb0c21a7567ef0661d1a820943c032bb3a6ebdff59c5c9 WHIRLPOOL d2e321e96a47335e02b72483e4ede94df63166fbfe851b7259043f0d23c48e45b212513abadeea8f4a52d43e99ab4e899b4aaaaad0348e406daa5300a3f7a505
 EBUILD llvm-3.6.2-r100.ebuild 7982 SHA256 966845070ac04a74c846935bf39c5fad48db47935a441420e0b9d1e15a6bbba2 SHA512 4a1673e289d67385d2971f367251e1e301e30be59d8931f2c73ed9ce6708fee0c993a11a243f134101f5e2fffb662cad09173791ad80a11e052c073ee6f48419 WHIRLPOOL 255219455c07ec065d9c23635929129a3281cde6decda7a87c0527d869f7b84ac1f2bd377e7320b87deaf544b21f26f41f7b219d3bb684207adf8020f2642159
-EBUILD llvm-3.7.1-r3.ebuild 16941 SHA256 4d4b12a9349082d0815fb802a9da38b344d71fa61f190ae7d0ee02c504c960d7 SHA512 5ca52835db5c31f58a98e642f0eadd411645ccf51780b45c752344c8d77e782b488b6043d1b932040458d9378981762ad4be81497fb34d8807dc6f0dd82a1857 WHIRLPOOL 6da5da9e61c14a9cef0d9f2173004bf2b9be7437fdbee43698b28e21d3b347c20dca9a87da274b7163d3ecb9c95c9e318b4da23958d27f36d42af9e38d3aeed2
-EBUILD llvm-3.8.1-r2.ebuild 17467 SHA256 1f81cc00e3aba219f33bfc599bec993db2c65c7e4f742ea29cf57ac1ffded638 SHA512 06422cb15fd1616c66127669bdaf9710c9bf81b5ddba850b99641b9921f732e6665bcb42dfff300e69df263686d48abe02b23bb5b1c8c22d525703d9ae849407 WHIRLPOOL 12d8eae00b3d20635470720169eb38c63490bfda60d2cbbb0b569079b71c4f33ac411916ba434865a985a0f10ebb08e435fd64d2aa61de33af3c45b6db1a0080
-EBUILD llvm-3.9.1-r1.ebuild 16490 SHA256 b2028283bab2b9ead67b4bb38fc45e8c301c2b101bc97148974a1b9e70726122 SHA512 7756549475e656155e7631c724b2f08d3c51c45127d2ae1f6f5eca9f9bd42107e8c2b90b3a002a944acc3f28365ac7058ad68698d1d91f11ed541b511c487e2d WHIRLPOOL 4bb34aafe2bc1761cb55db53db5c4fdae11bdc54cd6599857328d9cbfcef8a4e5f233391d3e2d63140ec643fd3dc6573eeec8cbc88000c0c072c52bc11fa00ea
-EBUILD llvm-4.0.1.ebuild 6794 SHA256 56f1d0ac2a81b238a6a335078fafc36e0e0317987b69145171f04c6956026e10 SHA512 ed7115ba42a53826fa60486ae25c9086697dae235bf2c448f34e925da17678769af0087ad8cf894fca68e74518f311a003eae3c0b8678a5056f00641f29b3ce5 WHIRLPOOL ea5b62bb4c834edb966a2e9a3f18d022e7738ee401aefcb77e57eb1d9db9972c07813b9a6f3619cb93b34a580e97d6f7e32af0d98ade95ee3c6c7c232d655e1d
-EBUILD llvm-5.0.0.ebuild 6786 SHA256 f28928961ccded2fe72ffa9f6f1c50a7c34afb6c0300b6813bfea7698ddc0621 SHA512 c965d5c7569677c5c46393011a38baa3377596744c8b814152fb1b293751a56d57fceb2dd1b4e61e5e6ddcda006c164e19a1957fc89835e1f98035c47af6ce49 WHIRLPOOL 59930261c8b46bb5db7f3f6a9d9959563a00b9bf1b42b75e7bfd12f780c84be6273f206f98e7f3581f03e5eb1ae430fb424de8f1619f209eb75ab616222f2442
-EBUILD llvm-5.0.9999.ebuild 6496 SHA256 f866b08ccddc189ace8d3e5bd4f070b9f6ea38fcfb10007b1f9415b9b67e3ffb SHA512 dfd4cc2c3fdd69a92bf4096095aaaecc1878ac474cad553db34fb421ebc9fdf5f87b9b18c2bb2cd1275a875c6dd13caea7dc016507f470959c74f53a572aa7a7 WHIRLPOOL 245c343c7072eff23c7c2c4e2c4e06328ab5353e254be630d5b583b7e102127831a923658686c876c64b32bad268575f1738c5e76fb97636ee929639e5c2c399
-EBUILD llvm-9999.ebuild 6833 SHA256 bfa3c3d891d755a4bc0ecdf2db5b6076be2762c0781679fd99658afc5814affc SHA512 112c5d35a525bb08cfd60f9b92023bc7b7d391c50c8b5ad84df8c7564814b6c3915826d345838e0ede41288cdc000ae268411666c8ac0a9f45a47d78bd378136 WHIRLPOOL 0f87be73213b480a02f384637b2e6db3578fec8d26a49935baca77ca4a929a9347c4c6bd47031181ea8091d93da0ee4d9ad3f222f7bfb0c34df71fa2b6d4be4a
+EBUILD llvm-3.7.1-r3.ebuild 16958 SHA256 6144ca998b0b3d0cc660a7de5b84b4eec2670d5c38a751cff2fc1c05346f06fd SHA512 5e1824bb8e24faa592cdade50282c96a77bdc8574c0afee3984ab536d6a1c575babcc458c22acdc526c50838d20ce7fe7c4dff3d4cd7fcb2bcb11b2e7a2a3033 WHIRLPOOL 9c0e65146823832de026da18bd813eb54b7585f5963f203eb25d4a95261005c485221f547c4256f756a5847fd3796f52802af6bccb6a1c7a1f82e1bb287e79ec
+EBUILD llvm-3.8.1-r2.ebuild 17484 SHA256 4c7451d143a18109028b86faf64296564c7d8b53891932cea2a94fb988f58647 SHA512 657009e71fb5d0c8ea1e61b62176f9c7e3f9b4e935c76a1c9136742771fc938420178dc6c724f3bfd224c67f88c816fa85fb8af1bdfc46daed014a92c3660e50 WHIRLPOOL c1c489e8ec9d4dede65374aabb8a22c2008364ad846a6420689d24444c6cce4bafeb25f8ad3253b6a51a4bb6eda57a6b94cbf7519ef9ca2cf6963cd2e0695aed
+EBUILD llvm-3.9.1-r1.ebuild 16507 SHA256 f49dd0e5e6dc2b5fe9ec58cef90bb52e9c92b2d6df637ceb4b6159209c1d6d7a SHA512 1234349f89c1d2b07e1918075b52f2866e56cc742d3f3da233dd8465c559c765c7cb256f1d6eb77ee61fede9be2c84bd6236c42e5672d5130f0e7730ee24de96 WHIRLPOOL 0427a95a6fd09baf8a9c79c07c8cb71e3cda74d01f294fccc13e2da2e805736799fac5ddc4ccfdda6c80cd69936d2f866f72604f4473333058afcd8d8f71ed8b
+EBUILD llvm-4.0.1.ebuild 6811 SHA256 1d711db507b63ca34a01eee95b12e83165d38826db185c1c1d442f12003243b3 SHA512 6639e96db8a3b4bcc28dd35ffb786c133e824867df47a1e69cdad157f1ed8c51408f4ed01dfce688a697a0ba559cc103db20d8f561bc4eddac95e828ab555a45 WHIRLPOOL 023d13935882e369d38244e005e20231ebad5867cba426b090f2a809928e74c33e9451e4c7a4832732699abb4a36a24c1dbabddf515e9fde6ede5240625322c3
+EBUILD llvm-5.0.0.ebuild 6803 SHA256 c015d8c4182ac771588253f9ec7e4ec9d66cd7dde7808c6504fc36c2c7793e21 SHA512 0dd78bdc302f0c5132f66d36dce91f0562a2c0284e5b7bc6e3cdebc6c632378ecf7ea23ee348b39b8bcdc074c502a2824094c4b9ac754e379c7a51e3c14623ee WHIRLPOOL cc5dea7621779ce777bf89d401a397b6783914993154020ce27c11b76096e828f185b3ee14fdfcc8de56aa2adc22fdc29b88bf13759a15f301c19ab2a919abaa
+EBUILD llvm-5.0.9999.ebuild 6513 SHA256 01c9873f1628df1b355c57439472a0a4ca1d1033349320a69411df93e0c5f025 SHA512 78245f0d60a6f5c2b1984e502b3cd76bf9f3dc65a53654b2541f58c4168c71c72217bc23f3d71ec937f8e829c808b67bcb70e5465a5072725679f5d78f3e216d WHIRLPOOL eb198551534ba84d9e3e98b2d6bb09c4595e8515a872557a139a456e4a81d947ade706021ec9de5387ab3901dd459704ffeed2592544d6a7e031ea1c6bae9897
+EBUILD llvm-9999.ebuild 6850 SHA256 e6e15f0b63b9c68fc3c70644c14a30ba40df4c2b071778ea5321ec51662662f6 SHA512 7390732991cd0e018534336bbff4671c9a7fce23c27b3c69042fbfa9f5f7dc0b1385523447bc29493023a69b55093ae86fd0d53740fefb309441a6152b535359 WHIRLPOOL a4982d23f1f12e30a0e52eeadb733feeba087db6b8bae5b4c126d6058a713bd1af0ebc1a291aad762a9bbd1c73ea9e365ade70d220b8d340669635dc76776304
 MISC ChangeLog 44039 SHA256 8baec74338dcf46c8f9e7c7506741bd786c17061a6ee8b0a0b0c4578dfc01365 SHA512 73a2efe8a3e9de1e3333aff6d914ad055294262888c4460ed470e08a5f3a7b9e160448b4835c803fd92c704e4832f9bc91122038c8c36f5f947fd62b6e48e7b8 WHIRLPOOL 7157a12efb77e2e4b34ee3cd7c54dcbfa789cb442dc2cee45c1c595ed3d64a6ba74e9a8b6651e32136accb98b8da6f284a00f178c8f3bb3f22801c6b190145d1
 MISC ChangeLog-2015 43796 SHA256 ecefaa7b76b23b8a297c152b9a997690e4421ceae10191fe8f32728529efafd3 SHA512 2dc035d9ea0ba8bb2f3db1242ca2f92e156f869d1b047f2cc306f8a8e85a6e30ead5734d0a85fd34bb04a5f405f3b3a4e8a9ade18878c3e7280b38855df34aca WHIRLPOOL cfd7e1f53f6a8d61bb2e3fe7386d08e9b519e9c74b736de38616ee6057ee86c53ffa36377dc6e7da2142b688e8877ae6da7e869d9f3a54bfbf4b756024674bf7
 MISC metadata.xml 2755 SHA256 8f607ddf2ddd552822cf5e5ff134bdd76d40fb04e29279b741664b2e110bcbf5 SHA512 69ab0854bb2cbbbea8b4a19510bf3c0505558403974f55f3ee74882880b6259f574b6750f122dc9dcd7fc0da246bde960f6a9ffc652ee0a5e1823c24276cc6d7 WHIRLPOOL de86a991cda215c813f6867a087fbe1344134f02ea1bb20f387c5f57f3287f7d2c05a3987be7090bdcbc118dc9b1f67e7fb092e123169ac49b632496116e92a7
diff --git a/sys-devel/llvm/llvm-3.7.1-r3.ebuild b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
index a443825a626c..89214c8b5379 100644
--- a/sys-devel/llvm/llvm-3.7.1-r3.ebuild
+++ b/sys-devel/llvm/llvm-3.7.1-r3.ebuild
@@ -257,8 +257,8 @@ src_prepare() {
 		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)
diff --git a/sys-devel/llvm/llvm-3.8.1-r2.ebuild b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
index e6e60425a190..d0c0910eaf9e 100644
--- a/sys-devel/llvm/llvm-3.8.1-r2.ebuild
+++ b/sys-devel/llvm/llvm-3.8.1-r2.ebuild
@@ -262,8 +262,8 @@ src_prepare() {
 		eapply "${WORKDIR}/${P}-patchset"/lldb/six.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)
diff --git a/sys-devel/llvm/llvm-3.9.1-r1.ebuild b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
index 11188e4e124b..76552025bb21 100644
--- a/sys-devel/llvm/llvm-3.9.1-r1.ebuild
+++ b/sys-devel/llvm/llvm-3.9.1-r1.ebuild
@@ -251,8 +251,8 @@ src_prepare() {
 		eapply "${WORKDIR}/${P}-patchset"/lldb/six.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)
diff --git a/sys-devel/llvm/llvm-4.0.1.ebuild b/sys-devel/llvm/llvm-4.0.1.ebuild
index 0c5bec512cce..4e3e2dcbed0e 100644
--- a/sys-devel/llvm/llvm-4.0.1.ebuild
+++ b/sys-devel/llvm/llvm-4.0.1.ebuild
@@ -87,8 +87,8 @@ src_prepare() {
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
-	# User patches
-	eapply_user
+	# User patches + QA
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/llvm/llvm-5.0.0.ebuild b/sys-devel/llvm/llvm-5.0.0.ebuild
index 355123205952..d699c29c5be3 100644
--- a/sys-devel/llvm/llvm-5.0.0.ebuild
+++ b/sys-devel/llvm/llvm-5.0.0.ebuild
@@ -84,8 +84,8 @@ src_prepare() {
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
-	# User patches
-	eapply_user
+	# User patches + QA
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/llvm/llvm-5.0.9999.ebuild b/sys-devel/llvm/llvm-5.0.9999.ebuild
index 14fb539b01c5..9d4b6f4c4e4f 100644
--- a/sys-devel/llvm/llvm-5.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-5.0.9999.ebuild
@@ -84,8 +84,8 @@ src_prepare() {
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
-	# User patches
-	eapply_user
+	# User patches + QA
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {
diff --git a/sys-devel/llvm/llvm-9999.ebuild b/sys-devel/llvm/llvm-9999.ebuild
index e86690a206c7..64f66a7d6c0a 100644
--- a/sys-devel/llvm/llvm-9999.ebuild
+++ b/sys-devel/llvm/llvm-9999.ebuild
@@ -86,8 +86,8 @@ src_prepare() {
 	# disable use of SDK on OSX, bug #568758
 	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
 
-	# User patches
-	eapply_user
+	# User patches + QA
+	cmake-utils_src_prepare
 }
 
 multilib_src_configure() {