gentoo resync : 04.01.2018

64 files changed, 175 insertions, 176 deletions

diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f0c0316d1a7f..e1349449beb8 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.59-r7 b/metadata/md5-cache/sys-devel/autoconf-2.59-r7
deleted file mode 100644
index 67f25b4b6ff5..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.59-r7
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND==sys-devel/m4-1.4* dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND==sys-devel/m4-1.4* dev-lang/perl !~sys-devel/autoconf-2.59:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.59
-SRC_URI=mirror://gnu/autoconf/autoconf-2.59.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=66160ae1d9b90cd5b0b113f70c9c75ee
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.61-r2 b/metadata/md5-cache/sys-devel/autoconf-2.61-r2
deleted file mode 100644
index b025f07b20b6..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.61-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl !~sys-devel/autoconf-2.61:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.61
-SRC_URI=mirror://gnu/autoconf/autoconf-2.61.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=97acc7b19ffcaa0932378c331fe8518e
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.62-r1 b/metadata/md5-cache/sys-devel/autoconf-2.62-r1
deleted file mode 100644
index cee4b6f14773..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.62-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl !~sys-devel/autoconf-2.62:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.62
-SRC_URI=mirror://gnu/autoconf/autoconf-2.62.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=07fac91c9ff48bba32cf9b8177bf4bb7
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.63-r1 b/metadata/md5-cache/sys-devel/autoconf-2.63-r1
deleted file mode 100644
index c466c485cb1c..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.63-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl !~sys-devel/autoconf-2.63:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.63
-SRC_URI=mirror://gnu/autoconf/autoconf-2.63.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=be4ffa41cdc21766ad2f2b8b3bcd3254
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.65-r1 b/metadata/md5-cache/sys-devel/autoconf-2.65-r1
deleted file mode 100644
index 35db90666f8b..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.65-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl !~sys-devel/autoconf-2.65:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.65
-SRC_URI=mirror://gnu/autoconf/autoconf-2.65.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7648c3811a455257d580ecfda6f53636
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.67 b/metadata/md5-cache/sys-devel/autoconf-2.67
deleted file mode 100644
index 984e30716e04..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.67
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl !~sys-devel/autoconf-2.67:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.67
-SRC_URI=mirror://gnu/autoconf/autoconf-2.67.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b2f61df0e3e1d81ed2c100b2f391c826
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.68 b/metadata/md5-cache/sys-devel/autoconf-2.68
deleted file mode 100644
index 5ae15153d36f..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.68
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=sys-devel/m4-1.4.6 dev-lang/perl !~sys-devel/autoconf-2.68:2.5 >=sys-devel/autoconf-wrapper-13
-SLOT=2.68
-SRC_URI=mirror://gnu/autoconf/autoconf-2.68.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b2f61df0e3e1d81ed2c100b2f391c826
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.69-r4 b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
index 22da3884bd95..b4b982904530 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69-r4
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.69:2.5 >=sys-devel/autoconf-wrapper-13
 SLOT=2.69
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=25628233a5c661952b2949fea9c04162
+_md5_=bd39956691992bd426f103e300e3ecca
diff --git a/metadata/md5-cache/sys-devel/bc-1.06.95-r2 b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
index 45868ee8b48d..555cdff72468 100644
--- a/metadata/md5-cache/sys-devel/bc-1.06.95-r2
+++ b/metadata/md5-cache/sys-devel/bc-1.06.95-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure prepare
-DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-devel/flex
+DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-devel/flex virtual/yacc
 DESCRIPTION=Handy console-based calculator utility
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/bc/bc.html
@@ -10,4 +10,4 @@ RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/re
 SLOT=0
 SRC_URI=mirror://gnu-alpha/bc/bc-1.06.95.tar.bz2 mirror://gnu/bc/bc-1.06.95.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c07058f8ba6f9e6c86363f53ae7adddb
