gentoo resync : 27.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-27 12:48:57 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-27 12:48:57 +0100
commit: 70b82ae359a5538711e103b0e8dfb92654296644 (patch)
tree: 8412b84ff9ce02a22be5251052b00feefe1d5b70 /dev-util
parent: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff)
48 files changed, 1529 insertions, 185 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f791328030be..dbf89e61bfd0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 8331977873ee..ba28243f86c3 100644
--- a/dev-util/astyle/Manifest
+++ b/dev-util/astyle/Manifest
@@ -1,5 +1,5 @@
 DIST astyle_3.0.1_linux.tar.gz 172483 BLAKE2B 4c80491cbcc976aa38ff294014df0dc01b39685eafdac6989bea082b1f61120c3985d14ff6db9f76606bbe8da1aaa344c2e0c9c2999a014f5d54384c0420cf97 SHA512 3e8d617c0ec89682bfb076081bb63ae9d44e897de0c85d5109b28adbbfe0620d5dacf59a4bd96ac30a5a4fcb3be136758e9c6fe2c69258b37956c212890a7158
 DIST astyle_3.1_linux.tar.gz 185589 BLAKE2B d0bc9bf3403de89d207f33ac885c7cd57fd1e71314c947e1593ee24ade9ce36c83c6fd8e7021f44d8d3b344ea3add63fa5a7b246c40f10193dc38b51e7ad36bc SHA512 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
 EBUILD astyle-3.0.1-r1.ebuild 2401 BLAKE2B c27dd1d6b4e886cf68a795563d15d3fc942b62480aeae96116f108ea70dc0c6383a2d4efa5622c2aab03dda4d8ecb8d202eb7fa95c4ada8e2f8229be0f5a98dd SHA512 868aa688a44823004342598fe128af286aa78a071612cecdf335410cf7ccd88ebe91774d3385afd68c29f00fb5d26e95c235f0a2c4afb0650c75b2d802aef67a
-EBUILD astyle-3.1-r2.ebuild 2395 BLAKE2B 98f245433e2cb2a59cd6267d2ae1f07fcd333d6998bf8d04cc08b4a55721c808ccea335b1ed59fbd77b7aeda169ce5a51ea9a04a4834440aafc1e56ca22408d9 SHA512 2dc81c012d958dc8fe76a8e8136abe83fa822c145b6d20eb921bc5a964192574eb1334b2c1f59366f2a1ec8e424091af458ee32cec3750155c5f02fe7e80445e
+EBUILD astyle-3.1-r2.ebuild 2394 BLAKE2B 125ff25f20164f972e4df9520b333bee6614908d811dd419e0d1a1a36f6756537c0cb4f59d012b69715642a40438c315cc7e3f03e6d685250fcf2de36f4626b5 SHA512 cb9e392672a7bed33ce2747661ac22841c47ff62d196621dbcb9c6f6b4c1614cb56211ce73d6936aaee5e1911f563f40ffaee10319b400fe0a060b1fc072746f
 MISC metadata.xml 753 BLAKE2B ddd9b5eb1eaf20f626bdb0b568c856f6e2bb548fff3b6271bd163d6b1f711e66635d2e3fd839c67421f92232a7a8c7343179a4a95e39266dcf44b91bffc0c2c3 SHA512 2896e9eb1f69dfcef21bbc4f622e0ee7e2a88ab882d1ed91623642d4b7ddabb3b9e4e060e1662254e40cd4cdc77f189dc6888dd509ca40633c1f197fb2e4610b
diff --git a/dev-util/astyle/astyle-3.1-r2.ebuild b/dev-util/astyle/astyle-3.1-r2.ebuild
index 4e7729f00f84..8e2af0ab3608 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/astyle/astyle_${PV}_linux.tar.gz"
 
 LICENSE="MIT"
 SLOT="0/3.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="examples java static-libs"
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index b184bdbe4021..30b216926f30 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,7 +1,4 @@
-DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
-EBUILD bitcoin-tx-0.15.1.ebuild 2470 BLAKE2B 0beaf2e85ddbe60e53efed0fcea6877b9799695fac06da2dad962939a48d1a2bff1f530f1bea92799d3a8001e353cb0f08804d827bc145bca602c503eaadf42e SHA512 aba586d5ef584d1d060668a97117e9602ae1a1626b4e867f42f1a58be918678fece96fdb504b96e04317d3ade34382799100a769e00e5057ebd6f8bc738ee888
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
deleted file mode 100644
index d4d855fafc42..000000000000
--- a/dev-util/bitcoin-tx/bitcoin-tx-0.15.1.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 2010-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools bash-completion-r1
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
-KNOTS_PV="${PV}.knots20171111"
-KNOTS_P="${MyPN}-${KNOTS_PV}"
-
-IUSE="knots libressl"
-
-DESCRIPTION="Command-line Bitcoin transaction tool"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-
-SRC_URI="
-	https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
-	https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-KNOTS_DESC="https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-
-RDEPEND="
-	!libressl? ( dev-libs/openssl:0=[-bindist] )
-	libressl? ( dev-libs/libressl:0= )
-	>=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
-	dev-libs/univalue
-	>=dev-libs/boost-1.52.0:=[threads(+)]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( doc/bips.md doc/release-notes.md )
-
-S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
-	if use knots; then
-		einfo "You are building ${PN} from Bitcoin Knots."
-		einfo "For more information, see ${KNOTS_DESC}"
-	else
-		einfo "You are building ${PN} from Bitcoin Core."
-		einfo "For more information, see ${CORE_DESC}"
-	fi
-}
-
-KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
-
-src_prepare() {
-	eapply "$(KNOTS_PATCH syslibs)"
-
-	if use knots; then
-		eapply "$(KNOTS_PATCH f)"
-		eapply "$(KNOTS_PATCH branding)"
-		eapply "$(KNOTS_PATCH ts)"
-	fi
-
-	eapply_user
-
-	echo '#!/bin/true' >share/genbuild.sh || die
-	mkdir -p src/obj || die
-	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		--disable-experimental-asm
-		--without-qtdbus
-		--without-libevent
-		--without-qrencode
-		--without-miniupnpc
-		--disable-tests
-		--disable-wallet
-		--disable-zmq
-		--enable-util-tx
-		--disable-util-cli
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--without-gui
-		--disable-ccache
-		--disable-static
-		--with-system-libsecp256k1
-		--with-system-univalue
-	)
-	econf "${my_econf[@]}"
-}
-
-src_install() {
-	default
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-}
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
index 593b34e2d0cf..c130a8024f37 100644
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@@ -1,7 +1,9 @@
 DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a5081e8d71e7883418d686dffd1de8d61b2dda8761a1d074392a4f84699a4cff36be4f6be8abf52ba705434b8283 SHA512 37d87a27f2d3c17df7c61eebb8ab50887c7f723901125af08a5833bd053c5706cf1a2d3310fa30a6ade3bec8292b30bc4ddfb3143ece8129c606fcbe5103ddd6
 DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
 DIST bitrise-1.20.0.tar.gz 4226859 BLAKE2B f358caf503e02bfbeb895ebe759aeceb2c28f0055676cc897b16ffacfadf2b0f48e7c0c495716d58d1a65b8697889eb3c6895a145bd7fa6828bbbe32280c5d15 SHA512 edb3e78fe8714604f2e514d80efc879b8a28e18846be9f7a9abc641901355b31ce6659ed30ef9c81bcefbe9816d48a6a3f6c292f8948c09c6e9330fbef154eb7
+DIST bitrise-1.23.0.tar.gz 4294480 BLAKE2B 2bc18a78822280fbca6039270ef61403cebd364aabca23b0bfd6b2e62b865cedeb046fe57641125bbddbd48922a34d89f59ed3c0b3e13b17497f485ac39c0932 SHA512 a41ddb2757f5d13675425fe943ca5834600f81233992fc80505347d87472df6268b98b82da9ea0349786647b2d7360b0a9019b41d1016ae231db348a5a0cac32
 EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
 EBUILD bitrise-1.19.0.ebuild 1107 BLAKE2B f7310107af1e54c7c0bbdabed8a34bb395cb32fe7c0f33dbefea4f20bf2e1e1dc220f192f7c7ac2ad7a7b9e4119f81fe4d58a8e01760e8c2310fd68bd5f7820c SHA512 08be8f002c738976f4127fbcc55223949f439bfc2e56de01f442a545164640e88205f24af10a3d643b6947446f809ba5a3690a82e1433321b150248d73978ff1
 EBUILD bitrise-1.20.0.ebuild 1486 BLAKE2B 16bd7ae58234830fe8a85828cf857b8be6a96742531f94de2f8aca024fc88afc2cb2bc4a8802f4cd02a3c12f37b62dd05bc981a34679a7489357f5de0b3c67df SHA512 ab6d0c7e346618d8500dd0308166d2195e6d711f34b5778ba097d96f90529b9e2b01714da454be938706011add5101c3b5b08b37bd00550c7fee5340505f2de1
+EBUILD bitrise-1.23.0.ebuild 1494 BLAKE2B 4d48900a79908b97c4f34b81d2cd38476cd0f92c09aa13345edf967a1cd04af8799a81e1ea45ec95795d68729967ae289f5ebc5582b3a4f166cba9caa357e2f7 SHA512 dcf78dcf576cdacb11ece035c8d5692f7b5c086662f8c9ab6adce6b7faa6fcbbc9246e1090b4f1b8e97a9c38c12ad790c53ab551afbeac0b9b83a201a74088ca
 MISC metadata.xml 1069 BLAKE2B 18a8c9d910ea0495f53dd0f979ee07f5b99394c9198e56739a54e03c9d5a158038de5b9d38fb57a71a191327b76e7902ffe78324c23889295e4f7c404ba0e130 SHA512 787df19e97b702d0b0ca57a2474a68957fb953c16f236aa235f2488598c051851cc174824aaf60bdd7666d8338dca78f109ac03510e1a374605e855605870cf8
