gentoo resync : 15.02.2018

26 files changed, 124 insertions, 187 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 5d34c6d8df37..cc60ff7a2432 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/beediff/Manifest b/dev-util/beediff/Manifest
deleted file mode 100644
index 11ea48b13b04..000000000000
--- a/dev-util/beediff/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST beediff_1.9_src.tar.gz 77382 BLAKE2B ee5ddb7a054ac81fbeb03eb948784320253039f01c47a14ed1193f4a8e608d80ba70041fb0afe3348b61680a911167910c22f3b664549f6ac6bdc1d32d31919c SHA512 b3aaa2f5ca6907269fb38c33c136928d379e85b776ad1fb5acb2217063a3f742a32fe59010672bc5c53644e878cb31fb044658f8ffb8b8481c9867dfe2bf64c2
-EBUILD beediff-1.9.ebuild 687 BLAKE2B cdeb5cfb2968d261aff4f10d0c6fb810ffc50da88fecbf776cf96562a00ffe6ee751df752e1bead9ec9a80eae9a08978518c131db4cfbb2fbb31a3c5e087257c SHA512 2e1f670d9967ff5d09ed07a443fbdbc881af1d2b1aa1780741ca05dfd27ea6c360ddc3d80811075564ecacfad1ba9703d406fab51643f1ac9eec636c88f64c31
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/beediff/beediff-1.9.ebuild b/dev-util/beediff/beediff-1.9.ebuild
deleted file mode 100644
index 291c7b1aab2a..000000000000
--- a/dev-util/beediff/beediff-1.9.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qt4-r2
-
-DESCRIPTION="A graphical user interface for comparing and merging files"
-HOMEPAGE="http://www.beesoft.pl/index.php?id=beediff"
-SRC_URI="http://www.beesoft.pl/download/${PN}_${PV}_src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4"
-RDEPEND="${DEPEND}"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
-	sed -i \
-		-e '/QMAKE_CXXFLAGS/d' \
-		beediff.pro || die
-}
-
-src_install() {
-	dobin ${PN}
-	doicon img/${PN}.png
-	make_desktop_entry ${PN} "Beesoft Differ" ${PN} "Qt;Development;"
-	dodoc ChangeLog.txt
-}
diff --git a/dev-util/beediff/metadata.xml b/dev-util/beediff/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/beediff/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/coccigrep/Manifest b/dev-util/coccigrep/Manifest
index b148038abc78..db891843f02f 100644
--- a/dev-util/coccigrep/Manifest
+++ b/dev-util/coccigrep/Manifest
@@ -1,4 +1,4 @@
 AUX 50coccigrep-gentoo.el 99 BLAKE2B 596f01a6ac85deca70bdcf4f50c2475c7a38e44926d719e0da5eb23a8c713f89ebad0182cdca66b3011029bcda14d0cde76d4a186a126e05b74a0ccaa8e9efd1 SHA512 13cf90c99017cfb865c1d41e9813bb20993b4a91419e4bcca6b5536e8c35bfb871616c5174dd08eb8f1726f05296205428d14eaf9e9fabcf08bff01b287581f4
 DIST coccigrep-1.13.tar.gz 32366 BLAKE2B 8b9d8e0832c6bbacb3a8efd74ab8f4a0ec3112e935ddca63f345799ebc96a3dfbc8fe8e9fa77cee912d7dd5ee28c62e72ea00173e4ee4b16588b4b6e1eaf661c SHA512 d01baefe1c5f5d23ce03e5daccde0c38d4c05872313a0c8d15e53444c34fa6ae0db3b25bd62d8635a3f7b16e64767f92051c59d29bbd81cd24f94c9376af08ba