+_md5_=4cfc91fd1c1c0694a40f265c18891a2c
diff --git a/metadata/md5-cache/sys-devel/bc-1.07.1-r1 b/metadata/md5-cache/sys-devel/bc-1.07.1-r1
index c707c9c04348..372b2da25eef 100644
--- a/metadata/md5-cache/sys-devel/bc-1.07.1-r1
+++ b/metadata/md5-cache/sys-devel/bc-1.07.1-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure
-DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-apps/ed sys-devel/flex
+DEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/readline-4.1:0= >=sys-libs/ncurses-5.2:= ) sys-apps/ed sys-devel/flex virtual/yacc
 DESCRIPTION=Handy console-based calculator utility
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/bc/bc.html
@@ -10,4 +10,4 @@ RDEPEND=!readline? ( libedit? ( dev-libs/libedit:= ) ) readline? ( >=sys-libs/re
 SLOT=0
 SRC_URI=mirror://gnu/bc/bc-1.07.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0e185f1a3ce65c59310b185f3244ff53
+_md5_=38df0107b4b75691ad4444b0aab66444
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-3.2 b/metadata/md5-cache/sys-devel/binutils-apple-3.2
new file mode 100644
index 000000000000..c89ad7c013ad
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/binutils-apple-3.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=sys-devel/binutils-config test? ( >=dev-lang/perl-5.8.8 )
+DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 3.2
+EAPI=6
+HOMEPAGE=http://www.opensource.apple.com/darwinsource/
+IUSE=test
+KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
+LICENSE=APSL-2
+RDEPEND=sys-devel/binutils-config
+RESTRICT=test
+SLOT=3
+SRC_URI=https://opensource.apple.com/tarballs/ld64/ld64-85.2.1.tar.gz https://opensource.apple.com/tarballs/cctools/cctools-750.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-LP64-patches-1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-3.2-r0.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a7a7a6315d9a30ece89d3f2d257242f1
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2 b/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
index c97e080bb582..19e957fc765c 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-4.3-r2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm )
+DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 4.3
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm )
+RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* )
 SLOT=4
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-128.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-822.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-30.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-195.6.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=709ab081186e03b16bf49eca0f190b16
+_md5_=e307d67f8b3ad6ab93e3e821e26b7dd6
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
index 2096728df24d..7b348f2d7c81 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-5.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm )
+DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* ) libcxx? ( sys-devel/llvm:* )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 5.1
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx )
+RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx )
 SLOT=5
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-236.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-855.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=07f7a2327e817b2bfcfd901012f407c4
+_md5_=ca2e6e936c1ca47419918306a8c090b2
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
index 2c2340abba44..034cc726d7bd 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-6.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm )
+DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* ) libcxx? ( sys-devel/llvm:* )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 6.1
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx )
+RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx )
 SLOT=6
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-241.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-862.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c4fd074624f30dacd161f2ea7b4f6e33
+_md5_=c6ca5b51913644bfb3dc25b2c600891c
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1 b/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
index d11cda91a284..64d0813565f7 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-6.3-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm ) libcxx? ( sys-devel/llvm )
+DEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx ) test? ( >=dev-lang/perl-5.8.8 ) || ( >=sys-devel/gcc-apple-4.2.1 sys-devel/llvm:* ) libcxx? ( sys-devel/llvm:* )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 6.3
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test libcxx multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm ) libcxx? ( sys-libs/libcxx )
+RDEPEND=sys-devel/binutils-config lto? ( sys-devel/llvm:* ) libcxx? ( sys-libs/libcxx )
 SLOT=6
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-242.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-870.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-353.2.1.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5a801b9e1c1e6c07e2528f6c42f7129c
+_md5_=a95dbe4c5ef3d527d3e2cb3aa6e791dc
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.0 b/metadata/md5-cache/sys-devel/binutils-apple-7.0
index c60552546ae7..b19ab238f58c 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.0
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.0
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.5.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.14.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d3375ec04ba26224e01f6b296f0739a9
+_md5_=90b8458421978e8722cbc85f8082529f
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
index 4317f006270d..2aace455b9de 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.0-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.0
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.3.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.5.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.14.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e3750a806d0be3a1d003eb5b6b4c9cef
+_md5_=7ab263e17c4ba28049aacc823e19c8f9
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.1 b/metadata/md5-cache/sys-devel/binutils-apple-7.1
index bce873cdb565..2cea8d8175ec 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.1
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.6.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.7.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.17.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=2972c7f3341372af42a94013b462ec5e
+_md5_=b2810083c77fac29e7ccc3a6e53a00b1
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
index 8e8080b5ed12..0411d4b38737 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.1
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.6.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.7.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.17.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=cc092df1b5d715bf90e93898dc992da6
+_md5_=2656c85ce8a91e299df8a4cc4ff465ba
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.2 b/metadata/md5-cache/sys-devel/binutils-apple-7.2
index 951c7f35298b..2d2f3372e042 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.2
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.2
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config app-arch/xar sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.8.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c936c9482d6065d2ca4afa77dc8fe8b3
+_md5_=a9a554dd5831e4cf8124d9badc7cc7ea
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1 b/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
index fdc5be1236d9..49a103254824 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.2-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.2
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-253.9.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-877.8.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0949231f66419b45b861b7549bca4f74
+_md5_=e52df8152b04172bcb1e8cff0253d0b3
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.3 b/metadata/md5-cache/sys-devel/binutils-apple-7.3
index 1c3d335f8e2f..4903bf2caf26 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.3
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.3
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.3
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-264.3.101.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-886.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r0.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ae470ab68a933161e5c7e6dc57fe04e9
+_md5_=4c29fa9a2df065581b8edb9e07576178
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-7.3.1 b/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
index 747bf42cc6a4..09fbb39465eb 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-7.3.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 7.3.1
 EAPI=5
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto test multitarget
 KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=7
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-264.3.102.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-886.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-360.18.tar.gz http://www.opensource.apple.com/tarballs/libunwind/libunwind-35.3.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.1-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-6.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.2-r0.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r1.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=59dc940184f28b54a12ea964d7ccc420
+_md5_=6f3a6a0e104c7910468a553d41342a24
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.1 b/metadata/md5-cache/sys-devel/binutils-apple-8.1
index 8537a6a9b18e..a44843453e03 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 8.1
 EAPI=6
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto tapi classic test
 KEYWORDS=~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.1.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9eb99b27fbea779f6060428dd26713d7