diff --git a/dev-util/bitrise/bitrise-1.23.0.ebuild b/dev-util/bitrise/bitrise-1.23.0.ebuild
new file mode 100644
index 000000000000..d5b744e68293
--- /dev/null
+++ b/dev-util/bitrise/bitrise-1.23.0.ebuild
@@ -0,0 +1,49 @@
+# 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"
+
+RDEPEND=">=dev-util/envman-2.1.0
+	>=dev-util/stepman-0.10.4"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	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() {
+	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
+	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
+		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
+	popd || die "Couldn't return to ${S} directory"
+	local -x PULL_REQUEST_ID=""
+	local -x 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/cbindgen/Manifest b/dev-util/cbindgen/Manifest
new file mode 100644
index 000000000000..ad9c7fff014a
--- /dev/null
+++ b/dev-util/cbindgen/Manifest
@@ -0,0 +1,40 @@
+DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
+DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
+DIST cbindgen-0.6.6.crate 82574 BLAKE2B ec3d2d03ea677acf89046d148447ea1108f4d0189878e9ffe4ceab273ea377cd489df27d9d6c589641dc614d0c8982fb19d2452d4ae88609adaa9a6aebf70baa SHA512 d51d17765d705424dead65e4240c52fe93da731d5ac1cc76fe79e2eb68a42c26a7de58b08149cccd6806ee5bb189df8c15c3a532a5f857a65c2fd69c656d7137
+DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
+DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
+DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
+DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
+DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
+DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee
+DIST libc-0.2.41.crate 333728 BLAKE2B 4b6d8a3ddedfbd01114878b14dcd7f4cdb663ab19c3f325d1785d9fc0c752634a7efe7777b3b14cac77ac5a2a3b8ae70a9e413006dafdcfe268b6e3c30bec8ab SHA512 6666f28673f765817dc6c989876a53031b117d281a6b148976b900ddeaa220fcb04c0e2bfe8b07d46f7e1b212e9c2fd7273b3300be548a3af0d2c9025bef7b26
+DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
+DIST proc-macro2-0.4.4.crate 28564 BLAKE2B 56935ff3b80d9c94f198a253de77fd7c8650ec75e62df100114bbeee633941570e4525a5dabfc92c370a8770be375d1ae0a83ecc09df10c4cfad2adc55ad501f SHA512 13b74a69277bd7674554414039e79dd0ae14f6e998a46e6e587cc17b6f2c97a6dbcbc459c827888510e5aff3b79d48b11f840bc21a28ff16c0eee8a51b784a86
+DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
+DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10
+DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
+DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
+DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST serde-1.0.64.crate 71347 BLAKE2B 97f9a8103865f1eb2645cac613a808169a0c36da5f16e23959a736824f783c895fd71eaa07e711995404e36adec9b7f19db6e80ebdd400ce14dacd13f5e343b6 SHA512 6494787064f50a0c39b8d5328ea8ff961a97d7f0e4ab123b0a1e3fb43735f0dbd9721f60942c5797d9abfb9f2e79347345e0816d3783d8fb9138bb7d141abdb1
+DIST serde_derive-1.0.58.crate 45146 BLAKE2B 69b230d33072d7d7e9ae17f62872560a4b919436b6e33111827597c06b380e0e43d02fa4ffafa9ed8128d008bf065165e876090c4652827ffc3dc1603a5db8a8 SHA512 6eaa57861ede4b9bbc1e0bfc561917afaa133613c4279fddc17529c291f0fb1122e0443267de9498ddd4e45ca9d13e38d88aef00864b0505a05e06ca65bb8d80
+DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42406cf4501fb3288b80a5ed8a110eae47a1f2b053e2b497c92457c5bfee2ed0b5f86e9dbaabb1bd3953914dd06ec SHA512 03b760d0bfd8a49499107a4b43bb9f588b375c92cb85fd131642bd787734a8523a176dc10330329a3ad8c6d575c917a813fc513a4fb5890c11ade0d48c046165
+DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST syn-0.13.11.crate 134240 BLAKE2B 6661d1ea3cb20a3bd4650b95324a201fbe143d31733eb8910ce126b0983043fb569d2250875996588831a6112fe45976d4a103e9ee6e373a1374644ac33fd420 SHA512 e14192e7bdc91d5bffbfc1e7091a46c340b4f5a9a6336b9cc12c78c328f9feaa432b4261346431fac1b5a11f93e122f1e902f1fae0927f9df6b5294e0abc3fa5
+DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea38e681a9b9234b0ab18bed183862178bec132d5ceef5d40a63d37a2fd872f16a509d7f6043b3eb27ef8a3 SHA512 408c785e6c6f7f63134a22c383f54ed8ab45d0521e1ddaba9204b21d1e0e56242e153377bd3ff67467816d581c91ecf663cbb814b1d6549a961e01f20b331482
+DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
+DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
+DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95
+DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
+DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
+DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
+DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
+EBUILD cbindgen-0.6.6.ebuild 952 BLAKE2B 5916e4bbb6e7d1b42be8d7488d1ed5a2ab078ff89a6449e0a0520f68bf3d05e30001b58a52080cd510b4cd0c75d48228bc47722c21188b2e7ea92eec3766a8ab SHA512 666ce07daa9f3e120fcedb67705a803ac43770d2f7c7915f7690f99c62fa8183ff16222b9ad58c0681c6fa86ab0689d02f2f615ef6fec10fde7e65a1fcd4a0bd
+MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.6.6.ebuild b/dev-util/cbindgen/cbindgen-0.6.6.ebuild
new file mode 100644
index 000000000000..9a903be75348
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.6.6.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2017-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.10
+bitflags-1.0.3
+cbindgen-0.6.6
+cfg-if-0.1.3
+clap-2.31.2
+cloudabi-0.0.3
+dtoa-0.4.2
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+itoa-0.4.1
+libc-0.2.41
+log-0.4.1
+proc-macro2-0.3.8
+proc-macro2-0.4.4
+quote-0.5.2
+quote-0.6.3
+rand-0.5.5
+rand_core-0.2.1
+redox_syscall-0.1.40
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+serde-1.0.64
+serde_derive-1.0.58
+serde_json-1.0.19
+strsim-0.7.0
+syn-0.13.11
+syn-0.14.1
+tempfile-3.0.3
+termion-1.5.1
+textwrap-0.9.0
+toml-0.4.6
+unicode-width-0.1.5
+unicode-xid-0.1.0
+vec_map-0.8.1
+winapi-0.3.4
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/cbindgen/metadata.xml b/dev-util/cbindgen/metadata.xml
new file mode 100644
index 000000000000..677f50ae24fa
--- /dev/null
+++ b/dev-util/cbindgen/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>mozilla@gentoo.org</email>
+		<name>Gentoo Mozilla Team</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">eqrion/cbindgen</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d083141b9ff1..fb9c50eb33f9 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,13 +18,13 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f68592
 DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692
 DIST cmake-3.12.2.tar.gz 8388114 BLAKE2B 2bb28991527287da62d5416dfde3a9ff072534d52b124d1f73a555d7defb16f05300c78e4c258ba2d09d11cef285fe799c3d132cd1bd4e573aea67cb86beb2af SHA512 a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
-DIST cmake-3.13.0-rc1.tar.gz 8587210 BLAKE2B eb9703dee7bedda3a916ed87eed62bcd0e28376e62e7d928db7bf2de5c2ceb21285e34e1f261e9cbdaad84e4be7d3c3eb06e6809b84eabf6202d3f9efd2c305a SHA512 8c98f10d137193d14438e9e2442de017c8df7bc433f0391c0f8b22235dc7718cab428bd877944ed6cb4005d91685cda5009e0f50fcd783d8181ec357f8d9130e
+DIST cmake-3.13.0-rc2.tar.gz 8594563 BLAKE2B 848ce36f23df2482f56da470244759234e93788685a0115ad639bbd8dd7ec3c2c59e7725c479583397df707e631e4a86dafcd34e5461c8bc40965f23ae101d59 SHA512 b5b5b7eafec3d65e5d05f974ab9dbed723c598685cb64265465679590ee888a80f161a7339f35140de7414e6327ed968047478c8d5bd00c049cd66841ca8385e
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6227 BLAKE2B 1ff1b9195e39fda2b03e5dc5d2148a53b959469b19fd7d423d5502e41c72a6791dba00302dab6d241fca639bbe80711d3c0ad77eaea2ff5aea7b621cb72d77e6 SHA512 7896c37bceb3300d554ec654b4500abc2c8d4a08af8b11bc488351e39652aa6b54d02e563f4de01c6d2d73f59b3545810221f3e35ab16883d50574b1bbff0af8
 EBUILD cmake-3.12.1.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
 EBUILD cmake-3.12.2.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
-EBUILD cmake-3.13.0_rc1.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
+EBUILD cmake-3.13.0_rc2.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.13.0_rc1.ebuild b/dev-util/cmake/cmake-3.13.0_rc2.ebuild
index 73aee46de553..73aee46de553 100644
--- a/dev-util/cmake/cmake-3.13.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.13.0_rc2.ebuild
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index a39d5d39f6b7..151953218b1d 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -1,26 +1,34 @@
 AUX electron-1.7.15-v8-crankshaft-rce-fix.patch 1581 BLAKE2B a78c4bccca8ca37957d714e6cb29c893fabdd1960a4b20145e6d86f701ff6be69b2495d90563fa5314c350c60d7d81c382a417347f924ae1c24ff13a0e90fa82 SHA512 3a9423434ce03744b5eb7c8850c6908e8c94e23fed3bc5d87bde09e6c47eb429eb0852b8453b3311a2f640b8d9d136343155743d633206ff85c9ac5a4f75106f
-AUX toolchain/BUILD.gn 400 BLAKE2B 5237bf9cdb5be027aa8dff5b854297f51fa5f8a09f5b24a1b5c6c4494126e16573f2bafe503389566507d60818880286efca8ccc9ce8f5cc560faf76f2df6c42 SHA512 cc36ab3406dcaedfd9472e94c53d3f25c4f5e25e2d1275e2bc99b8e18ffdf6de1583f7e0ceadfb8a8d10ab3e5d7018b84ec506e3b31a0a55cfb9453fb19ad3d0
+AUX toolchain/BUILD.gn 799 BLAKE2B c1a088f005100fe77846bde9405ff8e68b65ce8798c4f746609575afdcbefe402e8d10ca55ecc195080752db9c48489ec66aaa658045e32337b9fb599b4d9b36 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d
 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 chromium-61.0.3163.100.tar.xz 556305252 BLAKE2B 88b9dc05d626ec33c2044cd8bb5a5bd2e36c4ba5c231230b5b6529d62cc100874099d17633ca320a0c668b130797d6b222107d2efcd6f80b5b0b460d378f4454 SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78