-EBUILD coccigrep-1.13.ebuild 1331 BLAKE2B 148d5bcec052c3030ed2568d6f91d4852d56a989f91b49c95351496f04fcaa6bb06589d1c238bffc419d2b7a7d6cf8f1c0978f8e2fc759e660481f8d4e844d73 SHA512 bfbfe08294264e7f982e2f68e0ce0ecf72bb28eaac4f73d6afe45a9a63e56350481a7979923588a825a0e2de249a86788b6adae7cd5274fb4991868354c37a45
+EBUILD coccigrep-1.13.ebuild 1336 BLAKE2B 7f096b29a8b9556a20b0253ec4016c21f15da1cc51d71dbb15057d0ae890e92d1b7b92d9c728520780ccb4a8b7602cfc6ac9bd45b0e6031d483e9483d0774aa6 SHA512 e8c7b1e718a98695eea59a7a76920c6e97b5967aaa0f961d76063f5d049dc687f274fc2c3fb3d34ba0ee090a07ff7d6dabd105682754a4211c4c0530a7a58de4
 MISC metadata.xml 400 BLAKE2B b233da69d5a9b48dc8349f1f0e746a5d39dbf14a2da934b486935e44d5a8219d7e771f880ce41d2005b2ccc75f5c982989008e7b294bb853d1e240203fb83d32 SHA512 785b3ffe7af1ca248f1aad24c21e3d5c5e0fdef899a7002ae53fea4a8fcafd3ad2d2e759540a1e0556853b62bfa7b0c27303a5be45bde5ce176db3be94c31c40
diff --git a/dev-util/coccigrep/coccigrep-1.13.ebuild b/dev-util/coccigrep/coccigrep-1.13.ebuild
index 6cc6aa3b0ab8..f56d4bacedc9 100644
--- a/dev-util/coccigrep/coccigrep-1.13.ebuild
+++ b/dev-util/coccigrep/coccigrep-1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/regit/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs vim"
 
 RDEPEND="dev-util/coccinelle[python]
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index de4d05891bfa..f1efa8c333d7 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,6 +1,6 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
 DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-EBUILD coccinelle-1.0.5.ebuild 2527 BLAKE2B bca33bdd0234c05252ae763c977a356ebf1faea0e6ef2d7f58a37b2f0887a0d412a2d8aa82e2b7307b8d0c730478fdfd636eb6c1eeafdcc4cb5e15794bb7d659 SHA512 faed2a5a7a28a9a0e907916fb0835703f715f3dfb5dca631126818bab314316f263cf69fdd07f877551f5b67b994c5bc3c0690ea644574dbc2456453a4278e74
