gentoo resync : 16.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-16 05:02:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-16 05:02:38 +0100
commit: f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
tree: c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /dev-util
parent: cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)
60 files changed, 1611 insertions, 203 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9412bb88b342..a45da4080755 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 0d7196858d11..500b2f6a8a7a 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -2,7 +2,7 @@ DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
-EBUILD aruba-0.6.2-r1.ebuild 992 BLAKE2B 44400b3953d5f6b4ff34d1a8878249238c9b64c9142ade8b6ec182ac6cc2ad4192e2e48f7e515932e01d1a1acb771d2edba7c99e047b92f965c6b11afe4abfbf SHA512 cade3518b27a5935b40276c6adb7a8f339d0dcdd147e7b90857959c8b2889c82b28a450e81ef459483e15639a9d40736d289ee5031764cc576e90e217f105100
+EBUILD aruba-0.6.2-r1.ebuild 997 BLAKE2B 1dd08f3196bb3e07c686684ef766a7fd8c6e79b55423bedb391430aa45d0b74409d45cd0cfc16e1dad6f3b47086adecb06062ddeba01ba4edaab07cac2be0858 SHA512 ed621f77a4a3dd461fb1f1ba83770b31887a0f5061d99248ee11bc2e6c442281575475e9a1683aaaf5c104de7de7d5dad1895efe6169fc6469a155cb125f180d
 EBUILD aruba-0.6.2-r2.ebuild 985 BLAKE2B 157b93d1d0e018a7c58f07a839d06d4386392cc36df235880009ffc409b5c0dd9d17c78486f7512f4febf33000a33e6f9ddc6edbc08bda152655cbeccdac6d15 SHA512 5cee45c56b5118a10e681828d9e72fb3c81f4f9e67abf300b5b62210b9a456a0a9ea5264b47ee110060c5db1aacea7a6464a20ac5f96f43b3f0eaa20b9aac618
 EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r1.ebuild b/dev-util/aruba/aruba-0.6.2-r1.ebuild
index bbd7c4507ba7..05b5da859d1b 100644
--- a/dev-util/aruba/aruba-0.6.2-r1.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 8d237f1c8b13..37dfa6b90af3 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,7 +1,10 @@
 DIST bazel-0.10.1-dist.zip 92973197 BLAKE2B a1d681407e2c72a57b3dcbb5e2afc49e59670be65da3d7d038dc3b8593bc0ab5b4a06c8dd8fc8a617a92eef2fc26a049b6de9a1eab0d05f31efb2fbeeb9ce711 SHA512 1894c951fd39a084011f89dd0d458e182525c2bfd6c80da071865e981e21a8c2b8363530ab53af18e6deae4a488744d6d2b7a5a4acf04715c2e26560a01df707
 DIST bazel-0.13.0-dist.zip 90105262 BLAKE2B cb065025524123babef187bac2e1f54f43645d08cb1282a5fe8f8c8b090e595570646072e2380836e2c43403f7953f97321becc24b743d7b9ab43ad208cf2c2d SHA512 3c128e551cff1b685250a68892ca3e1ad6be8b152ee2b8eb527c94adbb8fd50c70e703a363bb938916275030ddb14d756c14e4dc238e7a7b40289c700c5d53c7
+DIST bazel-0.14.1-dist.zip 89415405 BLAKE2B 7be5d4630d024d235a66f6bdf495c282b04a4034dde156c50d37a7e2eb3bf98df0caead7887f421b664fe92486e6baa5cd90e61b1e82b07b1691dc509ab93a68 SHA512 02c7125438f060d8e5e25b91ce3ca76fac6681b4f12033d807955a4ca5a5c22a3508a7229581b7349f35f343911f8408f43f8d78d54601277576dd32539e4681
 DIST bazel-0.7.0-dist.zip 84669893 BLAKE2B 2f8bbe3a48224a797bdebdaad8f7c403c8b0232ada5eee8c8619f241e9670dda311b9280f48b5e2013079f959891d94f55aee2af0dfae9fc4f6a486663fa245d SHA512 039ab6a04fd4422bd14503187e6cc0d07301723b3ecae906606fa12ccea72190d82237899c103c1adfdf05dc8672887790780ddfb4cce87cd590adbde3d3f6d4
+DIST google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip 1056996 BLAKE2B bf168c41a9958bcdc679a40d1e88911c6af0e47207362204326b712e0129b37348360a855f44af8b76acc46108ac89a707d0c0f793500c513a919070248939b9 SHA512 40cb9ffcaa3c57c69bcbec7b070fad5865e7317817049b7588dd42899054eb97cd17cb0019df99ad2324ed8e2efd8334cd83ace758a4c2d3f453503ccf54a91e
 EBUILD bazel-0.10.1.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
 EBUILD bazel-0.13.0.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
+EBUILD bazel-0.14.1.ebuild 3603 BLAKE2B 3cc3d61b45ea0595ad543d240c13b7f61ff6f76ae5cd34f7f2ba60823fcbb3ad31653fbc09b5a7030df7f0750ae33d3c0c454d162e72911e0cb2944036fd71f2 SHA512 9369b64769351b94d119323f1d506ffe9816b3ab3a2a33f4f1977b2aeede49b85833aa3454a4ce1b0b4a8026fffe731302b60aaab42c326c1ec733cb20aec332
 EBUILD bazel-0.7.0.ebuild 2070 BLAKE2B c9e36a90c5d0233f282608f645db158d5449a2d2305209ff5b2268fb64d8208295316641123fe749446b2775098b7da38ce0fe753af959599995ebb24508cc39 SHA512 25e3293a33aae17cfbe2b4f7c3106bac1ff4362e72bf6becc4cd040088d9dab2cf64b3dca61d5de80631f00925f89a2a3aa24f49ac7520af50dec00181aae0f1
-MISC metadata.xml 703 BLAKE2B a019fea848bd86537d64d63746c1d7459ec1b511ac77c0c8ca9caee9e2b888ad99c15cdb5aca00ad6d6bbbfcfb5a2da05632af4d67b40d231e2234484f2eeb11 SHA512 46c1f55e4949ef3b7d42d769e31e34fcc9bffbe4b36cf6a467a514f8471325597d417f3da5ff955203fdc880531502969cef4fcedb4536cc7bfc64d2b7e50c5d
+MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.14.1.ebuild b/dev-util/bazel/bazel-0.14.1.ebuild
new file mode 100644
index 000000000000..b972de19c2d7
--- /dev/null
+++ b/dev-util/bazel/bazel-0.14.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+
+bazel_external_uris="https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
+	${bazel_external_uris}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+load_distfiles() {
+	# Populate the bazel distdir to fetch from since it cannot use the network
+	local s d uri rename
+	mkdir -p "${T}/bazel-distdir" || die "failed to create distdir"
+
+	while read uri rename d; do
+		[[ -z "$uri" ]] && continue
+		if [[ "$rename" == "->" ]]; then
+			s="${uri##*/}"
+			einfo "Copying $d to bazel distdir $s ..."
+		else
+			s="${uri##*/}"
+			d="${s}"
+			einfo "Copying $d to bazel distdir ..."
+		fi
+		cp "${DISTDIR}/${d}" "${T}/bazel-distdir/${s}" || die
+	done <<< "${bazel_external_uris}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	load_distfiles
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	cat > "${T}/bazelrc" <<-EOF
+	build --verbose_failures
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --experimental_distdir=${T}/bazel-distdir
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+
+	test --verbose_failures --verbose_test_summary
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+	EOF
+
+	echo "import ${T}/bazelrc" >> "${S}/.bazelrc"
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
+	VERBOSE=yes ./compile.sh || die
+	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
+	mv bazel-bin/scripts/bazel-complete.bash output/ || die
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+}
+
+src_install() {
+	output/bazel shutdown
+	dobin output/bazel
+	newbashcomp output/bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bazel/metadata.xml b/dev-util/bazel/metadata.xml
index e7d5f3b34fd5..7ddb1068e6a0 100644
--- a/dev-util/bazel/metadata.xml
+++ b/dev-util/bazel/metadata.xml
@@ -4,6 +4,9 @@
 	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 	</maintainer>
+	<maintainer type="person">
+		<email>perfinion@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">bazelbuild/bazel</remote-id>
 	</upstream>
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
new file mode 100644
index 000000000000..6dc0a9f83fd5
--- /dev/null
+++ b/dev-util/bitrise/Manifest
@@ -0,0 +1,3 @@
+DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
+EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
+MISC metadata.xml 1068 BLAKE2B 998f8032d11dfb6271d2fa37e6b56b66c3cbde70690a4eaac731e4cfd3a17c91bb0a3787f6001ad8fd8f213edfdca433ef9ab1d577257bd8fe490dacbe9fd4d3 SHA512 f5ab34d1cf7d68f1b79f379e6edf08533d0621ad06144d906160ad223df351713077dd1d26751fbb1995d4561f90862ce1104be279348079d2e01294c9ba716e
diff --git a/dev-util/bitrise/bitrise-1.16.1.ebuild b/dev-util/bitrise/bitrise-1.16.1.ebuild
new file mode 100644
index 000000000000..35fbfb5fcaf7
--- /dev/null
+++ b/dev-util/bitrise/bitrise-1.16.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
+}
+
+src_test() {
+	export PULL_REQUEST_ID=""
+	export INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/bitrise
+	dodoc README.md
+	use doc && dodoc -r _docs
+}
diff --git a/dev-util/bitrise/metadata.xml b/dev-util/bitrise/metadata.xml
new file mode 100644
index 000000000000..d00260bae974
--- /dev/null
+++ b/dev-util/bitrise/metadata.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>karol.wrotniak@droidsonroids.pl</email>
+		<name>Karol Wrótniak</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>Run your Bitrise automations with this CLI tool on any Mac or Linux machine, and use the same configuration on bitrise.io (automation service, with a mobile app focus). Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with stepman and envman. For a nice &amp; quick intro you should check: https://www.bitrise.io/cli</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/bitrise-io/bitrise/issues</bugs-to>
+		<changelog>https://github.com/bitrise-io/bitrise/blob/master/CHANGELOG.md</changelog>
+		<doc>https://github.com/bitrise-io/bitrise/blob/master/README.md</doc>
+		<remote-id type="github">bitriseio/bitrise</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 0e26954e4910..705fdc07f434 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -12,11 +12,11 @@ AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
-DIST cmake-3.11.2.tar.gz 7953913 BLAKE2B 2979f360fdd3727f571d84181a9f1064246871d7176cda7ca60766722eccfe738121fba498e46e502355cb54b9f88b7ec2a1a63a81688846fdc959dd7c11681b SHA512 c8ffa0885778ea942eb2533dab72da8719f67a212a33883913af047717c87368cb58e1d6c578b542d96d7dcc85d126abe81686214366c32174fd5553b399b69e
 DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218 SHA512 a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
+DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
-EBUILD cmake-3.11.2.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
 EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.11.4.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
 EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.2.ebuild b/dev-util/cmake/cmake-3.11.4.ebuild
index 050883851f5e..050883851f5e 100644
--- a/dev-util/cmake/cmake-3.11.2.ebuild
+++ b/dev-util/cmake/cmake-3.11.4.ebuild
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 1b50c4fa931c..38b3dfe4113b 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,11 +1,9 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
-DIST cucumber-expressions-5.0.15.gem 17920 BLAKE2B 83c741f985aee1fdb316693c70f519bd82e4cb373285f0bc9976405dad143ef562cbac92263e7fbf73254713a699270cf99080ed9d3a3f85a6b982caafebeb6d SHA512 0d50975fac9b94e17f7f0388b50cf1fe98775dc34887846f72d4b1f471ff957b466b9d567fd6e0da7561860d6e2d8364c2f3490ad9e8059ee0d1cd99ebc5f386
-DIST cucumber-expressions-5.0.17.gem 17920 BLAKE2B 4b90510f296d3affa659244948913618963204f80db95043924dfdb709e0654dfb5cef55b77c048cac7e7f3cb2af4a9a49150dd77c99f9a87b68d4dbf9f54f16 SHA512 2133e53733c2e68608885df650fed6c8975e310875079ea719c5bfee7635d7b49cc1c5bcc6946ca90323243b13606222993be31bc71da55cdd091b6b93e6567d
 DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
 DIST cucumber-expressions-6.0.0.gem 18944 BLAKE2B ea7987ff411b00b80683e4ace66d6b3e5b91ef35a93af369a79f19472c6fba3eb0be8453fde3d716eef83ec221e35e7c2d0634e0c941693773fbf174e578f45c SHA512 e47a7099cfa3d49cd17bd6f289e0dd6856990e60d1ed4ed68897a4efd40eb5715bdb1bd2fdc0aa5389cf92cd67402ea544238752e38af6156a7b182cd6ebef4e
+DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
 EBUILD cucumber-expressions-4.0.4.ebuild 479 BLAKE2B b6d58cb994fcc741ba5c6f8d26531d01530c26803df4ef3a914882bc9eb440a9da4c2b84a593a622807616b8e2bb82191b827f08facad37521d83840bc53e6c3 SHA512 43d857be0ad1cf4cc39ce9852c8d032b65607331eec1402ed7f0ec92524621ec34bf4c2213e8c2bccc0763311a06b0db38b205baf13219cf8d49b63eb52b8f9d