+_md5_=89e49ad662607da746eacf01c0324d25
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1
index 39627d2f16dd..bfa87ee7d1ff 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 8.2.1
 EAPI=6
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto tapi classic test
 KEYWORDS=~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.0-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1888df9edaf83192548a6f2daeaaca8c
+_md5_=18b5c1a0e6627a2a1179266d620789e6
diff --git a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1 b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
index b5b5886e2f3f..b19e7d75f0e8 100644
--- a/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-apple-8.2.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
+DEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx test? ( >=dev-lang/perl-5.8.8 )
 DESCRIPTION=Darwin assembler as(1) and static linker ld(1), Xcode Tools 8.2.1
 EAPI=6
 HOMEPAGE=http://www.opensource.apple.com/darwinsource/
 IUSE=lto tapi classic test
 KEYWORDS=~x64-macos ~x86-macos
 LICENSE=APSL-2
-RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm sys-libs/libcxx
+RDEPEND=sys-devel/binutils-config lto? ( app-arch/xar ) tapi? ( sys-libs/tapi ) sys-devel/llvm:* sys-libs/libcxx
 SLOT=8
 SRC_URI=http://www.opensource.apple.com/tarballs/ld64/ld64-274.2.tar.gz http://www.opensource.apple.com/tarballs/cctools/cctools-895.tar.gz http://www.opensource.apple.com/tarballs/dyld/dyld-421.2.tar.gz https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-4.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-5.1-r2.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-7.3-r1.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/binutils-apple-patches-8.2-r1.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d6d1777ec0aa9da8a117e7a95485c718
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3d669ebb509bce2c8ccbeb1ad711e6d9
diff --git a/metadata/md5-cache/sys-devel/clang-3.4.2-r100 b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
index 74cb06ddb2f2..e1471cd2b93f 100644
--- a/metadata/md5-cache/sys-devel/clang-3.4.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.4.2-r100
@@ -7,5 +7,5 @@ KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.4.2[clang(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/3.4
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=a61328beb79e89d572b0c10608098c7c
diff --git a/metadata/md5-cache/sys-devel/clang-3.5.2-r100 b/metadata/md5-cache/sys-devel/clang-3.5.2-r100
index 9a47990ae95f..e8145c17c5f4 100644
--- a/metadata/md5-cache/sys-devel/clang-3.5.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.5.2-r100
@@ -7,5 +7,5 @@ KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.5.2[clang(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/3.5
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=2f4fe77d06534e24c7437e49b3a899f9
diff --git a/metadata/md5-cache/sys-devel/clang-3.6.2-r100 b/metadata/md5-cache/sys-devel/clang-3.6.2-r100
index 1bb406fd0bc2..b83d602c18cc 100644
--- a/metadata/md5-cache/sys-devel/clang-3.6.2-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.6.2-r100
@@ -7,5 +7,5 @@ KEYWORDS=~ppc-macos ~x64-macos ~x86-macos
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.6.2[clang(-),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/3.6
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=d3f085b21567722d4a7aa6a05434e29d
diff --git a/metadata/md5-cache/sys-devel/clang-3.7.1-r100 b/metadata/md5-cache/sys-devel/clang-3.7.1-r100
index a9d91db7a333..eaa0ba7733db 100644
--- a/metadata/md5-cache/sys-devel/clang-3.7.1-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.7.1-r100
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.7.1[clang(-),debug=,multitarget?,python?,static-analyzer?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/3.7
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=a934a0ed4cee33319d33908c65d046f0
diff --git a/metadata/md5-cache/sys-devel/clang-3.9.1-r100 b/metadata/md5-cache/sys-devel/clang-3.9.1-r100
index 5cdf21dfbe7f..a48b2a46f25e 100644
--- a/metadata/md5-cache/sys-devel/clang-3.9.1-r100
+++ b/metadata/md5-cache/sys-devel/clang-3.9.1-r100
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-3.9.1[clang(-),debug=,python?,static-analyzer?,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/3.9.1
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=0f0bb7e1272c5f2e2028f7b050a85a1b
diff --git a/metadata/md5-cache/sys-devel/clang-4.0.1 b/metadata/md5-cache/sys-devel/clang-4.0.1
index 968d7c5481dc..901c1bd94dc9 100644
--- a/metadata/md5-cache/sys-devel/clang-4.0.1
+++ b/metadata/md5-cache/sys-devel/clang-4.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-4.0.1:4=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/cfe-4.0.1.src.tar.xz https://releases.llvm.org/4.0.1/clang-tools-extra-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 ) test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ced87766bf4c1ed37cd147c280daa8ff
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.0 b/metadata/md5-cache/sys-devel/clang-5.0.0
index b638f8366608..828bcf10d47e 100644
--- a/metadata/md5-cache/sys-devel/clang-5.0.0
+++ b/metadata/md5-cache/sys-devel/clang-5.0.0
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-5.0.0:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.0/cfe-5.0.0.src.tar.xz https://releases.llvm.org/5.0.0/clang-tools-extra-5.0.0.src.tar.xz test? ( https://releases.llvm.org/5.0.0/llvm-5.0.0.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-5.0.0.tar.bz2 )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f5b4b69c978814452439a969f9eb0bbb
diff --git a/metadata/md5-cache/sys-devel/clang-5.0.1 b/metadata/md5-cache/sys-devel/clang-5.0.1
index 4b8b19582f69..183d6c067787 100644
--- a/metadata/md5-cache/sys-devel/clang-5.0.1
+++ b/metadata/md5-cache/sys-devel/clang-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=~sys-devel/llvm-5.0.1:5=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGP
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.1/cfe-5.0.1.src.tar.xz https://releases.llvm.org/5.0.1/clang-tools-extra-5.0.1.src.tar.xz test? ( https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71f22ec4558d5deac1a8e5c8ab00e39b
diff --git a/metadata/md5-cache/sys-devel/clang-6.0.9999 b/metadata/md5-cache/sys-devel/clang-6.0.9999
new file mode 100644
index 000000000000..2d8735c93a8b
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-6.0.9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=~sys-devel/llvm-6.0.9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=C language family frontend for LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+LICENSE=UoI-NCSA
+PDEPEND=~sys-devel/clang-runtime-6.0.9999 default-compiler-rt? ( =sys-libs/compiler-rt-6.0.9999* ) default-libcxx? ( sys-libs/libcxx )
+RDEPEND=~sys-devel/llvm-6.0.9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
+RESTRICT=!test? ( test )
+SLOT=6
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4ae422a29c7ac59693708cd1a3413544
diff --git a/metadata/md5-cache/sys-devel/clang-9999 b/metadata/md5-cache/sys-devel/clang-9999
index ed22e8a23786..df560c937421 100644
--- a/metadata/md5-cache/sys-devel/clang-9999
+++ b/metadata/md5-cache/sys-devel/clang-9999
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DEPEND=~sys-devel/llvm-9999:7=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( dev-python/sphinx ) xml? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=C language family frontend for LLVM
 EAPI=6
 HOMEPAGE=https://llvm.org/
 IUSE=debug default-compiler-rt default-libcxx doc +static-analyzer test xml z3 kernel_FreeBSD llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
 LICENSE=UoI-NCSA
 PDEPEND=~sys-devel/clang-runtime-9999 default-compiler-rt? ( =sys-libs/compiler-rt-9999* ) default-libcxx? ( sys-libs/libcxx )
-RDEPEND=~sys-devel/llvm-9999:6=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
+RDEPEND=~sys-devel/llvm-9999:7=[debug=,llvm_targets_AArch64?,llvm_targets_AMDGPU?,llvm_targets_ARM?,llvm_targets_BPF?,llvm_targets_Hexagon?,llvm_targets_Lanai?,llvm_targets_Mips?,llvm_targets_MSP430?,llvm_targets_NVPTX?,llvm_targets_PowerPC?,llvm_targets_Sparc?,llvm_targets_SystemZ?,llvm_targets_X86?,llvm_targets_XCore?,llvm_targets_AVR?,llvm_targets_Nios2?,llvm_targets_RISCV?,llvm_targets_WebAssembly?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* z3? ( sci-mathematics/z3:0= ) ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !<sys-devel/llvm-4.0.0_rc:0 !sys-devel/clang:0
 REQUIRED_USE=python_targets_python2_7 || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
-SLOT=6
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=34fa5fef00035981d2375ca77872a570
+SLOT=7
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d28a5cc65b776be6e7169b78ca0ea175
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-3.9.0 b/metadata/md5-cache/sys-devel/clang-runtime-3.9.0
index 7aa6f34c365b..af2017053c2f 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-3.9.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-3.9.0
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=metapackage
 RDEPEND=libcxx? ( >=sys-libs/libcxx-3.9.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-3.9.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=fc5a4e8e145014fd694ebc0034862fad
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-3.9.1 b/metadata/md5-cache/sys-devel/clang-runtime-3.9.1
index 3e147138b7f4..d93e2d4d74c3 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-3.9.1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-3.9.1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-mac
 LICENSE=metapackage
 RDEPEND=libcxx? ( >=sys-libs/libcxx-3.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-3.9.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=c49e82dfa9a7eb21d637ac1eb5a6a30c
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-4.0.1 b/metadata/md5-cache/sys-devel/clang-runtime-4.0.1
index d94bcab49aa3..0e93ebad4262 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-4.0.1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-4.0.1
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-4.0.1:4.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-4.0.1:4.0.1 ) ) libcxx? ( >=sys-libs/libcxx-4.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-4.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=4.0.1
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=500760567965cd129d7435a07bc6fd8b
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-5.0.0 b/metadata/md5-cache/sys-devel/clang-runtime-5.0.0
index cbb7a6a4bcbc..a6f42a826cd9 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-5.0.0
+++ b/metadata/md5-cache/sys-devel/clang-runtime-5.0.0
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-5.0.0:5.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-5.0.0:5.0.0 ) ) libcxx? ( >=sys-libs/libcxx-5.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-5.0.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=5.0.0
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=c5e2e85f580197ee6ca96277d70e36fc
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-5.0.1 b/metadata/md5-cache/sys-devel/clang-runtime-5.0.1
index c77325eff751..1694d05c82e7 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-5.0.1
+++ b/metadata/md5-cache/sys-devel/clang-runtime-5.0.1
@@ -8,5 +8,5 @@ LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-5.0.1:5.0.1 sanitize? ( ~sys-libs/compiler-rt-sanitizers-5.0.1:5.0.1 ) ) libcxx? ( >=sys-libs/libcxx-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-5.0.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=5.0.1
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=8edc5189f52f935700291211ace4fa2f
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-6.0.9999 b/metadata/md5-cache/sys-devel/clang-runtime-6.0.9999
new file mode 100644
index 000000000000..1a8c8b5bdd35
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/clang-runtime-6.0.9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DESCRIPTION=Meta-ebuild for clang runtime libraries
+EAPI=6
+HOMEPAGE=https://clang.llvm.org/
+IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=metapackage
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-6.0.9999:6.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-6.0.9999:6.0.0 ) ) libcxx? ( >=sys-libs/libcxx-6.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-6.0.9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=sanitize? ( compiler-rt )
+SLOT=6.0.0
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=1b57d990e3a400542b79117f15a797a2
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-9999 b/metadata/md5-cache/sys-devel/clang-runtime-9999
index 7f3caeee0779..a302d7bb4f48 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-9999
+++ b/metadata/md5-cache/sys-devel/clang-runtime-9999
@@ -4,8 +4,8 @@ EAPI=6
 HOMEPAGE=https://clang.llvm.org/
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 LICENSE=metapackage
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-9999:6.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-9999:6.0.0 ) ) libcxx? ( >=sys-libs/libcxx-9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-9999:7.0.0 sanitize? ( ~sys-libs/compiler-rt-sanitizers-9999:7.0.0 ) ) libcxx? ( >=sys-libs/libcxx-9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-9999[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=6.0.0
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1a27b19836a8160a93258c8eb031cef6
+SLOT=7.0.0
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=16af7594772de8f947cab26da53d12f6
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.1 b/metadata/md5-cache/sys-devel/flex-2.6.1
index 79d7346de6d5..076f934749c2 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.1
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.1/flex-2.6.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=2ec43ac0eab5ab69df1adc10bca90659
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.3 b/metadata/md5-cache/sys-devel/flex-2.6.3
index 495874fb8cfc..20a6301db664 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.3
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=5198ba7ec4c0b3e176f445a4f8e4e932
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.3-r1 b/metadata/md5-cache/sys-devel/flex-2.6.3-r1
index 0931dafdc6cc..e329a6da9c96 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.3-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.3-r1
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.3/flex-2.6.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=534da78e4a5a98f7af7a9bb0bedbcde2
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4 b/metadata/md5-cache/sys-devel/flex-2.6.4
index 609723ec7743..fd9e1c9e8cb6 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=03712e8fd659a1c8ad0950a485cbace5
diff --git a/metadata/md5-cache/sys-devel/flex-2.6.4-r1 b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
index d88b7ae7a2df..3a1695d50b6d 100644
--- a/metadata/md5-cache/sys-devel/flex-2.6.4-r1
+++ b/metadata/md5-cache/sys-devel/flex-2.6.4-r1
@@ -9,5 +9,5 @@ LICENSE=FLEX
 RDEPEND=sys-devel/m4
 SLOT=0
 SRC_URI=https://github.com/westes/flex/releases/download/v2.6.4/flex-2.6.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
 _md5_=bf040b71469d22cd5d3c5bb1438eec43
diff --git a/metadata/md5-cache/sys-devel/gettext-0.19.8.1 b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
index 93a7b751de2d..5451247d8ab2 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.19.8.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.19.8.1
@@ -10,5 +10,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( >=virtual/jdk-1.4:= ) !git? ( cvs? ( dev-vcs/cvs ) ) git? ( dev-vcs/git ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.19.8.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0
 _md5_=b4663c5b206f56ba2d517935832b4f06
diff --git a/metadata/md5-cache/sys-devel/lld-4.0.1 b/metadata/md5-cache/sys-devel/lld-4.0.1
index 907f481cbbbf..118ce85c0a6a 100644
--- a/metadata/md5-cache/sys-devel/lld-4.0.1
+++ b/metadata/md5-cache/sys-devel/lld-4.0.1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-4.0.1
 SLOT=0
 SRC_URI=https://releases.llvm.org/4.0.1/lld-4.0.1.src.tar.xz test? ( https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dab6cce0b3734cc7c4d0986da8d8c741
diff --git a/metadata/md5-cache/sys-devel/lld-5.0.0 b/metadata/md5-cache/sys-devel/lld-5.0.0
index 37b0202fd301..9f972e0e7963 100644
--- a/metadata/md5-cache/sys-devel/lld-5.0.0
+++ b/metadata/md5-cache/sys-devel/lld-5.0.0
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-5.0.0
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.0/lld-5.0.0.src.tar.xz test? ( https://releases.llvm.org/5.0.0/llvm-5.0.0.src.tar.xz )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=157057fb72668394fde46a01b807bd50
diff --git a/metadata/md5-cache/sys-devel/lld-5.0.1 b/metadata/md5-cache/sys-devel/lld-5.0.1
index 1b63ce7f9071..5a4e8b696f61 100644
--- a/metadata/md5-cache/sys-devel/lld-5.0.1
+++ b/metadata/md5-cache/sys-devel/lld-5.0.1
@@ -9,5 +9,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-5.0.1
 SLOT=0
 SRC_URI=https://releases.llvm.org/5.0.1/lld-5.0.1.src.tar.xz test? ( https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1fe999bc0dae3fb1e401ecf91e23f3e7
diff --git a/metadata/md5-cache/sys-devel/lld-6.0.9999 b/metadata/md5-cache/sys-devel/lld-6.0.9999
new file mode 100644
index 000000000000..54f38a23405c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/lld-6.0.9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=~sys-devel/llvm-6.0.9999 test? ( || ( ( >=dev-lang/python-2.7.5-r2:2.7 ~dev-python/lit-6.0.9999[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=The LLVM linker (link editor)
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=test
+LICENSE=UoI-NCSA
+RDEPEND=~sys-devel/llvm-6.0.9999
+RESTRICT=!test? ( test )
+SLOT=0
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ad260a43fdec6c5d824ed1573feff34
diff --git a/metadata/md5-cache/sys-devel/lld-9999 b/metadata/md5-cache/sys-devel/lld-9999
index 589be3d62046..d9ce597b40cf 100644
--- a/metadata/md5-cache/sys-devel/lld-9999
+++ b/metadata/md5-cache/sys-devel/lld-9999
@@ -8,5 +8,5 @@ LICENSE=UoI-NCSA
 RDEPEND=~sys-devel/llvm-9999
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	llvm	fe231a791db197943447fdeadafa7e08	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	llvm	f9e74238f1b5743ea5d7214fcc7dbb36	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bb6945b140e9013469b37e5a8e6956b4
diff --git a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3 b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
index 4d5d71f8ed23..89399225453c 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
+++ b/metadata/md5-cache/sys-devel/llvm-3.7.1-r3
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml )
 SLOT=0/3.7.1
 SRC_URI=https://llvm.org/releases/3.7.1/llvm-3.7.1.src.tar.xz clang? ( https://llvm.org/releases/3.7.1/compiler-rt-3.7.1.src.tar.xz https://llvm.org/releases/3.7.1/cfe-3.7.1.src.tar.xz https://llvm.org/releases/3.7.1/clang-tools-extra-3.7.1.src.tar.xz ) lldb? ( https://llvm.org/releases/3.7.1/lldb-3.7.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~voyageur/distfiles/llvm-3.7.0-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.7.1-patchset.tar.gz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9631a2d75258702da79f3ec822bee060
diff --git a/metadata/md5-cache/sys-devel/llvm-3.9.1-r1 b/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
index 858c3a6b078d..f6423202330a 100644
--- a/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-3.9.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= clang? ( python? ( python_targets_python2_7? ( >=dev-la
 REQUIRED_USE=python_targets_python2_7 lldb? ( clang xml ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore ) multitarget? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=0/3.9.1
 SRC_URI=https://llvm.org/releases/3.9.1/llvm-3.9.1.src.tar.xz clang? ( https://llvm.org/releases/3.9.1/compiler-rt-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/cfe-3.9.1.src.tar.xz https://llvm.org/releases/3.9.1/clang-tools-extra-3.9.1.src.tar.xz ) lldb? ( https://llvm.org/releases/3.9.1/lldb-3.9.1.src.tar.xz ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.9.0_rc3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-3.9.1-patchset.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=76e15b7047ca63ed601622e4be26a6a7
diff --git a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1 b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
index 778fe1aaa2cd..3a617da45f1f 100644
--- a/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
+++ b/metadata/md5-cache/sys-devel/llvm-4.0.1-r1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=4
 SRC_URI=https://releases.llvm.org/4.0.1/llvm-4.0.1.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-4.0.1.tar.bz2 )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d242b745df4b0bc76784488050f33dc
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.0 b/metadata/md5-cache/sys-devel/llvm-5.0.0
index e4a12982da8d..9d9b0fc18e7c 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.0
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.0
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.0/llvm-5.0.0.src.tar.xz !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-manpages-5.0.0.tar.bz2 )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8aa3a1bd3c3d1ab090724325b6cc8c12
diff --git a/metadata/md5-cache/sys-devel/llvm-5.0.1 b/metadata/md5-cache/sys-devel/llvm-5.0.1
index d99f8bee1372..54304e56170b 100644
--- a/metadata/md5-cache/sys-devel/llvm-5.0.1
+++ b/metadata/md5-cache/sys-devel/llvm-5.0.1
@@ -11,5 +11,5 @@ RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( d
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore )
 SLOT=5
 SRC_URI=https://releases.llvm.org/5.0.1/llvm-5.0.1.src.tar.xz https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-patchset.tar.bz2 !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-5.0.1-manpages.tar.bz2 )
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bbf2a0432aa33b7576690f7e0d58a4aa
diff --git a/metadata/md5-cache/sys-devel/llvm-6.0.9999 b/metadata/md5-cache/sys-devel/llvm-6.0.9999
new file mode 100644
index 000000000000..a7552ce49306
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-6.0.9999
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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-6.0.9999.9999 ) doc? ( dev-python/sphinx ) gold? ( sys-libs/binutils-libs ) libffi? ( virtual/pkgconfig ) !!<dev-python/configparser-3.3.0.2 || ( >=dev-lang/python-2.7.5-r2:2.7 ) dev-util/ninja >=dev-util/cmake-3.7.0-r1 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Low Level Virtual Machine
+EAPI=6
+HOMEPAGE=https://llvm.org/
+IUSE=debug doc gold libedit +libffi ncurses test kernel_Darwin llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=UoI-NCSA rc BSD public-domain llvm_targets_ARM? ( LLVM-Grant )
+PDEPEND=sys-devel/llvm-common gold? ( sys-devel/llvmgold )
+RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
+RESTRICT=!test? ( test )
+SLOT=6
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd5b03f06e50d7be68a5edef1cb4a178
diff --git a/metadata/md5-cache/sys-devel/llvm-9999 b/metadata/md5-cache/sys-devel/llvm-9999
index 4ab2636088b8..19d29592a0fa 100644
--- a/metadata/md5-cache/sys-devel/llvm-9999
+++ b/metadata/md5-cache/sys-devel/llvm-9999
@@ -9,6 +9,6 @@ PDEPEND=sys-devel/llvm-common gold? ( sys-devel/llvmgold )
 RDEPEND=sys-libs/zlib:0= gold? ( >=sys-devel/binutils-2.22:*[cxx] ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=virtual/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_X86 llvm_targets_XCore llvm_targets_AVR llvm_targets_Nios2 llvm_targets_RISCV llvm_targets_WebAssembly )
 RESTRICT=!test? ( test )
-SLOT=6
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	eed53a6313267c9fbcd35fc384bd0087	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6f9152751ec5e4940c52195fb327bffd
+SLOT=7
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	eapi7-ver	ad64fd3dcf3a655ac44ecae6d0e5ffcc	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	97ce9decef1ff4b6c5be700283f67343	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	6f5991c7101863d0b29df63990ad852e	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	c80ccf29e90adea7c5cae94b42eb76d0	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=efb2c5e72d3d543b78762553b3cc1f2d
diff --git a/metadata/md5-cache/sys-devel/llvm-common-6.0.9999 b/metadata/md5-cache/sys-devel/llvm-common-6.0.9999
new file mode 100644
index 000000000000..27431bfa57ec
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvm-common-6.0.9999
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile configure install test unpack
+DEPEND=>=dev-vcs/git-1.8.2.1
+DESCRIPTION=Common files shared between multiple slots of LLVM
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=UoI-NCSA
+RDEPEND=!sys-devel/llvm:0
+SLOT=0
+_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a
+_md5_=ff58001480627af41739f6f527b9b690
diff --git a/metadata/md5-cache/sys-devel/llvmgold-7 b/metadata/md5-cache/sys-devel/llvmgold-7
new file mode 100644
index 000000000000..8aa050d2f139
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/llvmgold-7
@@ -0,0 +1,8 @@
+DEFINED_PHASES=install
+DESCRIPTION=LLVMgold plugin symlink for autoloading
+EAPI=6
+HOMEPAGE=https://llvm.org/
+LICENSE=public-domain
+RDEPEND=sys-devel/llvm:7[gold] !sys-devel/llvm:0
+SLOT=0
+_md5_=4d081e43e84e9ad052d3661448874bfa