-EBUILD coccinelle-1.0.6.ebuild 2535 BLAKE2B 929201d9b5cd3df87b12dbcd3b8b9c6dfeb56098c1f1e9a826573fff56e99843d17c852e0f39aa7dca9b060e69bec94fecf46bebc62f3fbc4c3a006a267f18fb SHA512 d39ac4d96574eefaa32e3b19456f0d01cd406363d631f866c17abf7557175738266c9dc0147889eda3ad26a4ad2c8af7246ef92b94f73135a2658bc17ed518ce
+EBUILD coccinelle-1.0.5.ebuild 2532 BLAKE2B 61181f5b7d0c9fc9412fc14ef043f65219318715f586105d75d7e5ea27e0bb95bcfa0870f41f98cebd6e6f30a0636fee8f0b0f46e806a3f743a00d86eba61d12 SHA512 4fc8095cc0c7ac610e5f73bb4bbc5fce144979773fff9047f54dfea8ffdc17c4d8576c9dd90059f778a8ec19f905a61f6ad29ef4a0a68629fedadb4c376751c5
+EBUILD coccinelle-1.0.6.ebuild 2540 BLAKE2B 250bbaff5f571d1ed9130840eebc1382813276ee32134664f9d8130a5d96050857cba62802eaa7f0e3929ff3bd9bc3d47bbc8c03b807f1628ce2b9617c92e576 SHA512 a81263ea8c9bd9323e96df6996bcb311bd6f7ab1a67444efe2c5ebba2f666395af4cdef9b9ddf0353d314ccb8053cb317b6f51f348c6c229cb45554e0d5fd93a
 MISC metadata.xml 350 BLAKE2B 0a338a957b414534b2bc01b9e916a93bc4b17d54b855b23d90f67af7f53a2dddded19eec734bd50edec0130b0b2210869c96c3f8cafe968446dad7d44b76740a SHA512 9c0be4d11897f712a537302f5f87d92cf8df5866e60d3293f5dbf7fe6dd1d88d5678e103319577b397546307604124db39ac47cde7dfb5e61141c43a0fbe5761
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
index 5d511dcf7a2a..e4f865f92b0e 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,7 @@ SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 403ac36a8d1d..1e97b0576dc1 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://coccinelle.lip6.fr/distrib/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc emacs ocaml +ocamlopt pcre python test vim-syntax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 6cf3acd9f0ba..a011f3269557 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,7 +1,5 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
-DIST drone-cli-0.8.0.tar.gz 1149494 BLAKE2B 6be4edf8a122919570319867d2981fd56fe644093f83216fc17ff4d17e6caa13f163748b6eec68eb6ebab86259bf10fc8636670248fb382120a72738b918ac9b SHA512 5dc9a9910a76e31f0f9f845e1d59a0dc8371463de295f35090efdc16230b1458cc2d2f8632e91c46d18efb0c154874c65388cf6a37cca72b72f08d56b61cae72
-DIST drone-cli-0.8.1.tar.gz 1150026 BLAKE2B 25197e3e8d15f07026251d68689fea1fab03329121b748bfd3c06d6310fb76de743934467e7c453492a7843c7ee0a925161e7f4dd912949490c4adad1d896dac SHA512 c3f157ae4f7deebc1641e73bbbf218da85d0f732143941c2c37a52fd6c7db0951d6ed6dc6d55920641a3b9a7a10537813442353890699075bdfd072601b82cd3
+DIST drone-cli-0.8.2.tar.gz 1383569 BLAKE2B 570a8af9da23be7aac83299e3feaec17e09af4a506c715b636417b35f5f1e4253e3c049a44ceeb3ee056f9134463bdb5d8bbda8228b757178fa3022461d13909 SHA512 cbf32882bf7ce1a29ff37bd600f60b3fd3517d56803fca7575fc4595c2e398ce2b4cc760ca03f16eca414386e6328ee782726c9720f9678457bf97c56f24f232
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
-EBUILD drone-cli-0.8.0.ebuild 784 BLAKE2B 18cb3725cfcd63ec71ecc2b060e642b6d7a1975a53aded45e14420e7f39992c52109ea943bb4b8f10116901f68cd9808c23e7b922bf089bf1e4a7e88970b2fd4 SHA512 3dcf6b16268b39b395db9e1b0164e74847ce411862de4f789a2d2c48a5844b39c54696df2306aaa868212d51e0024fc70dac1d90cfc1b69b1f9835ba57547ffd
-EBUILD drone-cli-0.8.1.ebuild 776 BLAKE2B 91e46038938be9e771d9e979f9663e9843e013f3cc4d1bd835270152374414b8b85a5eaec144ccf2e5b05c0f8830d35a7aa80d9cb5f64f6ad2ab90ffa01c73f7 SHA512 c95490546d157429a0bf1121a3e44794015d357ff3b9977325c89769c332311d469147fd620e38d8799ab1d4307f29170495169ec9d97b8fa7f42591506f87dd
+EBUILD drone-cli-0.8.2.ebuild 776 BLAKE2B b34171f2374a53942f1ea7cd45d6df56cbbe048be116fc0264a651c3b4526109b471b4fdb8f3981bd6c6b267041bc63007f0234b987582b118d054fb645699bd SHA512 6dd61f938441c87273dd58150b49fbe5d9e61a962a018d7fec68a5e18011cb3f65fb15fdebb55b2b7c9d743bfd3bfdd3d21f98a5974d36e2c3f2f1e22a303354
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-0.8.0.ebuild b/dev-util/drone-cli/drone-cli-0.8.0.ebuild
deleted file mode 100644
index 2a1ec2b92731..000000000000
--- a/dev-util/drone-cli/drone-cli-0.8.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="d7b19e6f6f581880352f232ba3453e0b769a9dca"
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Command-line interface for Drone"
-HOMEPAGE="https://github.com/drone/drone-cli"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-RDEPEND="!!<dev-util/drone-0.7"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}"\
-		go install -ldflags "-X main.version=${PV}.${EGIT_COMMIT:0:7}" ${EGO_PN}/drone || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/drone
-	dodoc src/${EGO_PN}/README.md
-}
diff --git a/dev-util/drone-cli/drone-cli-0.8.1.ebuild b/dev-util/drone-cli/drone-cli-0.8.2.ebuild
index 950e201a21ba..227f4987dfe1 100644
--- a/dev-util/drone-cli/drone-cli-0.8.1.ebuild
+++ b/dev-util/drone-cli/drone-cli-0.8.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 EGO_PN="github.com/drone/drone-cli"
-EGIT_COMMIT="1cb942f726e6c616bb78c85b70baa61ba01152a2"
+EGIT_COMMIT="91d29707ae30f7ffb628c0397dfaca1c986be5ce"
 
 inherit golang-build golang-vcs-snapshot
 
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index ace2cf421347..bdbd5a252476 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,5 @@
 DIST goland-2017.3.1.tar.gz 213951052 BLAKE2B 019ebf772443dd9f5e81cfb3717f5e4cb19ec3c8a67eb20037b6b72c97bf3e382e073660021aac22c3e6dbef9b71c4642acd026e10f27e09a5c60002cc2fc84e SHA512 b4d0251ede2a80b1cabf6b29e362a1679929d4f24530a88f6bc80482bb8fbd36d0d619d94b0cce45ca2c92142335a84141aa6e54fb42154ac09097e8b7318a16