-EBUILD cucumber-expressions-5.0.15.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
-EBUILD cucumber-expressions-5.0.17.ebuild 486 BLAKE2B be168b3065f738b734d610906cd70d4a78ede9d9f8ae244518d5c52ce8a3a9711a161a5b95439865c8a98edba86429d523f29430bc5aee3e712688381e0e5e6f SHA512 37280514dfabd2dbff86634558be5109245ebc799a860eb86616cf49b80f6cf4820502ef036732b42faf72abd6e8964a4829479891ba82e22c1093fdac80d33c
 EBUILD cucumber-expressions-5.0.18.ebuild 479 BLAKE2B cd32c66f95ec375ed5457e7ef41cf01537bc7074628379c887d39930c6ba8e999c0bfe85f3894ab0db0350912085eef5b53a26fe1e6d78010f01cb5316f2316c SHA512 02a0b11ec9e2e6de1178eebdc91b3f93fa6d6f834aed8f6e5fc969ef482653a8684ac84e26ec619fd53af74db2d8544745c3164fe6a1d3fe247bc081d1f4d131
 EBUILD cucumber-expressions-6.0.0.ebuild 479 BLAKE2B eb8da200398a284c6d43c8fa78fb0a785a8295e0757c2a993ba6855bcd076f31911aee0b9db905477aa973e7cf9150597ac27cb9ba9eb2872e94e5b5b7069d70 SHA512 08f7b4addf7b69101fa252217e4552bb003944108fcd70970a5f09053529d41bae3e1602d2d673b0c84b3502045c5b0c257848b69edf447ba5f89cb6d49c3dab
+EBUILD cucumber-expressions-6.0.1.ebuild 479 BLAKE2B eb8da200398a284c6d43c8fa78fb0a785a8295e0757c2a993ba6855bcd076f31911aee0b9db905477aa973e7cf9150597ac27cb9ba9eb2872e94e5b5b7069d70 SHA512 08f7b4addf7b69101fa252217e4552bb003944108fcd70970a5f09053529d41bae3e1602d2d673b0c84b3502045c5b0c257848b69edf447ba5f89cb6d49c3dab
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.17.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-5.0.17.ebuild
deleted file mode 100644
index 832428b34fa9..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.17.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-5.0.15.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 832428b34fa9..06b14165109d 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-5.0.15.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -15,4 +15,4 @@ HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~x86"
-SLOT="5.0"
+SLOT="6.0"
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index f56db4a60b78..cc0536f80370 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -4,7 +4,7 @@ DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4c
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
 DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
-EBUILD cucumber-2.4.0-r1.ebuild 2473 BLAKE2B c2af659c58de223eacfee53adeeeaf69095aa1a84b062b5fd9f2de7797941d499e3a88cd79e99cc72e42a15d3e02fcd1e31e024114da8ade82f325d1be2992b9 SHA512 e7087af641078b13fe9bddcfadd09c03bb521a1d2473ce5a29931c923efd58d11292e4e0c97fb1365dd32be699ab6317b6cbbf69742e0377ea41dbf09f5f8321
+EBUILD cucumber-2.4.0-r1.ebuild 2478 BLAKE2B 616fec059aa5d4546c73eefe7b41b4dd058791ee1bf70f8eb16df78919f1023d8c49e912f0cfc554804e001cc1aaefdc3e7dc1a574c79afb76a55ce7daab5a41 SHA512 dd402e3a7fd794cb6a73f9787520132eb189670f306858f556c5c00b9b43118267e6804289906b1fddc9e4eb631b7953109439dd0720954d7a1c69e12f8b3e50
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
 EBUILD cucumber-3.1.0-r1.ebuild 2640 BLAKE2B 6153fd69023f41de353be99be0a2dd06f83b72da4b598e7c41af68a2613ed4a94886c9272256d5cf4191b37a9ff6228a0f4e51a49fd212e14c833f11a2af84ae SHA512 05c022ee6a27cc814aa7e2acdda3da8ec35b9f0e2ac50b9b9d2ad0f38effc43da82dcbffccce4d2e0f0c0d0516dee8ef3874644627549a71cf1e4607ccc4e781
 EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B 73ed0d1eef2e67fcac273f1c616af5666e5c06791b37690d01e59a79cea8bdc1536b7ba4eb29accba2d6966aa65dda500b8271f4f193b8b805fe2f2b0ce3ca6d SHA512 6317b921eb64ff878fadbb48dcccceae1fbbbd7867afa85839af7d3cf7031a210fbfbe1763530bdd00f3978722ef327d478b8fcf25bc9049c543693b9a206cd9
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index 92751765ac1d..7dd7fb70ea75 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index fc0f5324ac42..432c7a9c4edf 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,4 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
-EBUILD desktop-file-utils-0.23.ebuild 1285 BLAKE2B a817dd18102e4ba8347fdc2c305d27526730156f13dc5af7a598bb0efc9c594ff56dd181f88be47ac4a2d60cea1d83c6deb7a81ef7e9ce05f8e39e01295b775c SHA512 f1d749de1e75139ab04f0e9603a8275ef9b593f8eacca786d1849f0cf574833fca4d9bc52aea2d4c919d9ac05452542838aeb88645c9035c9aac3b8dfbf468e7
+EBUILD desktop-file-utils-0.23.ebuild 1284 BLAKE2B 7ee49c484dec7684919af3ed443dce419e7afa9cc7864976207ebc6c4600bd961f044a5cac5d582cdb185f82aefd5c10241eaa1d51612a9f420676b25ed18506 SHA512 c380d1255117d4b98182dfcc06c03d643f7094ea2b3229ef68efc075654421603059d9d74443253ee4dd45b82a76a5109482c10659b194c3a101a64016244c93
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
index 20ead4dd1df8..a336cd83a18c 100644
--- a/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="emacs"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index e035bd5389cf..a39d5d39f6b7 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -1,16 +1,26 @@
+AUX electron-1.7.15-v8-crankshaft-rce-fix.patch 1581 BLAKE2B a78c4bccca8ca37957d714e6cb29c893fabdd1960a4b20145e6d86f701ff6be69b2495d90563fa5314c350c60d7d81c382a417347f924ae1c24ff13a0e90fa82 SHA512 3a9423434ce03744b5eb7c8850c6908e8c94e23fed3bc5d87bde09e6c47eb429eb0852b8453b3311a2f640b8d9d136343155743d633206ff85c9ac5a4f75106f
 AUX toolchain/BUILD.gn 400 BLAKE2B 5237bf9cdb5be027aa8dff5b854297f51fa5f8a09f5b24a1b5c6c4494126e16573f2bafe503389566507d60818880286efca8ccc9ce8f5cc560faf76f2df6c42 SHA512 cc36ab3406dcaedfd9472e94c53d3f25c4f5e25e2d1275e2bc99b8e18ffdf6de1583f7e0ceadfb8a8d10ab3e5d7018b84ec506e3b31a0a55cfb9453fb19ad3d0
 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
 DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
 DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
+DIST chromium-58.0.3029.110.tar.xz 518167664 BLAKE2B dc9b4eee10236b892c82c6c12f649aed30454124496794485430e6119ee83e420564b2f2fbd21a3d1525cfb3de3524210c50770cbf74b2dbfdb18b35445a740a SHA512 412dc94e23d6699b959f23956f5f82f4c600050649a8a2e694bb2c6e166245e3670f4549ee1c08a0df05b4e361f040d1739515180b8631adbfac9c907af8d93f
 DIST electron-1.6.16.tar.gz 4957555 BLAKE2B c72433ed076bc6b68b81b136db4dcf1a0fe17f16c7859e5176c215d86164f0c3d531310d8edbee9f52038722aa6dbc7934d9d9a5511bcb978bb9c255122f1794 SHA512 f657aae526defa8526948c89b8667475d1fb27f1884a1a4655773052cf3b3578483d3d51e35e6aa077579c3023056eec5d2a06f24a2c4013ca078fb82f850182
+DIST electron-1.7.15.tar.gz 5172906 BLAKE2B 9b3785eed455cf2864572582a37cb7b107e96b207879c8975870383714bc1103073840409246392433af7c4edf2404d519d16ea4185cb1e6925b2ef6cf93a9aa SHA512 ade60d6810a85f9d92ff8213d2c38059f49dd8304220feb0759622390176d9a145b14b2df1b2541cb153ffff4c83d00001297c3d85de0530a1a75e0544e22fe2
 DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
 DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
 DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10
 DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86
+DIST electron-libchromiumcontent-2f7b83669315f9492380334d1a8b1cd9bc758efd.tar.gz 70588 BLAKE2B 1f4d76577547c3dc24ca615f16563260ef44e6d6944ae0486cd7965bbdfa4149f26fe827c13cdbc8372eec95c1698763a56a645ac9845f9685ef752e33ab5ddb SHA512 2d065b024eb9928ba8abfa03d729b3ab1da96f436b76999371641dd468b38167b0812ff8538db1b7e1dc6a4f102cfbcce9cb8580837d593b0369d37c9f63c2c7
 DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
+DIST electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz 24066 BLAKE2B 622d0ee16fd35a98c154bad7cd271350b6d0c2da0d1df1b0effde6ddb52eea3530921a746c96eed2130ae403c3ef00dac8a86a8a896afcc9b4e74d03a17fb727 SHA512 99a6e67469852a84a7a4b1585a1ff9d32491f9bab511a3853c630ac30bf1c703d0b1c0f8830a546f2665dfe87f1f582860dfabb332909f6973e64dff2ed4b5f4
 DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
 DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
+DIST electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz 46772284 BLAKE2B 453ade1d1540f099d7225f3c758fc1455dcae3a6b8ada00c20b85519bfd61beb3fc3beb083f063de2ce52c5b2e83eb67acea23f2605e201031b42552747e522b SHA512 532bc27e026fd032e8747150bac885277ae2e6cede3053e61690b846e380d664daa0b49e843c44d937a5f84f902f149323b8dc873dcfcf8ddc27b6feb1df750d
 DIST electron-patches-1.6.16.tar.gz 28592 BLAKE2B bd64ff7ad03a8ecb9422702cc33746d57464228a3ee7ae7fa9ecc30ad5507a8cb2db71caf5f6700cfe1d963e9957d50c1e5c784e148aaabc11aef9d90d2508f0 SHA512 b53b5f88532a0898878abac71b36c410c3734da871266703932238f707e54a4f6af92cc4792dc645ba02069ec5e9e548317e0e121556210f69dfbb63d5a1fa03
+DIST electron-patches-1.7.15.tar.gz 58386 BLAKE2B d11ae9fd93cecb71a1ae625ab2377be0040c19ab2c858e4afba72835b4dab3d2f8c19d4192ff9ce4452ddefe54c07800d7530fee443e08b8140ea428752ac4b0 SHA512 deb639de2fcb2f1451e3fdc5dd8beb7fb24d86406430f2202fbda8e719dc7c4f14e9edcded00b8a452e22eac926fb21ab19b16fbc22778a8315d68da3441ae8d
 DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