+DIST electron-1.6.18.tar.gz 4965032 BLAKE2B ecb085a75717fb472740583dbd31634bd8b4be8365fdaf3334e558a8076577d3a973ba78c87136bdf42be14a8fcbe0b7816f49a1eccc162c62941485a2bb09fb SHA512 bd10d34e9a91350671a8c1af807fd01d7379bd7c9eca7c3f096349a5dbefaa78e063ee6a27fa5029a19daec0ca70fbe45f9964e27945a5f47ac83416540aacda
+DIST electron-1.7.16.tar.gz 5174554 BLAKE2B 421fde393533c4af26a046a3a1a6ef067306ac6990fe9b7f74436b00e939b85d07f39bb7b9f02547288105adfd069f2640238e83cf444a3a99723441da0556f9 SHA512 84815598f14330916dc65f1326a841e73a8c1551c4b9ba21667562f6c67eb770529b3049d53951e91b07356e4d7cfc3ed3a5e3722305d7282adfc871c3195a35
+DIST electron-2.0.10.tar.gz 3012289 BLAKE2B 3d4f2560e754917c7e72e6450ccf9d6d5f8a7741fb5c426d6db9cad01780be5531671bea55eb9033f5de288617d8cc366a17b1a77eac5bd32440ff8e9ee53a5e SHA512 5663e9b018a51bf7f7c87a8c5b51cf631a91980bf01fdcb207f2054da2bfaffdebfe027bd8c27dfa0af523fd09ec1c52076a7f6de9c5bf9a0ffbb898d1797b59
+DIST electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz 5168487 BLAKE2B 41583e3297c2e8a612720f2087720cb7bc4ebf0aaaf5481029bd65458b26e5e824da283f474cf70d8933f80538e9f6c4b8a5843f27a6448b727ec9f12578b526 SHA512 303d1545dbe8e5fdece0fcd90c2ad09fab24483b176df1491580b9b382a607c0a814681cd58bcb7166b9cfc5af882a2b0d2fcc175d23f747b37c921040b68310
 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-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz 1141359 BLAKE2B 7145fc178dcb62e9f14123da03e98f5e37c29f3a58799e675b3638eb0694771d1320de8bc70d97daa5c8c21db548efa3aa3c86d2018d6cea95f288b39cae4020 SHA512 4c8353a34061f4e061bb9e23945c0fb7a56f1b9f249b323cd3315cafcecdaca5c1f63940e2334ded03413cf26f5aa4a5bd8f1720fb2ba422a97d70f121d7d3d4
 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-4a4acde5522c21fe2f0a21f5ca29f99e90b03adc.tar.gz 73046 BLAKE2B 051b69473c5a97746aa2f18fc94d4909ad52e0a0edc638ba3950d70b46fb798523da0d62f4a7f427187f80406f8efc3c9e04039f90567521c4f29adb0ab82fbf SHA512 960f8b27adcf0df459bae024092971e8c10f1dfa933e3374303d7fd0ecaf2cf201674c474dfce6500609d229f1b4441968dfbc46a2d6220723b7ceebec277dba
 DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
+DIST electron-libchromiumcontent-cbd04c0dccc7655cd42f02baee3a622d5170ac08.tar.gz 161487 BLAKE2B de2f7f708aafc2f9033fb0dbee50880f9441196c81ba355bae966a1ffbb0c2f30c86cbb30021af599ac3abf071431f99c07a7a51b45db41901624148e1988369 SHA512 f207fdddecda879ff3c83e1503af0e919c1f6fe2e3666ac9d40c9fc21dfb3a679e1f0ab3ce7b89057a412934c5a9c96ed846761c669875ee0c3a1955308be184
+DIST electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz 24130 BLAKE2B b807a13d01ccd07a3310d8551cafee69a111bb342ee9e15bc0a20243c6f98638e3f18ddd716389fcabace064d4b98acbe50ff6eed862d8d46d152c8bd6f562b2 SHA512 c9ca33f7f96f52aae132f0e4cbd141fe28cea96b9e2c9fadcac40e3bd09d417469fac2851ad1c49790a4533174df0bec9d5ad45203a1358b3d4a2c0df49903fa
 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-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAKE2B 36f91e8ae7d1ae4e99c44128398589e015224c664c86d3869327a4c433fdf8efdb758d4462ec3d8997399bf6d62cfe63f91ae8ee4886aab7817b1654c94592a2 SHA512 8f31577a4ef836b5535ec69d8a020c06e92c01667a0d4b857fcb6789025a6903d42ba3f9b51fd0828d39e88dd7ba44a07cfb3a59023b04c4f5cb89e1a27874bc
 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-patches-f0fb7725cfe73704dce84ec51bdccc024dc7ceff.tar.gz 88340 BLAKE2B 759f8da023fae94ac0639387ace26694b2ff9dfd978f783cae2f1ccaaf749200ec2cdcfb771fbd3dc8a605521886c8e3383b7ed565eb250f753d238fd30ad6ef SHA512 c542d8fcf95123dc4ebced608ae0d1d9bc04db67f89c50f219bdf4ed8e916059333d1e3571387bf2992b46c3b0a02692f7ec2531920f693db30c7ed401bb73d4
 DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
+DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
 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
-EBUILD electron-1.7.15.ebuild 27961 BLAKE2B adf311387891f08a03493bc4750ec33381a26a3a5877e5bc34946ab0ab97667d79580d24c26674ce314ebccea7cfdb581e536415529dcdc2dd4753fe31c8b00d SHA512 420a2c29b85d773cdf72db90dd1d0e4de03ce9f658d12578a2ad7da5ec825c51685a8934a22bd2161ac2f16af8056a37f1e1a61b1e85ba35e1323cb1513b9b99
+EBUILD electron-1.6.18.ebuild 28186 BLAKE2B 746db1980065510845990dc5c426982f6de9ddd9c74f42503c91b84a04835550243eaa21804408068b143d0295a5bddf23457d811f836ad072d74e792018201e SHA512 0ea10454ec86607f2413d77af97ee9f8152b7f66792a7766723a4453f2c5b629e4d19ee3c57fb900dec888560b458493c3904d25c8cab9c7c32fa65add7e159c
+EBUILD electron-1.7.16.ebuild 28059 BLAKE2B 027bd8197783c279780f947483a95188609f5a8f138406e64eda10e033ede8b58939fad212a2a2bc24e2bdd4444645ab76c63cd89f513ff66fce6d5f2d6f98e1 SHA512 e9856a634e9cdf320e64296830db12968cafd2f22186b1f2d5d0d18f05998ff5ce2c0dd0775d83ee1af76c2586dec2c79989b41e5c8028f5090581df3db99adb
+EBUILD electron-2.0.10.ebuild 28636 BLAKE2B 9a1b85fe418e8088ba605bdd223d1c812cd9b77061f9b0ef0dd39a589f68fb65126f407256e6221763408b6eff0017410a27f04a4bd30bba3f8b69e060f65541 SHA512 a92a1178b6200236cf5d68a020ef3a6e54eb839b9077260163e5459237e5f0b3d9aa465fb6e6ce027667d740c7a855d4ea7708d05b38f6575058d0910fe2d584
 MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760
diff --git a/dev-util/electron/electron-1.6.16.ebuild b/dev-util/electron/electron-1.6.18.ebuild
index 58491cdd5640..fc39f787b71a 100644
--- a/dev-util/electron/electron-1.6.16.ebuild
+++ b/dev-util/electron/electron-1.6.18.ebuild
@@ -8,9 +8,9 @@ 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 \
+inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
 	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
+	virtualx xdg-utils
 
 # Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
 CHROMIUM_VERSION="56.0.2924.87"
@@ -34,8 +34,9 @@ LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
 # Keep this in sync with package.json#devDependencies
 ASAR_VERSION="0.13.0"
 BROWSERIFY_VERSION="14.0.0"
+GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
 
-PATCHES_P="gentoo-electron-patches-${P}"
+PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
 CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
 BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
 BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
@@ -63,7 +64,7 @@ SRC_URI="
 	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/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
 "
 
 S="${WORKDIR}/${P}"
@@ -78,7 +79,7 @@ GRIT_S="${PDF_VIEWER_S}/vendor/grit"
 LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
 
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
@@ -195,11 +196,11 @@ 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
+		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; 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
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
 			# bugs: #535730, #525374, #518668, #600288
 			die "At least gcc 4.9 is required"
 		fi
@@ -519,7 +520,7 @@ src_configure() {
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 
 	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries="
+	local gn_system_libraries=(
 		flac
 		harfbuzz-ng
 		icu
@@ -532,11 +533,12 @@ src_configure() {
 		re2
 		snappy
 		yasm
-		zlib"
+		zlib)
 	if use system-ffmpeg; then
-		gn_system_libraries+=" ffmpeg"
+		gn_system_libraries+=( ffmpeg )
 	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
+	build/linux/unbundle/replace_gn_files.py \
+		--system-libraries ${gn_system_libraries[@]} || die
 
 	# Optional dependencies.
 	myconf_gn+=" use_cups=$(usex cups true false)"
diff --git a/dev-util/electron/electron-1.7.15.ebuild b/dev-util/electron/electron-1.7.16.ebuild
index ee39885c1cfa..3f5ca3af95df 100644
--- a/dev-util/electron/electron-1.7.15.ebuild
+++ b/dev-util/electron/electron-1.7.16.ebuild
@@ -8,9 +8,9 @@ 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 \
+inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
 	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	versionator virtualx xdg-utils
+	virtualx xdg-utils
 
 # Keep this in sync with vendor/libchromiumcontent/VERSION
 CHROMIUM_VERSION="58.0.3029.110"
@@ -28,13 +28,14 @@ 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"
+LIBCHROMIUMCONTENT_COMMIT="4a4acde5522c21fe2f0a21f5ca29f99e90b03adc"
 # Keep this in sync with package.json#devDependencies
 ASAR_VERSION="0.13.0"
 BROWSERIFY_VERSION="14.0.0"
 NINJA_VERSION="1.8.2"
+GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
 
-PATCHES_P="gentoo-electron-patches-${P}"
+PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
 CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
 BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
 BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
@@ -60,7 +61,7 @@ SRC_URI="
 	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/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
 	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
 "
 
@@ -75,7 +76,7 @@ GRIT_S="${PDF_VIEWER_S}/vendor/grit"
 LIBCC_S="${S}/vendor/libchromiumcontent"
 
 LICENSE="BSD"
-SLOT="$(get_version_component_range 1-2)"
+SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 IUSE="cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic
 	  +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
@@ -194,11 +195,11 @@ 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
+		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; 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
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
 			# bugs: #535730, #525374, #518668, #600288
 			die "At least gcc 4.9 is required"
 		fi
@@ -349,7 +350,7 @@ src_prepare() {
 
 	# Fix broken patch
 	cd "${LIBCC_S}" || die
-	eapply "${FILESDIR}/${P}-v8-crankshaft-rce-fix.patch"
+	eapply "${FILESDIR}/${PN}-1.7.15-v8-crankshaft-rce-fix.patch"
 
 	# Apply libcc Chromium patches.
 	cd "${CHROMIUM_S}" || die
diff --git a/dev-util/electron/electron-2.0.10.ebuild b/dev-util/electron/electron-2.0.10.ebuild
new file mode 100644
index 000000000000..0742d0910c41
--- /dev/null
+++ b/dev-util/electron/electron-2.0.10.ebuild
@@ -0,0 +1,908 @@
+# 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 eapi7-ver gnome2-utils flag-o-matic multilib \
+	multiprocessing ninja-utils pax-utils portability python-any-r1 \
+	toolchain-funcs virtualx xdg-utils
+
+# Keep this in sync with vendor/libchromiumcontent/VERSION
+CHROMIUM_VERSION="61.0.3163.100"
+# Keep this in sync with vendor/breakpad
+BREAKPAD_COMMIT="82f0452e6b687b3c1e14e08d172b2f3fb79ae91a"
+# Keep this in sync with vendor/breakpad/src (and find the corresponding
+# commit in https://github.com/google/breakpad/)
+BREAKPAD_SRC_COMMIT="67f738b7adb47dc1e3b272fb99062f4192fa6651"
+# Keep this in sync with vendor/node
+NODE_COMMIT="51abeb37cad3f2098c0f0fffdff739f4ac2393e8"
+# Keep this in sync with vendor/native_mate
+NATIVE_MATE_COMMIT="6a3d238b7e1e3742f2bb495336a84021d927a24f"
+# Keep this in sync with vendor/pdf_viewer
+PDF_VIEWER_COMMIT="a5251e497fb52e699b28f627e3cbb6d8cefb62df"
+# Keep this in sync with vendor/pdf_viewer/vendor/grit
+GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
+# Keep this in sync with vendor/libchromiumcontent
+LIBCHROMIUMCONTENT_COMMIT="cbd04c0dccc7655cd42f02baee3a622d5170ac08"
+# Keep this in sync with package.json#devDependencies
+ASAR_VERSION="0.13.0"
+BROWSERIFY_VERSION="14.0.0"
+NINJA_VERSION="1.8.2"
+GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
+
+PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
+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/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.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="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE="cups custom-cflags gconf gnome-keyring 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/expat:=
+	dev-libs/glib:2
+	>=dev-libs/icu-58:=
+	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.4.2:=[icu(+)]
+	media-libs/libexif:=
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	>=media-libs/libvpx-1.7.0:=[postproc,svc]
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12-r0
+		media-libs/opus:=
+	)
+	>=net-dns/c-ares-1.13.0:=
+	>=net-libs/nghttp2-1.32.0:=
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	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/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
+	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-util/gn
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-4.6.1
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(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 && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; 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
+
+	# Apply Gentoo patches for Electron itself.
+	cd "${S}" || die
+	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
+	eapply "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
+
+	# Apply Chromium patches from libchromiumcontent.
+	cd "${CHROMIUM_S}" || die
+	_unnest_patches "${LIBCC_S}/patches"
+	eapply "${LIBCC_S}/patches"
+
+	# Finally, apply Gentoo patches for Chromium.
+	eapply "${WORKDIR}/${PATCHES_P}/${PV}/chromium/"
+
+	# 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
+
+	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/base
+		third_party/angle/src/common/third_party/murmurhash
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		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/catapult/tracing/third_party/oboe
+		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/freetype
+		third_party/glslang-angle
+		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/googletest
+		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/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/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		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/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		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/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		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 third_party/opus )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	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: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: xml (bug #616818).
+	# 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
+		libdrm
+		libjpeg
+		libpng
+		libvpx
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( libvpx ffmpeg opus )
+	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_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"
+	myconf_gn+=" linux_use_bundled_binutils=false use_custom_libcxx=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
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\""
+	else
+		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	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
+	# --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 \
+		--shared-nghttp2 --shared-cares \
+		--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..."
+	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || 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
+	CHROMIUMCONTENT_2ND_PASS=1 \
+		eninja -C "${chromium_target}" chromiumcontent:libs
+
+	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 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+=" -Dmas_build=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/toolchain/BUILD.gn b/dev-util/electron/files/toolchain/BUILD.gn
index 78f7b57e3be5..f88d3afdcfda 100644
--- a/dev-util/electron/files/toolchain/BUILD.gn
+++ b/dev-util/electron/files/toolchain/BUILD.gn
@@ -17,3 +17,21 @@ gcc_toolchain("default") {
     current_os = current_os
   }
 }
+
+gcc_toolchain("host") {
+  cc = getenv("BUILD_CC")
+  cxx = getenv("BUILD_CXX")
+  ar = getenv("BUILD_AR")
+  nm = getenv("BUILD_NM")
+  ld = cxx
+
+  extra_cflags = getenv("BUILD_CFLAGS")
+  extra_cppflags = getenv("BUILD_CPPFLAGS")
+  extra_cxxflags = getenv("BUILD_CXXFLAGS")
+  extra_ldflags = getenv("BUILD_LDFLAGS")
+
+  toolchain_args = {
+    current_cpu = current_cpu
+    current_os = current_os
+  }
+}
diff --git a/dev-util/envman/Manifest b/dev-util/envman/Manifest
index 20c8aa974018..83d7d9024919 100644
--- a/dev-util/envman/Manifest
+++ b/dev-util/envman/Manifest
@@ -1,5 +1,7 @@
 DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
 DIST envman-1.2.1.tar.gz 3033981 BLAKE2B a48c46d35a122ad86274867c246f1af998a983a67e8d30214bc6f3a989ad6b435a61ebad7f128803ffb9dcfc05af261b99cf3316fed93412c6ee1da873cc988e SHA512 bbec25964d868077c88a01ab827744633b325eb955809d4ec48a5224f6f8530c31b297b592f0280dabd01007bf75fd6ac3609c4d19be0332ca114d36725c7fb6
+DIST envman-2.1.0.tar.gz 3133726 BLAKE2B 8c5c87d43bdc22838036fe25ea6b48e702163d474169181257cef6f0fe4fba01b18f870d9bfee5f56b30cce13f47f6af70f4e55fcff221af77f14550a13ebb46 SHA512 c0b7ab5355332fa24ecd4166e3fdb1f02e589ee11288768a382a9556d2c3061b1930061873525e19b71451a47c72c09f5b7c6191b8564b0dec2a9c29dfbcf222
 EBUILD envman-1.2.0.ebuild 873 BLAKE2B ab827ea0ff610b6d2675f925dc65b32b47472eaca4f605341a71d332ea00527fb8f8357847a7f0bdbc3314d9182ea104dd13f9c179a8b210410190cb1472ade1 SHA512 862df91f0bed24dffec1e1c0d209aed338a2ab060c41ec147a82503a81f279b787ed2524ff0cca90be47717881b491ac7a4490736a8ac4a3011289bd7480ac11
 EBUILD envman-1.2.1.ebuild 869 BLAKE2B ed7a46805b4ee9acc2746795b09d812bf012c2975f7b75d501d94409c3a14312c9c4c985cb3191512203e9ce5fcedda346fed15c39bc79c4160f509a7041e49a SHA512 6dd367bd5ff737cb782192c35be6251a60a049f2a69a196171a2b2415b57d896a1c5db8702689ad926a6a445227cac50de83e00aaf2429cffb52133292357f15
+EBUILD envman-2.1.0.ebuild 865 BLAKE2B de902e8487a1978ca7de1283449ebeae631a01a10a54b26351ee3a3a7ab67327d28c308e4c56bf25cd22832906884f92f71c4faad7e616b181e875eb5793fd08 SHA512 b274313029889346172143f43ef85c234b55c683b0db93f37f1a52ba0222d3585d56e656045ac76d629578b8eef76a06c99ed3c9d12343a186b0d8d5b1308a61
 MISC metadata.xml 942 BLAKE2B 32b021b4b9f97464d5ff81c7541a389105d75d32ac8598474007f4f27013c0b1bff37968a4ebcf9b9e41264686aef44c43da6896426392adfaf91576ca2873fa SHA512 4fd1c54eec14f80bd804140299d2f987c404f0653c6b6adfc1715ac01cbaed0555ccb8cd87fbe6a2f34b7cb90f81cf20db817866f40ea2f6c607c7268705a089
diff --git a/dev-util/envman/envman-2.1.0.ebuild b/dev-util/envman/envman-2.1.0.ebuild
new file mode 100644
index 000000000000..20bf664c7e84
--- /dev/null
+++ b/dev-util/envman/envman-2.1.0.ebuild
@@ -0,0 +1,38 @@
+# 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="Environment variable manager for Bitrise CLI"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
+}
+
+src_test() {
+	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
+}
+
+src_install() {
+	dobin bin/envman
+	einstalldocs
+}
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 778a5929fb0a..63c38f316c43 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -1,8 +1,10 @@
+AUX lcov-1.13-gcc-8.patch 3049 BLAKE2B ec0e22a61851ec2acbb0ac8909f1fc91d57d8dc2914583cf70cfbd7c08153c0c87a76d7f30e41f3660d4ecd9e76b3f06fb562865fc79474019f29c83602728c4 SHA512 f3598e28e98e97d3d1eec8ed4168996623cf920f94870cce4e731de2e1b0925a786dc8cbaf9d70379fc4e73f4f26f3a9405b2077c5246dcd66cc0eab25625b94
 AUX lcov-1.9-gcc-4.7.patch 1035 BLAKE2B d4ce8c505f1dd22f44feadf9f99bcf73fd5e461a714d3d40d5e8e222b5d427d947e42d4806252437ae4392ec3ee3d9521f85173044d493f7a4f81a35e042c5fd SHA512 c9d1a80ead5ed8de91fdac4ac3b7b8d8cbcf245f38276c91551a4f74942ff348947fbbd4b4a3fa171fd90ea240ffea8f4b162ca9eab2a929a7daa2eb0834f307
 DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd22a6ee52035115d84e7f05d7593168ffee9c5925937a509e3be64cebaad6e4694004ee2808817d6df19da SHA512 db42256c7fbe00d17256ad4944b7e658e65f2dc2b9df1814e25d46a652e92a0ff8bacd4e68de743681df22f4352ffc82b3ccdc0a85723546d7eb64c92e28c0fe
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
 EBUILD lcov-1.11.ebuild 574 BLAKE2B 4349f37845e48e6cd30e543557ee59b00ff18a030d3049adb7a1d47924202c9233db6c8b6831ba123cc1e3ca7093b298ae688cbfa15dab59097d4ea858d3dbd0 SHA512 a5559fb75533fa53ec54edc0262fac5582b68ca42b66b4dcb7b708e69032eb63c7fffb94af629113d50ff2598166853ed19c489ebfbddafada4fe88e0ea4f3bb
-EBUILD lcov-1.13-r1.ebuild 683 BLAKE2B 1f30b7d233031078f27b25789c2e6cbd9ec72339ed45e90d9082cf014fc4c8f002148db98fe8078b09201f597f2d11e18bb1cc9220a9d75a43e09e85128ad54e SHA512 6d4ab75878d5e603fa615abd4160c92eb8b686a48ad7f6a64bc85d7009adf5188dd83b564eb187c73e542e6af03c5f5bff58f143acf7ac0c383abcfe27c856a4
+EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010
 EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18
-MISC metadata.xml 440 BLAKE2B ba4141809aea82e4fdb57c1c216dcef2c12f1edc3c4ee2405552a74a24d8c53cc22febc8994fe824c41a17f88c7f22dcd383b6a9f59c9f51b81fd83b0f30f4f3 SHA512 8c0066aad63765a2fc18d80de9028aba7e303619fea5efa41a8db1138b3b87434c84b4cadbb0f2961aef42c9262d3265bcee1786f38184d2daa2f369f99377ce
+EBUILD lcov-9999.ebuild 825 BLAKE2B 57bdeb72524382fd715b8e854bc6221f2671cf31045c9832078b6d63dae0eca6e20be38ea48a34ad2eb949768d9fc6fc492074a4e97a9ae5d20bc9a492326e92 SHA512 c5c8a461cb533aea1275ff86a3747238405e730a2b1479a1857ba3227a98ee63e6336a1cb1cdafe58e98842cf36af4632ae1423b02ad8527f4a0990056590bd0
+MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/files/lcov-1.13-gcc-8.patch b/dev-util/lcov/files/lcov-1.13-gcc-8.patch
new file mode 100644
index 000000000000..b67ca411bdaf
--- /dev/null
+++ b/dev-util/lcov/files/lcov-1.13-gcc-8.patch
@@ -0,0 +1,91 @@
+From a5dd9529f9232b8d901a4d6eb9ae54cae179e5b3 Mon Sep 17 00:00:00 2001
+From: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+Date: Wed, 7 Mar 2018 14:18:55 +0100
+Subject: [PATCH] geninfo: Add gcc 8 support
+
+Fix errors and incorrect data when trying to collect coverage data
+for programs compiled with gcc 8.
+
+Covers the following gcov-related changes in gcc:
+
+.gcov-file format:
+  - Line coverage data can appear multiple times for the same line
+  - Line coverage count can be suffixed by '*' to indicated unexecuted
+    basic blocks in that line
+
+.gcno-file format:
+  - new header field 'support unexecuted blocks flag'
+  - new function record fields 'column number', 'ending line number',
+    and 'compiler-generated entity flag'
+
+Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
+---
+ bin/geninfo | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/bin/geninfo b/bin/geninfo
+index 8562560..ef6a818 100755
+--- a/bin/geninfo
++++ b/bin/geninfo
+@@ -68,6 +68,7 @@ our $lcov_url		= "http://ltp.sourceforge.net/coverage/lcov.php";
+ our $gcov_tool		= "gcov";
+ our $tool_name		= basename($0);
+
++our $GCOV_VERSION_8_0_0	= 0x80000;
+ our $GCOV_VERSION_4_7_0	= 0x40700;
+ our $GCOV_VERSION_3_4_0	= 0x30400;
+ our $GCOV_VERSION_3_3_0	= 0x30300;
+@@ -1934,6 +1935,9 @@ sub read_gcov_file($)
+ 			{
+ 				my ($count, $line, $code) = ($1, $2, $3);
+
++				# Skip instance-specific counts
++				next if ($line == $last_line);
++
+ 				$last_line = $line;
+ 				$last_block = $UNNAMED_BLOCK;
+ 				# Check for exclusion markers
+@@ -1963,6 +1967,9 @@ sub read_gcov_file($)
+ 					}
+ 				}
+
++				# Strip unexecuted basic block marker
++				$count =~ s/\*$//;
++
+ 				# <exec count>:<line number>:<source code>
+ 				if ($line eq "0")
+ 				{
+@@ -3537,6 +3544,10 @@ sub read_gcno_function_record(*$$$$$)
+ 	graph_expect("function name");
+ 	$function = read_gcno_string($handle, $big_endian);
+ 	return undef if (!defined($function));
++	if ($version >= $GCOV_VERSION_8_0_0) {
++		graph_skip($handle, 4, "compiler-generated entity flag")
++			or return undef;
++	}
+ 	# Read filename
+ 	graph_expect("filename");
+ 	$filename = read_gcno_string($handle, $big_endian);
+@@ -3544,6 +3555,11 @@ sub read_gcno_function_record(*$$$$$)
+ 	# Read first line number
+ 	$lineno = read_gcno_value($handle, $big_endian, "initial line number");
+ 	return undef if (!defined($lineno));
++	# Skip column and ending line number
++	if ($version >= $GCOV_VERSION_8_0_0) {
++		graph_skip($handle, 4, "column number") or return undef;
++		graph_skip($handle, 4, "ending line number") or return undef;
++	}
+ 	# Add to list
+ 	push(@{$bb->{$function}->{$filename}}, $lineno);
+ 	graph_add_order($fileorder, $function, $filename);
+@@ -3631,6 +3647,10 @@ sub read_gcno($)
+ 	debug(sprintf("found version 0x%08x\n", $version));
+ 	# Skip stamp
+ 	graph_skip(*HANDLE, 4, "file timestamp") or goto incomplete;
++	if ($version >= $GCOV_VERSION_8_0_0) {
++		graph_skip(*HANDLE, 4, "support unexecuted blocks flag")
++			or goto incomplete;
++	}
+ 	while (!eof(HANDLE)) {
+ 		my $next_pos;
+ 		my $curr_pos;
diff --git a/dev-util/lcov/lcov-1.13-r2.ebuild b/dev-util/lcov/lcov-1.13-r2.ebuild
new file mode 100644
index 000000000000..4d6f4df43817
--- /dev/null
+++ b/dev-util/lcov/lcov-1.13-r2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+fi
+
+inherit prefix
+
+DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
+HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="png"
+
+RDEPEND="
+	dev-lang/perl
+	png? ( dev-perl/GD[png] )
+"
+
+PATCHES=(
+	"${FILESDIR}/lcov-1.13-gcc-8.patch"
+)
+
+src_prepare() {
+	default
+	if use prefix; then
+		hprefixify bin/*.{pl,sh}
+	fi
+}
+
+src_compile() { :; }
+
+src_install() {
+	emake PREFIX="${ED}/usr" CFG_DIR="${ED}/etc" install
+}
diff --git a/dev-util/lcov/lcov-1.13-r1.ebuild b/dev-util/lcov/lcov-9999.ebuild
index ee07971279d3..cd55511f0993 100644
--- a/dev-util/lcov/lcov-1.13-r1.ebuild
+++ b/dev-util/lcov/lcov-9999.ebuild
@@ -1,21 +1,29 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/linux-test-project/lcov.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+fi
 
 inherit prefix
 
 DESCRIPTION="A graphical front-end for GCC's coverage testing tool gcov"
 HOMEPAGE="http://ltp.sourceforge.net/coverage/lcov.php"
-SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-linux ~x64-macos"
+IUSE="png"
 
 RDEPEND="
 	dev-lang/perl
-	dev-perl/GD[png]"
+	png? ( dev-perl/GD[png] )
+"
 
 src_prepare() {
 	default
diff --git a/dev-util/lcov/metadata.xml b/dev-util/lcov/metadata.xml
index 3073388aefc6..90c86767b856 100644
--- a/dev-util/lcov/metadata.xml
+++ b/dev-util/lcov/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>jeffrey@icurse.nl</email>
+		<name>Jeffrey Lin</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>marbacz@gmail.com</email>
 		<name>Marcin Baczyński</name>
 	</maintainer>
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 8694d56150db..fcebbea36a4c 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -8,5 +8,5 @@ DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
 EBUILD ltrace-0.7.2.ebuild 870 BLAKE2B d54ab07bc77f0123e1c45045cfdac7211871299520eaa945083febb3e4efddab68450257beb0882467ff3b488c588d03f371bc775575d9270edc20d529765d3d SHA512 4ee1d65ecfd2b2d69a06c4f09e32715b6c4ffd242834bcc683053de28932d6fc94a8a6b176890bac2c5013478c3db29405680b05e51bda9b919f71083e1337a1
 EBUILD ltrace-0.7.3.ebuild 878 BLAKE2B 63d0fc0e772670082d1ee5b36922db061d3bcd13c1d94093c1a520992a13d28fe19d06f88d3774f36075a9a39d6a7d907d7366ed7a0d3bd54847a8b921756fbd SHA512 675739c0dd96d879fe87d66b7711217e7d4070a0d6b5fc2bb3f0b4667e1e27ad521a373bb0030b6bf62344da4db3af0f674a3a5fdd3f1542cc34c5e486d16ad3
-EBUILD ltrace-0.7.3_p4.ebuild 1295 BLAKE2B 68a97e29102da127b6d15fc9b874ba7996dd360699940f66c808878828c255096fba76d49039a00c6ad6a04da1cb766f83e1ab3b358b51f90c5baef0e1625f99 SHA512 9c720324609d28a4331c8b2b8d88e40cd7fee99870605843bad475959691058d27953c6b072c931ce12ad05413c96f02183af7034880d3614c6a2eb1cae976f2
+EBUILD ltrace-0.7.3_p4.ebuild 1294 BLAKE2B 91af85bc4edb62f647c1417db9d174bcb10b8fb6d2face7ef7e21c6d67b97cd842ac5efc0ee4b452cacb0c5bd655acb11b843b79f3867f73a9146f9d5661fbe3 SHA512 d51347f1b630e1a86d0806080b987c05e57ed0cbdcc0fad77a027fa78b89de774131160e4ae7132602661b3a65b39a1f284c205211fdffd53906121e6f21bbc3
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index 0b12f5bc4cd4..fd5f6d7ae503 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="debug selinux test unwind"
 
 RDEPEND="dev-libs/elfutils
diff --git a/dev-util/lttng-tools/Manifest b/dev-util/lttng-tools/Manifest
index 755614e7e51b..688b5b1742c3 100644
--- a/dev-util/lttng-tools/Manifest
+++ b/dev-util/lttng-tools/Manifest
@@ -3,9 +3,9 @@ DIST lttng-tools-2.6.1.tar.bz2 956120 BLAKE2B 2d0b641ae11989a90f54fc9955c18c26fa
 DIST lttng-tools-2.7.1.tar.bz2 984351 BLAKE2B 51d61857c56c3bffcaec80d8b57c18c96c3125d56f7feaa70e3ad44d108987a663734c17cf2553b1979061ae400c1e5bd0a30de4bf3bf5af28846403a3e055c1 SHA512 b0cafa5b74182a077232dbe2b73ed4e2267a921a62163367f0e7e14463e176d4538fc6ec27b8737f55fc417734677e5d22efc65685f885fa5f892f7900ee0e2d
 DIST lttng-tools-2.7.3.tar.bz2 986692 BLAKE2B 4632781abe699a4cec6c311ade314d8c1dd5264fe46b6ee14a4e982a52a6bfc738bcceb42c2d58f93052088b1c9a5cd3b024cbfa85418782e75ca25f9c7a6d0c SHA512 17568232b24028757b623c63bf40fc2929e700ecafe3e759d891373fc7342458c3d26c2199fcbbde6deeb1746b6bc8e7e95b7c19bb33c40f4c97339c4c04c459
 DIST lttng-tools-2.8.0.tar.bz2 1118863 BLAKE2B 96eb5f8fd43851ad39f0e51bd66fd7c5b7a53e52c4a50e2e22d44abd2a4407912a4b71b0eeae707502e7f0590f08038eb0fc1344e5b5119b8b5df994f0eb8cb5 SHA512 2a49b9f83b2a53dda653d8bf7cf35cbc67173912a38d9d52e2eb9313deb8a64ec9b5f7751055dc56cd972aaf412694088a7cc63297338448418872da5791d7a2
-EBUILD lttng-tools-2.10.5.ebuild 874 BLAKE2B 2c34966d56358232f234b51e94cf4868f6b727d7e139262a709a1f1a541e36c4bdd7dde69e7efe0bdcf7e016a6c0c0891224bef698e0fc79bddf3e98b993c8f3 SHA512 827bb9b7e99ce999a080a345518a738bdcf47a7a9f06ec01c31a199ace1e3e1eed4e2baecde85598c9ae25b3e7b18d36d57b3e75d3f6ecd9d24be1943cdf469f
-EBUILD lttng-tools-2.6.1.ebuild 861 BLAKE2B 6734cf1d887abbb4c0fc328de1fd5c190902ac99eebc3bd78c9e838a600f4ed6af1dddf5669caa86a39ff8045d48f9bbe6cbaff9257c4de4834c0294ea481418 SHA512 36de610728b91d969724beb8f8b323b2ba55e23acdee7e30a4bbc0559204bba894f3d45b10ca2343baca92ccf1b910cb2b19e1469fc439b45743c3aac964923e
-EBUILD lttng-tools-2.7.1.ebuild 859 BLAKE2B e72ae0bffd7ed7707be89848dd799deecd2de98636bef179fcb0ab9072729095660ae74163b12cc673d2342833434d73a4ac077820e3b6c448b5c11972c69bf4 SHA512 c08fa1100598dddca0178170658fe1879362e2d8a8f474f7fa314a9599e03c8ec98399104b509c0fd34b590f33c2ee76a8c6ea0fe629c9b222fb9d81cf408fe0
-EBUILD lttng-tools-2.7.3.ebuild 861 BLAKE2B 6734cf1d887abbb4c0fc328de1fd5c190902ac99eebc3bd78c9e838a600f4ed6af1dddf5669caa86a39ff8045d48f9bbe6cbaff9257c4de4834c0294ea481418 SHA512 36de610728b91d969724beb8f8b323b2ba55e23acdee7e30a4bbc0559204bba894f3d45b10ca2343baca92ccf1b910cb2b19e1469fc439b45743c3aac964923e
-EBUILD lttng-tools-2.8.0.ebuild 861 BLAKE2B 6734cf1d887abbb4c0fc328de1fd5c190902ac99eebc3bd78c9e838a600f4ed6af1dddf5669caa86a39ff8045d48f9bbe6cbaff9257c4de4834c0294ea481418 SHA512 36de610728b91d969724beb8f8b323b2ba55e23acdee7e30a4bbc0559204bba894f3d45b10ca2343baca92ccf1b910cb2b19e1469fc439b45743c3aac964923e
+EBUILD lttng-tools-2.10.5.ebuild 873 BLAKE2B 3a9d5f554658f41aab146abef5f48711dbd69f98e89847ce942ac3c9dd25d3450e58bf485528b11357df6e7a8a85ebc3bb570c81450e812a51600a66dcdc8436 SHA512 daabf517bc5ac4dba30647ef98a4c0f8749fbc6dcefaadaec5fb08b309fd0a840a1bdb8098c4841782ce5d75c9db6929098bb3e4ed75a03a1c26916cf3ac109d
+EBUILD lttng-tools-2.6.1.ebuild 860 BLAKE2B 1783314eb7c9469b05cdae5d2f823a6922567df99aecbcff5d0f52c811669fafce01cc5e4145abaca4b748e79be3bb32a3531e0888caa4e40a9cf452fecf4b87 SHA512 07f494427faf355614fdd06b31e8efacfa9a0c0dd26e1b15c8043556377bfe94bac8021adc160a527f3cd04f6e44d35b00cddb29a06062c97c4c3e82987c1578
+EBUILD lttng-tools-2.7.1.ebuild 858 BLAKE2B 31a692fd7f821c17c55334006c76a46b6a9379d288cea505175a9de97fe3b54755e45e407b1fdba4c18f06f166bb900c1fa6f1da056ccb5124c2f2679a64e343 SHA512 b349080d5b4f2bc8b8a82e1f1b2ebb99674ad7d2aabfe503aec90c6eabeac2c4d6069b1da49f6d112aaf7da2457bd703d53e266f2fa4b05140d04d6cd8e014d0
+EBUILD lttng-tools-2.7.3.ebuild 860 BLAKE2B 1783314eb7c9469b05cdae5d2f823a6922567df99aecbcff5d0f52c811669fafce01cc5e4145abaca4b748e79be3bb32a3531e0888caa4e40a9cf452fecf4b87 SHA512 07f494427faf355614fdd06b31e8efacfa9a0c0dd26e1b15c8043556377bfe94bac8021adc160a527f3cd04f6e44d35b00cddb29a06062c97c4c3e82987c1578
+EBUILD lttng-tools-2.8.0.ebuild 860 BLAKE2B 1783314eb7c9469b05cdae5d2f823a6922567df99aecbcff5d0f52c811669fafce01cc5e4145abaca4b748e79be3bb32a3531e0888caa4e40a9cf452fecf4b87 SHA512 07f494427faf355614fdd06b31e8efacfa9a0c0dd26e1b15c8043556377bfe94bac8021adc160a527f3cd04f6e44d35b00cddb29a06062c97c4c3e82987c1578
 MISC metadata.xml 493 BLAKE2B 3b627bbc8927620ca6fd13d49c5cdf57999a84ad849d32c0303bd1d4409b9bbb511330b814e29fb626f85754c07ce0d08e9a8343d724650f2ff21f5d7462c81c SHA512 39a5a7c28b3471efe353af48d001726df67d061cf89a11c1a7f8f80309c9d591f594787968570af1af86d2f5ac2ddfcb9d81bd84604d2836d28b184c414af252
diff --git a/dev-util/lttng-tools/lttng-tools-2.10.5.ebuild b/dev-util/lttng-tools/lttng-tools-2.10.5.ebuild
index d42ffde22d8b..0f0562f2e525 100644
--- a/dev-util/lttng-tools/lttng-tools-2.10.5.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ust"
 
-DEPEND="dev-libs/userspace-rcu
+DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
 	ust? ( dev-util/lttng-ust:= )
diff --git a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
index 9f1c5e6a680d..a538527aec43 100644
--- a/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ust"
 
-DEPEND="dev-libs/userspace-rcu
+DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
 	ust? ( dev-util/lttng-ust:= )
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
index 37b1fe1b01d6..8186e3655647 100644
--- a/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="amd64 x86"
 IUSE="+ust"
 
-DEPEND="dev-libs/userspace-rcu
+DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
 	ust? ( dev-util/lttng-ust:= )
diff --git a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild b/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
index 9f1c5e6a680d..a538527aec43 100644
--- a/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ust"
 
-DEPEND="dev-libs/userspace-rcu
+DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
 	ust? ( dev-util/lttng-ust:= )
diff --git a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild b/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
index 9f1c5e6a680d..a538527aec43 100644
--- a/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
+++ b/dev-util/lttng-tools/lttng-tools-2.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~x86"
 IUSE="+ust"
 
-DEPEND="dev-libs/userspace-rcu
+DEPEND="dev-libs/userspace-rcu:=
 	dev-libs/popt
 	dev-libs/libxml2
 	ust? ( dev-util/lttng-ust:= )
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index b39cdb5cd7b1..f0a3be8779c6 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -3,9 +3,9 @@ DIST lttng-ust-2.6.5.tar.bz2 619053 BLAKE2B babe2d0b8df6ca1d1942415d613a05d77471
 DIST lttng-ust-2.7.1.tar.bz2 643906 BLAKE2B 2ef4be03ce3b2bcc8e781c2b6e798ee00bb85d7f7039ad34fc49b3bfda46142d65fc98d19fefefb3e375e6f0de95292a1e15de25318b2da62b51d9fb017b43a1 SHA512 80ba4b79df2a0ba0606a31145a427c8c5b30e2a4ace20f9e4602738ace99fe88146569de549288ff33c809a606b6973c17c3effcf9699b5dca3383b8da5b10ee
 DIST lttng-ust-2.7.4.tar.bz2 648002 BLAKE2B aaacf4da1c1ff7c4909d9a8ba17b3d108175e8669dfcba151e2e73d094fa68096a0ec2c0bbaf89bec8370566e9b25147a0bbe7bfb0965b0e9fd70704e7a226df SHA512 f3164fd72724065d23b2b21aaa037b6e90f4eeb9dad75f16af4766374cd8a0a7a6eb2c815d93c17950a1048c5a32e6b334fa31b3d4b0f8314e352a9ddc8d4395
 DIST lttng-ust-2.8.1.tar.bz2 743271 BLAKE2B d6adac00525ab747306288dd71f27ce982dd93e4ff42b9938064ae1435ad1c0867acebe3030a33748dc9aa78b6200ba2c47631e4359a963772fc4685472d21ae SHA512 15c459620cb73ef5be8c7df2ef02663ef650555b973a3d1ed976ae38068b53a8c83143a611bcb53e91a3f211361c44cd2a331cb41dd53d28a69924f7ac44cc95
-EBUILD lttng-ust-2.10.1.ebuild 688 BLAKE2B 381ee0fcee4f34f43ec83c472d864d8ce182a1436c18a5487ec99b987a9d497581c212d55ac3155164c66e3f05db020cd345f0948a696c7aff33a120b41a5065 SHA512 42ed193d0cba1717002e3cfed7850c6bdc8e39cc7bde1250c052ea2bd65c297f7a30a31497934f25c14ae5ae037e6fa1fa3c35f62037cd9a6173992f90e61bd5
-EBUILD lttng-ust-2.6.5.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.7.1.ebuild 632 BLAKE2B f7a3577e36025dd620dc9a29f8e35f90a4d4baa3fd3d214013a81987c73c366fe6f8e0c8fd764a3614706a5bf9c64f77920e72f8f6d0868cea1093d4e0142fe6 SHA512 7848f28030dd7ede00ed14d0924af46d589d549dbd73d5afb83b0a06fd2600ddd01c2e32eebe5ed7aa243225d63fbc1648e2d66f38794c0f85a4e6e9fdadabe7
-EBUILD lttng-ust-2.7.4.ebuild 634 BLAKE2B 226de182ce8f0f60ca1ddc385e22b12fc915baca73bfebae55dc54b61e583ac5f5af8239f3e3ba5c4403f4253872cac2981a4b2916a6924d490e3836c0edf3be SHA512 610deadc2813386c71b3449fec096c0793be2e08315085e25d10331b55153bbeeecfd371eb9ba900117c8ff18841085d72a870dd61a96ff821b6284491262a05
-EBUILD lttng-ust-2.8.1.ebuild 667 BLAKE2B 4343a3356cbacd2a6535f92c8aeedf6f7483cfa3626e3e317e3f1162e01f0921d10f3a5e7da93ab8d6d33d99f47b6ec641873f8710ff9b385c46e8badb5e541e SHA512 6cde2eac5aaba4d03e7b26125485614cb4fc85e65d75696f2729045215d4e46d85f8fbd4523fefc70ca75c6deb0ea4987e6814317f4798f136e3c2ea27b073ce
+EBUILD lttng-ust-2.10.1.ebuild 687 BLAKE2B e92c5051c63af6f75479fc703ea6167e96b034ab7e1557f637629496231f954e6fe3fbe0683fe6d46d63ff4d693b26a774dcaf6bc9aba2b47c604015882ccffe SHA512 852e72fc196dff6fa72b38a187c5de2c4c7d864e03cdef26d74aa44838cb165c6774150a713b26c0604f4541a15da38f03ca5d27ff2db572c86d916bc70f22d0
+EBUILD lttng-ust-2.6.5.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
+EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
+EBUILD lttng-ust-2.7.4.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
+EBUILD lttng-ust-2.8.1.ebuild 664 BLAKE2B 018b9946fe227cafc977b9d0a53c17ee66bc10a595183a47d1074785cb82f03c2f9fc4c4c60984d8acda9d27f0f76b14915c0d61191c270544f13a7e84ef12a2 SHA512 1fda188b41588aa8fb693f106aa8424374d59c1b030ba7639579617182a93915f74227c17c5817ccc636dd2d460f43397766d8c10934e29caeb1b7a2db53b0d2
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
index 2ccf9da9a9ae..07d839929318 100644
--- a/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
-DEPEND="dev-libs/userspace-rcu"
+DEPEND="dev-libs/userspace-rcu:="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
index b5983a546e8b..c20c8f8b88d4 100644
--- a/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
-DEPEND="dev-libs/userspace-rcu"
+DEPEND="dev-libs/userspace-rcu:="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
index dc493ad0c9d3..2131cbbec5ad 100644
--- a/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
 IUSE="examples"
 
-DEPEND="dev-libs/userspace-rcu"
+DEPEND="dev-libs/userspace-rcu:="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild b/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
index b5983a546e8b..c20c8f8b88d4 100644
--- a/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ SLOT="0/${MY_SLOT}"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE="examples"
 
-DEPEND="dev-libs/userspace-rcu"
+DEPEND="dev-libs/userspace-rcu:="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 243c57dca7f7..5c455cffe80c 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,10 +14,10 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="examples"
 
-DEPEND="dev-libs/userspace-rcu"
+DEPEND="dev-libs/userspace-rcu:="
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${MY_P}
diff --git a/dev-util/rebar-bin/Manifest b/dev-util/rebar-bin/Manifest
new file mode 100644
index 000000000000..9ecaa14300ee
--- /dev/null
+++ b/dev-util/rebar-bin/Manifest
@@ -0,0 +1,3 @@
+DIST rebar3 694889 BLAKE2B 3a8f5562a0c984caf5d7b3ba1063a90bf110a60cea316eaf88f5199b890e186f85193dc0302b36dc31051d3552912c8d1582f563f989df97ee28364a3f47512a SHA512 8fb5c7737d70fc7a706b1e124ab660550e8637da9258338016ab2e260f1c6d662548ef723705cd18210050d052e79945578623d9e9892e08dbfdb9cb04fd89fb
+EBUILD rebar-bin-3.6.2.ebuild 590 BLAKE2B f9d0ca1c49a545709d17665e9872aee34f9a06d2c9711b5d0e701017c1b7e812ef7ff035ead1482640add65db692b8611900d62932ba5109aff766c140b755ec SHA512 725fb4d99ea3848e4a643714c01c4a7efc3230967df2bb8eef69069243e937c578ab21fc5a73a151339089761b4bd581fbf1990299d6b553d8ebe7ff902a1912
+MISC metadata.xml 1026 BLAKE2B e5a32a2acddabb427aed5d66ed8717fb56bc58938d389a05325765a182e6ba767d42011d95fa07e5faf2337bbba4d684d9c0802cfd3a815fb4459e8487d13c5e SHA512 537da2b6658cc8d0a2a2f90df63862afdfcdc326e4a930a059a3aef1f122f1a3f78ef11998e4e465b4d7463be6e3fbfbdd75ac78d5917a467cc9124da75bdfe4
diff --git a/dev-util/rebar-bin/metadata.xml b/dev-util/rebar-bin/metadata.xml
new file mode 100644
index 000000000000..56b1d345d115
--- /dev/null
+++ b/dev-util/rebar-bin/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
+	<longdescription lang="en">
+		Rebar3 is an Erlang tool that makes it easy to create, develop, and
+		release Erlang libraries, applications, and systems in a repeatable
+		manner.
+
+		Rebar3 will:
+
+		- respect and enforce standard Erlang/OTP conventions for project
+		structure so they are easily reusable by the community;
+		- manage source dependencies and Erlang packages while ensuring
+		repeatable builds;
+		- handle build artifacts, paths, and libraries such that standard
+		development tools can be used without a headache;
+		- adapt to projects of all sizes on almost any platform;
+		- treat documentation as a feature, and errors or lack of documentation
+		as a bug.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">erlang/rebar3</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
new file mode 100644
index 000000000000..9835d50cdf22
--- /dev/null
+++ b/dev-util/rebar-bin/rebar-bin-3.6.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${P#-bin}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A sophisticated build-tool for Erlang projects that follows OTP principles"
+HOMEPAGE="https://github.com/erlang/rebar3"
+
+SRC_URI="https://github.com/erlang/rebar3/releases/download/${PV}/rebar3"
+
+LICENSE="Apache-2.0"
+SLOT="3"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-lang/erlang"
+DEPEND=""
+
+S="${WORKDIR}"
+
+QA_PREBUILT="/usr/bin/rebar3"
+
+src_unpack() {
+	cp -v "${DISTDIR}/${A}" "${S}/" || die
+}
+
+src_install() {
+	dobin rebar3
+}
diff --git a/dev-util/rustfmt/Manifest b/dev-util/rustfmt/Manifest
index d60bc3f9b7dc..f88b06845a7d 100644
--- a/dev-util/rustfmt/Manifest
+++ b/dev-util/rustfmt/Manifest
@@ -17,6 +17,7 @@ DIST regex-0.2.2.crate 193403 BLAKE2B d8b439c1544b7faf15fa073f9e759a1a4bdc905290
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST rustc_version-0.2.1.crate 9840 BLAKE2B 765402ed397f839f1766da11ac80464d2f3cbd150508dcf1336402eaede9c20052dda4f9baed6ad73192c7586a50147b53e6c45a8d534463731653c113cae85f SHA512 edec68b24e95a04c58a08c67b58dd044f28930a87ad04aff0c0c66ffb3f1e89ab07f2fb9fed5e2e8c6ca3b372225da347bc10bbcd13d62b4552ab15abfdce0f7
 DIST rustfmt-0.8.6.crate 110133 BLAKE2B 09d41e337179b534504fd9f9c259f07e90564c84bcb8810cdea1bc7b45fe4e10b85baf0b4f4dcb0c117876240f072c267a10449ec3ff8af0e765233394ec5141 SHA512 d7f8baba7b35a18ea21c6b0549bbfa4b2e2ff6bce681b4395ac5a08643f138a8de492455edb51d9ed1553cca19807a503b113b860f11359a33a339674ed9cb81
+DIST rustfmt-0.9.0.crate 109710 BLAKE2B 7e599de80cfe334ad30482abcca6ea4bb6a54088d8334a5f177013975bd4dd1ded8cb0bb422a0355866abfa7eb171ad3aa4977b11e821c0e8ed8d9d3ce2b7e3b SHA512 6a09091f27dedcb8e838ee4561ebf05dd23b2e368853b8494a3e14574cd47ce04da20a388963c885863f535a50d8e37f9880a6eaba35c5cc7677bde342f47bce
 DIST semver-0.6.0.crate 15598 BLAKE2B b46a0e8b782550a49174e461b447e617f0232d9df3bf2363273d4815452df5a587ba7534c843d7d68969166059704e1e8abd716623cfac5b42957b2eda55e14f SHA512 8b4dcad3c672ff8468a68fc19de2804e079af1a75406d71b996621021b5e05dc53fef972455fa9146c199493b71e2b80fe180e33ba4ccfb4dda10ba962a0a6bf
 DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.8.crate 59699 BLAKE2B f60a77b40d921e91b1e55f3c5f0ec7e1f05aca92f81c991a86c0d8c58d70451e291b94fad5237d23435b144bc0568062d8560c25cfd7ad0e984bc61383e366d9 SHA512 743ab9518935ba219faab7f61f3ce30d6e20c20145ed9ebe46df49e570e74063baace630eacaad2f3b7e9e0030b64faa428810701537a6e2a5224802bc55edc1
@@ -42,4 +43,5 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 EBUILD rustfmt-0.8.6.ebuild 1138 BLAKE2B 8a34a08085a3d0623808a06d8e38e0fe5eb4c4a8efba1eafb3b670baa890dd0d9ac35a318b86962690fdb70e001b3d726dddee73ceecc897ecd66d116398e99c SHA512 8d5682dc0a546b1309dea2855360a89c37c172c0bce80ac50e2b5e19534d04a5ec49f06fb53999e98d149d805c3c4c5a2e2d61286bb1437df9ae1a62570925a7
+EBUILD rustfmt-0.9.0.ebuild 1086 BLAKE2B 78dc685cb03d6a6705e34073e27c91a0383357b32e620d6ae0e472e63ea3685cef31ba95b2af8757c2f928dd50c2f60da70d2a3c2c0ed519492e12e94d7ae447 SHA512 18340fe9a0784eaa414d234993d438740008dd7f1515f684412dd26ed7bb9bf882aec86469b7f71e8e89465973fbd52b02032ece5aef9744cf296a171d270a56
 MISC metadata.xml 344 BLAKE2B 9ad68bd02a6cb23d8801af7d5a7f83ba655ea3fa2a566433d00e79c924db04a1963e4d37b5102671f24cfe2f44aa4408c975bb63c09de35c629b9e1cda1e2ada SHA512 aeced857d8f01a427d61171bd400db3503c524dde306580d4c92790fa4843e7a5ab3e8a4b0c429a626b87ae6575ed65eeb7913334faa219d6cae0c445cce7c04
diff --git a/dev-util/rustfmt/rustfmt-0.9.0.ebuild b/dev-util/rustfmt/rustfmt-0.9.0.ebuild
new file mode 100644
index 000000000000..3060ef0ed69e
--- /dev/null
+++ b/dev-util/rustfmt/rustfmt-0.9.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2017-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.1.5
+
+EAPI="7"
+
+CRATES="
+aho-corasick-0.6.3
+bitflags-0.9.1
+diff-0.1.10
+dtoa-0.4.1
+env_logger-0.4.3
+extprim-1.2.2
+getopts-0.2.14
+itoa-0.3.1
+kernel32-sys-0.2.2
+libc-0.2.23
+log-0.3.8
+memchr-1.0.1
+num-traits-0.1.39
+quote-0.3.15
+rand-0.3.15
+regex-0.2.2
+regex-syntax-0.4.1
+rustc_version-0.2.1
+rustfmt-0.9.0
+semver-0.6.0
+semver-parser-0.7.0
+serde-1.0.8
+serde_derive-1.0.8
+serde_derive_internals-0.15.1
+serde_json-1.0.2
+strings-0.1.0
+syn-0.11.11
+synom-0.11.3
+syntex_errors-0.59.0
+syntex_pos-0.59.0
+syntex_syntax-0.59.0
+term-0.4.5
+thread-id-3.1.0
+thread_local-0.3.3
+toml-0.4.1
+unicode-segmentation-1.2.0
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unreachable-0.1.1
+utf8-ranges-1.0.0
+void-1.0.2
+winapi-0.2.8
+winapi-build-0.1.1
+"
+
+inherit cargo
+
+DESCRIPTION="Tool to find and fix Rust formatting issues"
+HOMEPAGE="https://github.com/rust-lang-nursery/rustfmt"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
index 11e5e2510258..680a77641670 100644
--- a/dev-util/stepman/Manifest
+++ b/dev-util/stepman/Manifest
@@ -1,5 +1,7 @@
 DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
 DIST stepman-0.10.2.tar.gz 3087278 BLAKE2B 224bc6141678d4155474591d7094956ddd230086315ccff8ec2f91bb2d72761f46daa864086a449fb5d79dc2f7ec6f8935fa62a9a5be41a2f0aad9e3de84ca20 SHA512 6b7f1e17ff14e8a0a69056f6a8fa00043b53d818e61603fc2571a42a73e2c88edae1bb233fb734e1796c581c63f7aaf6e91c425525adbb2e1c3429cdc8dfa1e8
+DIST stepman-0.10.4.tar.gz 3173321 BLAKE2B b8dcf7eb7ff5afba1fc12b8bf8d4d594b7c86cf26346de053fd8b50010d6a8dbbf55c6e33eef9e9606c672516319b8bacd66eb8a188eb915280f92d027fea253 SHA512 9cd66e45f9a379ad785dc9a35a022d7f9fadeb9707154890d6c6ee17c716d5fcf319dee80c121f9eedc53baef71aaac3a60a6f32135c05113b97f9a5fc7dd299
 EBUILD stepman-0.10.0.ebuild 962 BLAKE2B d83a3ee4b3169a85604fd93d8de9ca2b54ccc2c7e47592d98236eda93dd2edc8ef080de477906e2f305d6e855402fdecf60e74b2c6dc959afff19bae1799a78d SHA512 09686058814adcb51f743b97410ea933b4122dbf2b96ace3ddad51499d50f867fb65e253c3ec9c23ed7334fb3b0d26ceb6477d9130bcf96f91d4071edb6eb1c4
 EBUILD stepman-0.10.2.ebuild 799 BLAKE2B d2e4bf1e47c302e80aa19a705c8a6297714834e721c53da69df8234e8e43e655d4be1d3777e92bcc3f457a1570531d08b989880b393ed05099e0048249e31099 SHA512 12a7cbe7df5a571055e3787e5ab337dd996967dc01267d6627ba0f15544bf8ba5e9275f1d1c8b71685ed91025865b33fa6eb0c703bc5c6078a1d04403f37b962
-MISC metadata.xml 949 BLAKE2B 883da9ca0b0e0d8d86e6c4e863eea1f53a029c4d5ee517ca546a70ea34180055dd3500a7f85c4cf98571f9f487ac78cb86b48a772992a4461aa0342b12def494 SHA512 db268017d243e1e24b2ea28731e8286f731bbb73214f17828d4a86dba4fd2a7c4e259f8afb2698984569bcd20b06029cfb3be45fbf8e84934ca650ee842f2a17
+EBUILD stepman-0.10.4.ebuild 1197 BLAKE2B 8067e8f30073f7c992c6d68af486b9e8bc80321157132f10777e23f5da6b3a2f05523ea25ffd1c79b072ab6ddde50c4145bc01dba47a84368c809c0e16d612a5 SHA512 3e386f354d56a561d25ca860dc0b4ed1cd1cae7afe205f28ababf1dff4da5743f18b17c2a2b508a6914711e2d34b0d6b09a445f6ee22d02e71e29c3cdb220367
+MISC metadata.xml 942 BLAKE2B 29a5ac9fabe873c653e59f0afb8e19e23259d5e3116769c6c0371de83b08b89b09ad221e8116f06eca5f49659e25e80fce02f6085a5f16e71cabb6aa4bdea176 SHA512 58bef9578f6df469253ba9d10a2e5e374d1462c9e90b9e1870fa5d812ff5d4d34a834a6afaa4743b7a106116d8f85d722c412e6f2cc03cb27b7e1fa3c6459d1d
diff --git a/dev-util/stepman/metadata.xml b/dev-util/stepman/metadata.xml
index a84ba4077979..3e39f8636d3c 100644
--- a/dev-util/stepman/metadata.xml
+++ b/dev-util/stepman/metadata.xml
@@ -9,7 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
-        <longdescription>Step collection manager for Bitrise CLI. Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with envman and bitrise. For a nice &amp; quick intro you 
+	<longdescription>Step collection manager for Bitrise CLI. Part of the Bitrise Continuous Integration, Delivery and Automations Stack, with envman and bitrise. For a nice &amp; quick intro you 
 should check: https://www.bitrise.io/cli</longdescription>
 	<upstream>
 		<bugs-to>https://github.com/bitrise-io/stepman/issues</bugs-to>
diff --git a/dev-util/stepman/stepman-0.10.4.ebuild b/dev-util/stepman/stepman-0.10.4.ebuild
new file mode 100644
index 000000000000..f95a6153f9c0
--- /dev/null
+++ b/dev-util/stepman/stepman-0.10.4.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="Step collection manager for Bitrise CLI"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
+}
+
+src_test() {
+	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
+	rm update_test.go step_info_test.go setup_test.go || die "Couldn't remove network-dependent tests"
+	popd || die "Couldn't return to ${S} directory"
+	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/stepman
+	dodoc README.md
+}
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index fbb4a1cb8e47..335e912a1cfa 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,5 +1,5 @@
 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
 DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
 EBUILD vint-0.3.18.ebuild 1322 BLAKE2B 5a55a92987bf5877f828f09dd922c16a7b7a1206033e251975bdc949edc1d27d502676bf678da006a8f100209081c7b1e69fd610ee8eea64ede7d09732ecdba9 SHA512 6e54367dc5746fe60d15ff4c80fa97feb4d0cf14ed4631625c1959192c17dd4de9b61336637b829460e2b70d3587f90ddc1a3609999ff32ff55f715561d16742
-EBUILD vint-0.3.19.ebuild 1086 BLAKE2B 2e1389dec9087b8197e87a892c7a7f0666eb92b8cfc2c6973bd87b67af3c9c065e968efb6acc364ed6e1ca27bf7eacc4065af46e9f7e79c4b99c8515272de26d SHA512 050e66af6d9cdc080425d28fec5305d71a6564af82368bb34411ed2cd52fb753d716f2d24f0f615c005278c1e63988ab6fa8345c7ee59414f9067b4f04cec6c2
+EBUILD vint-0.3.19.ebuild 985 BLAKE2B 3558b3b7c61d024e4dd942dda4678f1bb4df36921099310704860491195d887f5ffcd76b6030463a26a13be1d2e5eeb62b2c936bd633ae2c236cf7c44bae9acf SHA512 082dd17850f5f5e547720ed4750e5faa05b783b5493ef85130e81b694974b205118fcb4a54f0e72d427312bb3cdbfbb00d2d950aa78bc01df4695152ea7b57a8
 MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index 1e5cc17ad27c..f4c45248021c 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,13 +27,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	test? (
-		>=dev-python/coverage-3.7.1[${PYTHON_USEDEP}]
 		>=dev-python/pytest-3.3.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-cov-2.5.1[${PYTHON_USEDEP}]
 		$(python_gen_cond_dep '>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]' python2_7)
 	)
 "
 
 python_test() {
-	py.test -v || die "Test suite failed with ${EPYTHON}"
+	pytest -vv || die "Test suite failed with ${EPYTHON}"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-27 12:48:57 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-27 12:48:57 +0100
commit	70b82ae359a5538711e103b0e8dfb92654296644 (patch)
tree	8412b84ff9ce02a22be5251052b00feefe1d5b70 /dev-util
parent	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (diff)