-DIST goland-2017.3.tar.gz 213261483 BLAKE2B 4c84d073265fc701dc0f34571850c2fab05e2e07479d9dc886af660a097a361a5532cf9078569e9dc8cee0322f92544683e9c05689d025bb39de925a10e05c2d SHA512 5fa8d61850e31c1db82e32d9ccccaad71fc00db85a31bc423384b443819d9dc6f3ba11399c580d8eb9c3fe698b437c13072fc49126359bd405b7d57e12c92328
+DIST goland-2017.3.2.tar.gz 214008724 BLAKE2B 682860f2dfaa96a97ac91eed2a49aa4ee524154df5ba10936b1cc2f816e837b21b27f9da9641c06e5b028fb44d03933abc6b64b87e286e1c38a4c08b92dd2626 SHA512 3488905d1c8944b80f24d40e910da2c04f06ee6dcc08620ffbc7b96c0214d28e00f36b85a178ee9ede8c08fda89294e0d10b99c6929eb595284fc937270e17a5
 EBUILD goland-2017.3.1.ebuild 1043 BLAKE2B da6f4c5156e10afe541dce7dd6f3221488cc5cc893a5ce198c0a77ec4de7b40e9ace46a3675221dc52ede0c5243ae884fe5f682d4fbed018f29719a7991d025f SHA512 0b15d7f4eef60f271ba5df45d9dadb704b8bb5eee596b3826d871f533c6efe6b1fb4ea90148346caf3d684ec485684cd0c995388487506cbc0cca0f3cbdecf0e