+DIST electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz 38752 BLAKE2B 0fa9e928d64d31fec04c542cb4a4277497d42c621a500cbcb77783bdd20f6251ac075f779229a1f43645f8181734b8a213fa77dc2b906b7846f725978996b488 SHA512 76f996b4a14290f1c3d061c9c2bb3d5869c53c1ef0e395b8faa6dd3470787dd2c6f492d5dcba18d805c0ccc1c6e2a3a602bf873876075d160f69a899a79d953d
+DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 EBUILD electron-1.6.16.ebuild 28088 BLAKE2B afaa3c13bff2adb837230c5b44a07a7725b50ea3f4b7e263538c53b5d9f22e837499b089b405b4708bdafb5bfee852c34229c988a5f6c4336f6cc12802868dd1 SHA512 55a4c3c9663294a77d89b8a85a176aad32a4ba9c579be9e5513ecc8742edbf4f2b4e7e94f82a13a44f9d21490735f4a71727938de88864c1d2fc23dd4d7aec0f
-MISC metadata.xml 1179 BLAKE2B f233c35ac72f6b375d7f036671f0a21b6a5b72453713c6cae6b13b8b7d2c5d8b71682799124f121f6fafe115aea6de05f44b440054ccbad4af86b2c03e0833e4 SHA512 3f9a3dba4cad2d4eebd2d90eb5b1d078df6c59f5eda52fbc148b23b999a9ec4318b87e1ab8bbcdd6ec353bf274ed65ae3a19cae7df07465cd86f64abd85018a0
+EBUILD electron-1.7.15.ebuild 27961 BLAKE2B adf311387891f08a03493bc4750ec33381a26a3a5877e5bc34946ab0ab97667d79580d24c26674ce314ebccea7cfdb581e536415529dcdc2dd4753fe31c8b00d SHA512 420a2c29b85d773cdf72db90dd1d0e4de03ce9f658d12578a2ad7da5ec825c51685a8934a22bd2161ac2f16af8056a37f1e1a61b1e85ba35e1323cb1513b9b99
+MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760
diff --git a/dev-util/electron/electron-1.7.15.ebuild b/dev-util/electron/electron-1.7.15.ebuild
new file mode 100644
index 000000000000..ee39885c1cfa
--- /dev/null
+++ b/dev-util/electron/electron-1.7.15.ebuild
@@ -0,0 +1,888 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 gnome2-utils flag-o-matic multilib \
+	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
+	versionator virtualx xdg-utils
+
+# Keep this in sync with vendor/libchromiumcontent/VERSION
+CHROMIUM_VERSION="58.0.3029.110"
+# Keep this in sync with vendor/breakpad
+BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
+# Keep this in sync with vendor/breakpad/src (and find the corresponding
+# commit in https://github.com/google/breakpad/)
+BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
+# Keep this in sync with vendor/node
+NODE_COMMIT="a992f2ff412b85606ec1d4c1eb00ad832fa1e640"
+# Keep this in sync with vendor/native_mate
+NATIVE_MATE_COMMIT="7d9c1a80f025f4c46f7da8ea73246fe0f1968579"
+# Keep this in sync with vendor/pdf_viewer
+PDF_VIEWER_COMMIT="beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf"
+# Keep this in sync with vendor/pdf_viewer/vendor/grit
+GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
+# Keep this in sync with vendor/libchromiumcontent
+LIBCHROMIUMCONTENT_COMMIT="2f7b83669315f9492380334d1a8b1cd9bc758efd"
+# Keep this in sync with package.json#devDependencies
+ASAR_VERSION="0.13.0"
+BROWSERIFY_VERSION="14.0.0"
+NINJA_VERSION="1.8.2"
+
+PATCHES_P="gentoo-electron-patches-${P}"
+CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
+BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
+BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
+NODE_P="node-${NODE_COMMIT}"
+NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
+PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
+GRIT_P="grit-${GRIT_COMMIT}"
+LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
+ASAR_P="asar-${ASAR_VERSION}"
+BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
+
+DESCRIPTION="Cross platform application development framework based on web technologies"
+HOMEPAGE="https://electronjs.org/"
+SRC_URI="
+	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
+	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
+	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
+	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
+	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
+	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
+	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
+	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
+	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
+	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
+	https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz
+	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
+"
+
+S="${WORKDIR}/${P}"
+CHROMIUM_S="${S}/chromium"
+NODE_S="${S}/vendor/node"
+BREAKPAD_S="${S}/vendor/breakpad"
+BREAKPAD_SRC_S="${BREAKPAD_S}/src"
+NATIVE_MATE_S="${S}/vendor/native_mate"
+PDF_VIEWER_S="${S}/vendor/pdf_viewer"
+GRIT_S="${PDF_VIEWER_S}/vendor/grit"
+LIBCC_S="${S}/vendor/libchromiumcontent"
+
+LICENSE="BSD"
+SLOT="$(get_version_component_range 1-2)"
+KEYWORDS="~amd64"
+IUSE="cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic
+	  +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+# Native Client binaries are compiled with different set of flags, bug #452066.
+QA_FLAGS_IGNORED=".*\.nexe"
+
+# Native Client binaries may be stripped by the build system, which uses the
+# right tools for it, bug #469144 .
+QA_PRESTRIPPED=".*\.nexe"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	>=app-eselect/eselect-electron-2.0
+	cups? ( >=net-print/cups-1.3.11:= )
+	>=dev-libs/elfutils-0.149
+	dev-libs/expat:=
+	dev-libs/glib:2
+	>=dev-libs/icu-58:=
+	>=dev-libs/jsoncpp-0.5.0-r1:=
+	dev-libs/libxml2:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.14.3:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gconf? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
+	media-libs/libexif:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	>=media-libs/libvpx-1.7.0:=[postproc,svc]
+	media-libs/speex:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	>=sys-libs/libcap-2.22:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libdrm
+	x11-libs/libnotify:=
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXinerama:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!<dev-util/electron-0.36.12-r4
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	!gtk3? ( x11-libs/gtk+:2 )
+	gtk3? ( x11-libs/gtk+:3[X] )
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	dev-perl/JSON
+	>=dev-util/gperf-3.0.3
+	dev-util/ninja
+	net-libs/nodejs
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 4.9 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288
+			die "At least gcc 4.9 is required"
+		fi
+	fi
+
+	# LTO pass requires more file descriptors
+	if use lto; then
+		local lto_n_rlimit_min="16384"
+		local maxfiles=$(ulimit -n -H)
+		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
+			eerror ""
+			eerror "Building with USE=\"lto\" requires file descriptor" \
+				"limit to be no less than ${lto_n_rlimit_min}."
+			eerror "The current limit for portage is ${maxfiles}."
+			eerror "Please add the following to /etc/security/limits.conf:"
+			eerror ""
+			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
+			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
+			eerror ""
+			die
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	use lto && CHECKREQS_MEMORY="7G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		CHECKREQS_MEMORY="16G"
+	fi
+	eshopts_pop
+	check-reqs_pkg_pretend
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+_unnest_patches() {
+	local _s="${1%/}/"
+	local path
+	local relpath
+	local out
+
+	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
+	| while read -r path; do
+		relpath="$(dirname ${path})"
+		out="${_s}/__${relpath////_}_$(basename ${path})"
+		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
+			"${_s}/${path}" > "${out}" || die
+	done
+}
+
+_get_install_suffix() {
+	local c=(${SLOT//\// })
+	local slot=${c[0]}
+	local suffix
+
+	if [[ "${slot}" == "0" ]]; then
+		suffix=""
+	else
+		suffix="-${slot}"
+	fi
+
+	echo -n "${suffix}"
+}
+
+_get_install_dir() {
+	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
+}
+
+_get_target_arch() {
+	local myarch="$(tc-arch)"
+	local target_arch
+
+	if [[ $myarch = amd64 ]] ; then
+		target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		target_arch=arm
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	echo -n "${target_arch}"
+}
+
+src_prepare() {
+	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
+	rm -r "${NODE_S}" &&
+		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
+	rm -r "${BREAKPAD_S}" &&
+		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
+	rm -r "${BREAKPAD_SRC_S}" &&
+		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
+	rm -r "${NATIVE_MATE_S}" &&
+		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
+	rm -r "${PDF_VIEWER_S}" &&
+		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
+	rm -r "${GRIT_S}" &&
+		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
+	rm -r "${LIBCC_S}" &&
+		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
+	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
+		"${S}/node_modules/" || die
+	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
+        "${S}/node_modules/" || die
+
+	# node patches
+	cd "${NODE_S}" || die
+	# make sure node uses the correct version of v8
+	rm -r deps/v8 || die
+	ln -s "${CHROMIUM_S}/v8" deps/ || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" \
+		deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
+		deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	python_fix_shebang "${CHROMIUM_S}/chrome/browser"
+	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
+	python_fix_shebang "${S}/tools/"
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen
+	# https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
+	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
+
+	# Fix broken patch
+	cd "${LIBCC_S}" || die
+	eapply "${FILESDIR}/${P}-v8-crankshaft-rce-fix.patch"
+
+	# Apply libcc Chromium patches.
+	cd "${CHROMIUM_S}" || die
+	_unnest_patches "${LIBCC_S}/patches"
+	eapply "${LIBCC_S}/patches"
+
+	# Apply Gentoo patches
+	cd "${S}" || die
+	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
+	eapply "${WORKDIR}/${PATCHES_P}/${PV}"
+
+	# Merge chromiumcontent component into chromium source tree.
+	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
+	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
+	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
+
+	if use gtk3; then
+		sed -i -e 's/gtk2/gtk3/g' "${CHROMIUM_S}/chromiumcontent/BUILD.gn" \
+		|| die
+	fi
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		breakpad/src/third_party/curl
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/numerics
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/murmurhash
+		third_party/angle/src/third_party/trace_event
+		third_party/boringssl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/third_party/polymer
+		third_party/catapult/third_party/py_vulcanize
+		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
+		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/ced
+		third_party/cld_2
+		third_party/cld_3
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libusb
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/vulcanize/third_party/UglifyJS2
+		third_party/openh264
+		third_party/openmax_dl
+		third_party/opus
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms2-2.6
+		third_party/pdfium/third_party/libjpeg
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/pdfium/third_party/zlib_v128
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/smhasher
+		third_party/sqlite
+		third_party/tcmalloc
+		third_party/usrsctp
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/x86inc
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg )
+	fi
+
+	cd "${CHROMIUM_S}" || die
+
+	# Remove most bundled libraries. Some are still needed.
+	ebegin "Unbundling libraries"
+	build/linux/unbundle/remove_bundled_libraries.py \
+		"${keeplibs[@]}" --do-remove || die
+	eend
+
+	cd "${S}" || die
+
+	eapply_user
+}
+
+src_configure() {
+	local myconf_gn=""
+	local myconf_gyp=""
+
+	cd "${CHROMIUM_S}" || die
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_libusb (http://crbug.com/266149).
+	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		harfbuzz-ng
+		icu
+		libjpeg
+		libpng
+		libvpx
+		libwebp
+		libxml
+		libxslt
+		re2
+		snappy
+		yasm
+		zlib)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg )
+	fi
+	build/linux/unbundle/replace_gn_files.py \
+		--system-libraries ${gn_system_libraries[@]} || die
+
+	# Optional dependencies.
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=$(usex gconf true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local target_arch=$(_get_target_arch)
+	local ffmpeg_target_arch="${target_arch}"
+
+	if [[ ${ffmpeg_target_arch} = arm ]]; then
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		filter-flags "-Wl,--as-needed"
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
+
+	myconf_gn+=" icu_use_data_file=false"
+
+	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
+
+	# Tools for building programs to be executed on the build system, bug #410883.
+	if tc-is-cross-compiler; then
+		export AR_host=$(tc-getBUILD_AR)
+		export CC_host=$(tc-getBUILD_CC)
+		export CXX_host=$(tc-getBUILD_CXX)
+		export NM_host=$(tc-getBUILD_NM)
+	fi
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	third_party/libaddressinput/chromium/tools/update-strings.py || die
+
+	touch chrome/test/data/webui/i18n_process_css_test.html || die
+
+	einfo "Configuring bundled nodejs..."
+	pushd "${S}/vendor/node" > /dev/null || die
+	# Make sure gyp_node does not run
+	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
+	# --shared-libuv cannot be used as electron's node fork
+	# patches uv_loop structure.
+	./configure --shared --without-bundled-v8 --shared-openssl \
+		--shared-http-parser --shared-zlib --without-npm \
+		--with-intl=system-icu --without-dtrace \
+		--dest-cpu=${target_arch} --prefix="" || die
+	popd > /dev/null || die
+
+	# libchromiumcontent configuration
+	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
+	myconf_gn+=" is_electron_build = true"
+	myconf_gn+=" is_component_build = false"
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	einfo "Configuring chromiumcontent..."
+	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
+	out/Release/gn gen --args="${myconf_gn}" out/Release || die
+
+	cd "${S}" || die
+}
+
+eninja() {
+	if [[ -z ${NINJAOPTS+set} ]]; then
+		local jobs=$(makeopts_jobs)
+		local loadavg=$(makeopts_loadavg)
+
+		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
+			NINJAOPTS+=" -j ${jobs}"
+		fi
+		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
+			NINJAOPTS+=" -l ${loadavg}"
+		fi
+	fi
+	set -- ninja -v ${NINJAOPTS} "$@"
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	local compile_target="${S}/out/R"
+	local myconf_gyp=""
+	local chromium_target="${CHROMIUM_S}/out/Release"
+	local libcc_path="${S}/vendor/libchromiumcontent"
+	local libcc_dist_path="${libcc_path}/dist/main"
+	local libcc_dist_static_path="${libcc_dist_path}/static_library"
+	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
+	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
+	local libcc_output_shared="${libcc_output}-shared"
+	local target_arch=$(_get_target_arch)
+	local l=""
+	local create_dist_args=""
+
+	tc-export AR CC CXX NM
+
+	mkdir -p "${compile_target}" || die
+
+	cd "${CHROMIUM_S}" || die
+
+	# Build mksnapshot and pax-mark it.
+	eninja -C "${chromium_target}" mksnapshot || die
+	pax-mark m "${chromium_target}/mksnapshot"
+	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
+
+	# Build chromedriver.
+	eninja -C "${chromium_target}" chromedriver
+	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
+
+	# Build libchromiumcontent components.
+	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
+
+	cd "${S}" || die
+
+	# Gather and prepare built components of libchromiumcontent.
+	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
+	create_dist_args+=" --no_zip"
+	create_dist_args+=" --system-icu"
+	CHROMIUM_BUILD_DIR="${chromium_target}" \
+	PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
+	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
+
+	# v8 is built as a shared library, so copy it manually
+	# for generate_filenames_gypi to find.
+	mkdir -p "${libcc_dist_shared_path}" || die
+	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
+
+	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
+		"${libcc_dist_path}/filenames.gypi" \
+		"${CHROMIUM_S}" \
+		"${libcc_dist_shared_path}" \
+		"${libcc_dist_static_path}"
+
+	# Configure electron.
+	myconf_gyp+="
+		$(gyp_use cups)
+		$(gyp_use gconf use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use gtk3)
+		$(gyp_use lto)"
+
+	myconf_gyp+=" -Duse_system_icu=1"
+
+	if [[ $(tc-getCC) == *clang* ]]; then
+		myconf_gyp+=" -Dclang=1"
+	else
+		myconf_gyp+=" -Dclang=0"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	myconf_gyp+="
+		-Dclang_use_chrome_plugins=0
+		-Dhost_clang=0
+		-Dlinux_use_bundled_binutils=0
+		-Dlinux_use_bundled_gold=0
+		-Dlinux_use_gold_flags=0
+		-Dsysroot="
+
+	myconf_gyp+=" -Dtarget_arch=${target_arch}"
+	myconf_gyp+=" -Dpython=${EPYTHON}"
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gyp+=" -Dwerror="
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
+
+	myconf_gyp+=" -Dicu_use_data_file_flag=0"
+	myconf_gyp+=" -Dgenerate_character_data=0"
+
+	myconf_gyp+=" -Dlibchromiumcontent_component=0"
+	myconf_gyp+=" -Dcomponent=static_library"
+	myconf_gyp+=" -Dlibrary=static_library"
+	myconf_gyp+=" -Icommon.gypi electron.gyp"
+
+	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
+		egyp_chromium ${myconf_gyp} || die
+
+	mkdir -p "${compile_target}/lib/" || die
+	# Copy libv8 and snapshot files so the node binary can find them.
+	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
+	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
+	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
+
+	# Copy generated shim headers.
+	mkdir -p "${compile_target}/gen" || die
+	cp -r "${chromium_target}/gen/shim_headers" \
+		"${compile_target}/gen" || die
+
+	# Build the Node binary and pax-mark it.
+	eninja -C ${compile_target} nodebin
+	pax-mark m ${compile_target}/nodebin
+
+	# Finally, build Electron.
+	eninja -C ${compile_target} electron
+	pax-mark m ${compile_target}/electron
+
+	echo "v${PV}" > ${compile_target}/version
+}
+
+src_install() {
+	local install_dir="$(_get_install_dir)"
+	local install_suffix="$(_get_install_suffix)"
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+
+	pushd out/R/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || die
+
+	# Install Electron
+	insinto "${install_dir}"
+	exeinto "${install_dir}"
+	newexe out/R/nodebin node
+	doexe out/R/electron
+	doexe out/R/chromedriver
+	doexe out/R/mksnapshot
+	doins out/R/libv8.so
+	fperms +x "${install_dir}/libv8.so"
+	doins out/R/libnode.so
+	fperms +x "${install_dir}/libnode.so"
+	doins out/R/natives_blob.bin
+	doins out/R/snapshot_blob.bin
+	doins out/R/blink_image_resources_200_percent.pak
+	doins out/R/content_resources_200_percent.pak
+	doins out/R/content_shell.pak
+	doins out/R/pdf_viewer_resources.pak
+	doins out/R/ui_resources_200_percent.pak
+	doins out/R/views_resources_200_percent.pak
+	doins -r out/R/resources
+	doins -r out/R/locales
+	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
+
+	doins out/R/version
+
+	# Install Node headers
+	HEADERS_ONLY=1 \
+		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
+	# set up a symlink structure that npm expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	dodir "/usr/include/electron${install_suffix}"
+	mv "${ED}/usr/include/node" \
+	   "${ED}/usr/include/electron${install_suffix}/node" || die
+}
+
+pkg_postinst() {
+	electron-config update
+}
+
+pkg_postrm() {
+	electron-config update
+}
diff --git a/dev-util/electron/files/electron-1.7.15-v8-crankshaft-rce-fix.patch b/dev-util/electron/files/electron-1.7.15-v8-crankshaft-rce-fix.patch
new file mode 100644
index 000000000000..b18722448df8
--- /dev/null
+++ b/dev-util/electron/files/electron-1.7.15-v8-crankshaft-rce-fix.patch
@@ -0,0 +1,37 @@
+From 3c8f3a181afb7407ca6b8dd6605dcea3a8e78ba8 Mon Sep 17 00:00:00 2001
+From: Elvis Pranskevichus <elvis@magic.io>
+Date: Sat, 24 Mar 2018 13:34:10 -0400
+Subject: [PATCH] Fix crankshaft RCE patch
+
+---
+ patches/v8/crankshaft-hydrogen-rce.patch | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/patches/v8/crankshaft-hydrogen-rce.patch b/patches/v8/crankshaft-hydrogen-rce.patch
+index d99d964..273705e 100644
+--- a/patches/v8/crankshaft-hydrogen-rce.patch
++++ b/patches/v8/crankshaft-hydrogen-rce.patch
+@@ -1,16 +1,17 @@
+ diff --git a/src/crankshaft/hydrogen.cc b/src/crankshaft/hydrogen.cc
+-index d55bb37..d595617 100644
++index d55bb37..2833c63 100644
+ --- a/src/crankshaft/hydrogen.cc
+ +++ b/src/crankshaft/hydrogen.cc
+-@@ -7176,7 +7176,10 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess(
++@@ -7176,8 +7176,11 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess(
+    // Get transition target for each map (NULL == no transition).
+    for (int i = 0; i < maps->length(); ++i) {
+      Handle<Map> map = maps->at(i);
+ +    // Don't generate elements kind transitions from stable maps.
+      Map* transitioned_map =
++-        map->FindElementsKindTransitionedMap(&possible_transitioned_maps);
+ +        map->is_stable()
+ +            ? nullptr
+ +            : map->FindElementsKindTransitionedMap(&possible_transitioned_maps);
+--         map->FindElementsKindTransitionedMap(&possible_transitioned_maps);
+      if (transitioned_map != nullptr) {
+        transition_target.Add(handle(transitioned_map));
++     } else {
+-- 
+2.16.1
+
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index 94de2f288070..b401858fffc6 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -11,6 +11,8 @@
 	</maintainer>
 	<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
 	<use>
+		<flag name="gconf">Use gnome-base/gconf</flag>
+		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="lto">Build with link time optimization enabled</flag>
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index ef653f170ebc..51d6cc86eb75 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,7 +1,10 @@
 AUX gdbus-codegen-2.40.0-sitedir.patch 1086 BLAKE2B 7c3a460c3ceb90e35ce160eed36229e99459062e2b9166003408aa8a1b10b529aa419f18943c6d225a89c2378f9405f8f54b40fe460428a81544359562a2b8db SHA512 e860da78f31cb61896c450b4728cfc1d8eb57f0c06c9440fa4c3d4344429e41b12531b59e6ad6c8cb4ff146f9f63ddd9ed0e6b7f493a11adba46ea628bcc3499
+AUX gdbus-codegen-2.54.3-sitedir.patch 885 BLAKE2B e63cdb128735fa8fbdf2ae1e324f9ba602149c6a36e69752e948a2be0c559625154a6d6036478d9f30da9d628ada9d62930142fc351686aca0e7f55ec7cc4386 SHA512 122583e4d4f84144c822a37ee9b259e9f3be0dddecaee1d19575e53836122b3c5a283d201e1864c15d1f9b3f7f9827f8e6040a7f856ea1d471842acc28f0dd1a
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
+DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 EBUILD gdbus-codegen-2.50.3.ebuild 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
 EBUILD gdbus-codegen-2.52.3.ebuild 1313 BLAKE2B feea720780058dd1f086d7142cbcbf8ffbbd40ede7667a8f1e95f9a17ffdc4ce75acd524d269d9dfa4b6649d9f49d48e21501107745a227eea1311041fd68e12 SHA512 6a135d73e6a2d02ae545f617b3d227c6e86737374b4611034c4d9868c3cd266038c413a1281ff6fcb3dfa65813a389ee0428f740741c8d77e970f414f535fdc3
+EBUILD gdbus-codegen-2.54.3.ebuild 1303 BLAKE2B b0e9e2582ee7f4d9fca636bf37a87a48bb596c9c3c196c0d2233c03e1c989d455524a99a516190b06dadedd72223f44b16db4c024853b4b3c0a0f58e2732aec1 SHA512 f7bd9a848fb0b32153545083876663d1f8d11a85bedebcae7bad7dede1b0f47e6455beb30dffb2cf5404563c24b585958e03d5fe71f006625a7ce3858346f36c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
new file mode 100644
index 000000000000..d3bbba4cb034
--- /dev/null
+++ b/dev-util/gdbus-codegen/files/gdbus-codegen-2.54.3-sitedir.patch
@@ -0,0 +1,22 @@
+diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in
+index 8050981..932410a 100644
+--- a/gdbus-codegen.in
++++ b/gdbus-codegen.in
+@@ -28,16 +28,7 @@ filedir = os.path.dirname(__file__)
+ 
+ if srcdir is not None:
+     path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
+-elif os.path.basename(filedir) == 'bin':
+-    # Make the prefix containing gdbus-codegen 'relocatable' at runtime by
+-    # adding /some/prefix/bin/../share/glib-2.0 to the python path
+-    path = os.path.join(filedir, '..', 'share', 'glib-2.0')
+ else:
+-    # Assume that the modules we need are in the current directory and add the
+-    # parent directory to the python path.
+-    path = os.path.join(filedir, '..')
+-
+-sys.path.insert(0, os.path.abspath(path))
+-from codegen import codegen_main
++    from gdbus_codegen import codegen_main
+ 
+ sys.exit(codegen_main.codegen_main())
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
new file mode 100644
index 000000000000..1ac95b47d966
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.54.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_REQ_USE="xml"
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.54.3-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index f8a828582ec5..1c0975ca0938 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,4 @@
 DIST glslang-6.2.2596.tar.gz 2270084 BLAKE2B 234d7d201c5ddd91fdaeac1a84104b2b635131fa910315b1d14ae169f6141840a1559114fa2e07775120f56f57d59decd689f44609923152a2e15ecdda66207a SHA512 24c6e90c75767ffc2faf3f0868a7357d5f528cae8972c8b690cda0c573eac0f60f6b8795793534f39ccc2c649cb788101715e42cbdf7ca9d59c955f9b37a4f99
-EBUILD glslang-6.2.2596.ebuild 495 BLAKE2B 38652c1151d347678280e258975ea966d268dd874c8bcf7a12f162b7ca51b39d0d8b8aad8a1a3ef60c7df0c2a7eee3cb2929d205c3d00c7b7f19a39b79e1e431 SHA512 78f3900c0532e34ebf4ddb9c356c47e55837eefd157e9362c8c4a99eb1b6e3dbc2c24564a7e19af186308d155042265a948d223b603e116d70f7db3397b59dae
+EBUILD glslang-6.2.2596.ebuild 500 BLAKE2B 8ab8168010867e61588f4c66987c4d9956f67a517355c8558c77be3643a1cd181a4687f4b639291219a01a44dd72a64bc4fea6c995d8445a3e97f2cf0c8478df SHA512 68a655dd11c81e1bde33cf637e0e7220278b7ec13310abff759d8c3b3529e82d2aeb49843074eddba22525dd6bcdcd46dba3251042d8a50c708932db9f026162
 EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-6.2.2596.ebuild b/dev-util/glslang/glslang-6.2.2596.ebuild
index 6a9bfa1c48ec..677174912af4 100644
--- a/dev-util/glslang/glslang-6.2.2596.ebuild
+++ b/dev-util/glslang/glslang-6.2.2596.ebuild
@@ -7,7 +7,7 @@ inherit cmake-multilib cmake-utils vcs-snapshot
 
 SNAPSHOT_COMMIT="6.2.2596"
 SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
 HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index ce8245568f3a..28337844bb04 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,5 +1,7 @@
 DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-DIST hadolint-1.6.1.tar.gz 32674 BLAKE2B b7b3bc664848806d2316053724a91d0276e8af8c0324b31c2b3c2ae48b247e2092473170bc0f8ffcd76cf3b91e3c17e0e9b7b5f47c1eb416d23d01b29b454182 SHA512 ed79861d0938327ebeac8a8162d3a76257a22829d6188512bb43d5312327e39f31ff960d85e7d5c367a377c0a21e7df637e6d40448415752f132cf385ab8bfa2
+DIST hadolint-1.7.1.tar.gz 33520 BLAKE2B e66b76135c0b69a906e8a4cb0f08b9eb53e8c5d15140f20c31894155cfdc97cdc2899f1bbf575fdbed9feea99884d88b604d0bdfd2daeed4efd6064a9e28e453 SHA512 44e952665a3fbd592397cfb251935f0129900c5c87f34dc884cdb83e668e369848c0c0c403f8d7f31fd786de84e64b5e8df4d3935309acfe8266d5621f7966de
+DIST hadolint-1.7.2.tar.gz 34960 BLAKE2B db1ff9df439e3dbc0e36a47749d0013e76abadfecfb87abfce9e4e41f654a3955bdff2804c92a60e1e399b0e74601c80a7a96012de93bed48e0425afee359e39 SHA512 1562ca9e2b81d6840bd89b98ce706372e32e93505efd6eecef613ddcb089306653da09ef09f8876fe19c6effd1520784ae05c83bb2460975628389ef80f5df93
 EBUILD hadolint-1.5.0.ebuild 1064 BLAKE2B a4001c12da3c75c033a7efb686005e9fc7fdbf532dad9bc36db569371c82a604b4563cd24b7c2130f13ccbd7612ae344ae8c50443d7828d89156de04d00c7658 SHA512 9934c3ac41e0764c87b5ea4ca0c88853751662a84a7f24e5aa6357e92edb6cb8ee23e6416cd67ef400897f39bcbb9f47ea4802de6b8884def844db8562b6a88c
-EBUILD hadolint-1.6.1.ebuild 1053 BLAKE2B 80699fb7ccbb094072eb3ba83cb0ee6e591e3092310cfd3e03d504eb63ffefdb4102eb0cff0ba83a61af4ea5ff4734e3a55e50d2cb483d283a7968092ddd415c SHA512 4c3b68251cabb19fa184828824e2c6dc9861dc84cdd3300f689583cb4f19dad3b5a24e31df55e81163d551189485b8d1edec4480827692c0db932e4207059cd7
+EBUILD hadolint-1.7.1.ebuild 1106 BLAKE2B a6742842b4e7215a627d1d4602a65b21ef2b9212174589b5f43c3a06bb7f5f0acc226ba3d8b7eb12beb183d4613754c7baafd8ccf79d1a727a9942273527300f SHA512 4d7ab4a23ca0f17dd0bfedb75c61937006002bd6a403f686c800f1dc8e512cfa49c80e8d6bd52749ba96326ff658ca9f7a97fca79bc26715cec52e6e879f6d33
+EBUILD hadolint-1.7.2.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.6.1.ebuild b/dev-util/hadolint/hadolint-1.7.1.ebuild
index 9a011ff9f34e..ee88be7b441a 100644
--- a/dev-util/hadolint/hadolint-1.6.1.ebuild
+++ b/dev-util/hadolint/hadolint-1.7.1.ebuild
@@ -18,16 +18,16 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="dev-haskell/aeson:=[profile?]
-	dev-haskell/dlist:=[profile?]
 	>=dev-haskell/gitrev-1.3.1:=[profile?]
-	>=dev-haskell/language-docker-3.0.0:=[profile?]
-	dev-haskell/optparse-applicative:=[profile?]
-	>=dev-haskell/parsec-3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14:=[profile?]
 	>=dev-haskell/split-0.2:=[profile?]
 	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
 	dev-haskell/yaml:=[profile?]
 	>=dev-lang/ghc-8.0.2:=
-	>=dev-util/shellcheck-0.4.7:=[profile?]
+	>=dev-util/shellcheck-0.5.0:=[profile?]
 "
 DEPEND="${RDEPEND}
 	>=dev-haskell/cabal-1.24.2.0
diff --git a/dev-util/hadolint/hadolint-1.7.2.ebuild b/dev-util/hadolint/hadolint-1.7.2.ebuild
new file mode 100644
index 000000000000..7e0e70f87627
--- /dev/null
+++ b/dev-util/hadolint/hadolint-1.7.2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile Linter JavaScript API"
+HOMEPAGE="https://github.com/hadolint/hadolint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.5.0:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/-static//" ${PN}.cabal || die
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 306a51646e69..d4a603fd70ab 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -5,9 +5,11 @@ AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e
 DIST jenkins-bin-2.107.2.war 74568464 BLAKE2B b506199d2e56c3f88bdd295dd88b8644869c59e93689768376752b1bd54a5f5ccb8a56b32d9556a592b5567dc884cfa6d0049810f6a23304f5c1fa9026b31804 SHA512 c5abc515ac646904c44d06a31e253c5824096abb40af415357f47610354a793bd571310fed9e5596103c399a495a7b229a731509873a99795471459410db6411
 DIST jenkins-bin-2.107.3.war 74576216 BLAKE2B 2791f6fce3c6c331c47e55b72777c90c2323e6c53629ee92ccd6987c4557a713759f1a2fe2f6e882cec5536c6e1783c1fb9b740174e1ab3f89d56e97460ad4ef SHA512 29209b7359439f55c27127a946dbfcdc318407ee21de447b8f4864209e2076f0a16083dd501e3ead054b086af78f319e25979b7fd25847135d76deeb10a99fad
 DIST jenkins-bin-2.116.war 74606954 BLAKE2B 15d1a665eeb35694bc03bc54c8b5b623fc3ad40c492c5e8541a271396fb48fe9a67eefaa25665a2658dff0f3ce1bea51de23902a3f7297dc0621750c7c7d5f8f SHA512 ab2a41f848dae9bfcb3fc3a8dea2da4957cb919aa1cf0609bea238ef6670a973226e5da817f582e8d718700cd8e57c05384f6ef6cf9ad80e94c87813a5199373
+DIST jenkins-bin-2.121.1.war 74736772 BLAKE2B a5972bfd0a049065eec7f842482754de838e72db73eb846f4742273d356a0ad52adaf01dbf1c617d88d133502f78657488341b81aee42746b16e82a3250b143a SHA512 b87c8458a5db9e8a1b1a67cc8e36d224719d8460987a8b95f563619c5d662e6af8a3fc276d420f5520e541a0bee7211d2fe414caf11b4116c57ba214c687faa8
 DIST jenkins-bin-2.121.war 74737297 BLAKE2B 20d53c5869655331036ef5e18f94f71a0bda46f651b706bc61ae24083df72db285291478575662c52c661bc15c79e00e3f10e503f430aa5d23107f251f12d338 SHA512 4df05ad4abf0dd4fc40fbcb9dd8cdad985f6c3970ac4b777aeb5766a1ae45718b70929b71288e245f5e90541aa886c31c589dfdd006623759b7c6b5326e44118
 EBUILD jenkins-bin-2.107.2.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
 EBUILD jenkins-bin-2.107.3.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
 EBUILD jenkins-bin-2.116.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
+EBUILD jenkins-bin-2.121.1.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
 EBUILD jenkins-bin-2.121.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild
new file mode 100644
index 000000000000..95d08ad47b24
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.121.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="http://jenkins-ci.org/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 0e87406d6f23..cdee65f501c6 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,6 +1,6 @@
 AUX kdevelop-5.2.1-qt-5.11.patch 1581 BLAKE2B 83ef207fb434b3faa7c73752e9b48d7d52182b7cb2bee0f7ad840a124066b72431cd4b69601ea866bb79de483cca2ddfa6fb4d6ad6bcba8cefa0d2833e5067bd SHA512 d4adbcb6c1a26e9198d7997b84ee059216094b1b8d518bb39d1ddafbd968de6f40123e4495b8f2b3a649524247796fcd026545b09b62e9d544e0fd6b1ec74a69
 DIST kdevelop-5.2.1.tar.xz 6653576 BLAKE2B 800ab50b62ca70e54d66bc7956b257e6d14f5a2c2fda7c7720aa0ddf1dad1dd2d7f993103c7f4caed0fc78734643a89f2710cb598319695d9ea6d79f62fd6305 SHA512 ee4a7f93c4f5168e6c63ca415a1f757cb7d2615370201700db16abdf1799e5c12421e382f5937be4a65af026a00df679b745fc4dab4d73974275d95d53173cd0
 DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
-EBUILD kdevelop-5.2.1.ebuild 3861 BLAKE2B a1d47f34a8dbf9a1cf00de8b8abee636450ddb7850f413806b7d82e11d27ff138a81be8a7f825676608df7019ced76de5226e0476b4221a3ad9ce3a1f4aa5f40 SHA512 5da724760ff0ea0e82de7208c6622436f01b12f32464dd20382d20eedc36cc6fa1371240ea1f579c1d534f2bc41549c90e8a21900c3191325cd867ceb64bc1bf
-EBUILD kdevelop-5.2.3.ebuild 3817 BLAKE2B 5f0feb86df96ec85382eb49169b392dde349175968eb29d9e0e652757ba3fa6389b3deea3cf11ec2ebbac12f1f8566ec06a21f2b37e83fd41062e6de1d420dbc SHA512 d174a6ca2f89445fad19fe4cc36c44cfe2a31ad4c59a9f0479e787f5542f433d9e414c205ae8342fb798c9578ffca091cefd4095d7abd15ece56282d16c754e6
-MISC metadata.xml 794 BLAKE2B 765d868d9ca5ac71ee71a7c22d85beb02951dd7a601c2d52da87b1d49686494e8ce17c9e7e0f5f2767e0cb02625d74bcc6a95cfe3ae6793298150fcb651fcae4 SHA512 4d96ffa2a718e987a2d61531fe4a194c3fca3e863ab9cf8ac59d3b187a526c841066936f0a92591475672c6c22b57bd04a798908932f839644025b615ce8b417
+EBUILD kdevelop-5.2.1.ebuild 3847 BLAKE2B 553c7a7917998ed08784af85ed78538c0877dbcd82a7bb95234832ec4ee59bdbd9d7db552e75efd6292a7085a6d8e926fec6c1f84271651f1f086438322c28e2 SHA512 49c93d602726a36669ffd79ab156928b2aeba15fe957545a8a9094e0bfa21e53ffc0791c90a548b5526e468aab369983441062965bd8818f2743140fd1a563fe
+EBUILD kdevelop-5.2.3.ebuild 3803 BLAKE2B 1f06760c167fe2d4967f471fe0c39edb8fcf225019914cddad058b63129a154dcdc4cb44423f460e6700195cbad2bf18ddd0465d09c65ec98a0188d4f6a48bfe SHA512 32e8f14d9b71edc7aad087d5bd6497fa7e2fb87d21e4a0f66f023ed2c74b7a33d5deb78be5d19f8f00c5cdcbab5720d1d579b4ef62c9b67f3744a7e32f232cdc
+MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
index 386f403299a9..93a5bc5f7b99 100644
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage"
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="test? ( welcomepage )"
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	>=sys-devel/clang-3.8.0:=
 	x11-misc/shared-mime-info
 	gdbui? ( $(add_plasma_dep libksysguard) )
-	okteta? ( $(add_kdeapps_dep okteta) )
+	hex? ( app-editors/okteta:5 )
 	plasma? (
 		$(add_frameworks_dep krunner)
 		$(add_frameworks_dep plasma)
@@ -107,7 +107,7 @@ src_configure() {
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
 		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
 		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
 		$(cmake-utils_use_find_package subversion SubversionLibrary)
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
index 22af01b752e7..a3180b4b9c25 100644
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
@@ -12,7 +12,7 @@ inherit kde5
 
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui okteta +plasma +qmake reviewboard subversion webkit +welcomepage"
+IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="test? ( welcomepage )"
@@ -60,7 +60,7 @@ COMMON_DEPEND="
 	>=sys-devel/clang-3.8.0:=
 	x11-misc/shared-mime-info
 	gdbui? ( $(add_plasma_dep libksysguard) )
-	okteta? ( $(add_kdeapps_dep okteta) )
+	hex? ( app-editors/okteta:5 )
 	plasma? (
 		$(add_frameworks_dep krunner)
 		$(add_frameworks_dep plasma)
@@ -105,7 +105,7 @@ src_configure() {
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
 		-DBUILD_executeplasmoid=$(usex plasma)
 		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package okteta OktetaKastenControllers)
+		$(cmake-utils_use_find_package hex OktetaKastenControllers)
 		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
 		$(cmake-utils_use_find_package reviewboard KDEExperimentalPurpose)
 		$(cmake-utils_use_find_package subversion SubversionLibrary)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index a5bf469b2fbb..9b8c92eb6da3 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="gdbui">Enable GUI for attaching GDB to a running process</flag>
-		<flag name="okteta">Enable hex editor plugin via <pkg>kde-apps/okteta</pkg></flag>
+		<flag name="hex">Enable hex editor plugin via <pkg>app-editors/okteta</pkg></flag>
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
 		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 264bf2aef55d..906d226b5c4e 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -12,6 +12,7 @@ DIST mingw-w64-v4.0.6.tar.bz2 10853871 BLAKE2B a166692d4ddbf740f566abc844d577d38
 DIST mingw-w64-v5.0.1.tar.bz2 9160780 BLAKE2B 52964e7ae113d8886648cb0395514067fa054840d153e86407317ccd2f299fccb6d21f76c773e1e2ef22b2c00b53728c18065091125a000750395e96fb601f05 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa
 DIST mingw-w64-v5.0.2.tar.bz2 9107077 BLAKE2B b8e3e614fe4a1ea6a4770efdd029300e923e3b7b39b71731692281da44f468b235d487d38d7e1b4396e1b44a4c60fcc7a67a6c1331fb46e339c13c86bf7de7bd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060
 DIST mingw-w64-v5.0.3.tar.bz2 9160627 BLAKE2B 941b40c426548564e8b2da0af8e917dad34bdbf0b05c63ea2127e39139bcce5d86e80433817483c64cd2a6ef6140a7818a76564ff5d9408614ecaa58f17b41e7 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9
+DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
 EBUILD mingw64-runtime-3.0.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
 EBUILD mingw64-runtime-3.1.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
 EBUILD mingw64-runtime-3.2.0-r1.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
@@ -25,4 +26,5 @@ EBUILD mingw64-runtime-5.0.2.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae532
 EBUILD mingw64-runtime-5.0.3-r1.ebuild 2572 BLAKE2B 9caca29d8aa7fdf54d3437a3801d7640bac7e4c9becd805b311a7247103d8772b8cfcef553db1175ed7b4973bd6667a5f7715b2179b1e66a0e44f90d366e9fae SHA512 c7b33d49e829790eaddd9739c5077a036a68ec0beae3e9d0a39687870028fc4a757878d6be89900ba56ac08cedfd5e7f90f4c1a26591902332de2b0a23dbde9f
 EBUILD mingw64-runtime-5.0.3-r2.ebuild 2683 BLAKE2B 92ccdb40cc2ebdc49bc903da98384f82a5fd7836f990b861662bdfb338478339702831b1e13c46301fd2329f2718e22357af0edc56dee238a75ff938207975bb SHA512 67946916dcc13cbae20ed39e8d90ad0905fd3179f3aed454e41dc48d417db33db61e374bbe00764ab373972cfd88a405a296950f5e13a4c4e34c73cb7d22f85c
 EBUILD mingw64-runtime-5.0.3.ebuild 2497 BLAKE2B ba30e069818937c620dc436e4a3c8d9e9bc0838620c80372f8e30153c2f3903dbfda3e0c6d157e9cccd94241bc3da47dec7ba3b92a39808b85771fc58dc2636d SHA512 8cf13af35caf3ceb2fc8bafdb6e3f980a0d63bc7795ef8bf12e2b6195bf1bb6e8fe0c0c0b5af45350c3e4a83a14ac4d7b98f1e4f9bf3c6807a29533f6eb1947e
+EBUILD mingw64-runtime-5.0.4.ebuild 2597 BLAKE2B 500aecb0c6f8a8fe314c18937515438c730e25d6637d0b641d90cbbef8cb0764ffd690c7313c6cbade86bbf8bdf725f2bc075460a1e96987f9c6c043609f72da SHA512 cca85d0666b28bec6abcd4c4d40b89f9fb6c76077b10b8e8111b1fb6a96f78bc3877392c7f03f17a733e421bb242adcb8b2058af82136fc9c32c18b9fb7120b7
 MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
new file mode 100644
index 000000000000..25722876100e
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+export CBUILD=${CBUILD:-${CHOST}}
+export CTARGET=${CTARGET:-${CHOST}}
+if [[ ${CTARGET} == ${CHOST} ]] ; then
+	if [[ ${CATEGORY} == cross-* ]] ; then
+		export CTARGET=${CATEGORY#cross-}
+	fi
+fi
+
+WANT_AUTOMAKE="1.15"
+
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="Free Win64 runtime and import library definitions"
+HOMEPAGE="http://mingw-w64.sourceforge.net/"
+SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="headers-only idl libraries tools"
+RESTRICT="strip"
+
+S="${WORKDIR}/mingw-w64-v${PV}"
+
+is_crosscompile() {
+	[[ ${CHOST} != ${CTARGET} ]]
+}
+just_headers() {
+	use headers-only
+}
+alt_prefix() {
+	is_crosscompile && echo /usr/${CTARGET}
+}
+crt_with() {
+	just_headers && echo --without-$1 || echo --with-$1
+}
+crt_use_enable() {
+	just_headers && echo --without-$2 || use_enable "$@"
+}
+crt_use_with() {
+	just_headers && echo --without-$2 || use_with "$@"
+}
+
+pkg_setup() {
+	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
+		die "Invalid configuration"
+	fi
+}
+
+src_configure() {
+	CHOST=${CTARGET} strip-unsupported-flags
+
+	if ! just_headers; then
+		mkdir "${WORKDIR}/headers"
+		pushd "${WORKDIR}/headers" > /dev/null
+		CHOST=${CTARGET} "${S}/configure" \
+			--prefix="${T}/tmproot" \
+			--with-headers \
+			--without-crt \
+			|| die
+		popd > /dev/null
+		append-cppflags "-I${T}/tmproot/include"
+	fi
+
+	# By default configure tries to set --sysroot=${prefix}. We disable
+	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
+	# That way we can cross-build mingw64-runtime with cross-emerge.
+	CHOST=${CTARGET} econf \
+		--with-sysroot=no \
+		--prefix="${EPREFIX}"$(alt_prefix)/usr \
+		--with-headers \
+		--enable-sdk \
+		$(crt_with crt) \
+		$(crt_use_enable idl idl) \
+		$(crt_use_with libraries libraries) \
+		$(crt_use_with tools tools) \
+		$(
+			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
+				&& echo --disable-lib32 --enable-lib64 \
+				|| echo --enable-lib32 --disable-lib64
+		)
+}
+
+src_compile() {
+	if ! just_headers; then
+		emake -C "${WORKDIR}/headers" install
+	fi
+	default
+}
+
+src_install() {
+	default
+
+	if is_crosscompile ; then
+		# gcc is configured to look at specific hard-coded paths for mingw #419601
+		dosym usr /usr/${CTARGET}/mingw
+		dosym usr /usr/${CTARGET}/${CTARGET}
+		dosym usr/include /usr/${CTARGET}/sys-include
+	fi
+
+	env -uRESTRICT CHOST=${CTARGET} prepallstrip
+	rm -rf "${ED}/usr/share"
+}
diff --git a/dev-util/rr/Manifest b/dev-util/rr/Manifest
index 9c33befb8cb3..9e02ef171609 100644
--- a/dev-util/rr/Manifest
+++ b/dev-util/rr/Manifest
@@ -2,7 +2,7 @@ AUX rr-4.5.0-sysmacros.patch 788 BLAKE2B 0df763a64593b6f37b324f48864d88c105d050b
 DIST mozilla-rr-4.5.0.tar.gz 683371 BLAKE2B 1654de3811be4eac40ed751b910aed0ddca2100147e47e2e068f625c607964f98d33033c38cdf3a2146284bc477b08299e3432389342e7b058e331f0b924686f SHA512 8e9b7c6eaa9908e75853b5e19f61954b57e6e5afa7a8b6fe55f31aee36bab6ff315b5c3511d14c93dca5da19055a7879b6f3b9f51c349b1bb9acea130187a5e6
 DIST mozilla-rr-5.0.0.tar.gz 1143119 BLAKE2B b08f8ade8856b03fa94057a8c850000cfacc0722090ac3f7d1c147a3c4e7c2bbfe58a740711495e88476d90eb02c6e9a5b85078dcb4fcf3ed107ad281dd3dcf8 SHA512 aaec0869e68290d5f7b752d02e89fc4f83dd2fce4abf91b36c006eeec97555b7adc69da311eadd48c9891599245305b585ed1a53580f7c616dba401f1592c5f2
 DIST mozilla-rr-5.1.0.tar.gz 1158274 BLAKE2B f150e9d05b0a6a32c818f968879d0a394beb6524469cad905a21024e0d79e229f261c766f17aecbacdb81cf8e7408e62d1fdf8677569de8ed4d882b91f93b83d SHA512 8cb7da20ddb2bfbeaf57d9bca76a3b5495d4bd74a00092c40c948570a2cda3dca6cb1e73ed65af099fe405a4d29ff1a852496baf0fcb6119258443649a65766a
-EBUILD rr-4.5.0.ebuild 1073 BLAKE2B 17ddef70d68788ae63231ad466ee0e4fd5d7c97bbb3ec7552e5c6b582dc62f7dda4cd503e87387e30f72e264a713a7a9b77d49902a0c1970ce724d014f69f908 SHA512 45174284c9f7c0c1c297629a028a8b83fee93972ee94d111b0c681922df208530849a20884663f511df38f7113b61ce2e4fc3404116102a3a6aa0945afab3c57
-EBUILD rr-5.0.0.ebuild 1091 BLAKE2B fb875fcacb79cd42cc4ed4fb5d9725f30bba468d3194ce647332bb9e44cc709386de467d85ccccdacdd73e47f4df17d352947c9c683a44b34c04ec07b56954f8 SHA512 1d357dda47fb5b2d41fac2aa7e03a2d37ac480eea41df316221d4982f70ba864ebe5b03578eaebda2207c1fb91e5523f4c991174ffd5fe3fd1f20d8830a4b9d5
-EBUILD rr-5.1.0.ebuild 1091 BLAKE2B 7ed9d5ee1237242e77d4f9375f47a1796146cd4b3bb4eb4d1528a66e135dd00eee0fea0693a4a06c23381dd9a7199f374aa34ef706151606c1556ee0bdef5ca5 SHA512 b58b66a8144e4df2c91c70438a9e7f2410d7f137181ff4a001f164bbb7a034f88473fdc855536013ac5b0945f3dff1046077cb4cc01a0a3f7222aa5fecc4b287
+EBUILD rr-4.5.0.ebuild 1074 BLAKE2B a48f08be7e4e8e825dae4084a839dc7a2c3709a19bdf01de77452e450352e5702a157a150ace3f68cd70b1d0540f735839a1aa0e15b32ba99051ffa49dcfd5ac SHA512 23234a47fe276a584c72279300beeaeb8c407b4185482cd73500113c08411b76fc267e0c703c93c8704e16a94f58496167d3f076e7377909de94e43846b82084
+EBUILD rr-5.0.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
+EBUILD rr-5.1.0.ebuild 1092 BLAKE2B 080cdd2195942ce68bfafceb23f06b5b2468583bad759589a72e7e4406c88083592514dd693ef506f73e5fb9e0506d11a561fe1b4b78e49d70e86ea23ea7ae47 SHA512 a09a4fdf38b14280d4c1cbd1d629c57edf539eb13f34885ea5864e7429065072847c0461559db7483bb9ed6011b69b285f10f9ddec2fc27f82b473c6d409d9e5
 MISC metadata.xml 555 BLAKE2B 3618975613ac5286f849880de14d61b1cb74b0e64d539250c700ff0c955667acbcc11125381c31ba39b839da4b38c5d648fea27ebea4f7f28ca492e0554e3a27 SHA512 33487b0389d097115365ef82c85accedf17d798e312e9528fae27519f242c343fa280d32bff05c6f1a1620d6481df1db57fc4c1e2fa7ce36dbe56f998f03870a
diff --git a/dev-util/rr/rr-4.5.0.ebuild b/dev-util/rr/rr-4.5.0.ebuild
index fd1d69c293d0..32d5d5d6983e 100644
--- a/dev-util/rr/rr-4.5.0.ebuild
+++ b/dev-util/rr/rr-4.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE=Release
 inherit cmake-utils linux-info python-single-r1
 
 DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="http://rr-project.org/"
+HOMEPAGE="https://rr-project.org/"
 SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
 
 LICENSE="MIT BSD-2"
diff --git a/dev-util/rr/rr-5.0.0.ebuild b/dev-util/rr/rr-5.0.0.ebuild
index e2903c93af11..330b1821df13 100644
--- a/dev-util/rr/rr-5.0.0.ebuild
+++ b/dev-util/rr/rr-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE=Release
 inherit cmake-utils linux-info python-single-r1
 
 DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="http://rr-project.org/"
+HOMEPAGE="https://rr-project.org/"
 SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
 
 LICENSE="MIT BSD-2"
diff --git a/dev-util/rr/rr-5.1.0.ebuild b/dev-util/rr/rr-5.1.0.ebuild
index 09b7822c9774..330b1821df13 100644
--- a/dev-util/rr/rr-5.1.0.ebuild
+++ b/dev-util/rr/rr-5.1.0.ebuild
@@ -9,7 +9,7 @@ CMAKE_BUILD_TYPE=Release
 inherit cmake-utils linux-info python-single-r1
 
 DESCRIPTION="Record and Replay Framework"
-HOMEPAGE="http://rr-project.org/"
+HOMEPAGE="https://rr-project.org/"
 SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> mozilla-${P}.tar.gz"
 
 LICENSE="MIT BSD-2"
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
index baa9c7239377..119efa5a4f8f 100644
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@@ -1,7 +1,6 @@
-DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86.tar.gz 232347349 BLAKE2B 14b1983537641dcf8ee9f61e29798ebf705a57e24c2c692f55eb8bd4ad07e48948a73420015f61dea5ca576a975dd7854c24f7559c4f4c452634191f752ae097 SHA512 f3d8bff300ee772e07f9c9287c37428d5ddf50bd750dcc86b6a28d9ad5a0b891fa8ce810599e754ac06bf48786a9c58b981055c29976c37b2c530466591d171a
-DIST scala-SDK-4.1.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 232491001 BLAKE2B 021bad9b9eb49dfdf60d11f8d2b03b8288ff1b5efb14d1b16d8b5afadaff2162f87c2d6a2ef24d5779fdd0110d9806dc506582bd993a02580511e50834ffb48a SHA512 d5b8fe3cb3d6623e2f29e0ad5d279b363143c9b392ea5d91092ecb9de765828ac0c50c74ff879f7c825099b22a833ad3acbb0c2cfcd51c769ee19082905b63eb
 DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 BLAKE2B 0d5044340945d6a5d1630c3e48790fb4f8af17b2fb9a54e14138b18891ccd9409cb6f95bf07d9061813b14a9b7449322903f4e12d0bb12211f6f4bb9383a9065 SHA512 b8fcac4e0eeace0d146028e2f1551cdd3f58d38830430080e7aa5ccd581ae6a31992a5d1f39b6e8fcb30979953f0b9777166d2de73d7310621c9e7fa2e620f3d
 DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 BLAKE2B 8b425a726eaf62ce71b25f77ab376d04e00900ad640dddbd08f434cd0c78e6c18f41b9c7a8495711600765a3e864cbdfc2757c984290ccb76b3bc59a1ff28caa SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5
-EBUILD scala-ide-4.1.0.ebuild 1118 BLAKE2B 4c3e0a178fe0bbaebc014b19b865841d641b3a5798c7413f4c6470b8024b854ea86dfe8620c1c43d53aad7d1b511f2ebf2fdeb2da25e642c1e65e820ffd44182 SHA512 24b633c578ce15a47dd6bdb5ff777891b7a9d89483284ffc26cd84c3820397d6a9a038fc3d725ed3fcc43d087eaf52e748e94dadb086b778ae0cd1a25ae54739
-EBUILD scala-ide-4.3.0.ebuild 1173 BLAKE2B 69ca00aacc88a04e68dc8a8cdfcacc990be801be4fe378d3f17c23b2fb1070825d5226f5763317429ee56a0aa9b8cb210a24af66b236d4cf0d916259b8c22aed SHA512 fb6404dda5c2334c1510fff49defc095a21e65f51be2170705f9a5ec5ab80b8378a900d7a221d2d86dac8c87cc7e637009f2f793280c55be676194a92fae151b
+DIST scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz 281266580 BLAKE2B dd7e38385228e5bcb5d9997324e5f9abeba8b9c1a09bb503eb0b10368df89ee48357900123e230341880356f24eb1e3138326970e4dc6bd85204a48422a464b4 SHA512 622f930b665b1187baaa416f3172dc6b48551148c6267fa251e1ab17cdc5c78cccce07371ce909e59af0202d7e9a0126aa9e1d22798e0498f217e7e541e0e1a8
+EBUILD scala-ide-4.3.0.ebuild 1171 BLAKE2B 8d9575f448760a492eb488c9594be70ca87faeb3226593fe2029cce119eab2ceaad65c3ef7362888e66b21189d833af467e9cbae883e5bded2c8a87ec6221830 SHA512 6dc5f301005ffa914ee5856fb8c4cfa4a37a0ec2ebaa053f5570a15a5caeea3ead88bc7bae163658bc278c6b8e8478c730dc57252d685b2c92a8e95020d448b0
+EBUILD scala-ide-4.7.0.ebuild 1177 BLAKE2B 1174e007a21c222012924cc8422ed3328338978c7b07aeb2d37d2e9fd2a15b060527882a4f698394347b21adb5162b184305e360b64cee1a75b49bbb76df8205 SHA512 e10e0ae0b9829c7fc9852e20e922152cb4f7ec73539edd2bbcb58fb0eeb03756e84c6a045f5b17b333592cf085471b68f1b309e542f078276a51c77f26e91d12
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-util/scala-ide/scala-ide-4.1.0.ebuild b/dev-util/scala-ide/scala-ide-4.1.0.ebuild
deleted file mode 100644
index ed655153400b..000000000000
--- a/dev-util/scala-ide/scala-ide-4.1.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-SRC_URI_AMD64="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/scalaide-pack/${PV}-vfinal-luna-211-20150525/scala-SDK-${PV}-vfinal-2.11-linux.gtk.x86.tar.gz"
-
-DESCRIPTION="The Scala IDE"
-HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="amd64 x86"
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-SLOT="0"
-LICENSE="BSD"
-
-DEPEND=">=virtual/jdk-1.6
-	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
-	)"
-RDEPEND=">=virtual/jre-1.6"
-
-MY_D="/opt"
-
-src_unpack() {
-	unpack ${A}
-	mv "${WORKDIR}"/eclipse "${WORKDIR}"/"${P}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/"${P}"/eclipse "${WORKDIR}"/"${P}"/"${PN}"
-}
-
-src_install() {
-	cd "${D}" || die
-	dodir "${MY_D}" || die
-	insinto "${MY_D}"
-	doins -r "${WORKDIR}"/"${P}" || die
-	insopts -m 0755
-	insinto "${MY_D}"/"${P}"
-	doins "${WORKDIR}"/"${P}"/"${PN}" || die
-	dosym ${MY_D}/${P}/${PN} /usr/bin/${PN} || die
-}
diff --git a/dev-util/scala-ide/scala-ide-4.3.0.ebuild b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
index 1e477ba646e7..f562273c4257 100644
--- a/dev-util/scala-ide/scala-ide-4.3.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151
 
 DESCRIPTION="The Scala IDE"
 HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="
 	amd64? ( ${SRC_URI_AMD64} )
 	x86? ( ${SRC_URI_X86} )
diff --git a/dev-util/scala-ide/scala-ide-4.7.0.ebuild b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
new file mode 100644
index 000000000000..352b17b81120
--- /dev/null
+++ b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-opt-2
+
+# scala-ide -> scalaide
+S_PACK="${PN/-/}-pack"
+
+# scala-ide -> scala-SDK-${PV}
+S_SDK="${PN%-*}-SDK-${PV}"
+
+SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-oxygen-212-20170929/${S_SDK}-vfinal-2.12-linux.gtk.x86_64.tar.gz"
+SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-oxygen-212-20170929/${S_SDK}-vfinal-2.12-linux.gtk.x86_64.tar.gz"
+
+DESCRIPTION="The Scala IDE"
+HOMEPAGE="http://www.scala-ide.org"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="
+	amd64? ( ${SRC_URI_AMD64} )
+	x86? ( ${SRC_URI_X86} )
+"
+
+SLOT="0"
+LICENSE="BSD"
+
+RDEPEND=">=virtual/jdk-1.6
+	|| (
+		dev-lang/scala
+		dev-lang/scala-bin
+	)"
+
+MY_D="/opt"
+
+src_unpack() {
+	default
+	unpack ${A}
+	mv "${WORKDIR}"/eclipse "${WORKDIR}/${P}" || die
+}
+
+src_prepare() {
+	default
+	mv "${WORKDIR}/${P}"/eclipse "${WORKDIR}/${P}/${PN}" || die
+}
+
+src_install() {
+	cd "${D}" || die
+	dodir "${MY_D}"
+	insinto "${MY_D}"
+	doins -r "${WORKDIR}/${P}"
+	insopts -m 0755
+	insinto "${MY_D}/${P}"
+	doins "${WORKDIR}/${P}/${PN}"
+	dosym "${MY_D}/${P}/${PN}" "/usr/bin/${PN}"
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 8a8d5463d2aa..d67856a63443 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,4 +1,3 @@
-AUX schroot-1.6.10-cmake-add-additional-regex-tests.patch 2283 BLAKE2B bbdf631d09fa45c0befdc31c33b821fc5cfb1cc282bee28913a3fb7cc7f48908199e2c16793b3611c0c1287979f78b0d90c03fc1baa22e221d2a57ecb828eb81 SHA512 e68698dbace2e79c9e89525f22314fb75a42568cbeeac570334956b14051ed8dddbdffb3bdd769f77a6609159377a64df7de5041aff7512d100bbdd72aa6d4c0
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
 DIST schroot_1.6.10-2.debian.tar.xz 34296 BLAKE2B 5c712bca72f938d01a9927d846ab48bca83f7f7ed01cee7b7d4caf9c6b5b38ad650152f68dd989fd93032fb669b8208fff09eaf83be7b7e712fcd41caafbc191 SHA512 ea980199b90a2cffc36348e01e2de229c5cb4321f10bcde4b593eeaaa18f34ab9187cc9c717e6043c477819fefbd793cc707e1e77a5bae1c1815a668956cd84c
diff --git a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch b/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
deleted file mode 100644
index 1660f18ae4b8..000000000000
--- a/dev-util/schroot/files/schroot-1.6.10-cmake-add-additional-regex-tests.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8c9139249689570ff2f4d058ed1031f0cbb6c084 Mon Sep 17 00:00:00 2001
-From: Roger Leigh <rleigh@codelibre.net>
-Date: Sun, 26 Jul 2015 14:00:13 +0100
-Subject: [PATCH] cmake: Add additional regex tests and corresponding unit
- tests
-
----
- cmake/regex-checks.cmake | 10 ++++++++++
- test/sbuild-regex.cc     | 20 ++++++++++++++++++++
- 2 files changed, 30 insertions(+)
-
-diff --git a/cmake/regex-checks.cmake b/cmake/regex-checks.cmake
-index d0bb211..60507ec 100644
---- a/cmake/regex-checks.cmake
-+++ b/cmake/regex-checks.cmake
-@@ -30,6 +30,16 @@ int main() {
-   if (${namespace}_match(fail, bar)) return 11;
-   if (${namespace}_match(fail, chk)) return 12;
- 
-+  // Checks for broken support in GCC 4.9 and 5.1
-+  ${namespace} range1(\"^[a-z0-9][a-z0-9-]*\$\", ${namespace}::extended);
-+  ${namespace} range2(\"^[a-z0-9][-a-z0-9]*\$\", ${namespace}::extended);
-+  if (!${namespace}_match(test, range1)) return 13;
-+  if (!${namespace}_match(test, range2)) return 14;
-+  if (!${namespace}_match(\"a-\", range1)) return 15;
-+  if (!${namespace}_match(\"a-\", range2)) return 16;
-+  if (${namespace}_match(\"-a\", range1)) return 17;
-+  if (${namespace}_match(\"-a\", range2)) return 18;
-+
-   return 0;
- }"
- ${outvar})
-diff --git a/test/sbuild-regex.cc b/test/sbuild-regex.cc
-index 915e915..a8520c5 100644
---- a/test/sbuild-regex.cc
-+++ b/test/sbuild-regex.cc
-@@ -33,6 +33,8 @@ class test_regex : public TestCase
-   CPPUNIT_TEST(test_output);
-   CPPUNIT_TEST(test_input);
-   CPPUNIT_TEST(test_match);
-+  CPPUNIT_TEST(test_match_bracket1);
-+  CPPUNIT_TEST(test_match_bracket2);
-   CPPUNIT_TEST_EXCEPTION(test_input_fail, std::regex_error);
-   CPPUNIT_TEST_SUITE_END();
- 
-@@ -88,6 +90,24 @@ class test_regex : public TestCase
-   }
- 
-   void
-+  test_match_bracket1()
-+  {
-+    sbuild::regex r("^[a-z0-9][a-z0-9-]*$");
-+    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+  }
-+
-+  void
-+  test_match_bracket2()
-+  {
-+    sbuild::regex r("^[a-z0-9][-a-z0-9]*$");
-+    CPPUNIT_ASSERT(sbuild::regex_search("foobar", r));
-+    CPPUNIT_ASSERT(sbuild::regex_search("a-", r));
-+    CPPUNIT_ASSERT(!sbuild::regex_search("-a", r));
-+  }
-+
-+  void
-   test_input_fail()
-   {
-     sbuild::regex r;
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index f95b70e2a856..c7f3347d4a92 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -15,6 +15,7 @@ DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
 EBUILD scons-2.5.1.ebuild 1603 BLAKE2B 2469be4adae61636d044e2beec6bba28cb62bc81c6381d8eb1228a8907ae05c248ca042490cb4af0ef94bd1e081b950dfff064d07e194cba347e01c5ad647624 SHA512 1609e0aa9c7ac60e38aa92cae29d15bebec7583656d9f18cd545745f8fd29677fbd00643e617408866df88b42949c47de3405e2c57ddfde1e608a88a8ea83611
 EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
+EBUILD scons-3.0.1-r100.ebuild 2078 BLAKE2B 44634da960c7a30c9a0b8923cf163ea0be4ce31308d9b57d6705dc9baacd8661d62b317ad622f058cdfaae29728d781708df22021038281b83e9e9f0dda1db71 SHA512 f34c403ac05b2f42f3e1de1dd4ab3a3e22c3377f68ac0781da2a04280123cd218c912f5ff784876139b78cd93fe9b0dabd8d3304a4f3341f01645459a154f766
 EBUILD scons-3.0.1-r2.ebuild 2063 BLAKE2B e2112913d1726903f0852585e3d93c029104fd83c5a598ebef1562e344e9c804d495669e74a2b9fe2f2e05362308fae60f29d3315ab028b72ee25a16830191e2 SHA512 a359c4f0dc2daea7dc12200d8dfeb91bd3e7d4768de2b807f82e863dd468251264e250061ec1088550d096a18005947a5f0f622aedf1eb721ce7cd920758d67c
 EBUILD scons-3.0.1-r3.ebuild 2066 BLAKE2B 177a52afb4171023de660f6afdc0d895f5cc499b619c2d427354f8c99282eece6567c6b08c66b8dc9f644ca2b7d1ae216471c289c1030dbd0becd875c972108e SHA512 b88dd6016af45be90e31c761b276cb354bca00e28b3939bbe7f2b0a704620f46e71fc5b58dcc5553e10565413501c22d5c6e19d9a67cc99d267bd474493206e0
 EBUILD scons-3.0.1.ebuild 1738 BLAKE2B eb1430c2c64fe79b36cf776b1df482726982e7b871393e5f1e829e2e5e02c21a1db129248121435b97bd8288f4aed5cbde3a0f167041d8a0c26fe86575903062 SHA512 1454bc63720c78d58362ae72d311d3fd4b81ef8b01900cb36f6cda2aab235d06a4fb6c2631927ac4efcee0fc761c6a672a925bda248a7def5d49b43529d042d8
diff --git a/dev-util/scons/scons-3.0.1-r100.ebuild b/dev-util/scons/scons-3.0.1-r100.ebuild
new file mode 100644
index 000000000000..93ab8b574de7
--- /dev/null
+++ b/dev-util/scons/scons-3.0.1-r100.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-3.0.1-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+		rm -r "${P}/src" || die
+	else
+		mkdir "${P}" || die
+	fi
+
+	cd "${P}" || die
+	unpack "${P}.tar.gz"
+	mv "${P}" src || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/}$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -as \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib" ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED%/}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 34e7b34ace34..8fca9a8f6afd 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,5 +1,5 @@
 AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7166fdc9d80c207a8f086ac086ddef03c2697025215a1497d07dad28ac9cd7b9c269c4a8e74d684d10550b1f9858afafa3212a08261a52 SHA512 9386f1e5535df5eb1f30dbc053bf047a52f39b5a79c0a8c7c65add87128665e718a97b796f5ca8cdf1fcbeb51f713acb9d63d3ba7015619b20d15b7cddb48822
 DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
-EBUILD spirv-headers-1.3.ebuild 557 BLAKE2B 5f7e5a8f2e85333b0e8fbefc01fddc6540e985175a6a6725b1ccdb5257c69170cf843e866e8b61b56f939e7d2e436115f895fda089cda0c75fc08e708af13fe7 SHA512 019b68821189bf705e3dd6c98d177b5c4cd01c0a1d5d42781d483a01119256e765c1f0efa263be1f96a4e35e53849e1c0ede77b06d83fc755ec140a7d3225d26
+EBUILD spirv-headers-1.3.ebuild 562 BLAKE2B b304f69a8b7445e00fb41e162b84256601db218f3a7efd1ea1938d3ee39738a011de48d5fb099b5b8bbabf05cebab6248f3ac33064535da32520d321b8eab8a1 SHA512 0239f7a19a7b9040c33f9b1d4641f7c2fa866c2e5673da98ed20981a8b79b8af3c061c21c2e127a83a58367b2b487d0ad968352c93686df92d1a1c1c6aba8421
 EBUILD spirv-headers-9999.ebuild 422 BLAKE2B 8b354506bc2d8ee3ebce13ca9e83cecf7f175494aa49e3b42255f5bf1423fe3f69ffcae361645d09d9f4869a0f639fd6ecf95dcd50bf73ed2ded05ed2f1289bd SHA512 d76c5ef2f2474771b3402c70837a86c1886308fa60bb2e00ac7ea850017a8414707fab08aa775134809125e98b3d97ada47ce8c5ace6a8d5f110be1c76e37f1b
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
index f9c2a16b0e0b..4edaed9c09ae 100644
--- a/dev-util/spirv-headers/spirv-headers-1.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 PATCHES=( "${FILESDIR}"/${PN}-Get-rid-of-custom-target.patch )
 
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 1e2c41f58429..bea7ad714993 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,4 +1,4 @@
 DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
-EBUILD spirv-tools-2018.2-r1.ebuild 983 BLAKE2B 4dbc7ec6a58ff9a219ef28333e63521232f654ef3069c2936889058341de3f52bae573d436a16c593a4dca2635a3fe8764cd3f86565fc3a026386999d764aed6 SHA512 082cdf79b0a477d6f25f572aaeb5aff6b6ee925b64b587819b36a4e484f2293afe3a2d5d5fa96485ce07b074953da7fd7b62d08371278864121d802ac5b18066
+EBUILD spirv-tools-2018.2-r1.ebuild 988 BLAKE2B cb11ebd8b27a3d0d287f0dd05e9f8f302b159e94f6c8e470d91a3e48249ca442f916387d95cf5fee72de97dde225ef65a07e04b1b6b862b27d92db7d95ce9d45 SHA512 9ffe6f70f02dc0d288f17f18cdea435487d98a4a2830cbd14640433b42bc638512c0566e12990dedeee0d5da359bca326d6e0e82751e3942fd1eba7252696cf1
 EBUILD spirv-tools-9999.ebuild 933 BLAKE2B 9bf70a1d6c12a693da702de94bd564823a4714c2bb21b83fd7479020a800f53ec247139eebff4698eae761e2358d25d09c6b16e27e3663f54afb14fd0eb32ca5 SHA512 0c0773cfebc77f3d44d24ed7d053e658ee1bebf0327dba76c88964a74f620c5cd995e37fabd5fec8d7136ebecff54aa16ef6aebbdbdb0bb329c025586958ff37
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
index f1227eb734c8..46aa033b73a0 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${PV}.tar.gz -> ${
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 # Tests fail upon finding symbols that do not match a regular expression
 # in the generated library. Easily hit with non-standard compiler flags
 RESTRICT="test"
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index b7eefc818e01..9175a7f33e4c 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,8 @@
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
-DIST strace-4.21.tar.xz 1185908 BLAKE2B 00d8c7e296dd3b2a004b4f7ae062a3813219351bb4a5aabbc2e04784c35760f271fc12fd0122dac276a9723079f63d7187239172c9379a056e55dab9606e2e4b SHA512 d3b0393f1f727530e2e5b4490c80a905d251223167a61f9a86884a4b8a4f25522c46c465961968ca25013f321e561e217cb6e8f15be31d4d371274030526187d
 DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e136cc1cba1d83091445e2a3b64588c0578f0165ffec01dda1cb1824c29dbdab05bb409232edede953f2a5e78 SHA512 624c3f27921b6df2eb8ff409a35fa9153c4571cd5f703e6cac18f024bccd5ff4acb81f88ca33f81d1046d9718dec7b2705e8940e80bb8447ec3e62a6fd5f8350
+DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
 EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f
-EBUILD strace-4.21.ebuild 2129 BLAKE2B 087f7b3b5f850d5d587f4d0685ce8809d4fbc5475ce2cfe70c303e9f3d071cd9f094c0c4cb11a50c23381f7d48b63137fcc536f8a4fa3dcb1b5090e1adc63a67 SHA512 4e8beb9a870d0b415df2f71226ba4a439bd2f9528b1d533e1b385d35691d27b8fbd4d9ec0ead5f211d89dacaa642d73b47c0b648a9c65b18ea4cb78f67ca4852
 EBUILD strace-4.22.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
+EBUILD strace-4.23.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
 EBUILD strace-9999.ebuild 2150 BLAKE2B c9f5b515169763de2bbdc32ee6bb875391839a474d333977ae1f5022b380a09b232d79897f42c2f2e6e8404c643096bb733ec3ad1391dc80bccfd5e1b322f0f7 SHA512 ed67dd4e6dd1c35267ef6472cae76eabbb46cfa83ee674068d62fdf0c80f43cb3d6841ee22771f1eb832c147b621a2bb4f2f056ac9c072977b9f4ac026689650
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.21.ebuild b/dev-util/strace/strace-4.23.ebuild
index 62217d304567..216395c678c1 100644
--- a/dev-util/strace/strace-4.21.ebuild
+++ b/dev-util/strace/strace-4.23.ebuild
@@ -6,8 +6,6 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	#EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	#EGIT_PROJECT="${PN}"
 	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	inherit git-r3 autotools
 else
@@ -46,7 +44,8 @@ src_prepare() {
 	fi
 
 	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
+	# Add -pthread since strace wants -lrt for timer_create, and -lrt uses -lpthread.
+	use static && append-ldflags -static -pthread
 
 	export ac_cv_header_libaio_h=$(usex aio)
 	use elibc_musl && export ac_cv_header_stdc=no
@@ -81,6 +80,6 @@ src_test() {
 
 src_install() {
 	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
+	use perl || rm "${ED%/}"/usr/bin/strace-graph
 	dodoc CREDITS
 }
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 3756620e120c..16c9634c7e2f 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,6 +4,6 @@ DIST systemtap-2.9.tar.gz 3258026 BLAKE2B 92f4fcafcc3f4d517a631950593fc53e31ca25
 DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb18b6a9da030adca94405880fb52ff6ddbb62b01ae7acafa03e39a1ef5f0a7c3659300518412d8eee0c57d01b433 SHA512 07b322d5745f570296e287db80f1e370da87eb65073815cf24d532827900453c1cb9ee74b5496b4f3919d176b960caad4479edc2dadf27b5c58898fb7398264d
 EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
 EBUILD systemtap-2.9.ebuild 2012 BLAKE2B 851defa24b90f2dcd2dd75317197b2d90933e1170d10fb51354091c204bdfaaab629fc889af8c79f9559e1eeba3f3f8432722e8d7adbe39bd814beed5a6cdf66 SHA512 dee651564fb1894dde6b900532a7d3c6c554161ebf573bd38dea24f9f54aba78b5cf2150c782105da59394bb5cb2b8d1daca8ba2f1698f0a3a7e82c917773a32
-EBUILD systemtap-3.1-r1.ebuild 2133 BLAKE2B e0faa3ec62add0cc424260265a7b3959ec209881378922e9b50efcda05e86985c8700656a1a6571a15b0ca66f084d2ca131865e2611bfe809ca74643db016f48 SHA512 7b3ee194c450b249a1e959e65e94a7020ef612218c84a426763d79b1b5d5f27e48c754200ca0a9fad1c42d0a8c4c418eddb402173761f7dabd3111b1edd23e23
+EBUILD systemtap-3.1-r1.ebuild 2132 BLAKE2B 6e8a22cafbd49eb0f74aaccbc7b42d7aa675c1316f6560dfa93c14afc0914f0632597d97dab7fd3dd9a3bfeff7dec393e3082f4e62b5b620a898ee386886d34f SHA512 8b4a879a5e8653b231f0b2988b958b710734b3155bf20e0e1d2b6985ba04ae891ea83a7839fced9c0f0d92a5edde7f3c80fd91617c1e7755a48312b70ec50a30
 EBUILD systemtap-3.1.ebuild 2008 BLAKE2B 70a2c35653fe2e580de58e4d662f8124271444dfae7359eaa1d21430f66c2bb4d5398c989decfb4cbb76f8e1857a1dcaa3dc16f2d8a60cc8d14c05118fcd6dc4 SHA512 3becae4fb0226da05ae87e60151550c4b50d93948d0f699b6aff8d2680152e1c58aae944d5c7bb75f410f54bfe6d37dec3630e7824c2747da4d1c13b1b9fa2e3
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-3.1-r1.ebuild b/dev-util/systemtap/systemtap-3.1-r1.ebuild
index 4ce0669c102a..be6ed6219e46 100644
--- a/dev-util/systemtap/systemtap-3.1-r1.ebuild
+++ b/dev-util/systemtap/systemtap-3.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="libvirt sqlite"
 
 RDEPEND=">=dev-libs/elfutils-0.142
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 536d4fbc016c..257a3cb27944 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,5 +1,5 @@
 AUX vulkan-tools-Use-usr-for-vulkan-headers.patch 1240 BLAKE2B 2206e0777c2c7fea95a1e0b43e09de372b6a898275b3dbfa3bc1cac84125be42ade8834ffb8b2fd872f8d8ffa64aa70b456ad5c2e63c98c9aa4abd1995777043 SHA512 c96da656fe2d32af3ea5fbf348e6297be88b1581bda55e65a97d8d96229363b26285495929d5fa749b8e8fc9c20aa16ee529bcdf020191d46eac9bf97bab4511
 DIST vulkan-tools-0_pre20180601.tar.gz 421373 BLAKE2B d7c6870cf27397800a2af512b0bf05919b01dc30d84961d8a8dceacf005be461a8b250ef65cbfee8b070ef7f6fe8544deb855c06aee99f6b5175f4073b5a051c SHA512 f41517c22fb06aee07d40b947c756d97453810998ccb6e8cf8c48a439de1826361fcd84f0e96eaf3898e373e732d3b938c807da6fc2a736d3b986c2d30778ba2
 EBUILD vulkan-tools-0_pre20180601.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
-EBUILD vulkan-tools-9999.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
+EBUILD vulkan-tools-9999.ebuild 1465 BLAKE2B 4100099eb8fedd15c99eb4ee6ef33137421bd6f996dd19bca8f3e575240dbbe02b8ce27ded58dfff1a8faffbf0b17902269bf0bd5c5275d08dc43e41ff5b7150 SHA512 cc72acc0b479694f8742c9cd8d05aa66c470734d9bcedde58d7d8a68c762e0bbe47520c089e33f8a5493047ff4392ba5f447bb2510441c9f954e0639b657e9db
 MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 42876e8f5904..86e63d7def66 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -36,8 +36,6 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	   )"
 
-PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" )
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
@@ -46,6 +44,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-16 05:02:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-16 05:02:38 +0100
commit	f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch)
tree	c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /dev-util
parent	cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff)