Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

23 files changed, 358 insertions, 277 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 50a58056f9ba..5d8142883745 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/icc/Manifest b/dev-lang/icc/Manifest
new file mode 100644
index 000000000000..30707873432d
--- /dev/null
+++ b/dev-lang/icc/Manifest
@@ -0,0 +1,9 @@
+DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 BLAKE2B 551711101488890ff2c14d43674b11c2cd996ee3bd94e70e75554d68fb8d4ea45f9d1149b402a2c0b3a15d022de2f610cdb77286d6e9f645186f4aae2cb5dd3c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025
+DIST parallel_studio_xe_2013_update4.tgz 2184817121 BLAKE2B abf16e9ae201c481c4813317bcc68d6343b39ce2049902c01688a3b166e300c797c6b9452bb268d4acdd670f309682b11fb4ccaff6cd34ca8235b3a15761dc56 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96
+DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 BLAKE2B 77ead5362528639cf6336ec1d70e4116461a562ebcbb170d14a4324519eddae3742b764b3cf0cf8ad8656ec7565c4634e5b09a224c1bfc90281b320c4b00bbf3 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247
+DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 BLAKE2B 33de5550d6fed069fc64fc0e6a3528bccb9b13c4f9b31f113fc100fe374d386216b572632371d9dd01f5cacceec85ed3ca724260c76c19aeea7da39b627d04d2 SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 BLAKE2B b038cda914b4c736259b84d2958a16a718fc75fe1663b4a835f4011fadb553a28f5c231d6f0a2744fc3eec257b390b021b0af709d69a5d10845cf9d63d1aa320 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81
+EBUILD icc-13.1.5.192.ebuild 813 BLAKE2B c0d2c97b70dd65963bebec7067514f4f803bcb3a21fc6da7a19e4344ac2833bb6980ed65ddab37a9f4afd721f6a6d222c060c5271ade259b9ec24ee5ccc8af95 SHA512 f618cd0bde870871dbd6d4de7f078de2b6d4aeece88d2f92acd4a00ffe6ff0c06786500fd3b2ead35a373a7bc6ad5ed67179230289c88df70919a2057c9e2995
+EBUILD icc-14.0.3.174.ebuild 841 BLAKE2B 9066de90344479503f6a8d9b36f48cc3df25becf54e86af51e2e17416e1a5f4dd76b92e33d286fe54c326f40069198d5976eeba370a478af530b6f499a5ce054 SHA512 b12e581a33608aba46dba2f9423d2dda1fd3f42b74825fc594b2b5859bcd2eed25b2820c254305f62ce2803688bc19fafc0970b4431261b1f3f4faef5f5f7947
+EBUILD icc-15.0.6.233.ebuild 855 BLAKE2B d9258ba5e096499f33700b6c529639a3cfdf8389fc2f590f8f0ad186ddba01ac2d32a1312dfc807d97e41803e899aa53303a3e0bec2de00da9cb7fa2061479cd SHA512 676b2bccdc87ef3bbc8be7992f4da6a8eef90e06f05f1a65329e7c5974ab857afa23bc5337d3060593bef4e432739be784e0c0c282e3c23a7e986c76eeae5416
+MISC metadata.xml 727 BLAKE2B 4cfd8b27958969fe8cdb987c81e698dab526b9f3994c24f94587dc6e1fc9133d596eb904eb1819374aa39974193e0b5072501db11d3de9086516c6a8e213b7ed SHA512 0c10f059eb58b9042a4e9d4d5d4c4ff92289cadb41cac59aef21d369cbfef9bc872a74a73f089b10417c9a59aac2d2fd9e8bc8f83e70a8d7168db55b1b085b33
diff --git a/dev-lang/icc/icc-13.1.5.192.ebuild b/dev-lang/icc/icc-13.1.5.192.ebuild
new file mode 100644
index 000000000000..1d92c2151e1e
--- /dev/null
+++ b/dev-lang/icc/icc-13.1.5.192.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3266
+INTEL_DPV=2013_update4
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp
+
+DESCRIPTION="Intel C/C++ Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="l10n_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# avoid file collision with ifc #476330
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] )
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerproc compilerproc-devel"
+INTEL_DAT_RPMS="compilerproc-common"
+
+CHECKREQS_DISK_BUILD=325M
+
+src_install() {
+	if ! use l10n_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
diff --git a/dev-lang/icc/icc-14.0.3.174.ebuild b/dev-lang/icc/icc-14.0.3.174.ebuild
new file mode 100644
index 000000000000..3947fc7f2e97
--- /dev/null
+++ b/dev-lang/icc/icc-14.0.3.174.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4220
+INTEL_DPV=2013_sp1_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel C/C++ Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="l10n_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# avoid file collision with ifc #476330
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] )
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerproc compilerproc-devel"
+INTEL_DAT_RPMS="compilerproc-common"
+
+CHECKREQS_DISK_BUILD=325M
+
+src_install() {
+	if ! use l10n_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
diff --git a/dev-lang/icc/icc-15.0.6.233.ebuild b/dev-lang/icc/icc-15.0.6.233.ebuild
new file mode 100644
index 000000000000..781b103b1bba
--- /dev/null
+++ b/dev-lang/icc/icc-15.0.6.233.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=8470
+INTEL_DPV=2015_update6
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel C/C++ Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="l10n_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# avoid file collision with ifc #476330
+RDEPEND="l10n_ja? ( !dev-lang/ifc[l10n_ja(-)] !dev-lang/ifc[linguas_ja(-)] )
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerproc compilerproc-devel"
+INTEL_DAT_RPMS="compilerproc-common compilerproc-vars"
+
+CHECKREQS_DISK_BUILD=325M
+
+src_install() {
+	if ! use l10n_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
diff --git a/dev-lang/icc/metadata.xml b/dev-lang/icc/metadata.xml
new file mode 100644
index 000000000000..4a2545b283af
--- /dev/null
+++ b/dev-lang/icc/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The Intel® C++ Compiler is a full featured C/C++ compiler for Intel
+  based architectures. The compiler supports multi-threading, automatic
+  processor dispatch, vectorization, auto-parallelization, OpenMP, data
+  prefetching, loop unrolling. The package comes with extensive
+  documentation. The product can be installed as a non-commercial as
+  well. License, terms of qualifications can be found on the web site.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-lang/idb/Manifest b/dev-lang/idb/Manifest
new file mode 100644
index 000000000000..5272adeda3cc
--- /dev/null
+++ b/dev-lang/idb/Manifest
@@ -0,0 +1,7 @@
+DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 BLAKE2B 551711101488890ff2c14d43674b11c2cd996ee3bd94e70e75554d68fb8d4ea45f9d1149b402a2c0b3a15d022de2f610cdb77286d6e9f645186f4aae2cb5dd3c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025
+DIST parallel_studio_xe_2013_update4.tgz 2184817121 BLAKE2B abf16e9ae201c481c4813317bcc68d6343b39ce2049902c01688a3b166e300c797c6b9452bb268d4acdd670f309682b11fb4ccaff6cd34ca8235b3a15761dc56 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96
+DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 BLAKE2B 77ead5362528639cf6336ec1d70e4116461a562ebcbb170d14a4324519eddae3742b764b3cf0cf8ad8656ec7565c4634e5b09a224c1bfc90281b320c4b00bbf3 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247
+DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 BLAKE2B 33de5550d6fed069fc64fc0e6a3528bccb9b13c4f9b31f113fc100fe374d386216b572632371d9dd01f5cacceec85ed3ca724260c76c19aeea7da39b627d04d2 SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a
+EBUILD idb-13.0.5.192.ebuild 685 BLAKE2B c10a01823d8ec3b8af230d93c06f734886cefaa49b64566a0d8e6ff3dffbbe0a018ac6f78a1d24f06242a75f214d265136aeb7323007897fdd9e089d85c490fa SHA512 6432a1a67242169b8f83d63310b71059e20b2e4666b2c39be6b99bb8da76acf9ae648a3ddbb72699a19a961cdd06424bc121934af140485629d09baf2531cc44
+EBUILD idb-14.0.3.174.ebuild 780 BLAKE2B 27af4d5a6be9af20af2d978d1465b16c5e3de6b0be58716f1f7cd2de5bff122a9ded80b2eddc74b5637ffbeece61699224a240711959854e0ff1fa88425b4a36 SHA512 c242304113fac6daad639eeabc35c6dee94cb589df7e79153f9126e4d689445c4dc67c004e965d4977327da4424c11528547d618aa99c435a24475d3340fea49
+MISC metadata.xml 807 BLAKE2B 4f362e615e302aaa91c68348ecab9b554995f55fd092343cbc4d1ea4b87b82ee5b5aa88053cfcd89247e5da41178a6f3befaf16498b84ca95e58089b3e6ded89 SHA512 2abd027e8401aef13ec51490d099215e06a4214de47589a001eba63f0ffd4344cb89939af952af4b7958f99f0fea43ad2451859d1e4fcbc234e033a6ef3c3f30
diff --git a/dev-lang/idb/idb-13.0.5.192.ebuild b/dev-lang/idb/idb-13.0.5.192.ebuild
new file mode 100644
index 000000000000..fc93f2631cd2
--- /dev/null
+++ b/dev-lang/idb/idb-13.0.5.192.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3266
+INTEL_DPV=2013_update4
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp
+
+DESCRIPTION="Intel C/C++/FORTRAN debugger"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=">=dev-libs/intel-common-13.1[compiler]"
+RDEPEND="${DEPEND}
+	virtual/jre"
+
+INTEL_BIN_RPMS="idb"
+INTEL_DAT_RPMS="idb-common idbcdt"
+
+CHECKREQS_DISK_BUILD=475M
+
+src_prepare() {
+	sed \
+		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
+		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
+}
diff --git a/dev-lang/idb/idb-14.0.3.174.ebuild b/dev-lang/idb/idb-14.0.3.174.ebuild
new file mode 100644
index 000000000000..3451d9823d02
--- /dev/null
+++ b/dev-lang/idb/idb-14.0.3.174.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4220
+INTEL_DPV=2013_sp1_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+_INTEL_PV1=14
+
+DESCRIPTION="Intel C/C++/FORTRAN debugger"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE=""
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND=">=dev-libs/intel-common-13.1[compiler]"
+RDEPEND="${DEPEND}
+	virtual/jre"
+
+INTEL_BIN_RPMS="idb"
+INTEL_DAT_RPMS="idb-common idbcdt"
+
+CHECKREQS_DISK_BUILD=475M
+
+pkg_setup() {
+	_INTEL_PV1=13 intel-sdp_pkg_setup
+}
+
+src_prepare() {
+	sed \
+		-e "/^INSTALLDIR/s:=.*:=${INTEL_SDP_EDIR}:g" \
+		-i ${INTEL_SDP_DIR}/bin/intel*/idb || die
+}
diff --git a/dev-lang/idb/metadata.xml b/dev-lang/idb/metadata.xml
new file mode 100644
index 000000000000..8b41cedf75a1
--- /dev/null
+++ b/dev-lang/idb/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The Intel® Debugger is a command line debugger for Intel based
+  architectures. It is well suited with the Intel C++ or Intel FORTRAN
+  compilers. It also comes also with a graphical interface and extensive
+  documentation. The package is bundled in either compiler tar ball, and
+  has been split to produce this one.
+  The product can be installed as a non-commercial as
+  well. License, terms of qualifications can be found on the web
+  site and follow the one received in the Intel compilers.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-lang/ifc/Manifest b/dev-lang/ifc/Manifest
new file mode 100644
index 000000000000..c7f7a7c6beda
--- /dev/null
+++ b/dev-lang/ifc/Manifest
@@ -0,0 +1,9 @@
+DIST parallel_studio_xe_2013_sp1_update3.tgz 3448198789 BLAKE2B 551711101488890ff2c14d43674b11c2cd996ee3bd94e70e75554d68fb8d4ea45f9d1149b402a2c0b3a15d022de2f610cdb77286d6e9f645186f4aae2cb5dd3c SHA512 6308a812c3eb2bd4549b756aa16fdeeb9337131e56bd203876a6763298c776858629a6d17148cdd5275f6781471e826a00a0181b72abcdd7d991196eb4798025
+DIST parallel_studio_xe_2013_update4.tgz 2184817121 BLAKE2B abf16e9ae201c481c4813317bcc68d6343b39ce2049902c01688a3b166e300c797c6b9452bb268d4acdd670f309682b11fb4ccaff6cd34ca8235b3a15761dc56 SHA512 84ea227fdca2c427996b0c4d17a0bad6c289a6fbfc267c19f54ebee875e11e6e8d14bb3103599e3b89331c34a153b0a63a5ca8c12f4619420f78f8c4b0c2da96
+DIST parallel_studio_xe_2013_update4_ia32.tgz 1220177902 BLAKE2B 77ead5362528639cf6336ec1d70e4116461a562ebcbb170d14a4324519eddae3742b764b3cf0cf8ad8656ec7565c4634e5b09a224c1bfc90281b320c4b00bbf3 SHA512 968db307e08cd31450200abd41ade1f2b2855f4b5cb19911d03c1cd357cab11cbba814db354452496fcf66fc3fad1423b24f428bd4db07402f12bd63e4d34247
+DIST parallel_studio_xe_2013_update4_intel64.tgz 1520767493 BLAKE2B 33de5550d6fed069fc64fc0e6a3528bccb9b13c4f9b31f113fc100fe374d386216b572632371d9dd01f5cacceec85ed3ca724260c76c19aeea7da39b627d04d2 SHA512 497ad8f3473e1d11cdd31dff340a8e6ec1f012e731def084b2072146b5d11db906f85ace53b2223c3fbef949222f73f36783fd697eb7809464f4403c0ac8744a
+DIST parallel_studio_xe_2015_update6.tgz 4190044333 BLAKE2B b038cda914b4c736259b84d2958a16a718fc75fe1663b4a835f4011fadb553a28f5c231d6f0a2744fc3eec257b390b021b0af709d69a5d10845cf9d63d1aa320 SHA512 a9896289db8e820f02c330702ff1e954af11af5f9bbc0e5623a001b3a8c33a2bcb8660ac8b0e569994a3682bfd263bf119dbe6a43fb343139adbeaaaa13f8a81
+EBUILD ifc-13.1.5.192.ebuild 815 BLAKE2B 88dc24ebc52266ad13955963093f551320c28d54515474c08dc084ccf4861b131623f06caa337b0b6bb9c02693452825aa1c7f1669581544c6d4294699ba795e SHA512 4b66da99613d0b2799d66c9e53d9cec1e2e6548122da877b2cc0e3f28e17f8f8f1b439c7d72db66814bba487b57211c619f77ce7898e6aca3dfee0e47ae8ee87
+EBUILD ifc-14.0.3.174.ebuild 843 BLAKE2B 4871b72b680cb1d8e1a899ea315d995107a60b38708f670dc2479f8f45246cd5ed451bfcaa12f3491248328409b63978e624d5e5303cf3811ecb93f841692590 SHA512 be737badefad44f9420687f1250eb31afa01592fed483c98793ca0b7a2f952f45e241bbacd2d1290e6866c71ceff2c81acc95537120c88335a7976f51715d989
+EBUILD ifc-15.0.6.233.ebuild 858 BLAKE2B 3d496c935e23f60af1e97f754f2d6465836eeb5a65e3ee19c417ab5f5b3eca139c7133c298c2edcfc01a48512c0481464688f5c7e0e74d2abe48d282efe26c63 SHA512 4bfecb40c96e806974338184d772ed25d9e7b4ad4da355b999b528205d7040572cc4b4e7742a364c33ac077c3c47c8ca7ec16d51ef2c9cbcfd029ebb0bbd06ca
+MISC metadata.xml 774 BLAKE2B 8de5d865dd0084919130bd2ba974f86c612f436167d0bf70104602cb9d8e84bca495441c702015fb7a6b09495a0b43c77d4542e0dc6126f9fc9d063c89798fe2 SHA512 14c7de3984226a6b32fd1e7d913d21cdff0a233e00f5f7502cfa6778b7a347beb1a505c8b92905c30a73e6e7ffe18a2b79169d8939858784894dd7ebcec4a553
diff --git a/dev-lang/ifc/ifc-13.1.5.192.ebuild b/dev-lang/ifc/ifc-13.1.5.192.ebuild
new file mode 100644
index 000000000000..4651e5c84c65
--- /dev/null
+++ b/dev-lang/ifc/ifc-13.1.5.192.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=3266
+INTEL_DPV=2013_update4
+INTEL_SUBDIR=composerxe
+
+inherit intel-sdp
+
+DESCRIPTION="Intel FORTRAN Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="l10n_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# avoid file collision with icc #476330
+RDEPEND="l10n_ja? ( !dev-lang/icc[l10n_ja(-)] !dev-lang/icc[linguas_ja(-)] )
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerprof compilerprof-devel"
+INTEL_DAT_RPMS="compilerprof-common"
+
+CHECKREQS_DISK_BUILD=375M
+
+src_install() {
+	if ! use l10n_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
diff --git a/dev-lang/ifc/ifc-14.0.3.174.ebuild b/dev-lang/ifc/ifc-14.0.3.174.ebuild
new file mode 100644
index 000000000000..ccac93c167cb
--- /dev/null
+++ b/dev-lang/ifc/ifc-14.0.3.174.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=4220
+INTEL_DPV=2013_sp1_update3
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel FORTRAN Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="l10n_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# avoid file collision with icc #476330
+RDEPEND="l10n_ja? ( !dev-lang/icc[l10n_ja(-)] !dev-lang/icc[linguas_ja(-)] )
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerprof compilerprof-devel"
+INTEL_DAT_RPMS="compilerprof-common"
+
+CHECKREQS_DISK_BUILD=375M
+
+src_install() {
+	if ! use l10n_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+	intel-sdp_src_install
+}
diff --git a/dev-lang/ifc/ifc-15.0.6.233.ebuild b/dev-lang/ifc/ifc-15.0.6.233.ebuild
new file mode 100644
index 000000000000..fe1be6319ab0
--- /dev/null
+++ b/dev-lang/ifc/ifc-15.0.6.233.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+INTEL_DPN=parallel_studio_xe
+INTEL_DID=8470
+INTEL_DPV=2015_update6
+INTEL_SUBDIR=composerxe
+INTEL_SINGLE_ARCH=false
+
+inherit intel-sdp
+
+DESCRIPTION="Intel FORTRAN Compiler"
+HOMEPAGE="http://software.intel.com/en-us/articles/intel-composer-xe/"
+
+IUSE="l10n_ja"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+# avoid file collision with icc #476330
+RDEPEND="l10n_ja? ( !dev-lang/icc[l10n_ja(-)] !dev-lang/icc[linguas_ja(-)] )
+	~dev-libs/intel-common-${PV}[compiler,multilib=]"
+
+INTEL_BIN_RPMS="compilerprof compilerprof-devel"
+INTEL_DAT_RPMS="compilerprof-common compilerprof-vars"
+
+CHECKREQS_DISK_BUILD=375M
+
+src_install() {
+	if ! use l10n_ja; then
+		find "${S}" -type d -name ja_JP -exec rm -rf '{}' + || die
+	fi
+
+	intel-sdp_src_install
+}
diff --git a/dev-lang/ifc/metadata.xml b/dev-lang/ifc/metadata.xml
new file mode 100644
index 000000000000..b545fb9baa3e
--- /dev/null
+++ b/dev-lang/ifc/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>sci@gentoo.org</email>
+    <name>Gentoo Science Project</name>
+  </maintainer>
+  <longdescription lang="en">
+  The Intel® Fortran Compiler is a full featured FORTRAN 77/95 and
+  substantial FORTRAN 2003 compiler for Intel based architectures. The
+  compiler supports multi-threading with automatic processor dispatch,
+  vectorization, auto-parallelization, OpenMP, data prefetching, loop
+  unrolling. The package comes with extensive documentation.
+  The product can be installed as a non-commercial as well. License,
+  terms of qualifications can be found on the web site.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 3838108d9bea..c66c4df438e7 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -1,13 +1,7 @@
-DIST rust-1.25.0-arm-unknown-linux-gnueabi.tar.gz 152771389 BLAKE2B b163a41846233f08ba34ba325058843141b285758eede668e84d32751ace27d4b36fc5e8f963e1d13da1b46ae7cb48944987acc7ff36ced300bee154c7b22e68 SHA512 33a7bb3ed7a0b5b85e5dc0438ff620b67bc7bfe4d5e35bdcc9207a5dddf017a588a7de4877c4f1784f22f1d6e503ddd24d57f3d3af94d4bf00c781d4c378bb5f
-DIST rust-1.25.0-arm-unknown-linux-gnueabihf.tar.gz 152774994 BLAKE2B 438fc55edcf80f1f292765c7d062c7c2e282c7798d0ca7312557262a7474f60341aae1c9a3f5bfe349576f7204fe1fa044dded933157b128e6c6015e23c89388 SHA512 688e8e0d2e5661f132033afe8020a93828a45d00a874155a1a7887c69590061a413db95f0443d43234fb65b5510dfd7bdb092c0cc7b3fde6abd5f386786d95ad
-DIST rust-1.25.0-armv7-unknown-linux-gnueabihf.tar.gz 150376603 BLAKE2B 44aadf00b74d3d35039486289b319db5b1820dfb3b0fdbc03714ae2a8df78e09ee09fa41d9d8ec1377b91fb4a8f67cd7f4cdc99ceb39da4b48ba464ee1b73600 SHA512 a45312bec4c06b04d3c148d87a64aa55e14cc160eaaa6b712ce738590063137c8f9dd1030656071c1ac9a22cb852f34efdb98c435527c7371da381b802fb9104
 DIST rust-1.25.0-i686-unknown-linux-gnu.tar.gz 169267482 BLAKE2B 8fb18c95adf7edd74cd305683ab2ee33d59cce1a0f515e9ba63dfd105ffaf9150444e281502747856fa5164f24707b4bbbe110a2b1b7a1cf65c96b883a6f2ede SHA512 76bcd978b9b23b0fc6315f91bed153e59616aa62f520aae8e8d3587b5f5fae74fef15f8b0a749b02a69be56fad4df9a413019438135481917bca1fb1a7704de7
 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.gz 178696930 BLAKE2B 0f82e837494d394c86462583f3d65f1ad839a97eda00fbc00476d06255831088cb7e554cc14edbf9dd23fbebf75078dc78204bdbec4795781f7fae0cbb6de63d SHA512 544e85bb69359d8ff6059d0f470b5995822f73e6d361be43f69f87d394b7252a11686f835336930bc257ba4347c0498abf5b1fbd751180d96bd9ca872b76d65c
-DIST rust-1.26.0-arm-unknown-linux-gnueabi.tar.xz 98262664 BLAKE2B 1de2aeef6d035f9f5a4238ad0c730baabfa39944a0cc47ab31fb51b1dd7f606688a4e9c7cd323e7a4998601fce4ebd0102e2d011cfff3caa3a20f91579442cd4 SHA512 44fdff800a6da1929ccab717f544add5a0500856b4ae1edbd6202d5d8b9781bd336c75c857ddf40e6f7175916fb026210bc5ec2656f4b564dd69cc9189bda3d6
-DIST rust-1.26.0-arm-unknown-linux-gnueabihf.tar.xz 98490960 BLAKE2B ad4210bc39d11974f0a5032f6779b4c8ca04f705da8c15a755d5072d157724896a65fc149c16c6f9a479f0c61a6cb0a70d90e48543f6d72725de6baf25d4a94b SHA512 3822303a7a8c567f3a917f4c934f1411fd606a335d5f6e574dd0be9d463e9fe27ff948c820b25a305e53d83b5d9fa0e1cbfca86451a0b3e11ff84ef7a82f65c8
-DIST rust-1.26.0-armv7-unknown-linux-gnueabihf.tar.xz 98788032 BLAKE2B 3727effee1eaf89d979e27f339901ac938acc22d9dd8e664c20941e46db8250f349493f65598243d5234539bb2037e9dabd38f1a047dd8f9bbe20ae2c8270747 SHA512 5766dbba6f4faae3e8dfd1d98ea948e3835d5b1c28b8daf6c734afd7f27301aa857147eb28762462f77c9da539aae2a81319f194154245abd5cdae7067f24d6c
 DIST rust-1.26.0-i686-unknown-linux-gnu.tar.xz 143003764 BLAKE2B 4c0b1872196c21bf9bc9d927455b4c8eb379e40281ef9fdd8a440b702b919628a00bf2e7b392084e8f41f30119c93bfa6e57ba47ee1adecb1d5cdda43778f821 SHA512 1257f9edefc49ee1742c3acd666d15f077c4d999a82dfe0d574df5c41981c3f716adf86b23d96cf9a6757508aea92abcbe06ad9e3bec2cb4ac19512d60ebba31
 DIST rust-1.26.0-x86_64-unknown-linux-gnu.tar.xz 139246408 BLAKE2B dc386c7b9e016bdcb8b2475d789b100922defc0bcd400476e4e618f51c338338edfc463428c9fa0fdcf8f051465a126d1c61030c5881d5c21888e80b8068bad8 SHA512 457503fea324251a92f25d0d45f1e2ac7d342a6a8f52d1abe93a579c7ae9b7f453a707d353e82614b37790747e8551f9762188ee25ff883495598cbf17b3f97e
-EBUILD rust-bin-1.25.0.ebuild 3450 BLAKE2B 473a4e4bbe1c84ed84641810a1231a53f10845bb598cd44a9de5db6b050aa843ba875ab5dc1859697d006d535bdc2cad671ff0bc5d16d54090e26bb147ba8117 SHA512 ce0b76d6efc5e875a959a2980d74d95297563c25071db915a8fc3e71dec2ab14fdf299189dee65856e04df5d4a987f046ee38f7724411ac0fd8edb1192167b95
-EBUILD rust-bin-1.26.0.ebuild 3585 BLAKE2B 3ae5644e7ccd922d703aa37813889ef8397354e47125cc5a8742384243208964d5c3be812d99393c1e63419ab3fadd235e24eb66dbb9a7d3bd1b97f41dc2c701 SHA512 a13c65f5c5f7ae9d9139234a5d7eefc9fc31f38b6bf6f201cbd7b33a7b7d4c6bfd4c3c4999609a0b3744189e389bf7a187f3b557b2d6fbb4a09efa9a825e0b3b
+EBUILD rust-bin-1.25.0.ebuild 2693 BLAKE2B c59f4ca19ea4620dffa79c6377491dbc6474365beecff4ccd80da5e5b0cdc106abd7ab9065a73cc547e5454353c35e82858f1f9e32f9074a03d319000ba5b2ff SHA512 cd196a6c3cc687455001c05c971ceca09b2cb799f246ba90cb6396c22397145975ff8362b4ccb7ee5d43933fb5d3e22d988ab2d5e997a9bd0bfe23c4113113c9
+EBUILD rust-bin-1.26.0.ebuild 2828 BLAKE2B 0cb9e6c214dbec3aefb112ec8d266fe5f9b07af225107912425ddb68b6f89cb8430fa626e599822aec79d1255901c49e555518551d1eb161eb9a27ba4080677f SHA512 667f127494ec6d3e81c0064b631ec818488da25fa5e828e5df3187bd33aa5fe48da8098ed9fb257d7334ef95ea7fa4bdf4244e455f72c537ead4355235e6096b
 MISC metadata.xml 250 BLAKE2B fe9734e0ff554c2ae0be039e12f780b2a36e30b518a00cac557fc63b2eecb4c9c61d914aae6f9a3f80efd109e596717ed3e5db4756440f923657fe41cb208e78 SHA512 659ffa5a36819a0534e5c614275998a130d02260924fa03d43b667f38672041b6740fb9c1efbc74d3f900ee4d3c14280aefa93d0c99fa27c1159683956f2c8f0
diff --git a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
index edd1c8706d66..056d9f3f6c27 100644
--- a/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.25.0.ebuild
@@ -3,18 +3,13 @@
 
 EAPI=5
 
-inherit eutils bash-completion-r1 toolchain-funcs
+inherit eutils bash-completion-r1
 
 MY_P="rust-${PV}"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.gz )
-	arm? (
-		http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.gz
-		http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.gz
-		http://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.gz
-		)
 	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.gz )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
@@ -35,26 +30,11 @@ QA_PREBUILT="
 	opt/${P}/lib/rustlib/*/lib/*.rlib*
 "
 
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	default
 
 	local postfix
 	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-        fi
-
 	use x86 && postfix=i686-unknown-linux-gnu
 	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
 }
diff --git a/dev-lang/rust-bin/rust-bin-1.26.0.ebuild b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
index c93726320822..4ee6eb84f3bc 100644
--- a/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.26.0.ebuild
@@ -3,18 +3,13 @@
 
 EAPI=5
 
-inherit eutils bash-completion-r1 versionator toolchain-funcs
+inherit eutils bash-completion-r1 versionator
 
 MY_P="rust-${PV}"
 
 DESCRIPTION="Systems programming language from Mozilla"
 HOMEPAGE="http://www.rust-lang.org/"
 SRC_URI="amd64? ( http://static.rust-lang.org/dist/${MY_P}-x86_64-unknown-linux-gnu.tar.xz )
-	arm? (
-		http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabi.tar.xz
-		http://static.rust-lang.org/dist/${MY_P}-arm-unknown-linux-gnueabihf.tar.xz
-		http://static.rust-lang.org/dist/${MY_P}-armv7-unknown-linux-gnueabihf.tar.xz
-		)
 	x86? ( http://static.rust-lang.org/dist/${MY_P}-i686-unknown-linux-gnu.tar.xz )"
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
@@ -38,26 +33,11 @@ QA_PREBUILT="
 	opt/${P}/lib/rustlib/*/lib/*.rlib*
 "
 
-pkg_pretend () {
-	if [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv7* ]]; then
-		die "${CHOST} is not supported by upstream Rust. You must use a hard float version."
-	fi
-}
-
 src_unpack() {
 	default
 
 	local postfix
 	use amd64 && postfix=x86_64-unknown-linux-gnu
-
-	if use arm && [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
-		postfix=arm-unknown-linux-gnueabi
-	elif use arm && [[ ${CHOST} == armv6*h* ]]; then
-		postfix=arm-unknown-linux-gnueabihf
-	elif use arm && [[ ${CHOST} == armv7*h* ]]; then
-		postfix=armv7-unknown-linux-gnueabihf
-        fi
-
 	use x86 && postfix=i686-unknown-linux-gnu
 	mv "${WORKDIR}/${MY_P}-${postfix}" "${S}" || die
 }
diff --git a/dev-lang/rust/Manifest b/dev-lang/rust/Manifest
index 4a327480c3b4..6a2cfc9818fb 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -6,9 +6,7 @@ DIST rust-1.25.0-i686-unknown-linux-gnu.tar.xz 102453124 BLAKE2B 8986ebab6a7a9d0
 DIST rust-1.25.0-x86_64-unknown-linux-gnu.tar.xz 111059260 BLAKE2B ae982976a735c2b5226722207a983bb638cb7c0cb0ceb6b438456d54fac86a5d1892b535f01ac463157205c0ae27ae876482f6ac1fa269a9ec3e1177be0cef2e SHA512 aea93ff64f620a1dd6b48d07ec3dcbc126b2f5c17b4697c096ec8cd02a3c7dfec7ae7d5df70a55eceb372897ad12f3d01c67d5aaea0167a80270931c61323f78
 DIST rustc-1.25.0-src.tar.gz 98639156 BLAKE2B 1408d5dd0611d4830de3b6b3d00e3fad4198a47599b639d0ac0bd05aaba401f743056a942e9df04a4d192c6b12e8cfe9a9cdf8cd26e48b72104ce9b423df049e SHA512 7d8886f4d5a621eb794e814deb60be681fa38cf086f87ffa14e5a3500c640b237c549a632de1331a0f1b71963de41f6d31a4df3866b7e597424002316fed81ce
 DIST rustc-1.26.0-src.tar.xz 54613664 BLAKE2B 798985e4060c28828066118f39fc296e52b3796ae02f3917912680154047eb6f91806b3d45f3a0e9afcef55d95cea3079debae12d2ddf2d9c46f992e12519094 SHA512 563b910ecf4b2a0d798a1201177f733333e64efad49e5aceec5adc66a8c6903df391c9afc0fdd8284348c08082e0c4de1e5cb68efe6797594de43ca93e4ad7a2
-DIST rustc-1.26.1-src.tar.xz 54604108 BLAKE2B 73e14d835812a42f32342732db448294c98e5cfdcb76b4a5d11085bef6302ae340abadba564c38319882b558df6dbe826ed73347229599f2f8718085a6cdbe10 SHA512 219b8d4dbc1aa087422d8227de8a6be10c0579fd9d1aae83af0a0305baf2c3a72222c6bdca8635c550b5b754d08a7a5b03b81b8b28019b23250327be1c7f8b00
 EBUILD rust-1.25.0.ebuild 4601 BLAKE2B fd0f6cfd9c480b1a6ce19cc02a66233a5acbca045d66955fe4263b66456145f5602de2878b739d99fb42d09c92ec99e7311402cea863e415fe2bdcd6ee0d88e3 SHA512 8928dbf17abbdd5b484dccc6d2fee12e1f653b0e37d2b4a2750cee0c64dea749102baa2ef13c46aa46a40d88fcea364730ad35f1ca72a017f00e60943f9470e4
 EBUILD rust-1.26.0-r3.ebuild 6165 BLAKE2B fea4c2b3ce27edd6a0d024421c8adf719d6d8985cd4f980387068cf69407f08881629cb1f78029543dfbcc42da4158c31ea7a482cd1d9c10409b5c1b7c805216 SHA512 884bdb757420bd0e822db94e47cf53858b63ff9c488013683804f3dedf4c7235358101db9cecdc838c00b2d3d8ad86e35942a4e571365e2e8fb59490bff44186
 EBUILD rust-1.26.0.ebuild 4927 BLAKE2B 7e78c4897053f80fb47c91ab83aaac3fcb772ab75796112aa035781663a962d052ff7486c4baafb2b809e6b22ed10f18ec495aa063a76065d3f45d69b603b80c SHA512 62197eb7b7e0be13f547b49b15491a71689c9076d8805fc53771e9b57e7aac3fbc0197ba6a087958e6be788c57885fa4b5cdc22767f57f318235c91ac40a4c3e
-EBUILD rust-1.26.1.ebuild 6165 BLAKE2B fea4c2b3ce27edd6a0d024421c8adf719d6d8985cd4f980387068cf69407f08881629cb1f78029543dfbcc42da4158c31ea7a482cd1d9c10409b5c1b7c805216 SHA512 884bdb757420bd0e822db94e47cf53858b63ff9c488013683804f3dedf4c7235358101db9cecdc838c00b2d3d8ad86e35942a4e571365e2e8fb59490bff44186
 MISC metadata.xml 482 BLAKE2B c75f5749d7c3b17c9ea4c811809448dbaea4723e74da9e0a9ba4e492c3275875c95ae4d209a0129c24f3e692c00c77e36f16b23e2b3d6ea22c05f50b0de7d054 SHA512 5e9ea6d3db22676701c132298ea8b03453a53aa3b79f564f2cc021735b60329f1201c871541dde362315e938543e89afc6f0c3629218744ddca75d95deeb4a88
diff --git a/dev-lang/rust/rust-1.26.1.ebuild b/dev-lang/rust/rust-1.26.1.ebuild
deleted file mode 100644
index 7c8ad9c00114..000000000000
--- a/dev-lang/rust/rust-1.26.1.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
-
-inherit multiprocessing multilib-build python-any-r1 versionator toolchain-funcs
-
-if [[ ${PV} = *beta* ]]; then
-	betaver=${PV//*beta}
-	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
-	MY_P="rustc-beta"
-	SLOT="beta/${PV}"
-	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz"
-	KEYWORDS=""
-else
-	ABI_VER="$(get_version_component_range 1-2)"
-	SLOT="stable/${ABI_VER}"
-	MY_P="rustc-${PV}"
-	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-CHOST_amd64=x86_64-unknown-linux-gnu
-CHOST_x86=i686-unknown-linux-gnu
-CHOST_arm64=aarch64-unknown-linux-gnu
-
-RUST_STAGE0_VERSION="1.$(($(get_version_component_range 2) - 1)).0"
-RUST_STAGE0_amd64="rust-${RUST_STAGE0_VERSION}-${CHOST_amd64}"
-RUST_STAGE0_x86="rust-${RUST_STAGE0_VERSION}-${CHOST_x86}"
-RUST_STAGE0_arm64="rust-${RUST_STAGE0_VERSION}-${CHOST_arm64}"
-
-CARGO_DEPEND_VERSION="0.$(($(get_version_component_range 2) + 1)).0"
-
-DESCRIPTION="Systems programming language from Mozilla"
-HOMEPAGE="http://www.rust-lang.org/"
-
-SRC_URI="https://static.rust-lang.org/dist/${SRC} -> rustc-${PV}-src.tar.xz
-	amd64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_amd64}.tar.xz )
-	x86? ( https://static.rust-lang.org/dist/${RUST_STAGE0_x86}.tar.xz )
-	arm64? ( https://static.rust-lang.org/dist/${RUST_STAGE0_arm64}.tar.xz )
-"
-
-ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM BPF Hexagon Lanai Mips MSP430
-	NVPTX PowerPC Sparc SystemZ X86 XCore )
-ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
-LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/?}
-
-LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
-
-IUSE="debug doc extended +jemalloc ${ALL_LLVM_TARGETS[*]}"
-
-RDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
-		jemalloc? ( dev-libs/jemalloc )"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	|| (
-		>=sys-devel/gcc-4.7
-		>=sys-devel/clang-3.5
-	)
-	dev-util/cmake
-"
-PDEPEND="!extended? ( >=dev-util/cargo-${CARGO_DEPEND_VERSION} )"
-
-REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )"
-
-S="${WORKDIR}/${MY_P}-src"
-
-toml_usex() {
-	usex "$1" true false
-}
-
-src_prepare() {
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	local rust_stage0_name="RUST_STAGE0_${ARCH}"
-	local rust_stage0="${!rust_stage0_name}"
-
-	"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig --destdir="${rust_stage0_root}" --prefix=/ || die
-
-	default
-}
-
-src_configure() {
-	local rust_target="" rust_targets="" rust_target_name arch_cflags
-
-	# Collect rust target names to compile standard libs for all ABIs.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target_name="CHOST_${v##*.}"
-		rust_targets="${rust_targets},\"${!rust_target_name}\""
-	done
-	rust_targets="${rust_targets#,}"
-
-	local rust_stage0_root="${WORKDIR}"/rust-stage0
-
-	rust_target_name="CHOST_${ARCH}"
-	rust_target="${!rust_target_name}"
-
-	cat <<- EOF > "${S}"/config.toml
-		[llvm]
-		optimize = $(toml_usex !debug)
-		release-debuginfo = $(toml_usex debug)
-		assertions = $(toml_usex debug)
-		targets = "${LLVM_TARGETS// /;}"
-		[build]
-		build = "${rust_target}"
-		host = ["${rust_target}"]
-		target = [${rust_targets}]
-		cargo = "${rust_stage0_root}/bin/cargo"
-		rustc = "${rust_stage0_root}/bin/rustc"
-		docs = $(toml_usex doc)
-		submodules = false
-		python = "${EPYTHON}"
-		locked-deps = true
-		vendor = true
-		verbose = 2
-		extended = $(toml_usex extended)
-		[install]
-		prefix = "${EPREFIX}/usr"
-		libdir = "$(get_libdir)"
-		docdir = "share/doc/${P}"
-		mandir = "share/${P}/man"
-		[rust]
-		optimize = $(toml_usex !debug)
-		debuginfo = $(toml_usex debug)
-		debug-assertions = $(toml_usex debug)
-		use-jemalloc = $(toml_usex jemalloc)
-		default-linker = "$(tc-getCC)"
-		rpath = false
-	EOF
-
-	for v in $(multilib_get_enabled_abi_pairs); do
-		rust_target=$(get_abi_CHOST ${v##*.})
-		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
-
-		cat <<- EOF >> "${S}"/config.env
-			CFLAGS_${rust_target}=${arch_cflags}
-		EOF
-
-		cat <<- EOF >> "${S}"/config.toml
-			[target.${rust_target}]
-			cc = "$(tc-getBUILD_CC)"
-			cxx = "$(tc-getBUILD_CXX)"
-			linker = "$(tc-getCC)"
-			ar = "$(tc-getAR)"
-		EOF
-	done
-}
-
-src_compile() {
-	env $(cat "${S}"/config.env)\
-		./x.py build --verbose --config="${S}"/config.toml -j$(makeopts_jobs) || die
-}
-
-src_install() {
-	local rust_target abi_libdir
-
-	env DESTDIR="${D}" ./x.py install || die
-
-	mv "${D}/usr/bin/rustc" "${D}/usr/bin/rustc-${PV}" || die
-	mv "${D}/usr/bin/rustdoc" "${D}/usr/bin/rustdoc-${PV}" || die
-	mv "${D}/usr/bin/rust-gdb" "${D}/usr/bin/rust-gdb-${PV}" || die
-	mv "${D}/usr/bin/rust-lldb" "${D}/usr/bin/rust-lldb-${PV}" || die
-
-	# Copy shared library versions of standard libraries for all targets
-	# into the system's abi-dependent lib directories because the rust
-	# installer only does so for the native ABI.
-	for v in $(multilib_get_enabled_abi_pairs); do
-		if [ ${v##*.} = ${DEFAULT_ABI} ]; then
-			continue
-		fi
-		abi_libdir=$(get_abi_LIBDIR ${v##*.})
-		rust_target=$(get_abi_CHOST ${v##*.})
-		mkdir -p ${D}/usr/${abi_libdir}
-		cp ${D}/usr/$(get_libdir)/rustlib/${rust_target}/lib/*.so \
-		   ${D}/usr/${abi_libdir} || die
-	done
-
-	dodoc COPYRIGHT
-
-	# FIXME:
-	# Really not sure if that env is needed, specailly LDPATH
-	cat <<-EOF > "${T}"/50${P}
-		LDPATH="/usr/$(get_libdir)/${P}"
-		MANPATH="/usr/share/${P}/man"
-	EOF
-	doenvd "${T}"/50${P}
-
-	cat <<-EOF > "${T}/provider-${P}"
-		/usr/bin/rustdoc
-		/usr/bin/rust-gdb
-		/usr/bin/rust-lldb
-	EOF
-	dodir /etc/env.d/rust
-	insinto /etc/env.d/rust
-	doins "${T}/provider-${P}"
-}
-
-pkg_postinst() {
-	eselect rust update --if-unset
-
-	elog "Rust installs a helper script for calling GDB and LLDB,"
-	elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
-
-	if has_version app-editors/emacs || has_version app-editors/emacs-vcs; then
-		elog "install app-emacs/rust-mode to get emacs support for rust."
-	fi
-
-	if has_version app-editors/gvim || has_version app-editors/vim; then
-		elog "install app-vim/rust-vim to get vim support for rust."
-	fi
-
-	if has_version 'app-shells/zsh'; then
-		elog "install app-shells/rust-zshcomp to get zsh completion for rust."
-	fi
-}
-
-pkg_postrm() {
-	eselect rust unset --if-invalid
-}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index f903168b45de..eba90388dc8f 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -5,9 +5,9 @@ DIST vala-0.36.11.tar.xz 2862788 BLAKE2B e6355669e1f70812ba3db12f3f9fa4f9eb7f8cf
 DIST vala-0.36.13.tar.xz 2869616 BLAKE2B adb22fa45e34c2be2accde2bc928148d3115dc0757338d66feb111b4225879f21f2af5f49511eff53697127d3431d22736be827d3663ed8a5de6d8ac718b0cee SHA512 7c9bb2e50f660ec28d55f755019ba81eb0358327967d8046a14691b5fe9c805f731c6277cbb732fc19af60322e2293bb25176387944ca2de709cde0c22b44d1f
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-0.32.1.ebuild 790 BLAKE2B 5fbcb72d246591c9ab0e0609b6b09be7422a31422344d4ca1cdce7b7ca250421f09b3899bc986b9a34b1ff697271e25ccec53af3b1980d294755022cf3a40dd4 SHA512 7e2215c42c25a890ac37ee471753987cf98767f186cf2e9cd3a7104bfb03a7d4425c61cf12f2bec91511559edcc276a38fb37b58c74e3152988e4f120bc425fb
-EBUILD vala-0.34.16.ebuild 792 BLAKE2B b2c7e572a8cfe2f1d2447e215752e22361b0367d2804dbf8df00bbc3e3b8901f50dc60b8c197f92dddc0d737fd637f89bbb24370abc91431cb6994241f6f09fb SHA512 87f84871923f38a7b2d61a95aeabb28fe01df037470467dabf6b904f69c610f420961103cd628c74aad01a2214241e730d307de8627d7634e9e47762602a4f17
+EBUILD vala-0.34.16.ebuild 793 BLAKE2B eed81e3fa7bd6027218e07746f41d8235a6638fd3a064726f8ab754145b5dc796c05fb6d58957f43f879bb4b431931d7303c7f67057b67a11b272cb11ce6db7a SHA512 195158bb70547cc5e10642ceff9c14d8c25cfd40b06a4e47646171a0371b72f06c0bb3d50ea1ef5465595e8fcf632760bb34e1bdea92b6cc10ad7f1120291b32
 EBUILD vala-0.34.9.ebuild 790 BLAKE2B b33d0f4822581785cb045304b209146daf494cf7b9917628f8127f6994576a076a375a06d60106e3c7aa88e4e6830cf73998d372d2d8b274271dc100f6427094 SHA512 39a137ec6e618d7bb19340846a026955ccaa3f4a77f0cc84e24c96cf9a4da0354a6504c3d44a734c709e5586ba8fe675c569b48edaf5877cd01d45f51a017cfd
 EBUILD vala-0.36.11.ebuild 882 BLAKE2B 9b3b0be67f7e1fad290caec4e7e29fb6d841d8e171a64f790857b905164ad3ff2c29c7e010d11becfa2d7a2d4687de314589f084af29ee9947dccbb91a29ba5d SHA512 7aef7342b8cad68c744f2c5039dd6bfb4ccd02d6a9f7287e531b730b5b6bbb15e862175bae297f6e025ab6ce50788a92d51b83cbece1889ef66c386e44402393
-EBUILD vala-0.36.13.ebuild 875 BLAKE2B 14ef5e33aee22fa1e0fb9c0351886a8c81ce71548867c5010be8b4f66a9dc95545c81416640e6b432425e4e4aa6e278e20cc92585056483ae759c5adf5a4b1dc SHA512 14d61af669f178a66de4809c2ce08159186a75c698152e71bb80cfc4e3483d7f4c55d7a99a8a1d1fde2be4ecfc34b3a43982afc7cd0d1029a8a1b0872f2cba30
+EBUILD vala-0.36.13.ebuild 876 BLAKE2B 0920718027abfb148de8042bf2b8b352e7c0a76378d8bc1a66e188b81e9b87f032f17aafbd7e083a45e29372f38494c215d8b2abb912a71aaf5b8ac59143c213 SHA512 3610aad4b6685e096030200b87d93efc12970538dc8b373f6c1787d3cd5dd01c82ddd3b40216cf46b1ccbe5e42e5fc4d6577a411680babd9c6faa3434d6ed1e8
 EBUILD vala-0.36.7.ebuild 874 BLAKE2B fac3c1a7156f8e1fbf81bdd6ca20b1fafa2d76e99aa5cffa83bc2dad9a22fbcf9e5bc8d69c058d22043e1052e1eb80f126c4ccef03ebd2b5cb0c73324f6712ea SHA512 1ea34baef09331a4871da45ab9ee412e4348a36b4892ea5e0893658602aa1e0a80770e308f5a7316418e863358edb0f8d9ce677d12baef4fe61910d20af98cb6
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.34.16.ebuild b/dev-lang/vala/vala-0.34.16.ebuild
index 446d4e8033c9..90d69ebfce64 100644
--- a/dev-lang/vala/vala-0.34.16.ebuild
+++ b/dev-lang/vala/vala-0.34.16.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.34"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/vala/vala-0.36.13.ebuild b/dev-lang/vala/vala-0.36.13.ebuild
index 9cd322cba8a6..c0d657637f70 100644
--- a/dev-lang/vala/vala-0.36.13.ebuild
+++ b/dev-lang/vala/vala-0.36.13.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/Vala"
 
 LICENSE="LGPL-2.1"
 SLOT="0.36"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="