-EBUILD goland-2017.3.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
+EBUILD goland-2017.3.2.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-2017.3.ebuild b/dev-util/goland/goland-2017.3.2.ebuild
index 3698daaba68c..d46b730ae466 100644
--- a/dev-util/goland/goland-2017.3.ebuild
+++ b/dev-util/goland/goland-2017.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 6d572f95fa3f..c6f8a66f8fab 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,6 +1,8 @@
 DIST include-what-you-use-3.9.src.tar.gz 446773 BLAKE2B 6b8e66e7ace440ff793c07fb3a4c3db95418f213c629b119fff315559bb581a04b864f5a8cf2eed2221dca84af23fb7ae0c3b3a2c4a59af88bf1e656951f5e8e SHA512 dd7990fa4112ddb0434807efd9dcf0f77bbecaa61eab51be24428f8e45b9321c7647a979278f3f1266ba9be05c6f1de536fc084613d38638b795248001ce4b44
 DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
+DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
 EBUILD include-what-you-use-3.9.ebuild 973 BLAKE2B 61940f05ffd32b4012be4d1710d69adfbfa5147151fd328be078d5663d73abf19ab3bec49ecf30d4a9a7ec91712162f30ecb53d796a38ef433282c8cb928aeb9 SHA512 954ea8edd222088d445c7330a6ac0069e0130729dbcb1068c889af9737cde2b31f06761216970a1cf009d39dc75b0c4f884335aeff0a844cab556bea411b6364
 EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
 EBUILD include-what-you-use-4.0.ebuild 909 BLAKE2B ef96edb28020f98a91316a4cf7e05a385f3dddd1224e326b6d42e7fc67c4a7521973cf4dc47111e9ae15440b20b16ad046417b9af7f17d61cb7cc74d336e81c6 SHA512 e99495f5a7b6c59727920370b3fe63b031841693eae43bdf33b3130dac0b9794140952390f29aec0f52421c59a084a457e375caf1d697f5d015342febd519931
+EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
new file mode 100644
index 000000000000..92dc8c8d1911
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=5
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DIWYU_LLVM_INCLUDE_PATH=$(llvm-config --includedir)
+		-DIWYU_LLVM_LIB_PATH=$(llvm-config --libdir)
+
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 63143869fb88..221fc2ad04dd 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,12 +2,12 @@ AUX jenkins-bin-r1.logrotate 483 BLAKE2B 1fac7c0973a5e2210db1bb5296980456ece0c01
 AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe086877a49d048334c7f94ea915040943b20ff96b7b60f983a434f1cd2c15743d2c387c86915e0597ac5ed1d SHA512 465ade6325efa05b4a150234f847ad19b9824f667fdc8f783af3d9842afc2815ee3d20dfd9566348701102bf28e1e0627af27ae43d055a9a6279ed638d8ece8b
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
-DIST jenkins-bin-2.89.2.war 74294776 BLAKE2B a163d6bd542b01cfcd5781fab524d91ec74ff0dacced3213366832e6839616554f0c42dd1ed580c55fccda693736b5f4041a6eff7bc5e66a6edf608ce3126bb3 SHA512 dfaa5ce0e3cf679fff8f3a1234db8dd88087d221cd1d0f4a84c2a41a5463f9fc2645fa9ba3bcd86f793bb07ef74a0efb3075fd28f3fdf7ccffb18904a8a69231
+DIST jenkins-bin-2.107.war 74518540 BLAKE2B 13aaab2968afdc3d8e2f13086bb480f0a798b736f0b8ce2c80537858cbba5b62efe12806beb22342daad5500f4f81cdcdc00b14e29f9e2ca0e7b5fc1f1c2c406 SHA512 9739e7d63ac7996f731abf43ae91a248697771974fac2763cc8b3838ec52b2c25b609e73d6a58b650994576e7d27c856e30dfbe08b16f597c1be80a9a2579745
 DIST jenkins-bin-2.89.3.war 74292096 BLAKE2B 63df34eef6786ae81ed8e6d486b77e13125fb3b74ed6db03ea45d2c57d9f49c6648e2ffcd4b042261de287cd60a13a43a7e93f151b32b113c8847221ce4594ad SHA512 777b4d7cf1420cbc6bc7da22a0ede75fc07d5d66af500f6e7ebde75475c7046051da6c18f695bdfd4dd238b57355828a5d5b43775a8b4eb3bd84db35d18a9874
-DIST jenkins-bin-2.95.war 74275142 BLAKE2B b2865010628940f216bf39847203d786ef63ec8f18b8adabec629b7ef7b01681dbdd381738163cff9c04f75b50705cfa5c9aad9bcf038fbfb9c91abb738fc1b6 SHA512 2002953a49cacdac8a93f24335d489dc4c10c7ae3f3bc80b4f6dd524a5ac1984fc7229c570e0c79dd53c51bf609cc989193c0a6881f2e0b9d8dd49e47bad20dd
+DIST jenkins-bin-2.89.4.war 74297875 BLAKE2B 05e243ac84e6a9a377dff3962d3e2f4f729d390bac9d5de27a19641babb24ab95b5e8cbcf127df7170928a902e267b0d4e497ba08ea99080f610bb4d5c7b12d4 SHA512 eba6d7ee6f2cd452d805ef97c15fc794424039efb4f1d8b7c0cc463c21c856c02455187cc24360847fd7ac06e816f37964b9a4d99fd306def6c713ed0339e2f7
 DIST jenkins-bin-2.97.war 74297213 BLAKE2B 374266b466736d8e6b6abdef13718e132336525926f28c6ced413dd1a091568bae81900133efc5a0efa96e41847e17b483e8842884c3efa7457c59cdb4bd32f6 SHA512 e784e35136c079caaae12788afa093830cd4d1d4f657b2f11571db5b7a3fa3271d2cd50a8793097905bc0ba67b8ad0bf78b94db00d86ab722453f4c0a41f647e
-EBUILD jenkins-bin-2.89.2.ebuild 1110 BLAKE2B 19defadb6c4401f2f8cdfa8375dfe2ea7e5c92e2c97eaf59d376bcaca38fb2d02ff618c76da1f1be57a198effb75417dcc8332c65c0605d580b54bc95b70de56 SHA512 7e51e0a6eade5438b25cd1f66220b865a99f7aff7ed4e6615ec8763fe9767a2caabd68eeb71f543c88d5ffddbe57af0e7623b86b693542930fcdd0ff2f9ccd26
+EBUILD jenkins-bin-2.107.ebuild 1103 BLAKE2B ccba66f8067aa454cae9d5a9a11e58e0e14667947b4cfac02bae20b78259a8fe8424c8f44f2d2a259d87e1e8bd42b23424f6eab831fb85dae3212e6e784a2671 SHA512 b2a162946df45cac30ee016ca73fb56dacb1b56c171b46b64ae3b1b27a2ee519bbc4338409391394012744282991e1e815409ac41c9015f790e350c4ecdd3e68
 EBUILD jenkins-bin-2.89.3.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
-EBUILD jenkins-bin-2.95.ebuild 1103 BLAKE2B e155df7fccc088abb265457f498946cbf0a9a8e7030f97e87cc7250f0892cd6418b873ad96e6a71dfa41932f0c57edba1f61edbe52cfec1ae95fe3e686c230df SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6
+EBUILD jenkins-bin-2.89.4.ebuild 1110 BLAKE2B ef67ad6149025638efc58f963860ba6378876b1d7141bca8f9f2256707a41165ba5344eadafcb192ebc1af2982e5d5c8c94f15da61ef0faff493ddd292aa466e SHA512 05d6b80d436be140e9361c75f34a8b2c90adcd1097b0861ecc8243384eabf7ec0407fe746afc6379d7270e498f5e21908c71f531a8d11c2fde06bc2ae55ecabd
 EBUILD jenkins-bin-2.97.ebuild 1103 BLAKE2B e155df7fccc088abb265457f498946cbf0a9a8e7030f97e87cc7250f0892cd6418b873ad96e6a71dfa41932f0c57edba1f61edbe52cfec1ae95fe3e686c230df SHA512 1744e21e9e5110d1efe3886d216e2b89c9c2fe64e167bbe2611c4fbdb0583e341aea4c31a14baa81411227cbb5678c9ad642be1c48c3e5100bb564e056a9aac6
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.95.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.107.ebuild
index 2101948a704e..4f30f3987712 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.95.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.107.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.89.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.89.4.ebuild
index fb976b69a9ff..95d08ad47b24 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.89.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.89.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 4ef654f9d801..b7e8ad14c69e 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,8 +1,6 @@
-DIST rosdep-0.11.5.tar.gz 76136 BLAKE2B 88c78dbdab31451ff819972425c7d444cd8b447a15ce4a90c0efc1ad32ca81585782010123aecc7bb32fc539deaf6dd31bcd743be6e208be6f8bdccd3ce8b3df SHA512 593ca209714945e79ec878e0e84d086645bea9095bc2fbf0a3ac48b8696c8694990f554f160b8271734e2980d95390dc2dffbd3da765c43c505d8b2e1e05e381
-DIST rosdep-0.11.6.tar.gz 79121 BLAKE2B 53bc1679127a280f82af5e20997b94ec976a9c9f293c7ea0f7eaa980954753016f68094262150f3c505663c90b0dc97ab29ebdf394d34897c7f78030cf8ff556 SHA512 f662ab62951d84db1af48978791304e0c1800929a1ae89c360a042a17bc48c2ff6b7ea790fa7fc16852fb5f09f62e9b800d7be7f71ee18124102e48f030e3b2a
 DIST rosdep-0.11.8.tar.gz 112899 BLAKE2B 863cb6caaa1748477ec6216dbcdaf1c547135e2aaddb533373d20cc84bef51f640ce3544aaf99821c749b953effd594cc1909ca7e05d6fb3e277ae806747c5a8 SHA512 9fe44eb2dbcdfce0ac6df9b4f6926d26fa12d9fe4089976a460448dc6d4ecb893c0c7cb6b6e9f16bd07da0be4088d7d3eb594d2c0fad6f77d8728e2873cbc344
-EBUILD rosdep-0.11.5.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
-EBUILD rosdep-0.11.6.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
+DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
 EBUILD rosdep-0.11.8.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
-EBUILD rosdep-9999.ebuild 1455 BLAKE2B 89878ff04c2eb0036974e95d0b25071c45c57c705c3e737a1df99748f43c14192e9ae274c70be0963780557882fa2bfa3fb0e5928dd8e004b97be70faf95b7fe SHA512 26863413617e4a0a251aec84c1e2fddf297333ac7e00eff1e95ea2d4f76526bc7db89540f4371b12e1e5b93a6435e1eedc5ffd05c534025aea2e29badaa3ea07
+EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
+EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.11.6.ebuild b/dev-util/rosdep/rosdep-0.11.6.ebuild
deleted file mode 100644
index 463cc83cafbd..000000000000
--- a/dev-util/rosdep/rosdep-0.11.6.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
-fi
-
-inherit ${SCM} distutils-r1
-
-DESCRIPTION="Command-line tool for installing ROS system dependencies"
-HOMEPAGE="http://wiki.ros.org/rosdep"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-	KEYWORDS=""
-else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
-	KEYWORDS="~amd64 ~arm"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-RDEPEND="
-	dev-python/catkin_pkg[${PYTHON_USEDEP}]
-	dev-python/rospkg[${PYTHON_USEDEP}]
-	dev-python/rosdistro[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
-	dev-python/nose[${PYTHON_USEDEP}]
-	test? (
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
-}
-
-pkg_postrm() {
-	if [ "${ROOT:-/}" = "/" ] ; then
-		einfo "Removing rosdep default sources list."
-		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
-	fi
-}
-
-pkg_postinst() {
-	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
-		einfo "Initializing rosdep"
-		rosdep init
-	fi
-}
diff --git a/dev-util/rosdep/rosdep-0.11.5.ebuild b/dev-util/rosdep/rosdep-0.12.1.ebuild
index 463cc83cafbd..842ec4941e9e 100644
--- a/dev-util/rosdep/rosdep-0.11.5.ebuild
+++ b/dev-util/rosdep/rosdep-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 463cc83cafbd..842ec4941e9e 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -38,6 +38,7 @@ DEPEND="${RDEPEND}
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
 		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 59c34b9090c7..d893022bd64f 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,6 +1,6 @@
-DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
-EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
+DIST strace-4.21.tar.xz 1185908 BLAKE2B 00d8c7e296dd3b2a004b4f7ae062a3813219351bb4a5aabbc2e04784c35760f271fc12fd0122dac276a9723079f63d7187239172c9379a056e55dab9606e2e4b SHA512 d3b0393f1f727530e2e5b4490c80a905d251223167a61f9a86884a4b8a4f25522c46c465961968ca25013f321e561e217cb6e8f15be31d4d371274030526187d
 EBUILD strace-4.20.ebuild 1960 BLAKE2B 65781937316df4e01de886b552b02834c37411a1c004de98b6e95e7dd2b6c9b11bfa27de5effc9661bbc341172d1cedae180e6488abca43c014e18949fccc3f3 SHA512 ca60303dcd6526df451f516dd519406e0c0160b92d400e1c44c1fac8e5df2874ae2dc8c9a2dc0297d6354246302e8bc7af20522d2422de2df858b3b1348da2fd
-EBUILD strace-9999.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
+EBUILD strace-4.21.ebuild 2109 BLAKE2B ab88781b7c02413b1c458a92bc424159e8302c2407d8d4c281ebb259e5e3ec5fa59df9c0ee6e69f6d639106b82f3af7c5f1d5282038433a8e4f401818bc10092 SHA512 5d5a2e17d23a2705e0011ab5ad1c5635f6548d81c7ff0f5592880794e711305a6af05a0f10797bbabc16d2b28edcf9326df513cc1b485fb62aad965c2fa46eb9
+EBUILD strace-9999.ebuild 2038 BLAKE2B 61c00720bd641dfb3f9fae3772c0c6313e904d07a8e635b1a5b3dfa263f0c810f237f34b87b6bba055e2876d10ddf793a4ca74aae40897a2beb4581be182623e SHA512 23e56bf7661d29d8331d51f68c732ceb2db55ff2a88927f4f9281beca96c0d30d39c3aa1e19f5509f22c3c2b40bfef6668e4cec0b95bdde53b9f9ac7fe1c3ba9
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.16.ebuild b/dev-util/strace/strace-4.21.ebuild
index ad9e35e242c1..0a2a04c8fabb 100644
--- a/dev-util/strace/strace-4.16.ebuild
+++ b/dev-util/strace/strace-4.21.ebuild
@@ -1,17 +1,19 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit flag-o-matic eutils toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
+	#EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
+	#EGIT_PROJECT="${PN}"
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
+	inherit git-r3 autotools
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
+	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
@@ -23,14 +25,18 @@ IUSE="aio perl static unwind"
 
 LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
 # strace only uses the header from libaio to decode structs
-DEPEND="static? ( ${LIB_DEPEND} )
+DEPEND="
+	static? ( ${LIB_DEPEND} )
 	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )"
+	sys-kernel/linux-headers
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	perl? ( dev-lang/perl )
+"
 
 src_prepare() {
-	epatch_user
+	default
 
 	if [[ ! -e configure ]] ; then
 		# git generation
@@ -62,6 +68,15 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
 src_install() {
 	default
 	use perl || rm "${ED}"/usr/bin/strace-graph
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index e445febc7869..8e7cd87aff5f 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -6,11 +6,11 @@ EAPI=6
 inherit flag-o-matic toolchain-funcs
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
+	EGIT_REPO_URI="https://github.com/strace/strace.git"
 	inherit git-r3 autotools
 else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
 fi
 
@@ -38,8 +38,8 @@ src_prepare() {
 
 	if [[ ! -e configure ]] ; then
 		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
 		eautoreconf
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi