gentoo resync : 22.10.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-10-22 11:09:47 +0100
commit: 64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree: 9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-util
parent: 957235cf19a691360c720f7913672adda4258ed0 (diff)
109 files changed, 1698 insertions, 850 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 03facfb90aa5..f791328030be 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
index f3a8ffc10f00..4a381b57c20d 100644
--- a/dev-util/Orange/Manifest
+++ b/dev-util/Orange/Manifest
@@ -1,5 +1,5 @@
 DIST Orange-3.14.0.tar.gz 22537651 BLAKE2B 253a9bf69856f9167fdc9cf001310982441450a93f3caaa74ed91ae2afbefb421734fda1561aff9e4aa1e3dd786c82c324ced07fcbd97a507197cad28778e27e SHA512 eed1e50826ea0ca7c96ad302eb8fe65f997810786f8c9ad3b3c90e085dd77f61ca75535294b3f0244a237d6ff7fe7d0b4cd9bdbd5bb5f489e45d7b1549ead55f
 DIST Orange-3.4.5.tar.gz 32999331 BLAKE2B a334da0d55096a8b3a6092cab4b79891c085e6faed8ddc738aa720ff97bf4bc70e215814a0770f284f5d34fe6ce58081b916477262ec62cb28dd246a923b589e SHA512 327c99f17b5c6a83c48c1826cf34624aaf620d84a2f566f22e394cfd0f1b9c7863cecde0ea7344f16b706efb6a4581adad90b59872db9f0be355495971aedd58
-EBUILD Orange-3.14.0.ebuild 1741 BLAKE2B b88670da206681d81d10dc055013fd0c029f7c0972fa98daf0f06cf1afb8372ff94870629fba78053332069d9210029e6fd2000732bb2b504f71211273f093e5 SHA512 d39a7cdf3958e278c9c0a73c3770f09bcd9ebe8e0a5cb3c6c93e7942b4994fee695f1d1194560e5d42fd472ea826b4cb9383699ea4fa53b3cedc362534941136
-EBUILD Orange-3.4.5-r3.ebuild 1421 BLAKE2B 665eed5c5520bcdb6ec25eb37de26fd9a5e2f756bd6163690a79b0f580875be91dfaee5c0786e85d8bb5e2ac1e778b4e49ebd23630d25be490a124857af3c9c0 SHA512 19f5394c51a2f05fb60cb85eeeddc8bc51d75b00892b0b27c2ca1c1ed2f35b3b4fa635fa9847d5a8836497c41c03a8b0c4e3a2311c43a0523e6196a9b39863d6
+EBUILD Orange-3.14.0.ebuild 1787 BLAKE2B 12c9af136dcc3ec042809252d47bcd380c3417c8641f7a04ce923e9938763251750548b2f5672a34b752f179dbe6458727e274d7e474cbc27ebc40419d1692c4 SHA512 87263aeae57d2b9eec81ec735043c689ba33e9f0f8f92c37a5a6a696427dd627897e3f9e330b86fcd0c6b54d6d6b7832ebbd5e18f66012e33a1d8930d68499a8
+EBUILD Orange-3.4.5-r3.ebuild 1467 BLAKE2B 19091f97648b4b6d1e29e8ba34c9a5e9ced4178ae723f8d7fbf526a4d05ce7f969fffc7253f1576cac39838ab7c4ae02b9e1f6e1a1cea25a838ca506284a377c SHA512 63bcde7e30ce41ccbcef6c3793da3ce8d2f7fb42f7d0f2f23ba9e15c4edab4f00b6d59bcc3a5149f40f95ed267b169f76fafc6305685082aee08e26e848f3e9c
 MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-util/Orange/Orange-3.14.0.ebuild b/dev-util/Orange/Orange-3.14.0.ebuild
index 39ffafd703eb..f4f9db0c5c86 100644
--- a/dev-util/Orange/Orange-3.14.0.ebuild
+++ b/dev-util/Orange/Orange-3.14.0.ebuild
@@ -19,7 +19,8 @@ IUSE="doc postgres"
 RDEPEND="
 	>=dev-python/anyqt-0.0.8[${PYTHON_USEDEP}]
 	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
+	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.5.5[${PYTHON_USEDEP}]
 	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
 	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
 	dev-python/keyring[${PYTHON_USEDEP}]
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
index f34690624e02..43ad03b58d54 100644
--- a/dev-util/Orange/Orange-3.4.5-r3.ebuild
+++ b/dev-util/Orange/Orange-3.4.5-r3.ebuild
@@ -19,7 +19,8 @@ IUSE=""
 RDEPEND="
 	dev-python/anyqt[${PYTHON_USEDEP}]
 	>=dev-python/bottleneck-1.0.0[${PYTHON_USEDEP}]
-	>=dev-python/CommonMark-0.5.5[${PYTHON_USEDEP}]
+	<dev-python/commonmark-0.8[${PYTHON_USEDEP}]
+	>=dev-python/commonmark-0.5.5[${PYTHON_USEDEP}]
 	dev-python/dill[${PYTHON_USEDEP}]
 	>=dev-python/chardet-2.3.0[${PYTHON_USEDEP}]
 	>=dev-python/joblib-0.9.4[${PYTHON_USEDEP}]
diff --git a/dev-util/astyle/Manifest b/dev-util/astyle/Manifest
index 8809096e399b..8331977873ee 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 2399 BLAKE2B f0739bdf63c8a7559f46b2bd0a3be11ec76f123fee5b38e745d028fd12dba54c514c9795da7d1ba38d814a5a9e97a8463c1222ea43860b1064d007c4ad5cbb0d SHA512 03845b6e959eafc6cbdd6f01357b8df7c241883ea961237630d3c2d87dc69998ca993f617264957c9260cb1b2244cc80f146d43f9a31bcecce0773211109a8fd
+EBUILD astyle-3.1-r2.ebuild 2395 BLAKE2B 98f245433e2cb2a59cd6267d2ae1f07fcd333d6998bf8d04cc08b4a55721c808ccea335b1ed59fbd77b7aeda169ce5a51ea9a04a4834440aafc1e56ca22408d9 SHA512 2dc81c012d958dc8fe76a8e8136abe83fa822c145b6d20eb921bc5a964192574eb1334b2c1f59366f2a1ec8e424091af458ee32cec3750155c5f02fe7e80445e
 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 cc2092626326..4e7729f00f84 100644
--- a/dev-util/astyle/astyle-3.1-r2.ebuild
+++ b/dev-util/astyle/astyle-3.1-r2.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
@@ -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/autodia/Manifest b/dev-util/autodia/Manifest
index d17fa7b2bae3..ec3b3e38fe71 100644
--- a/dev-util/autodia/Manifest
+++ b/dev-util/autodia/Manifest
@@ -1,4 +1,4 @@
 DIST Autodia-2.14-dbi.patch.gz 343 BLAKE2B fab5420ce032c87ac874ec345289d9d75f5d10d99eb483e8b2f9258dc9ae3b2a6e609098d600dc0dba5fcb4a8f6279bb2e1e51843fcbf98d7203595f581c9cc8 SHA512 2a7c1b4bacfaab3d0c0c16c12362be0a16161db0465ad1b5c4cc955296fd611824aa87b49e7c3672435d10004a383125e2edd3aff640fada2e1694cc02a8abd5
 DIST Autodia-2.14.tar.gz 78070 BLAKE2B cd7d68dd618599b46f59d9304a7c515f6c357a756c9ecaed50e7dfb7e404d4c9810ab5065310d549d5d8c2aede5c7156371c7e4855f73e5ab3893856f39fbd89 SHA512 41cd0d9dd8fc66d70aaf987a8a62ed8b916e9a38263c61cc1cb7994e7bfb24843bbd3440bbdad054fccbf0fbbdaa11ec3a35db2a6f926bc87ba65a5f4ac160ee
-EBUILD autodia-2.140.0-r1.ebuild 782 BLAKE2B 1f4484cf458ae5723d02bd67a7cd8bd3e0ad1d334cb2b7cfc7b31b1dc54c2a3773776a88faf2fb789d8fce9c70f09d62b0b28462170a0b6bc0995f53bc292355 SHA512 0ddb9e5061e30d392e0e41731e1f8e6d61657b1defcaaf6fe36562d13026015c9b9459514658aebcbdbf0f57ad7cab61a1e96aad0cfb8217ba6386c58167c7a8
+EBUILD autodia-2.140.0-r1.ebuild 744 BLAKE2B 5307f034033d6dc37b2b563809192ede57df84ba51dd95ef9987b812a45dc51e2e7f70fdd83a786a966bb7963994fefcee535586977ce887d883f11512890163 SHA512 9b3b1bf623f64456284971cb72bc249c7fb663f33b0974d6af4c56757518ef79bad54c2634340a5bc1fc68f7d4f1cca2c638d93f540baa598ee0cd993ef62fd4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/autodia/autodia-2.140.0-r1.ebuild b/dev-util/autodia/autodia-2.140.0-r1.ebuild
index da836e9aeda0..656e77b1bd87 100644
--- a/dev-util/autodia/autodia-2.140.0-r1.ebuild
+++ b/dev-util/autodia/autodia-2.140.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ inherit perl-app multilib
 
 DESCRIPTION="Parses source code, XML or data and produces an XML document in Dia format"
 HOMEPAGE="http://www.aarontrevena.co.uk/opensource/autodia/ ${HOMEPAGE}"
-SRC_URI+=" https://dev.gentoo.org/~tove/distfiles/${CATEGORY}/${MY_PN}-2.14-dbi.patch.gz"
+SRC_URI+=" mirror://gentoo/${MY_PN}-2.14-dbi.patch.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 03e566fef39b..e92b13b19da7 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,3 +1,5 @@
 DIST bazel-0.17.2-dist.zip 79230155 BLAKE2B 62a60011f9605a1d615e648fdbb98b193561e1d86a7562ccb10fdbb8b6986e17a72c4076dbdbf6baf8a7af83e320af2c4e4b65b5b2101d845597ddd688194ba5 SHA512 0d277e20eac6fc972a31be1c77a750f6585d16beabfe7dd096db4103f0f191958aa83b52203b91d4df5b486ff20004c0b4b22125e58379f64f68abc4a87ac326
+DIST bazel-0.18.0-dist.zip 86890953 BLAKE2B 53da2c2d4467f1f7dd2e613a347acd0ea547bd41fe49fa39cbbcb92c337dca43412ac9b65abf7a3e00c322b8fea075cbdef0da5b064bf4e22aaaa4c545c539de SHA512 128e1041ae0d85be26933bb107b406ca4ab177f00eec2ee1d791ec9089c0cb384857b532498276480d1063b82e7a9a809b9f8a0d0715260534c3e3d202d6cf13
 EBUILD bazel-0.17.2.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
+EBUILD bazel-0.18.0.ebuild 2870 BLAKE2B dca6242ba8027e5c2c62b2cae41f0962db415a11649a0850e9cef1f012e444d94f644734b6ddcfd208f16723c9907130d00e44767efca6b33b47992243964434 SHA512 dae913f3ffa15db53cdc5bcbabfed6a826bd6ff9d7ca8af7526775a5618bb415896b59f90ec10855900ffce264f5feed79c274b1419ef54123f01ca636664370
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.18.0.ebuild b/dev-util/bazel/bazel-0.18.0.ebuild
new file mode 100644
index 000000000000..c1c992cd2cab
--- /dev/null
+++ b/dev-util/bazel/bazel-0.18.0.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="http://bazel.io/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools zsh-completion"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+QA_FLAGS_IGNORED="usr/bin/bazel"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	cat > "${T}/bazelrc" <<-EOF
+	build --verbose_failures
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --distdir=${S}/derived/distdir/
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+
+	test --verbose_failures --verbose_test_summary
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+	EOF
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
+	VERBOSE=yes ./compile.sh || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+	output/bazel shutdown
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	if use zsh-completion ; then
+		insinto /usr/share/zsh/site-functions
+		doins scripts/zsh_completion/_bazel
+	fi
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bbe/Manifest b/dev-util/bbe/Manifest
index 84eeb217fbbb..e3aa46ca2e16 100644
--- a/dev-util/bbe/Manifest
+++ b/dev-util/bbe/Manifest
@@ -1,3 +1,4 @@
 DIST bbe-0.2.2.tar.gz 211590 BLAKE2B 47eb57d07419342377b9e21f15db6619e2c94ed835c059d50992a8166fa4020c87586cd4085f5cefe044794494b359aa4db5b2a400d638a93e75d9192397133d SHA512 6ac31aa005f18cbfd3fbacfe86b3d81ee61a027764296f574c4180da6ccc23dbf716a835fb013730d30c09c045197a70e28584303f3521afab0e5c63d0cf693f
+EBUILD bbe-0.2.2-r1.ebuild 465 BLAKE2B b8e7b65afc241b1f9bebcd5afe720b6ee1f425bf05321cf307e9de9dbf3257954cc1f753e00f9d54cf7225607896c316edeb41829843d22f0fdf3fc77a04bcfc SHA512 b3e2aa25edda1a5cffac8018dd4a7eaac05f4816f5a8cddf8414282ea7c82076ea33a74e8e0e6dfa9e8fc2ce61f069041ba4b5dfc11f344a57293cadb51f8b3f
 EBUILD bbe-0.2.2.ebuild 532 BLAKE2B 9ffb9cf809fc504b5c771cb43a39a3a3ae91b9e1637080379901d11b0f5c0922a292e4b93462e0d0fbc6c07520acdecfdf743f58ab3667862797be1acb128f8e SHA512 2d68c7af9c3ac3784ceaf9d4c837392cee405c2d9e92645b5707b9e188f221183c98dfc9b130b354e378fdb7d7c3b45e4a80810ede6ac46d3adc1146f8407b34
 MISC metadata.xml 323 BLAKE2B 4bcf6d746791f68582290bf43697ff941344dbfe4e07111b9a164077f0cd2080ac4d477785b2952898e5a75f37cfa3e2081458366d0f6b2180335baf20812fbe SHA512 58f9102a7e5a4c09bd8d16c7e66ba1088cd9e8b6f78998c5ba5930634fb7778d7f06a126e4c6dc33bc1d37574dfda200f71d2b7dc6a471daa3b22e3624462fa0
diff --git a/dev-util/bbe/bbe-0.2.2-r1.ebuild b/dev-util/bbe/bbe-0.2.2-r1.ebuild
new file mode 100644
index 000000000000..b93a74d75c49
--- /dev/null
+++ b/dev-util/bbe/bbe-0.2.2-r1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Sed-like editor for binary files"
+HOMEPAGE="https://sourceforge.net/projects/bbe-/"
+SRC_URI="mirror://sourceforge/${PN}-/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+src_prepare() {
+	default
+
+	sed -i -e '/^htmldir/d' doc/Makefile.am || die
+	eaclocal
+	eautoreconf
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index c2353c0c82ad..58b71be43646 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -11,6 +11,6 @@ EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e51
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
 EBUILD catalyst-3.0.2-r1.ebuild 2034 BLAKE2B 5fff0e99ffae7b322117a045224a9305ed5059c01189a5a0244045099dae8defac9aa18d90dd377bbbba5ed31ba7cd2e8da8cd5af334301d1938b3bf3bbad77a SHA512 245ed691199421fac51c8a612b80f281872b79fb382bd2e4aed91227b6f3c03bd16ef2dabee21cda87454ac1403cadf15728b57bfba7c5283ea198b381765542
 EBUILD catalyst-3.0.2.ebuild 1991 BLAKE2B 320f68ea1cee53ff519006532321a8ecc695c1b547bf4f3d170a564eb336c430f7575effa03e112c086591c2f5fd18f817416e050a76e01769c4e282da1d1ad3 SHA512 a27092e4b8af69f20c08d3ed5f808e16b08a7fa7ebc09ed599e0dc0f3e0d969cdc8093995aeb245439a463a96fa44eeabdfb2031fec96ad442c3b0fb306b567e
-EBUILD catalyst-3.0.3.ebuild 2037 BLAKE2B 7d717869fea553fa5cee9c2a35800eeb9db1b13185e9aa80d691ad82576479d9994b3e698a096d90405cc3b05115b904a7f66971c1f24036d2b529e9214d1200 SHA512 b54354cf0627fb9617dcfef7688f9d0252bffd8505defed0c825e1840463ad4d4f1ab0abdbcb41b60b29743ba6a99ce97eab645af9b22c4e5f0199ed8c006c64
+EBUILD catalyst-3.0.3.ebuild 2034 BLAKE2B 5fff0e99ffae7b322117a045224a9305ed5059c01189a5a0244045099dae8defac9aa18d90dd377bbbba5ed31ba7cd2e8da8cd5af334301d1938b3bf3bbad77a SHA512 245ed691199421fac51c8a612b80f281872b79fb382bd2e4aed91227b6f3c03bd16ef2dabee21cda87454ac1403cadf15728b57bfba7c5283ea198b381765542
 EBUILD catalyst-9999.ebuild 1993 BLAKE2B 53353a2d5d1195b5dd0150fe0d1bd32aedc4de9dcc0579956638623b56644e361fad4a10eda58d7fffc1bb061c8acb5e634c4c495fa055f94353e9aaa46beece SHA512 7a1ecbaef5ace276516aba497339c954cdd8e428809cd1739f5a6ce88dbd1a63e25fc219dfee1cb9d1dbfc2e7be7cf2dc43a77c52947e2c886e406f17cfced10
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
index aa1bef2ffa10..5e5de2a1b169 100644
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.3.ebuild
@@ -12,7 +12,7 @@ else
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6} )
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 5403300103bd..2fe2b34b6b7b 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,11 +1,14 @@
 AUX ccache-3.1.10-size-on-disk.patch 518 BLAKE2B 1f949d0cb0168e3de0a4e142db339f59b1dabda2b06912133e10c536e23f7912e002c7d4cf6ec90654863c0339339bf17baa9b3b107110e4f25e6876ba8fe39b SHA512 bf7a160b091798e7de57748f4f9e0d6f027872c713108e3791cfc82bf64d3ed843607267ff0cca9e0848abf8bbcbbb6c19921560032576849a42f29ecc496212
 AUX ccache-3.3-size-on-disk.patch 514 BLAKE2B 93ce94415da1ac5af7ccf60958908f7b1b75b9a7af2602c1f23113b06dbc15489f797a188103a948cb7dd81ffba11797fa0e525c2ab667b9fb5a2a890097028b SHA512 7e7f01ca602722a1add1615223bb109cecfdf69ab7612a0424732f992331b0addd7b94f684fedb91486f69cbe57fcb1961d1069116a27458f1f5b20a169f2569
 AUX ccache-3.4-size-on-disk.patch 522 BLAKE2B 6ec1f4cdb75d39997e16716caf3195c180ef7796568031b0dcbb92c385034b793fef2ad7afd9d3aaf66c37dd562447fca3bbac8b42909b2fa4e2b2ae1f8008ea SHA512 91757a176c813076d90f1a44b6a605bf1fac30e47caf253883c59e8f9e0e257d6aeceeb3f3f96351fc5c24f413eb7bb08a811e4be0991fe653ae62d68cce565f
+AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.2.4.tar.xz 302548 BLAKE2B 7d642dc3f944183660e79cfdfd68948528aa3ea4ef8162a4d04837c85ccace35107e663ec81a15438dab133fca2e8bf100fecd483f33c9b0aa52c68989ae8122 SHA512 d048b70804c81dece97f3ba511b3c109ec0d14e7dca69bc68faeeb61a4a7b5639c03e3e5ad7dad4e42b4bd198d7a7fffa4e3b7ef99590dfd4df0805db6c25db7
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
 DIST ccache-3.4.3.tar.xz 328824 BLAKE2B f2ff3276cbadde642a362400b32291f59f60c274861c4c706f0bced801aec7aeeafeeb611331bc23e96fc8790a1d1ffd39df58f24f6a5384d8ddda0da54c9339 SHA512 8a92ef3f3b3688bb4c0b39106bea387ec3065a074327c1fa793e511192acd5cf9aeb5c0065ee8868a944ec63463c2b59fb84edd952102468cd12fcbb1ee16c49
+DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1907 BLAKE2B eb985796e32759c421dc13c1eed2d42af1b487eaed3a7765ec67ca1c909d9244f5eb14d6d643ba4f357645336ffa69b2e0fef01a6d9c8f20a984b046e541ec4e SHA512 2ee7fa571a5daa9649ee24fb7027da366181d0ca38ff3e2bf61358b5b461742625c80554575a55634f12fcbf515d7745bbf638b9ae38405499eb81039d4d199e
 EBUILD ccache-3.4.3.ebuild 1939 BLAKE2B 66a0eef49b7e59918703df2d1270f421d576858a1cbb37b9c4f285b6208b56e4dabd3fe650f3f7c734c3570e38e1082db18c37745246410cba1106338948de26 SHA512 4c9540d5c8c9d6e2bbabaf78f2656d32318387fb05995adb09584819ad5149e19473f32fe579d761bce7be79cbba9bd9aad0a7dee9852808346287adfa7ed800
+EBUILD ccache-3.5.ebuild 2040 BLAKE2B 17c95227bc87c658f302d4e5e40d02e4b36b5e020aaed72381f3f987347ed3f5f5afdde48b09d84e72196ea1c97aae32f1898a998782c5c348d671acee3a804a SHA512 f5911f3da42149916d375f03e6a0168d28b6ca3e027708a3d1b72800914aef2cdaac90122f6426d4c30ca6bbc278751203b155641fd6c8a941e091d867f9a137
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.5.ebuild b/dev-util/ccache/ccache-3.5.ebuild
new file mode 100644
index 000000000000..e2a525cad94a
--- /dev/null
+++ b/dev-util/ccache/ccache-3.5.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.samba.org/"
+SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+${EPREFIX}/usr/lib/ccache/bin to the beginning of your path, before ${EPREFIX}/usr/bin.
+Portage 2.0.46-r11+ will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/ccache/files/ccache-3.5-nvcc-test.patch b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
new file mode 100644
index 000000000000..294b22439070
--- /dev/null
+++ b/dev-util/ccache/files/ccache-3.5-nvcc-test.patch
@@ -0,0 +1,11 @@
+Disable 'nvcc' tests to avoid test failure
+on system with gcc-7+ enabled by default.
+--- a/test/run
++++ b/test/run
+@@ -425,2 +425,6 @@ else
+ fi
++# Disable nvcc tests in Gentoo as nvcc requires gcc<7.
++# Not a default normally.
++REAL_NVCC=
++REAL_CUOBJDUMP=
+ echo
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 109d0ff4d95e..5b06fb7ff54e 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,8 +1,9 @@
 AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
+AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
 DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
-DIST devscripts_2.18.3.tar.xz 731708 BLAKE2B bbd993b6dac144dd9a9e696133d1613fc88ca7fa31debf8478bb0a8232b811b9c6cdcf0989db29f478958f500c5f885e382700c0ea451675721254cdd4d42797 SHA512 3fcd2ff4eb97fbc8d8f768ca11f03b96de0f2ab0b8824e089556695c65521cf2e8e2d532968c07292818c8cd7ea93adaa508b40aebafbbf744bd6b78d249321b
 DIST devscripts_2.18.4.tar.xz 740128 BLAKE2B c43867b79904ebb72fbe0f65e0c5a49100dfe435f867afc3c3f40b33dabba25a5cb07cd9e27780b0198da4800a17be3f2de6ea8aad504b281b79dd1df59baaed SHA512 91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897
+DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
 EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
-EBUILD checkbashisms-2.18.3.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
 EBUILD checkbashisms-2.18.4.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
+EBUILD checkbashisms-2.18.6.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
index be58ae776f20..16cbdc16f649 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.3.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.6.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,7 +27,7 @@ S="${WORKDIR}/${MY_P}/scripts"
 src_prepare() {
 	default
 
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
 
 	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
 }
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
new file mode 100644
index 000000000000..44455e3097b0
--- /dev/null
+++ b/dev-util/checkbashisms/files/checkbashisms-2.18.6-command-vV.patch
@@ -0,0 +1,30 @@
+https://bugs.debian.org/733511
+
+From 9c2109e0d16473a7e80961558b112f8071aa5877 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 9 Oct 2018 14:23:27 +0200
+Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
+
+POSIX permits the -v/-V options:
+http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
+command [-p][-v|-V] command_name
+---
+ scripts/checkbashisms.pl | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
+index 3044634a..60005cd4 100755
+--- a/scripts/checkbashisms.pl
++++ b/scripts/checkbashisms.pl
+@@ -699,7 +699,7 @@ qr'(?:^|\s)(?<func>function\s)?\s*(?:[^<>\(\)\[\]\{\};|\s]*[^<>\(\)\[\]\{\};|\s\
+         $LEADIN . qr'jobs\s'   => q<jobs>,
+  #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
+         $LEADIN
+-          . qr'command\s+-[^p]\s' => q<'command' with option other than -p>,
++          . qr'command\s+-[^pvV]\s' => q<'command' with option other than -p/-v/-V>,
+         $LEADIN
+           . qr'setvar\s' =>
+           q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
+-- 
+2.19.1
+
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 16ad3b51661c..d083141b9ff1 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,11 +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.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.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_rc1.ebuild
new file mode 100644
index 000000000000..73aee46de553
--- /dev/null
+++ b/dev-util/cmake/cmake-3.13.0_rc1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# boost (#660980)
+	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index b510d832d4c1..3242fc48b898 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -1,9 +1,7 @@
 DIST cucumber-expressions-4.0.4.gem 16896 BLAKE2B 5e888f63d4c976db4b10bd99b8f8f4122364fb32c106f6485b3b75e3ade15fd573260cc37aaf4abc3754bdf3ad62ac37b4d78a4abc63099a841e256e12425bd3 SHA512 9a52b866545154c9e7d4e8f08cbbf6b2d0dcee28c24486eb95ad4717a757a25ae8ac844702dd2e0c892fa0406f686d3b4eb024c90fc6e7b90be7a6edd7e2dadc
 DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d45364579213e97517f0ce57a954f58533230e2ac362c2664567ba79ee3404d02d2a7811986dc66e6a8365572978da5832e1a96 SHA512 4016248cf116920512895a874f67331a84f782dfbe560dd4a9d64ef001fa8d66ea2663b96dce8e2fb561fd533e6a8a0d399dcb923cba451cc452f15c571e3288
-DIST cucumber-expressions-6.0.0.gem 18944 BLAKE2B ea7987ff411b00b80683e4ace66d6b3e5b91ef35a93af369a79f19472c6fba3eb0be8453fde3d716eef83ec221e35e7c2d0634e0c941693773fbf174e578f45c SHA512 e47a7099cfa3d49cd17bd6f289e0dd6856990e60d1ed4ed68897a4efd40eb5715bdb1bd2fdc0aa5389cf92cd67402ea544238752e38af6156a7b182cd6ebef4e
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
 EBUILD cucumber-expressions-4.0.4.ebuild 486 BLAKE2B 1e32843c530edd3b6c108c2a8d88b6cec0072c5043f32f68ba245be22c8464791a416f4f81f806f7bb6a25cfb510071bd1641d48b236b63885fc73fe31abfad4 SHA512 2ef549ece304bec61447cb885034cdd8b4c654ae418dbf0efa12a151dabe382eb57f99cd7546d4166808754206db30b2797e324c9e4fadd2461c7978b57fbfd7
 EBUILD cucumber-expressions-5.0.18.ebuild 486 BLAKE2B 5c9ef936e8f7695dc4a5f046bcf60de90c3c9fe9b6fa2d0dd6607084a4c0940c5162cdf9bbd14ca4dfd73681851874a33cf6adb36ecceec5c5adc18e4677e0e1 SHA512 8d5ea7734d0bb8a03b6b00c748a20af66075c84191280a0e9ba98236cb11eb900bc6c36977a5936b3ef698b32d34cb6e17db8c616265d10a87fc2b55ccdbd975
-EBUILD cucumber-expressions-6.0.0.ebuild 486 BLAKE2B c7109af9b79771e7247dde370a3929114c88a6b8559c9d5eea3d45177408522628666f4d9f0e78862650067074a61e486a6f495c11c03ed6f5660cf91c1f21be SHA512 b58e1e0d2700d2efe19a9f45eebee2d86be298deced299550c7dc8aa12e30a0ad150ef8ace88305b458a15b48e5ffd03f41ec695f433ab549bad937c9b6cf18a
 EBUILD cucumber-expressions-6.0.1.ebuild 486 BLAKE2B c7109af9b79771e7247dde370a3929114c88a6b8559c9d5eea3d45177408522628666f4d9f0e78862650067074a61e486a6f495c11c03ed6f5660cf91c1f21be SHA512 b58e1e0d2700d2efe19a9f45eebee2d86be298deced299550c7dc8aa12e30a0ad150ef8ace88305b458a15b48e5ffd03f41ec695f433ab549bad937c9b6cf18a
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
deleted file mode 100644
index d7125ec4950d..000000000000
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a simpler alternative to Regular Expressions"
-HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="6.0"
diff --git a/dev-util/cunit/Manifest b/dev-util/cunit/Manifest
index 0cd59e6dff41..27e9dc43b927 100644
--- a/dev-util/cunit/Manifest
+++ b/dev-util/cunit/Manifest
@@ -1,5 +1,5 @@
 DIST CUnit-2.1-2-src.tar.bz2 349037 BLAKE2B 51122ae79f15ebaf3b4a4f46acc8f1e08e918097d1308409b02e722e6eb7e0147d14461dd834dfbdb95ad8bc230076c05b3700348781e2a9b31bf29898c61435 SHA512 c0af37b9f3a00fd7bb971f33e94373699d0380c28fad12f6db860739990a9ffffe0bb0a71c0e3531529b9952128c11248b8f365875d0315c16637a0b7e91642d
 DIST CUnit-2.1-3.tar.bz2 514500 BLAKE2B 919ff3345c06de44662deb3c43700dc14f3c6b0b1557e162f1f527b782874082bc866b3bbc3fd18869b975d7a0a6b4730eab87ed36847249ff8fa5cbede27797 SHA512 547b417109332446dfab8fda17bf4ccd2da841dc93f824dc90a20635bcf1fb80fb2176500d8a0906940f3f3d3e2f77b2d70a71090c9ab84ad9af43f3582bc487
-EBUILD cunit-2.1_p2-r1.ebuild 1373 BLAKE2B df6b3baa7a39d9db5f8dcab29a3956457d14b2d3d03374a93bacb6efe5ff8ab683e92c922155cbcb6a4e56830efd5afa5be69b19a59c728dd5b49a840d9788a0 SHA512 c166a390e38e30e9416cf287c8f29d94e777f65e3375c46056b58f21aba0f923608b7b875100c5cdf175eed07d9d2deb5e0f2ac4364fc49480e612708b5ee7d4
+EBUILD cunit-2.1_p2-r1.ebuild 1369 BLAKE2B 657474b205f655405f4402a16da33a06f383f7593b73f281925d4dba1984aa46df97b51f145d540bcf96792af209f1d7a29fe477d0c425737eab437c6f9a7000 SHA512 103e1cce7157000d66370e883623039068e3734aa96a2c8df59c30415e5610a19865df88d8406aadfe09de60632512b465f03de3f02c2887c91da0eed0a27685
 EBUILD cunit-2.1_p3.ebuild 1384 BLAKE2B 7cbcf32948969a5669c8f17cbf428f19f848bfac875a9230cfa87f0dc703ba2547e97c4451a982320f7c6e0995d221869c076a1863a79bcceceb4e5e81b459f5 SHA512 62a6c3d04d65a41fdb3f9546c0455666411674548d63335be1e427f56471647dc5e956d26ca7116370dca804ddf8dc1e6fc301c7c40017a36c644a324805428a
 MISC metadata.xml 242 BLAKE2B c9bc0f1e188dab4f0b4f1027441888c15919ad52adb639905a71471645438c94957a45ec043038fc19a829a6ec6b236eeb026560728dc231e5aeb484a467177a SHA512 3171a680f18023cbeeb73331a33942ddf076e0b8abc2c40284e4a4cb1803ad7264f8e38ffaf182d1f38ba28ad60e65a0ddf96c66a60e0f9a935aa941c49df87d
diff --git a/dev-util/cunit/cunit-2.1_p2-r1.ebuild b/dev-util/cunit/cunit-2.1_p2-r1.ebuild
index 4b8d7f86d7b4..409c1906eceb 100644
--- a/dev-util/cunit/cunit-2.1_p2-r1.ebuild
+++ b/dev-util/cunit/cunit-2.1_p2-r1.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,7 +14,7 @@ HOMEPAGE="http://cunit.sourceforge.net"
 
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="ncurses static-libs"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3[${MULTILIB_USEDEP}] )"
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
new file mode 100644
index 000000000000..bb20b50eff25
--- /dev/null
+++ b/dev-util/edi/Manifest
@@ -0,0 +1,3 @@
+DIST edi-0.7.0.tar.gz 733126 BLAKE2B bdf6f3ef37a04af4aa45042216b2661c83f22273777eb6dc9217cf44823948eccfcc9fe300d7d88ed19b051630fda304e5d8cf9bccba135eb0bdfa86fdd15e6c SHA512 a3e99355f17de9f8f5e0b1a4be2e7283147dea386e4a5dfa804df10830d3a43713974c1989c4fc55262bf582131a024a2723a8608035b82503019a6ed97e2b9e
+EBUILD edi-0.7.0.ebuild 1206 BLAKE2B 5d17de99369920e3971c17818ad1bfe73a0c4ff0105546ad00e2f02153ab9b87d7701636117308821669ca3e6c01fe9176de78994dec89ef7b7a8217b9798b71 SHA512 6470040fa7563cbe034144273c4d173b37fc625ab4aed55759182397b86efa8ac1ab66c7a14cb62bcb9df273386d430c160883a0e5908290471d559bd812d250
+MISC metadata.xml 499 BLAKE2B b79205914bede4f3e03ebb98fe231cef58336fd21d5d1b4884b61929af724f6758e8d0aeb1f4099ec9b2fbd4f00f52499272007ed10741e8e21b3a121ce840a5 SHA512 548df114fdb3d83fc0794e745ebdfc8e835a11a75826eb27b4e5da7bfb2fbd790a033905055799b81392b23f3aed41f20900a43331af205875507331e57cf86c
diff --git a/dev-util/edi/edi-0.7.0.ebuild b/dev-util/edi/edi-0.7.0.ebuild
new file mode 100644
index 000000000000..5c046e88d2dc
--- /dev/null
+++ b/dev-util/edi/edi-0.7.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit llvm meson xdg-utils
+
+DESCRIPTION="An EFL-based IDE"
+HOMEPAGE="https://www.enlightenment.org/about-edi"
+SRC_URI="https://github.com/Enlightenment/edi/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1-with-linking-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang"
+
+RDEPEND="
+	>=dev-libs/efl-1.21.1[eet,X]
+	clang? ( sys-devel/clang:= )
+"
+DEPEND="
+	${RDEPEND}
+	dev-libs/check
+"
+BDEPEND="virtual/pkgconfig"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# fix a QA issue with .desktop file, https://phab.enlightenment.org/T7368
+	sed -i '/Version=/d' data/desktop/edi.desktop* || die
+
+	# fix 'unexpected path' QA warning
+	sed -i 's|share/doc/edi/|share/doc/'${PF}'/|g' doc/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-D bear=false
+		$(meson_use clang libclang)
+	)
+
+	if use clang; then
+		emesonargs+=(
+			-D libclang-headerdir="$(llvm-config --includedir)"
+			-D libclang-libdir="$(llvm-config --libdir)"
+		)
+	fi
+
+	meson_src_configure
+}
diff --git a/dev-util/edi/metadata.xml b/dev-util/edi/metadata.xml
new file mode 100644
index 000000000000..8b902f0f90c5
--- /dev/null
+++ b/dev-util/edi/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gmail.com</email>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <use>
+    <flag name="clang">
+      Provide integration with <pkg>sys-devel/clang</pkg> for autocompletion and inline 
+      errors
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 764a3b11cd78..0be30738c3f8 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,7 +1,10 @@
 AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7
 AUX gn-gen-r1.patch 2045 BLAKE2B dcc370a2625f59475cc5c818800e5b8aa6d3ff0b24a356dc7defb42041ce525230fa691d0ead08ec32581aebda188121bd9115985a3d2bda65bff38557cbdd08 SHA512 77ea25769255879903556961446c731cbc609e911288f64f0600dfc364e2a05896251c3e02b241f94072b2a67c4a6fb7541f7bf7f409339a13902446476c2993
+AUX gn-gen-r2.patch 2410 BLAKE2B baec5c55e7fbcb2f98128ec8f43bcbc154b0cd8c5348ccbb964020d8ff36117d83078630ba6b952e6860e7dd7d99a0563a8eb7db39f9fea2b30b11a782c10029 SHA512 ca43a150c8f1902b4ae777a8b015403f2cddd63aa9597dc5f9c527928b6820264e4f9cce9179fedc739e12171e47076b05a8ea686107e7c7c9bf2eab4458bb04
 DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
 DIST gn-0.1463.tar.gz 905571 BLAKE2B e048e642704533d478fb751748a97f60283f63868ab1ab6fa5b8e7bc0322745cf21464eaa16194f684869b50f306668d3c7d3b4f72c3985b865d8492d1ff0901 SHA512 f32861a8fa44034b932e6aae4787fd7da6e4c6c19c5b6919de7b0d0f1ba20f415c1c55db95a08958a338b7b9de740ff49a29ab894a9c4e9049a89450d8c88281
+DIST gn-0.1479.tar.gz 909494 BLAKE2B 5d7165371337be630b2d8dcfd8cd067358d56d8d82501288a56bc15955674f0528fde27056c13f32a2b908576a9e2f28529dec9cd1f259e964405874ce74e90f SHA512 2be22c95952f9993d3f89e932abc0ed08eb2e99a3659322d90bf953b1f68591303b3490e0e55bf3988b1226fefef0a5b7f5d3039eb9ef76e4fe36a2e538ef94a
 EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006
 EBUILD gn-0.1463.ebuild 1034 BLAKE2B b415c7f196a387de4d3460b9b56f4546a76da2c400d246d14cb9e56ca2eb30c3aa8647b5f58ba73c51f7be41793fd799ffc0152a70f81d47c40407eb2e9756f7 SHA512 8a02e407c0a6b78107932705df99ffc1d8180f66f5d3e23ef3c3121d6d42434ba176012ede5ef1b21d47a3a3bda61578af7165d177c4f8d5b1350af0f57a1790
+EBUILD gn-0.1479.ebuild 1193 BLAKE2B 5cf36ee7d54534fb7056d5b570b2f4cfa31bb63a4f04ab066f9220038701ddeeb08b2ec4f214e0b3714ea253d62c276f1e4e3f6aa2070d00b8d05148362bba65 SHA512 cf81974ce864715eab1bbb39dc88c4d15e57b326e9ecc46076b9926b1846aaa306919853689b3269495ab5b970069c8e61adfd32c9ed363b811700b64ba4b389
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r2.patch b/dev-util/gn/files/gn-gen-r2.patch
new file mode 100644
index 000000000000..701a317bf023
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r2.patch
@@ -0,0 +1,70 @@
+From 00e907811ea7fc56de73ad44903946a9179b1c4f Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sun, 14 Oct 2018 20:34:07 -0400
+Subject: [PATCH] Remove unwanted cflags/ldflags parameters
+
+---
+ build/gen.py | 19 +------------------
+ 1 file changed, 1 insertion(+), 18 deletions(-)
+
+diff --git a/build/gen.py b/build/gen.py
+index 11c92460..b186e3b0 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -326,9 +326,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+@@ -340,14 +337,6 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         # Garbage collection is done by default on aix.
+         ldflags.append('-Wl,--gc-sections')
+ 
+-      # Omit all symbol information from the output file.
+-      if platform.is_darwin():
+-        ldflags.append('-Wl,-S')
+-      elif platform.is_aix():
+-        ldflags.append('-Wl,-s')
+-      else:
+-        ldflags.append('-Wl,-strip-all')
+-
+       # Enable identical code-folding.
+       if options.use_icf:
+         ldflags.append('-Wl,--icf=all')
+@@ -356,12 +345,12 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+         '-fdiagnostics-color',
+     ])
+     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++    ldflags.extend(['-pthread'])
+ 
+     if platform.is_linux():
+       if linux_sysroot:
+@@ -369,14 +358,8 @@ def WriteGNNinja(path, platform, host, options, linux_sysroot):
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+       ldflags.extend([
+-          '-static-libstdc++',
+           '-Wl,--as-needed',
+       ])
+-      libs.extend([
+-          # These are needed by libc++.
+-          '-ldl',
+-          '-lpthread',
+-      ])
+     elif platform.is_darwin():
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
+-- 
+2.19.1
+
diff --git a/dev-util/gn/gn-0.1479.ebuild b/dev-util/gn/gn-0.1479.ebuild
new file mode 100644
index 000000000000..fc369d2c0db0
--- /dev/null
+++ b/dev-util/gn/gn-0.1479.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="vim-syntax"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r2.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	unset CFLAGS
+	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
+	echo "$@"
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles
+		doins -r tools/gn/misc/vim/{autoload,ftdetect,ftplugin,syntax}
+	fi
+}
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 9f675d110be0..75103ba8db92 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -1,11 +1,7 @@
-AUX gperftools-2.0+glibc-2.16.patch 604 BLAKE2B c7f18515f32a2bcb4d8a0a7217f7d42df8224fd357af43ea691c8a5861318861f26cbc00a3c79225d641504ea8459803e563aefc57384ff4ed99e8cc5ef271a4 SHA512 aa9b94c4712227b6414fc34a47154f416b120004c81704ab181c7985b6dce60bf1d98e4175678fb445cd59bb6c85d4d7bb0a093e186ecc9f115bc841d27cb964
-AUX gperftools-2.0-32bit-barrier.patch 792 BLAKE2B 8efea587a96f4796d55809714ebf2b2a7058f0161431b7b3b404e0709e338f0a981525f74691b923354b622bbd2295ee001b2a2975da0e12a94cdc07ed207c1d SHA512 a39fd183d76a76e5c4cb3915f966e008250b4c72098bd2a9d13f10e01efd8dd1e36a51e0d4ef5f712d20398fa8605aa40e2529af085e80f918a1e227d7c92def
-DIST gperftools-2.0.tar.gz 1261243 BLAKE2B a37c62f6f3c27a29036955c37a58c480e5cc628bd49036e20fe616e610d45b6727b0782605892a543cb477c388093feb5527e6557c5bc8446aaf874e946884f6 SHA512 61bf7a26974058912a4165cbc363351bc735599d36ab569dc7e84a75a690adbc17a4178512a57469fc7c17befaad2a271ef4ea5c29a36b664153938939269926
 DIST gperftools-2.4.tar.gz 890402 BLAKE2B f4893d7c9bbd3a8dc5b4d8a25837039261fa32782e13653991002ab666d6e81de637932a8b46c66df219336adcc395a217a4ce32332e8e1558beeb140ea642f2 SHA512 77198c150ee26579adc8f190be0c4ba90a9e3854b006c3aa9252b5863b1fce317fd690c6aa0ed202c81f0bbcfbe2d5f8a182263e77b7fb4fbc6b3e8bfffc9fb0
 DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319e505fc715795cd836ced631b29bfd8e6f8ddf3c7f6dceb0f166523bb0fa55564b1cbc896c8cd8cfd475263c07c39 SHA512 20c3460f806c6425d54e8d1020f15bc8940aacd7bf1367b03a116fb873bbd6c1e1fbb75df1d0ca341eaec813552fec394327175115ea8442a4b7a1ef17f0df2f
-DIST gperftools-2.6.3.tar.gz 911813 BLAKE2B dae223927835f65b819836b25595df2943a0762ac3b6346e3d0186dab486cfa3e4eabc1f5a2ec43314f53ea96a68acb75991b76055591395bc52e78f655630d3 SHA512 6418c382760c8870ef42a535fcb65a623c1a9fd3ab58fcb7cfe2dd5048b2268b434427da36bc0c76beef2c28e13a6926d32d67084d8ca6675b78650a62de77a7
-EBUILD google-perftools-2.0-r2.ebuild 1803 BLAKE2B b81145202e20964c9c5784aa1b7b7afb1bef69659339654375a2019732d7696b2bd6fe0bf0347c7f559146b7c64e4c203ec7ad7626ccd68d3f030b488005a92e SHA512 7fe925ddae89c431f7177c4bc97dc2e5a663452e9fde34d16f28fd5dbfa8e584b961362cc1f65ee726478b54a2d000b15ef3bf81ce4e10c11aee2a78990e3a58
-EBUILD google-perftools-2.4.ebuild 2297 BLAKE2B 7c0dd1e856d745ecf215d3974f1bc2dd057f7ca3381bcc5ca7b8d2ce800b029c831934d27a938056aaa724a500f5799ef792155c2e371ea9fe2be4f0cdec0995 SHA512 026a68d5920847c00fd1af24397ce45575dab9e16f569c9d55b7b0424511cab365be429e33bb7d74ef70a57c38eacc825d3809d44c204678b046c9a76302a460
+DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
+EBUILD google-perftools-2.4.ebuild 2294 BLAKE2B 1aaa5d14010c35af89fbe126a6c9d24a2a6921300e273be96868a7254dbedc97e5012ac5d7353e3555b2777268cb299ca576452c7d406234f597d010e6577926 SHA512 8a0d186e63ee7aed584cee1d0897c02eda37b7a0f980a11c715e38513ae684cc0c78675aaf6c8c5ebcfc77da4b1f88f8fc364f38fc856a61ae7365a52f802750
 EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
-EBUILD google-perftools-2.6.3.ebuild 2318 BLAKE2B d33a9b7b8178087d2d4621b5fe19294844e6aeda7e1cbcbdc94184eb1582cc1f97c54b07d689218677b124fdd0e48b15c6315659875b1e1f11b3efc28ac3362b SHA512 4a49fa149ad25f5ce4b533259be598833ba3f99b5899abdcbc7cc6aefaea55dd047c09dfe02be22b12a880d3a57ec3da4dde69acb3d1bae6a3b912b3c8d2c90d
+EBUILD google-perftools-2.7.ebuild 2354 BLAKE2B 984b092a3af6c43f7d80cccb130998f692c0e2715aa4e6b3cab18aa19248588eb3b448b79ee131e4bcef3762a4efa46710064d4c52c6738580d17ac821917bc9 SHA512 271e5d2d1b2b94c6d21c56772a90432f0ae59f0a11cdfc109d61ca1c30bbf8387d00aeaf6ccafc3851d1afbf249bafa66ac5fc762b20afe56f451e610adfb030
 MISC metadata.xml 894 BLAKE2B 1c28c2e2c55af11aa4f2fa160dc63d16f4ab9deee8be2265af431a4594f8dd6a51a5258dd81b125e2f61f8367e26b6d1ce4248820b437f393051a8f036bd0b27 SHA512 8b940221b8eab122bf8579bce312c71c4ff49e6a35982e9b38990ad181ead444b8cb98b8a919fa941f99842fa28be9e5b456eb07954b3b25f4acc4112d98c0d2
diff --git a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch b/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
deleted file mode 100644
index b17e0d57f5fb..000000000000
--- a/dev-util/google-perftools/files/gperftools-2.0+glibc-2.16.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gperftools-2.0/src/base/linuxthreads.cc
-===================================================================
---- gperftools-2.0.orig/src/base/linuxthreads.cc
-+++ gperftools-2.0/src/base/linuxthreads.cc
-@@ -193,7 +193,7 @@ static volatile int *sig_pids, sig_num_t
- /* Signal handler to help us recover from dying while we are attached to
-  * other threads.
-  */
--static void SignalHandler(int signum, siginfo_t *si, void *data) {
-+static void SignalHandler(int signum, struct siginfo *si, void *data) {
-   if (sig_pids != NULL) {
-     if (signum == SIGABRT) {
-       while (sig_num_threads-- > 0) {
diff --git a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch b/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
deleted file mode 100644
index df89a92ed010..000000000000
--- a/dev-util/google-perftools/files/gperftools-2.0-32bit-barrier.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Atomic64 not available on all architectures.
-Use AtomicWord instead.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar gperftools-2.0.orig/src/base/spinlock_internal.cc gperftools-2.0/src/base/spinlock_internal.cc
---- gperftools-2.0.orig/src/base/spinlock_internal.cc	2012-02-02 21:36:23.000000000 +0000
-+++ gperftools-2.0/src/base/spinlock_internal.cc	2013-01-20 23:44:01.629077919 +0000
-@@ -80,7 +80,7 @@
- static int SuggestedDelayNS(int loop) {
-   // Weak pseudo-random number generator to get some spread between threads
-   // when many are spinning.
--  static base::subtle::Atomic64 rand;
-+  static AtomicWord rand;
-   uint64 r = base::subtle::NoBarrier_Load(&rand);
-   r = 0x5deece66dLL * r + 0xb;   // numbers from nrand48()
-   base::subtle::NoBarrier_Store(&rand, r);
diff --git a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild b/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
deleted file mode 100644
index c0b175dcf38d..000000000000
--- a/dev-util/google-perftools/google-perftools-2.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P="gperftools-${PV}"
-
-inherit toolchain-funcs eutils flag-o-matic autotools-utils
-
-DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
-HOMEPAGE="https://github.com/gperftools/gperftools"
-SRC_URI="https://github.com/gperftools/gperftools/archive/${MY_P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0/4"
-# contains ASM code, with support for
-# freebsd x86/amd64
-# linux x86/amd64/ppc/ppc64/arm
-# OSX ppc/amd64
-# AIX ppc/ppc64
-KEYWORDS="-* amd64 arm ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="largepages +debug minimal test static-libs"
-
-DEPEND="sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-HTML_DOCS="doc"
-
-pkg_setup() {
-	# set up the make options in here so that we can actually make use
-	# of them on both compile and install.
-
-	# Avoid building the unit testing if we're not going to execute
-	# tests; this trick here allows us to ignore the tests without
-	# touching the build system (and thus without rebuilding
-	# autotools). Keep commented as long as it's restricted.
-	use test || \
-		MAKEOPTS+=" noinst_PROGRAMS= "
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${MY_P}+glibc-2.16.patch"
-	epatch "${FILESDIR}/${MY_P}-32bit-barrier.patch"
-}
-
-src_configure() {
-	use largepages && append-cppflags -DTCMALLOC_LARGE_PAGES
-	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
-
-	local myeconfargs=(
-		--htmldir=/usr/share/doc/${PF}/html
-		$(use_enable debug debugalloc)
-		$(use_enable minimal)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_test() {
-	case "${LD_PRELOAD}" in
-		*libsandbox*)
-			ewarn "Unable to run tests when sanbox is enabled."
-			ewarn "See https://bugs.gentoo.org/290249"
-			return 0
-			;;
-	esac
-
-	autotools-utils_src_test
-}
diff --git a/dev-util/google-perftools/google-perftools-2.4.ebuild b/dev-util/google-perftools/google-perftools-2.4.ebuild
index a2986988f31c..da07048b388b 100644
--- a/dev-util/google-perftools/google-perftools-2.4.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/google-perftools/google-perftools-2.6.3.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index 708d67991674..79113d00762c 100644
--- a/dev-util/google-perftools/google-perftools-2.6.3.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-
 MY_P="gperftools-${PV}"
-inherit toolchain-funcs flag-o-matic vcs-snapshot autotools multilib-minimal
+
+inherit toolchain-funcs flag-o-matic autotools vcs-snapshot multilib-minimal
 
 DESCRIPTION="Fast, multi-threaded malloc() and nifty performance analysis tools"
 HOMEPAGE="https://github.com/gperftools/gperftools"
@@ -18,6 +18,7 @@ SLOT="0/4"
 # OSX ppc/amd64
 # AIX ppc/ppc64
 KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+
 IUSE="largepages +debug minimal optimisememory test static-libs"
 
 DEPEND="sys-libs/libunwind"
@@ -25,8 +26,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-HTML_DOCS="docs"
-
 pkg_setup() {
 	# set up the make options in here so that we can actually make use
 	# of them on both compile and install.
@@ -51,7 +50,6 @@ multilib_src_configure() {
 	append-flags -fno-strict-aliasing -fno-omit-frame-pointer
 
 	econf \
-		--htmldir=${EPREFIX}/usr/share/doc/${PF}/html \
 		--docdir=${EPREFIX}/usr/share/doc/${PF} \
 		--enable-shared \
 		$(use_enable static-libs static) \
@@ -83,3 +81,8 @@ src_install() {
 
 	multilib-minimal_src_install
 }
+
+multilib_src_install_all() {
+	einstalldocs
+	use static-libs || find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index d68d74fb38c8..e50c0138aa9c 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,10 +2,10 @@ 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.121.3.war 74764818 BLAKE2B a738a48fa944f6b27c1c36afde46d957bfa7134fce54b6799ef4ee7bc16b68c2c8819a907e54ad90f7713dad9b1df7dc59f4e1751e9c843172f59ab2b2c9e27f SHA512 93460c7623090e55b38da8a009ade40c44943683c64fa5a0528fab3813ffc592b3419856c8b2f175b16455a21db71f6f2e509ab97d793c94e0727f3c73525c41
 DIST jenkins-bin-2.138.1.war 75714886 BLAKE2B 9008f33ee79f99e029333ec9071021bf1bfa1f6984f28f9b99bfb88c88b24466c66e3b4ad85bb847b59c54480ef935007ee0b8dae42ab2a4296ae0fbb03e2de3 SHA512 22d64e1d895b8d8b82430eaa0f760910e299751e7ba3d4d9bdf206e8644dd2536c14ee3844f5baccabdea5e0b1c30937ecc7d7747aca6d9b03d53c4be04ddbd2
-DIST jenkins-bin-2.138.war 75704621 BLAKE2B b9411bcec408eb5b17fb3d1dfbf2b82be2516be07b53b182af543a4c59504a49adbac154caa5f2e67f26268464c5e47da5d3caf7f2a19945600d9f4e31402da9 SHA512 69e0873e265de35d09af26ecc53bda012c486b4b7ad43eefea67ca819e6c38dd3a61f189a94a79a60e6fa5b3279baf3228d41691e26417aceb4db12fd36a5325
-EBUILD jenkins-bin-2.121.3.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
+DIST jenkins-bin-2.138.2.war 75728164 BLAKE2B 2f322d05f60d4fac93087cae45f5a2a31af03c386d8c3e8ca392a0897d1bb0342e2ce48f9d4d07bb18e5110966078a47f25fbfdadb857f8339ec6f0e289b8fe6 SHA512 593b08d1aa0021de1698c7c30737be45425b0b956c3a8b62b3ffebcdfaf9971bf65d16544106265a635e2d21df69b3aca38ddfa7ed6a1ebb34e7cffc24591860
+DIST jenkins-bin-2.146.war 75878664 BLAKE2B 9063d66b8113162bcb177e878f679c80201fc5ef6bff3b6b222387c4c4655739b11579fef4ffe5282f4bdae58d407f9903665acfb1743e068a5453fd944ef163 SHA512 7d3fa96a97dd701f438e582dc2840b214e78df725daaa03a4646e846ec9f57ad0544b87d84b6436b8128e0a4a55c74c8c122b8f5ba607c8885f4c23b0b9ab8b9
 EBUILD jenkins-bin-2.138.1.ebuild 1107 BLAKE2B 5d30a2af07f3aa0e3108519482f0502ac3ae4077717ad237a5d7b25265ee8fa020aef2640e9968dcc2621dd3960f846f81f30f1589a5b05d5016d3a2ffc5661f SHA512 ad530a36e69fc071a35acbd328bd3b8ebbfe2a4aecf8ec94d509f3741995a31b1635a5eaf56adda67378477d7d6fd9e01abebfdf50e815af4614bec0811bac77
-EBUILD jenkins-bin-2.138.ebuild 1100 BLAKE2B d2dcdb83fff9aa62fa385b7c9540e5d3ed3f9758fcbda8ef90818f09c6b2033b0527a7eaf2377f3aeae6d73015544640e81474aa2fa78a7cab3bb9da071d1c90 SHA512 4cf21957d3803b439f7b13b612f86ff823435f46112bd9fedf5c225db03a98309dd6361ca9da7a789bbad718de009cba4fc819c0fffae807ac70e3cbb47470b2
+EBUILD jenkins-bin-2.138.2.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
+EBUILD jenkins-bin-2.146.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild
index 3b701c29b1b9..ff91a974c718 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.121.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit user systemd
 
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild
index bd24b8ebc145..dfe46af57ae6 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.138.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit user systemd
 
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index c8b46e5788c0..da1b4d710392 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,5 +1,4 @@
-DIST kdev-php-5.2.3.tar.xz 685364 BLAKE2B 02a00a5565bbb21a00a75231168f27a78cc3c7411430fc46e1c9b796fd378417e65369ff95fdb045a52d8c9aa1207b5b425e7c63de701d0805ee92db343e3ed4 SHA512 43ac063f38ae0f7fd222415f9327b9f738e9a450daa8a1cb6a83a1abe9c4e8adcb03628d8e62d1d93bdc85548ee36123347c39b702e7b44d4513ec54f67a5692
+AUX kdevelop-php-5.2.4-tests-optional.patch 2468 BLAKE2B f30fee2d349b2512a8fb1a02d6d1380ee5b11de43e58187438f8030faad3eaac6cf56b21ef6a7e047efb1bbca0188005092404ef0efed400ff2ad23f4752f4fe SHA512 5ef6d1b86ff63177bd28e4161e4292810aa651163581022be657786391fdfe4017e0ddd1cb94ba0be104153dded411f4b182deeda243987cf5d09f167868ada0
 DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
-EBUILD kdevelop-php-5.2.3.ebuild 1062 BLAKE2B cdf8d324b3c9cdf1d8242edef0fbcc55becf96c86f5871246beaf55083e1270312535a04ec7d821d39f62205c25b0a976d0a8a1571a2e5c3b0f3ead196d3fb73 SHA512 7415d13081b485f1aba68f71ff1be86673c1c4a396c9dcbd5349707f985e54f07621cb19473f2af4c2795754fa1e843fce197623fc5593302603c9c0a94a16d3
-EBUILD kdevelop-php-5.2.4.ebuild 967 BLAKE2B 8df42002e02e3b78482b74cfd5b1061d867ae9fb85c7a7821836c752680dcd2fe8cd215d12e7bc4cf029594f1ab4dd00ff12892c00a9d34ab2ee0570f8715b49 SHA512 6312ec050c6171c420c01c49a3b3412451c0f81aa5c1d7a235212003dffe3e380d2f5630bb6ad29eee38a55929035fe6d2e7691ddbd5ca5a1f605e66d5a200c6
+EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
new file mode 100644
index 000000000000..853952f11ac5
--- /dev/null
+++ b/dev-util/kdevelop-php/files/kdevelop-php-5.2.4-tests-optional.patch
@@ -0,0 +1,76 @@
+From eb3a484c072f7cc5a319d919d54e6d843cd8c79f Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 7 Oct 2018 12:05:45 +0200
+Subject: [PATCH 1/2] Make Qt5Test optional
+
+Test Plan: Builds fine w/o Qt5Test present.
+
+Subscribers: kdevelop-devel
+
+Tags: #kdevelop
+
+Differential Revision: https://phabricator.kde.org/D16012
+---
+ CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c09ca29..c1e25d6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -21,7 +21,10 @@ include(GenerateExportHeader)
+ include(FeatureSummary)
+ 
+ set(QT_MIN_VERSION "5.5.0")
+-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets Test)
++find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Core Widgets)
++if(BUILD_TESTING)
++  find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
++endif()
+ set(KF5_DEP_VERSION "5.15.0")
+ find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+-- 
+2.19.1
+
+
+From 600c167d742da9f22f6d72f6b5d8c3919de2580b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Wed, 10 Oct 2018 01:35:19 +0200
+Subject: [PATCH 2/2] Drop unused KF5Archive
+
+---
+ CMakeLists.txt                  | 2 +-
+ completion/tests/CMakeLists.txt | 4 ----
+ 2 files changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c1e25d6..5f1070a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -26,7 +26,7 @@ if(BUILD_TESTING)
+   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
+ endif()
+ set(KF5_DEP_VERSION "5.15.0")
+-find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Archive ThreadWeaver TextEditor I18n ItemModels KCMUtils)
++find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS ThreadWeaver TextEditor I18n ItemModels KCMUtils)
+ find_package(KDevPlatform ${KDEVPLATFORM_VERSION} REQUIRED)
+ find_package(KDevelop-PG-Qt REQUIRED)
+ 
+diff --git a/completion/tests/CMakeLists.txt b/completion/tests/CMakeLists.txt
+index dbe37c1..214cc05 100644
+--- a/completion/tests/CMakeLists.txt
++++ b/completion/tests/CMakeLists.txt
+@@ -23,9 +23,5 @@ ecm_add_test(
+         Qt5::Test
+         KDev::Tests
+         KDev::Language
+-
+-        # TODO: KF5: KDevice is forcing us to have this dependency. I'm sure
+-        # we can work-around it :)
+-        KF5::Archive
+ )
+ 
+-- 
+2.19.1
+
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.ebuild
index f7fc8d608f48..ff68ee5e3fd3 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.3.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.2.4-r1.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
@@ -7,7 +7,7 @@ EGIT_BRANCH="5.2"
 KDEBASE="kdevelop"
 KDE_DOC_DIR="docs"
 KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
+KDE_TEST="true"
 KMNAME="kdev-php"
 VIRTUALX_REQUIRED="test"
 inherit kde5
@@ -18,7 +18,6 @@ IUSE=""
 [[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -42,4 +41,15 @@ DEPEND="${COMMON_DEPEND}
 	test? ( dev-util/kdevelop:5[test] )
 "
 
+PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+
+# remaining tests fail for some, bug 668530
 RESTRICT+=" test"
+
+src_test() {
+	# tests hang, bug 667922
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	kde5_src_test
+}
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
deleted file mode 100644
index bdc85574736b..000000000000
--- a/dev-util/kdevelop-php/kdevelop-php-5.2.4.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDEBASE="kdevelop"
-KDE_DOC_DIR="docs"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-KMNAME="kdev-php"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="PHP plugin for KDevelop"
-LICENSE="GPL-2 LGPL-2"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop-pg-qt:5
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	!dev-util/kdevelop-php-docs
-"
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 735c68a47f99..8ac6199099fd 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,3 @@
-DIST kdev-python-5.2.3.tar.xz 1071116 BLAKE2B 5d271c98d3d516a2fa9dda8995b4f3215dee5803417d95bab1c811a73c18becce779d0d3185584eb2116b1152ce3020a3704d7b71bc801712c35154531447ab6 SHA512 fd869ec93d544f2c16883bf95fb694fe75582dec3bb55d661de3f5fe9dc2d692439ef9cae9039bffb0e1a85d645eef228da869694110323b3ba56d78df2def61
 DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
-EBUILD kdevelop-python-5.2.3.ebuild 1168 BLAKE2B e6e88767249fd607486ad0bf766caa1305a352c21a5f7c8feea95c2ee017c943c9f316f1c5084fd0c7924ac6d1d523dfc3ec2f198768ac005b218f22d5f0123d SHA512 083555b74b7af5d028a7b690d30a46c202f19125a0a5a519d5237a406c06bfdea76bb28e8e80bb56499f3442fa87da4e078ff22c0595b2b372cc788792aa6a8c
-EBUILD kdevelop-python-5.2.4.ebuild 1170 BLAKE2B b3d26171ff01de428c3bc5f0f805a6e5c83ad02beb368756af08b733dd1f3d226f353e70469ba9f1726bd21ce50cf587c0df66dd362d226c2ba4a15972fb123d SHA512 5ed32d3f49b61ed7812dbba36d519d7c102c6c823dcc36dd623ef60ff8fdce0c938fa03008c3ec7711b478f3c865c818a7a463f52f5e824cc30208913a540584
+EBUILD kdevelop-python-5.2.4.ebuild 1165 BLAKE2B a66030af8d7e71e5cf494e88cb1d1f2d5b843ee7a0e1ce21243e528a9b6daf67dec0033dfb843061133846dae3b25db39149833cce52ff8250c225c9412f98e5 SHA512 7d4113a3e68919132ca8847a9b49cd41379d3d81da5010ba29dea68e1ef7269a25850555b2328dd03b198c1f26c6c9ebf4a8687b20cd8d99eadb64ac10fa116f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
deleted file mode 100644
index ba7fd2bc14f1..000000000000
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_TEST="forceoptional"
-KDEBASE="kdevelop"
-KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6} )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Python plugin for KDevelop"
-IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep threadweaver)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-	dev-util/kdevelop:5
-"
-RDEPEND="${DEPEND}
-	dev-python/pycodestyle[${PYTHON_USEDEP}]
-"
-
-RESTRICT+=" test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null || die
-	emake parser
-	popd > /dev/null || die
-
-	kde5_src_compile
-}
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
index f62599c11d97..f760c0a47170 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.2.4.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.2.4.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
@@ -12,7 +12,7 @@ inherit kde5 python-single-r1
 
 DESCRIPTION="Python plugin for KDevelop"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index eb39580124ea..7585280f7bd6 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,5 +1,3 @@
-DIST kdevelop-5.2.3.tar.xz 6643364 BLAKE2B a08d5cc786a603b3e23d1d9bf9d362a35f2280436072df239ff6becbd9f0ecc370b35a8e95d3443475218eb5a27e044d76f3d34cd41f082fc65650ce05c499f7 SHA512 5a7f514f24725ab1dbb33d63fd365159c3a8831c400aeef4f1e463acc60d81e9db1a23d320b5be215597884fbf0cc6ec8aed4f69e1fd60f68328b5a052b39c3d
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
-EBUILD kdevelop-5.2.3.ebuild 3882 BLAKE2B dbf9df8aecef1077e2d9e5c6f466e5313da26cbc76e69f958a7d5f555ae4086f8e9c9c850fd9a124e24a70f52223e3e0e3232c56f2be30fed422786139bf35a3 SHA512 88b0714d803633c796cc643d2731a90e45b9065cd0ac57813c6a31c298a4580141ca33dbd491ba2f4b604ffc2497c734a6ab87b92fd3856c4ff1798aa4156b20
-EBUILD kdevelop-5.2.4.ebuild 3699 BLAKE2B 9d899cad0e65c6ec2becb727f2edcbcaa53021c33491f21a71f0829d356166e8fb2fc71cd65228642fe5041b8ae6fc6d5ec7adddc0cfffa9cf16d658af4e0c63 SHA512 43281a4d9b0a25e12d0316e330c8af8b946dc31cac7302664dc1fb0bae3832a4a08e50e9780f3d17950c38536aafcd7c6894b45ca26a98761818f69293e13785
-MISC metadata.xml 794 BLAKE2B 5436f574309cfb4c014322f1d4c37edd68a6a7e77bfe5ea81e189f1440c4cced6310e01bc65923bb144d62d32349b2f862af18b307b621e347b3a076dc8a8862 SHA512 fdc3da939f866f065c7811ea70ac8a005a01455bd60db64f5f3107276de49d2d5e28c60650ad530636fb5e4a51a3acd69ef30ea5f1c895e9ddf410b5eb287f6a
+EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
+MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.2.3.ebuild b/dev-util/kdevelop/kdevelop-5.2.3.ebuild
deleted file mode 100644
index 0fbf50234984..000000000000
--- a/dev-util/kdevelop/kdevelop-5.2.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.2"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit +welcomepage"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
-
-REQUIRED_USE="test? ( welcomepage )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( kde-frameworks/purpose )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-	welcomepage? ( $(add_qt_dep qtdeclarative 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	cvs? ( dev-vcs/cvs )
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop:4
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-	!<kde-apps/kapptemplate-16.04.0
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_cvs=$(usex cvs)
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-		$(cmake-utils_use_find_package welcomepage Qt5QuickWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.2.4.ebuild b/dev-util/kdevelop/kdevelop-5.2.4.ebuild
index f07d8b229fdc..f1dff60ee6b6 100644
--- a/dev-util/kdevelop/kdevelop-5.2.4.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.4.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
@@ -13,7 +13,7 @@ inherit kde5
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
 LICENSE="GPL-2 LGPL-2"
 IUSE="cvs +gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="amd64 x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
diff --git a/dev-util/kdevelop/metadata.xml b/dev-util/kdevelop/metadata.xml
index 9b8c92eb6da3..b3d54d197519 100644
--- a/dev-util/kdevelop/metadata.xml
+++ b/dev-util/kdevelop/metadata.xml
@@ -11,6 +11,5 @@
 		<flag name="qmake">Enable support for QMake build system</flag>
 		<flag name="reviewboard">Enable reviewboard support</flag>
 		<flag name="webkit">Enable deprecated <pkg>dev-qt/qtwebkit</pkg> instead of <pkg>dev-qt/qtwebengine</pkg> for integrated documentation</flag>
-		<flag name="welcomepage">Enable welcome page, requires <pkg>dev-qt/qtdeclarative</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/kyua/Manifest b/dev-util/kyua/Manifest
index 11b4da7d5ed3..890f1cf64baa 100644
--- a/dev-util/kyua/Manifest
+++ b/dev-util/kyua/Manifest
@@ -1,3 +1,3 @@
 DIST kyua-0.13.tar.gz 663776 BLAKE2B 5bb6b2a7723567395baeace0b70085a631856ac98ddb304bb5300f26bc89a1a1add589486cd08f1569ca9c7534fd5071a62cdcbb519a10d59221df63c0aef932 SHA512 80ecf4fd888d4759122f3c1d1d5b06a19135e06f7bca1ef8458c7a5e78c1b6baff54969c863c93f11c40611ca256fc0334402531397b16788fb3ec701dd278ae
-EBUILD kyua-0.13-r2.ebuild 611 BLAKE2B 4bb3dfc83b81b806a466a551ebebcb2e58471cfe81d1091273271f616feca6424ea7bb3426cc3dbe9fcef790f6e41ac5f24292b21860d54045d37ad2e7533c28 SHA512 45c8f2555acf066585d47b06298d8a9d41f6986cf2246df189c38e037dc94270ac5774bb8cb3f7505637727dac7b6d948b1997937e78b0fefbb724d928572417
+EBUILD kyua-0.13-r2.ebuild 613 BLAKE2B a08e469ae71dd4279c8dd064554699e10a0a2fc80aa2fe5ec38261d48ea41c9746b508495ac228c815d281f5c55c83c8a5ce9540611c738b91d95382890ef1c4 SHA512 1cd1b14b308f05d6b203f2c93412b33587ea31c2d58c8ccc8af8283ea7be8e97e66bc255aa3af8027275cd34cf77dc2810c983430405e2259a8c9d9366a46043
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/dev-util/kyua/kyua-0.13-r2.ebuild b/dev-util/kyua/kyua-0.13-r2.ebuild
index ef98722f052e..a7d31b7d8c33 100644
--- a/dev-util/kyua/kyua-0.13-r2.ebuild
+++ b/dev-util/kyua/kyua-0.13-r2.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/jmmv/kyua/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="test"
 
 # Tests fail
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 4758bd88beb4..8694d56150db 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 1297 BLAKE2B 3f07e0ff5ee87cb5bf66effc24bd5d1310233ccdcdf60ec4dd330526ff4dd9b1124afdd8843c194d2ac8686acbe0b5431e6e6c3535ee72714cef20958f4cd4c8 SHA512 93f733aa4ddd4cfb5ce00625a9e126ca13c77c9478562d2b6ae49e2167088506afb3bcb3c868f11bb563e77cb196fb1a6f8d20bc4bddb542157ccc5c8680f7c8
+EBUILD ltrace-0.7.3_p4.ebuild 1295 BLAKE2B 68a97e29102da127b6d15fc9b874ba7996dd360699940f66c808878828c255096fba76d49039a00c6ad6a04da1cb766f83e1ab3b358b51f90c5baef0e1625f99 SHA512 9c720324609d28a4331c8b2b8d88e40cd7fee99870605843bad475959691058d27953c6b072c931ce12ad05413c96f02183af7034880d3614c6a2eb1cae976f2
 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 158e5871be76..0b12f5bc4cd4 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-ust/Manifest b/dev-util/lttng-ust/Manifest
index db25520fa0d5..b39cdb5cd7b1 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,5 +7,5 @@ EBUILD lttng-ust-2.10.1.ebuild 688 BLAKE2B 381ee0fcee4f34f43ec83c472d864d8ce182a
 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 660 BLAKE2B 1e23aacfd12926352eede5fcfc3dc3f1b0f4629671f5153159306ec6f08f9fc5be7b82df946e43660d2826f51013f0a97753b58853c18f112549839984ea611d SHA512 6fc29c3ffacb7783b09919607611a86a73a9fe6033f051befe2390b8aeea6e6f0f4ee33a2afc2f32a419245e02960794285176110e7f90bb8814aa97405e4614
+EBUILD lttng-ust-2.8.1.ebuild 667 BLAKE2B 4343a3356cbacd2a6535f92c8aeedf6f7483cfa3626e3e317e3f1162e01f0921d10f3a5e7da93ab8d6d33d99f47b6ec641873f8710ff9b385c46e8badb5e541e SHA512 6cde2eac5aaba4d03e7b26125485614cb4fc85e65d75696f2729045215d4e46d85f8fbd4523fefc70ca75c6deb0ea4987e6814317f4798f136e3c2ea27b073ce
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
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 162cd0f3a50b..243c57dca7f7 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~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"
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index 79b32a72b8c3..d29527394589 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,3 @@
-DIST lxqt-build-tools-0.2.0.tar.xz 15552 BLAKE2B 558e1c9f43e09e51a720460592309f3f52fb7832a121ae40c8d9945ed135d6220190182a6d2311bfb9e9971f68a60f0ab7d5dcf2055301fa683dfc483170b3c6 SHA512 40349710a20d3f06761c57b5d40aa05cb194fa4b50d1e41e4bd7e6adf1beb5c7209f3d4965869a301369df17ec1d75f55aede7ab0fe88a55d692cd56d72121de
 DIST lxqt-build-tools-0.5.0.tar.xz 23392 BLAKE2B 1f28ae093af772ed2b6f75a7933b76a2c608171bf15e0c8483477d7f3b702dec79f41af70bb38863c3b17ff9d52a8f2acabd4ed2347bb7f421d2074b8767e96c SHA512 6802f3d5e3d622b136cf312ad929353aac1f42355c00ac9e3fb7a9d46c63dba1f87a0a4fd11185289c4e7222d5b0d30b8829dacd38c88de45901ff0559639e90
-EBUILD lxqt-build-tools-0.2.0.ebuild 503 BLAKE2B ce32303742984b29eca6a481df6f1a04e459c73661a6f7432404b5dff43fa83619dd2042ad690b03b333a2731e27e909e3d21c6668983e380d75f0ba4ae7ab30 SHA512 3d19db5002e4c194d0802226b617aee5901580286b298075fd563d9d38c76e83e9364900d8c82e6112939b1f8ea81efb2e050a2758f0b5935a862664311cd3d3
-EBUILD lxqt-build-tools-0.5.0.ebuild 508 BLAKE2B a1dda5bf87ffdeec4218646bc379483205aa5d471bf4c493079ee292297b38253cbdbf0bfae2703cc508a037c62e84e73edcc8d51083901c413887ffb450fb57 SHA512 3149c16f1b24e610e8223c5bc25480dd82ab222ba3ff06d856fbf0feb7b40eae95c55e0e9e27962e2e28477f2ca5eef8f3e0a6c717b8757bb7f1f923881677ee
+EBUILD lxqt-build-tools-0.5.0.ebuild 503 BLAKE2B 79a8b9b8f017d64574c9b27ea37bc5d996bc7a3e9bfffce322fe63bc85690e013664dbeaf79ff2371b060f88c1bf2bb84ca2597fbf93b56b03daed8891453db2 SHA512 d95996271fa9f93b4efe8ffb16498c5431d8d83909ff271fe5783c393fe3506c89bceb997aae0f912ad325d84dcd34f53ff36c569b66dbb22ed8d7e46fc4cc3b
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild
deleted file mode 100644
index a28ed1dceef5..000000000000
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="LXQt Build tools"
-HOMEPAGE="https://lxqt.org/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/lxde/${PN}.git"
-else
-	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-
-DEPEND="dev-qt/qtcore:5"
-
-src_configure() {
-	cmake-utils_src_configure
-}
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
index 97c50c2b4af0..d315bf468a78 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.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
@@ -12,7 +12,7 @@ if [[ ${PV} = *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
 else
 	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="BSD"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index cd879f0785ff..e73ef706a785 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -4,8 +4,10 @@ AUX test-llvm.patch 872 BLAKE2B f67b6f266a86a4fe72d8a6c39b2b4df07a5f13404f01e8da
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
 DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
 DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b
+DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-0.48.0-r2.ebuild 1196 BLAKE2B 1e36c78920fa7897f72e497dc68c76e127cffc0d5491fc4ff7a23aa6c1e2a67543683ef753ea1b55957b526ac7c206e64c8f4abd83fc32993573d3cf280e8473 SHA512 f7a6f2ceb491a429a2d03e814bc746c318c766aca488a578bb2424999e56c4f5b9b1afa4734af6f88868eb7863c69a3b5f34a6c9535bc6a1772968aa6be23151
-EBUILD meson-9999.ebuild 1124 BLAKE2B 38282459eddadc22bf10e3ba29373f06003b72930f60d74546aba436c164cdb26394f450b3fa85ec972465e2c171682d7cc2b0cf436ff7249bed50c20e9b82fa SHA512 80a17e57a3547bcf5e2f90ca20924d56beb825c57daf5a180196301bd11d1437439742f720bef8e4325f2517bdad8accc862f7b5fe362629b822281c6179ba0c
+EBUILD meson-0.48.1.ebuild 1130 BLAKE2B 9046928f6f8a61db1b953e68e98335404faa62db738837082a52c063a3d44aff506979062a4695329044028b538374f8c5405bb4789125c5405098539bd0c1b2 SHA512 091bd3265a8444aa24e28dbd0fa43fe96869ba79f4394c6ea7d3b21b6c34c575d409b709f6c608fff208c60ca59bcf9d71ff3dfa2ca32f2a9d62342a8aa828d3
+EBUILD meson-9999.ebuild 1080 BLAKE2B 5348a19505f572d16e6e1650591631efc4ec4ec19040e9cf462e4466d188a6c374f110d7985ae70dc9d313f5261e880816a8ca347a475e9ade130935dd785ff4 SHA512 c3832e217c487ae1e2196d17a009a1602c3b0aa9b216ae0f72d0532d4ca172af5149305371c1940a575398e136ac130e0b9be71b57c19d40363d97f1a62d38c5
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.48.1.ebuild b/dev-util/meson/meson-0.48.1.ebuild
new file mode 100644
index 000000000000..3b76628728cb
--- /dev/null
+++ b/dev-util/meson/meson-0.48.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/0.48.0-multilib.patch
+)
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 0d5b9b4711c3..9e0fbd73864a 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -24,10 +24,6 @@ IUSE=""
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=""
 
-PATCHES=(
-	"${FILESDIR}"/test-llvm.patch
-)
-
 python_test() {
 	(
 		# test_meson_installed
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 9747e3627f01..fdf1858cb3a8 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,9 +1,11 @@
 AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2bb2d19b5a588d566522e4829896c0f3862fd396d23f731da186e7a9ad369af00a0dbcb7c8b2e3cfbbeb SHA512 180c3390001a6bb49deef4f459d42fd7141a5cf68a7077cfe3b5b1384f7b40911f9e4d871ffce07f51b347deb2c2568c266c5a5d1d113010090cd4f65eebeb6e
 DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
-DIST ninja-1.8.2-fortran.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
+DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
+DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 EBUILD ninja-1.7.2.ebuild 2667 BLAKE2B c0bceb36d03edc78a846331ff9923d2ed6243b807db4a6af66892e25744cf2b09ae3479263b1b71891901a4a82500838600e0f9f72d6a6f6b02a276709d76303 SHA512 579c59e32df4104703b3bc703af7fa44fc8f800c874d2b817dcba646ecc461be5d94576efd6e2979f21e5778e5b2112c75963cf879b7f37180cee0613f1cf224
-EBUILD ninja-1.8.2-r1.ebuild 2731 BLAKE2B b4197d9c861712b1481da846bf949153071b8b5e136f6f2be60066fb0c08c90203faec1db2347704891ea9ac9a5a6d0fb74fd23ee220280c1980f4055e6f886c SHA512 822a0e3feefef7ef77ca471aeca77faa13b165da21bf1175c8329c0104361b36d062f151754c245aa4a565eeeadf858bd8371a133e0fc6eea3743e3bed99c85a
+EBUILD ninja-1.8.2-r1.ebuild 2776 BLAKE2B 439148c196cb3c673b7bbff703de4174d672f462e1f0b7de46c71efbed40554a7e4cb868352a4c2d6fe033b7a916d4978deda47eba3551faf45460996e4798a3 SHA512 3a63f2600977a2a71939f9163c0d54ffc202510d124239aad2642894febae848648aa96d7de0845406b30a3b9c07e2d73ca7dae32317a0d7379bb3e6c1a78580
+EBUILD ninja-1.8.2-r2.ebuild 2776 BLAKE2B 7ddde720c230e5c04a6f1c054cc98d406f4169935fbdd25beb417ecee2000cae3684b6b6fac47ca05411d54dc76d254b6210a1d178bb7faa05e4bae7485a8e6c SHA512 4422d2fcac6143f37d5ef66da08d22c3b345fa727a36cb832b00116ce3a91490a50bcd29191b12085b1c6fa9711505e9c408d9073b30ba86974b4eba3baaf038
 EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
 EBUILD ninja-9999.ebuild 2647 BLAKE2B 578d7226bb914c14ee269d249cfd72432f55190c7f31c260182c0fbafd408d5df2f639a24f84b75e3527747945412597b3d675c7191e7085519dd90461c09ff6 SHA512 9e11adf000ea2d8adca7387117a280d803b43cded0437a2056bba1ff61b8aae2580164f2cbe85d391eee1a8acf8ab697a70d888aa5435d586695d1c60f9439fd
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index caa2bb8e6460..84c7f67ce665 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -1,17 +1,20 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
-inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs vcs-snapshot
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
-	SRC_URI="https://github.com/Kitware/${PN}/archive/v${PV}.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz -> ${P}-fortran.tar.gz"
+	KITWARE_VERSION="1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
@@ -44,8 +47,6 @@ RDEPEND="
 	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
-S="${WORKDIR}/${P}-fortran"
-
 run_for_build() {
 	if tc-is-cross-compiler; then
 		local -x AR=$(tc-getBUILD_AR)
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
new file mode 100644
index 000000000000..18d8f1000a72
--- /dev/null
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
+else
+	KITWARE_VERSION="1.8.2.g81279.kitware.dyndep-1.jobserver-1"
+	MY_P="ninja-${KITWARE_VERSION}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://github.com/Kitware/ninja/archive/v${KITWARE_VERSION}.tar.gz -> ${MY_P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DESCRIPTION="A small build system similar to make"
+HOMEPAGE="https://ninja-build.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+
+IUSE="doc emacs test vim-syntax zsh-completion"
+
+DEPEND="
+	${PYTHON_DEPS}
+	dev-util/re2c
+	doc? (
+		app-text/asciidoc
+		app-doc/doxygen
+		dev-libs/libxslt
+	)
+	test? ( dev-cpp/gtest )
+"
+RDEPEND="
+	emacs? ( virtual/emacs )
+	vim-syntax? (
+		|| (
+			app-editors/vim
+			app-editors/gvim
+		)
+	)
+	zsh-completion? ( app-shells/zsh )
+	!<net-irc/ninja-1.5.9_pre14-r1" #436804
+
+run_for_build() {
+	if tc-is-cross-compiler; then
+		local -x AR=$(tc-getBUILD_AR)
+		local -x CXX=$(tc-getBUILD_CXX)
+		local -x CFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	"$@"
+}
+
+src_compile() {
+	tc-export AR CXX
+
+	# configure.py uses CFLAGS instead of CXXFLAGS
+	export CFLAGS=${CXXFLAGS}
+
+	run_for_build "${PYTHON}" configure.py --bootstrap --verbose || die
+
+	if tc-is-cross-compiler; then
+		mv ninja ninja-build || die
+		"${PYTHON}" configure.py || die
+		./ninja-build -v ninja || die
+	else
+		ln ninja ninja-build || die
+	fi
+
+	if use doc; then
+		./ninja-build -v doxygen manual || die
+	fi
+
+	if use emacs; then
+		elisp-compile misc/ninja-mode.el || die
+	fi
+}
+
+src_test() {
+	if ! tc-is-cross-compiler; then
+		# Bug 485772
+		ulimit -n 2048
+		./ninja-build -v ninja_test || die
+		./ninja_test || die
+	fi
+}
+
+src_install() {
+	dodoc README HACKING.md
+	if use doc; then
+		docinto html
+		dodoc -r doc/doxygen/html/.
+		dodoc doc/manual.html
+	fi
+	dobin ninja
+
+	newbashcomp misc/bash-completion "${PN}"
+
+	if use vim-syntax; then
+		insinto /usr/share/vim/vimfiles/syntax/
+		doins misc/"${PN}".vim
+
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		insinto /usr/share/vim/vimfiles/ftdetect
+		doins "${T}/${PN}.vim"
+	fi
+
+	if use zsh-completion; then
+		insinto /usr/share/zsh/site-functions
+		newins misc/zsh-completion _ninja
+	fi
+
+	if use emacs; then
+		cd misc || die
+		elisp-install ${PN} ninja-mode.el* || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index 5375956f9d50..9c08e326051f 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -16,6 +16,7 @@ EBUILD perf-3.12.ebuild 5006 BLAKE2B 7eb7939628a49ca9dadf7c4a223184b5e4da478fef6
 EBUILD perf-3.13.1-r1.ebuild 5128 BLAKE2B e34cc28ba57866db83fcf9ab639e95306582c66fd7ce427543b19528d72fa78757721efc0ac1b23c6435973766fa4619e5f6448bfb21a6c50cc01cca2a2c3859 SHA512 f7ce04b5f4a4db657dfeb6b59d70c15cfb012ce661a62620773607ee93d5becfea56912dd9fae88db47a9f42ade6ce0ed0d0ba67a3fc37b086eda0e9e87118ab
 EBUILD perf-3.15.5.ebuild 5143 BLAKE2B 694b1eaa11dde8aa29ab0ac812479869e9e45e47f02cf9201e78a5d6bcb4c18d645ae4bc8e584237ab738a1739f971a2ae62faf950d8bbe9845f02ad878aab84 SHA512 9a56717e87b9bf6bfa27f3d953e41af18c55e92020fbcc14fd01f43835e542bf1c7adb195387400c955706f5ca8a69090e41d6edfb728717910cd19b801d6dfc
 EBUILD perf-4.1.5-r1.ebuild 5269 BLAKE2B 859aff4b3f86bb85187c7a0a7a85cd423ec8ceed0a2c9bba55c711b466216017ed796b976a1b16a03c8aae7292f31b8329e37ee55810c868caa246aa39c38d17 SHA512 1aa7d9fad71cbaf1a28976cfe7dbf74d7e04b4a00f81e5d7e0b96cced0a051bcf9846122caa66bb1466790ef5b7dcea71a1b291b2300056b1846ce4e5531b165
+EBUILD perf-4.14.33-r1.ebuild 5004 BLAKE2B e6083a996ea2d925b498a229d6e1da8ebd781cd032ae13abaf88692f7dd5672412887a658c5324580f0c7eca55c2045bb67aa639c31f04e4663521704c5764b5 SHA512 61cc606b45c4f2a839dfda8e02881885a45c659cdab0ceb3a30b433dfee4180b94b267ce1ba9218559cea862a9890067956dc84e00269b9bca3ed617e6490a8c
 EBUILD perf-4.14.33.ebuild 4957 BLAKE2B 178c3e4dee18e132719f42cf83a209ac866dde793d69a3df3fd1a20585974dbc5a538d3d4dc5638fb20ff19ffae7eaf5a84d44b0b7f9b90ddf50a6794a57e71f SHA512 1c2346b9fd9c507185556e984b4976c55727290717d982b0fd2258e5d2d8dee015a62773de672afc9b7283afcec3820a20244911f44b5496c4bf53f78f34f695
 EBUILD perf-4.4.4.ebuild 5040 BLAKE2B fd6ff983115568989077d1d626b29121b452a11552d982b85a992cb6016b41e7beb7750008c8b87833f6dded0f6f2281275bffe7ad9c61dc773ec69a6f7fa33f SHA512 f39e5397d269f879dbaa62b4cfacebba27dd2f26feb17d70b5b4f60fcf256438c2920df340c27abb45f24404b21ace1c5bab982c7e4a93c2befa382762e76967
 EBUILD perf-4.9.13.ebuild 4925 BLAKE2B 919acbb8b5bc86a8cc0de41f963e87a85f16d7ba3fee026adab0c29ac5a46c8846fd102592576f0efdebb379080bf1580babfb0bc23729ea386ae3cc7ba3d634 SHA512 750501145fd525bf5e973edb7f4645cf0cd94c3449ae859ffcc33896e8963db8e573248893441de971248af2842fa18df9222704b5b92880a356e8656776a597
diff --git a/dev-util/perf/perf-4.14.33-r1.ebuild b/dev-util/perf/perf-4.14.33-r1.ebuild
new file mode 100644
index 000000000000..6eb3fa30238f
--- /dev/null
+++ b/dev-util/perf/perf-4.14.33-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit bash-completion-r1 eutils toolchain-funcs python-single-r1 linux-info
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-pre/-git}"
+
+DESCRIPTION="Userland tools for Linux Performance Counters"
+HOMEPAGE="https://perf.wiki.kernel.org/"
+
+LINUX_V="${PV:0:1}.x"
+if [[ ${PV} == *_rc* ]] ; then
+	LINUX_VER=$(ver_cut 1-2).$(($(ver_cut 3)-1))
+	PATCH_VERSION=$(ver_cut 1-3)
+	LINUX_PATCH=patch-${PV//_/-}.xz
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/testing/${LINUX_PATCH}
+		mirror://kernel/linux/kernel/v${LINUX_V}/testing/v${PATCH_VERSION}/${LINUX_PATCH}"
+elif [[ ${PV} == *.*.* ]] ; then
+	# stable-release series
+	LINUX_VER=$(ver_cut 1-2)
+	LINUX_PATCH=patch-${PV}.xz
+	SRC_URI="mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_PATCH}"
+else
+	LINUX_VER=${PV}
+	SRC_URI=""
+fi
+
+LINUX_SOURCES="linux-${LINUX_VER}.tar.xz"
+SRC_URI+=" mirror://kernel/linux/kernel/v${LINUX_V}/${LINUX_SOURCES}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="audit debug +demangle +doc gtk numa perl python slang unwind"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="audit? ( sys-process/audit )
+	demangle? ( sys-libs/binutils-libs:= )
+	gtk? ( x11-libs/gtk+:2 )
+	numa? ( sys-process/numactl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	slang? ( dev-libs/newt )
+	unwind? ( sys-libs/libunwind )
+	dev-libs/elfutils"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-4.9
+	${LINUX_PATCH+dev-util/patchutils}
+	sys-devel/bison
+	sys-devel/flex
+	doc? (
+		app-text/asciidoc
+		app-text/sgml-common
+		app-text/xmlto
+		sys-process/time
+	)"
+
+S_K="${WORKDIR}/linux-${LINUX_VER}"
+S="${S_K}/tools/perf"
+
+CONFIG_CHECK="~PERF_EVENTS ~KALLSYMS"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	local paths=(
+		tools/arch tools/build tools/include tools/lib tools/perf tools/scripts
+		include lib "arch/*/lib"
+	)
+
+	# We expect the tar implementation to support the -j option (both
+	# GNU tar and libarchive's tar support that).
+	echo ">>> Unpacking ${LINUX_SOURCES} (${paths[*]}) to ${PWD}"
+	tar --wildcards -xpf "${DISTDIR}"/${LINUX_SOURCES} \
+		"${paths[@]/#/linux-${LINUX_VER}/}" || die
+
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		eshopts_push -o noglob
+		ebegin "Filtering partial source patch"
+		filterdiff -p1 ${paths[@]/#/-i } -z "${DISTDIR}"/${LINUX_PATCH} \
+			> ${P}.patch || die
+		eend $? || die "filterdiff failed"
+		eshopts_pop
+	fi
+
+	local a
+	for a in ${A}; do
+		[[ ${a} == ${LINUX_SOURCES} ]] && continue
+		[[ ${a} == ${LINUX_PATCH} ]] && continue
+		unpack ${a}
+	done
+}
+
+src_prepare() {
+	default
+	if [[ -n ${LINUX_PATCH} ]] ; then
+		cd "${S_K}"
+		eapply "${WORKDIR}"/${P}.patch
+	fi
+
+	# Drop some upstream too-developer-oriented flags and fix the
+	# Makefile in general
+	sed -i \
+		-e "s:\$(sysconfdir_SQ)/bash_completion.d:$(get_bashcompdir):" \
+		"${S}"/Makefile.perf || die
+	# A few places still use -Werror w/out $(WERROR) protection.
+	sed -i -e 's:-Werror::' \
+		"${S}"/Makefile.perf "${S_K}"/tools/lib/bpf/Makefile || die
+
+	# Avoid the call to make kernelversion
+	echo "#define PERF_VERSION \"${MY_PV}\"" > PERF-VERSION-FILE
+
+	# The code likes to compile local assembly files which lack ELF markings.
+	find -name '*.S' -exec sed -i '$a.section .note.GNU-stack,"",%progbits' {} +
+}
+
+puse() { usex $1 "" no; }
+perf_make() {
+	# The arch parsing is a bit funky.  The perf tools package is integrated
+	# into the kernel, so it wants an ARCH that looks like the kernel arch,
+	# but it also wants to know about the split value -- i386/x86_64 vs just
+	# x86.  We can get that by telling the func to use an older linux version.
+	# It's kind of a hack, but not that bad ...
+
+	# LIBDIR sets a search path of perf-gtk.so. Bug 515954
+
+	local arch=$(tc-arch-kernel)
+	emake V=1 \
+		CC="$(tc-getCC)" AR="$(tc-getAR)" LD="$(tc-getLD)" \
+		prefix="${EPREFIX}/usr" bindir_relative="bin" \
+		EXTRA_CFLAGS="${CFLAGS}" \
+		ARCH="${arch}" \
+		NO_DEMANGLE=$(puse demangle) \
+		NO_GTK2=$(puse gtk) \
+		NO_LIBAUDIT=$(puse audit) \
+		NO_LIBPERL=$(puse perl) \
+		NO_LIBPYTHON=$(puse python) \
+		NO_LIBUNWIND=$(puse unwind) \
+		NO_NEWT=$(puse slang) \
+		NO_LIBNUMA=$(puse numa) \
+		WERROR=0 \
+		LIBDIR="/usr/libexec/perf-core" \
+		"$@"
+}
+
+src_compile() {
+	perf_make -f Makefile.perf
+	use doc && perf_make -C Documentation
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	perf_make -f Makefile.perf install DESTDIR="${D}"
+
+	if use gtk; then
+		mv "${D}"/usr/$(get_libdir)/libperf-gtk.so \
+			"${D}"/usr/libexec/perf-core || die
+	fi
+
+	dodoc CREDITS
+
+	dodoc *txt Documentation/*.txt
+	if use doc ; then
+		HTML_DOCS="Documentation/*.html" einstalldocs
+		doman Documentation/*.1
+	fi
+}
+
+pkg_postinst() {
+	if ! use doc ; then
+		elog "Without the doc USE flag you won't get any documentation nor man pages."
+		elog "And without man pages, you won't get any --help output for perf and its"
+		elog "sub-tools."
+	fi
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index c2779d5b5add..46bfb6330d82 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -3,10 +3,10 @@ DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5
 DIST pkgconf-1.3.90.tar.xz 285036 BLAKE2B e56e3ea3a6552ff190f239bf4d8d7e3d63c0ecc6a771d0a7c33aeacf6da61190abfed1ac2268d28d64efc298bc4b2b3f032eeaf8b2be628bef1d12de4b1aec36 SHA512 8efca947546969fea63e97f23eb1b5af49a1f2378eec66ff4f403fa218bcb3d5fed62a32fd6be70d9ebf39c8024bb9714cd0c2a52e6960c98021cabefc274530
 DIST pkgconf-1.4.2.tar.xz 285548 BLAKE2B ad48bac309e90f2c2958ee19ebbf95ec90c55ebd98a44486f47cc403b8c193131377433a23f16adb64bf97832ff5a0c20e0a3d01da5c6adb2b70483dcf23b9cf SHA512 d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236
 DIST pkgconf-1.5.1.tar.xz 289616 BLAKE2B 32cd7b3440635cacbc197ac6163c2d0c0a57281d060e27ba097f7845636e41160c25092f42e3d3dacacc0d9f01f6d3468ffaa2a18a82f98ce5fdc8e9f7267137 SHA512 a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a
-EBUILD pkgconf-1.3.10.ebuild 1297 BLAKE2B 033585762fe3fb08869fb9264f3ca37717da75061098cef3ab073fee9a63b8856d81a2142874081e9e419c1f07ed285ee16a5620663701fb5bfaa54dc9884068 SHA512 0e3b7a27767b6f2570947dd1cd433cafa0df4936d9925bd4b04b61602c58341073b9c9479a6241d3acbc4a3e701c048e965fae6240b8ad254efab520edaf96ff
-EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 0ab8f8e988a9d412585b6c53cbd06a6be0c71ab09a50fdceffaa2b90615c00de9864af9b8742f047d7b8a0b901844362582d90114728c8802d5a1563e1cb62f9 SHA512 60b22b469624108ba9f3aef81de7d493e7a4fa931f4579e4d909b41fde068c2ecb60283daff61133ac9d3682e326351a05551f265a651f2bfc7ce8e3a3cfd511
-EBUILD pkgconf-1.3.90.ebuild 1310 BLAKE2B d435e51265e2b908a64597396069fb29fa86b5727555db143e871b1ec2543a83565764574016d4707e28299cfdbac74e0577d0986621457e62ca512c57298a6f SHA512 ce6cacadf61a38e1e4e09bcd7a0e3cf17c2c874aec80b1f623c81b055d9e06e92880f109138b7f54cb9bad69c5bd2935cc411cc44f420b9ccdc74fe73e24c1fe
-EBUILD pkgconf-1.4.2.ebuild 1312 BLAKE2B 2caa46df26cd89577f059a03ee802473fb27834de25264217e5604771ff01fc19f37225f5b185ef1a3cc8f4089458a01939074bbd5673ed65388506971252fc2 SHA512 6953ef5f11162a8134f0f7e57840c45138b855dabf21bc8a32458374e71ecb5781fc8d3226c1b7647efe99411005c1a2be8ca839a1f575e6585d47fd07228d52
-EBUILD pkgconf-1.5.1.ebuild 1387 BLAKE2B 477fbd468d2e60da2fce7244c6a0b06843e66f4e04b48c30b799d00577af90f918c411ee9913dc21bcd2f5dbff4acdf68fa6f9fc4d1122afe9a7763d6240ca18 SHA512 5dd802be6405bd51fe2813dd529c48935481a41647b22f8e5b918fce17429cc92a56b9b8524ade824486cf7ef6f5d8b7ee4df730b87e293ed3783272d1d278c4
-EBUILD pkgconf-9999.ebuild 1387 BLAKE2B 477fbd468d2e60da2fce7244c6a0b06843e66f4e04b48c30b799d00577af90f918c411ee9913dc21bcd2f5dbff4acdf68fa6f9fc4d1122afe9a7763d6240ca18 SHA512 5dd802be6405bd51fe2813dd529c48935481a41647b22f8e5b918fce17429cc92a56b9b8524ade824486cf7ef6f5d8b7ee4df730b87e293ed3783272d1d278c4
+EBUILD pkgconf-1.3.10.ebuild 1300 BLAKE2B 1676e818f15a490f6006b24ccc3a9b943a8560d6b273ece690afb8259c76bb1fb65ef01ed9105d46ede0e62ca01a8803e86682e56a535eb8934dd71517f6abd9 SHA512 b1e869feae15b5710f1176d9885f923e8af96fd135ccca1050660af9d5aaebb90fec78dbc82cf854468856f9c1c89254a953c8fc04ed24ea7b524392449ee417
+EBUILD pkgconf-1.3.7.ebuild 1290 BLAKE2B 1b61b0efd185270da76d3be3251fcc9c735adf4d68aa7b900801268ea0558a72753ac19aa4ffc666be3dd577ff110aaa414ae349564799ea09eba53abbd003df SHA512 83835948caac96c0d9e1b0b84fbe5f12a3481b195c28e85f9babbc8803301608be0838f57d5d5079312ada5b47f520415613b36863ccc5c4d65aada059e9f1f8
+EBUILD pkgconf-1.3.90.ebuild 1313 BLAKE2B 41b8ec46f2aa403425fefa659747d7d749853439e928cee51ca5942a32daf85f5c3592b7fdd26ac18a47495ba6d618f9cdae38cd961598401c2308e0e71e8007 SHA512 ea72be69c717fedfc167fce696c1a9dbf549aa5cab4ec6c60b7641cef6ded07877d0847f941865a74ddc4a91f255424f553381203bdf0f1e2ab7242bd792c776
+EBUILD pkgconf-1.4.2.ebuild 1315 BLAKE2B 90e00841c795e7aadd1d5e6c6b064407fc8249d792df74a0433273e48c60024f9ababa9589df4c3f9b3eabd91b77e9a9400376010228aea7b580215606cc0638 SHA512 c0f77fe282688edfb8979c607da32464efb87f2154884e6bcc577b4e9c673087da65399773db06dbecf92d619bb4677dde5ce33a5ede337d1e59376b41db7018
+EBUILD pkgconf-1.5.1.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
+EBUILD pkgconf-9999.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.3.10.ebuild b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
index 8e7570f72a8c..9b9f885eb7a4 100644
--- a/dev-util/pkgconf/pkgconf-1.3.10.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit ltprune multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index 7382d049d3c8..cbfee8e34330 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
 inherit ltprune multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.3.90.ebuild b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
index 86434bc5ebfd..538e513ea99a 100644
--- a/dev-util/pkgconf/pkgconf-1.3.90.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
index e2b768e8e572..fe8a931fbf14 100644
--- a/dev-util/pkgconf/pkgconf-1.4.2.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.4.2.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
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-1.5.1.ebuild b/dev-util/pkgconf/pkgconf-1.5.1.ebuild
index 1ae23ee0c0d3..5b9170fe2f87 100644
--- a/dev-util/pkgconf/pkgconf-1.5.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.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=6
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 1ae23ee0c0d3..5b9170fe2f87 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.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
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 inherit multilib-minimal
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index c5957dc95da2..16b7167725b5 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,4 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2018.2.1.tar.gz 260758803 BLAKE2B 735d3e7483b46a9be8bf0a8fa88a51352b1048718aab00b63c133a408666e151947ded527b4ed754ce15aff17a3da9396e10b9194e61286f0ed0534d51f0eabe SHA512 bcae7f579664aa9b071eef6fedc68dad8c9e36078c258cee6877ada1247f9051c4d542657ef2b01dce087e273623b84d86d786ddf1e922d7c6599725f50428bd
+DIST pycharm-community-2018.2.4.tar.gz 260812419 BLAKE2B 2274d8af513535e4c5b3b69619c944f503dd9f2248a43cf3352221b34c40604f409038d85366321e858037e3c9c63dc838c046917c3102a2d536e4aef05c1636 SHA512 aca812b3355552c6a65865385e82c96fbca06f9caa39fd21723710922865f7aeb38de33eb041efb1e3553e161c34de6d8b8ed724d7c91ba16f3a818711ca9468
 EBUILD pycharm-community-2018.2.1.ebuild 1063 BLAKE2B 72a3afd5b6cb81cc3dfc0bdf0fd7e1c052038ae3faf5e7ffed57884040b82cd238172291fc3ea050dab92348a29ebdbbdad75de6b2e4b512eee019b5bbffd093 SHA512 4bdb36f6a983323d44defe031f738953567df7a01f775e02b943336579727808c0ab832e49aa367daa6d26b28eb30edf5a4b110addd172b4e9d898bcc93713f1
+EBUILD pycharm-community-2018.2.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
new file mode 100644
index 000000000000..c37c85ebc8eb
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 63592b367f77..73a3e6027ee9 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,9 +1,8 @@
-AUX radare2-fix-syscapstone-2.6.patch 954 BLAKE2B 9dd8ebb65f8830643a46c2302e769018ea78045eb18da7ca98adff00ebba63975b5c97eb2398d0eb33970a4102090fdee19734115170f4cbb0c4cd3863c74bbc SHA512 4412c99facdcf15bb6f3202c15e7c0a581df6eda67e5476b70f95e21540d253fdd2dd5518009c139cc7723d589f0d903a2a98f3d6ed33578b0bed2e5c2bf4242
-DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
-DIST radare2-2.7.0.tar.gz 6483865 BLAKE2B 4052a601eb154240fb57c64bf2351063685a25e7d8ca46ad721398cd98b5e8bbec6a6daccb9f2df8e222bad74a0ffb4edc72186d7ca51b69ffbf480a7eb576ba SHA512 4a40e4917967aeef34de6ea69dd3c6d07a215e1f1272221db9af92d898e2d44997e339016b3342d69a276eb99f2d0a1e640ce8e9c889fe728dd86865e917a0fd
 DIST radare2-2.8.0.tar.gz 6513419 BLAKE2B 51ee9fe82c09693e729b49e97b79a54e2b9f7de95ecf93c5e22107f68260ddc9fdee9291f200dba2770315487a85d1541abbb76281e6934d25c677a95e6882e3 SHA512 968c61eb5102125b232f9a74362fb90b0409da80b4cd4f109d11e49d02c80a5beee9e73065ef3b4a22fb8cdf43f86338fd21b648ddfa34001ed6cace47335803
-EBUILD radare2-2.6.0.ebuild 1187 BLAKE2B bc87ba5b9e174de19a2588bcd567ecfacd53cf8c3852242d9eaf23258369f4fee7484647c3753eb52b026117b596c2cd261f164d93b647bdb486bbb26955067e SHA512 c22851603eff958ad681d981631a58ca28dc3f4ed704d0c516c542d43a2d09a47509fee62055da4e864c2b5d258cda5c31368f52137fd7b3d7653ea49e8fe79d
-EBUILD radare2-2.7.0.ebuild 1128 BLAKE2B b5491982ca5801b848892d5c6d9b06cf52f1faba10aef11a4da986ff39d554af7f4bf8dbe848901050d8878460c09c239de88093ee16ce9cc0ad380bb469d3ec SHA512 941c05b0ab8db1a3fdf0752754340b2dc0c3cb48ae373c6bcb9f5f5a52407a31dc03b715b00df6895c0e181ca57f06366384d259fb79f0b745cd3e0dc26ab651
+DIST radare2-3.0.0.tar.gz 6638430 BLAKE2B d95404e0f2d86705703119d53de2e1b60f111bcd8d3b05b5d040692e9d9cc4f51fe682892514b47b55d4ff88314b577253a5f2c6ff8cacebd30fd0663c21d1ff SHA512 5ca698123ccad80c54c483f7e2cc678dabfc9c1c172670ff9e1d11512174c9ecc15e81dfdb5de846b42c951cafe23d29ceca6f3824504a2f3dac722c659bb2d4
+DIST radare2-3.0.1.tar.gz 6638512 BLAKE2B 1051e2d948bf312a5d54d03fa20a2fa6954f0ef735416e1c6e95d2042dcc6e1ec46f750d200c84dcb01395d0925ed42a4a1aa3f96b9eafad39d19ee214c91220 SHA512 755cbbf968179d987b1bd11469ef356e9e5b9968983f45a3276e0001c877d13b3b12b71a29dd954e8111c5196284c0e49f26bd79f5b5e037dd4dd27b1f73e380
 EBUILD radare2-2.8.0.ebuild 1128 BLAKE2B 7b86d678bb0af73cad89f9f08b0145516ca053ef26eecc0b74841aec9e9d293d190ad8cb98ebba6885afccc28d90b2352a8fd4a18ced82ae9cb32713506c969d SHA512 37f3f8bbb0c38251772e57e204d66b8f3ad06ae02a7c2b0931ece82a73319ca6a5eeb0b7e635bcefdb5ad2f09b65f963d4a6307ab812b88bb9a70f4d7904a1af
-EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
+EBUILD radare2-3.0.0.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+EBUILD radare2-3.0.1.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+EBUILD radare2-9999.ebuild 1192 BLAKE2B d6dc77b0fb62846880aa347fc742a8962cd9cfb93596a82bd49c912525d4f5dd4a3a0a9478de900b0c0fa0c2a547796c69b20e9ba1d77577373e4dddf4d8d0ea SHA512 b7af1fb1648b78d52e0d16b99ebba8b70ceef1372ef389e082cf8e4c275e0afc1342f80843e8cc163d3188587cddc4ffd7661769d8c37be1ba50255e62283e75
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch b/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
deleted file mode 100644
index 4eb3c053f07a..000000000000
--- a/dev-util/radare2/files/radare2-fix-syscapstone-2.6.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 3752d992f3140806ea1d513739b6f23addf52df1 Mon Sep 17 00:00:00 2001
-From: cc <longlene@gmail.com>
-Date: Tue, 22 May 2018 12:52:12 +0800
-Subject: [PATCH] fix for build with syscapstone
-
----
- libr/Makefile | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/libr/Makefile b/libr/Makefile
-index 05cb40fec7..0b39b48c02 100644
---- a/libr/Makefile
-+++ b/libr/Makefile
-@@ -84,13 +84,18 @@ E+=../shlr/bochs/lib/libbochs.${EXT_AR}
- #E+=../shlr/sdb/src/libsdb.${EXT_AR}
- #endif
- 
-+ifeq ($(USE_CAPSTONE),1)
-+E+=$(CAPSTONE_LDFLAGS)
-+else
-+E+=../shlr/capstone/libcapstone.${EXT_AR}
-+endif
-+
- libr.${EXT_SO}: .libr
- 	$(CC) -fvisibility=hidden $(MLFLAGS) -shared -dynamiclib -o libr.${EXT_SO}  \
- 		.libr/*.o \
- 		../shlr/gdb/lib/libgdbr.${EXT_AR} ../shlr/java/libr_java.${EXT_AR} \
- 		../shlr/zip/librz.${EXT_AR} \
--		../shlr/libr_shlr.${EXT_AR} $(E)\
--		../shlr/capstone/libcapstone.${EXT_AR}
-+		../shlr/libr_shlr.${EXT_AR} $(E)
- 
- else
- 
diff --git a/dev-util/radare2/radare2-2.7.0.ebuild b/dev-util/radare2/radare2-3.0.0.ebuild
index 44da1cbab237..ccba9bfa0ed9 100644
--- a/dev-util/radare2/radare2-2.7.0.ebuild
+++ b/dev-util/radare2/radare2-3.0.0.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit bash-completion-r1 eutils
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/radare/radare2"
 else
 	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -27,12 +27,12 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
+		--without-libuv \
 		--with-syscapstone \
 		$(use_with ssl openssl)
 }
diff --git a/dev-util/radare2/radare2-2.6.0.ebuild b/dev-util/radare2/radare2-3.0.1.ebuild
index 74ac2faaaf52..ccba9bfa0ed9 100644
--- a/dev-util/radare2/radare2-2.6.0.ebuild
+++ b/dev-util/radare2/radare2-3.0.1.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit bash-completion-r1 eutils
 
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/radare/radare2"
 else
 	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="GPL-2"
@@ -27,14 +27,12 @@ RDEPEND="
 		libressl? ( dev-libs/libressl:0= )
 	)
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${PN}-fix-syscapstone-2.6.patch" )
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
+		--without-libuv \
 		--with-syscapstone \
 		$(use_with ssl openssl)
 }
diff --git a/dev-util/radare2/radare2-9999.ebuild b/dev-util/radare2/radare2-9999.ebuild
index abe520e9a37a..e2ecbd2ce570 100644
--- a/dev-util/radare2/radare2-9999.ebuild
+++ b/dev-util/radare2/radare2-9999.ebuild
@@ -1,7 +1,7 @@
-# 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
 
 inherit eutils bash-completion-r1
 
@@ -27,9 +27,8 @@ RDEPEND="
 	)
 	system-capstone? ( dev-libs/capstone:0= )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
diff --git a/dev-util/re2c/Manifest b/dev-util/re2c/Manifest
index 8880d18f3f2e..f626f4880a04 100644
--- a/dev-util/re2c/Manifest
+++ b/dev-util/re2c/Manifest
@@ -10,7 +10,7 @@ EBUILD re2c-0.13.5-r1.ebuild 712 BLAKE2B 7dccc9fa372c83c421eb1ee12ceeac59765c37d
 EBUILD re2c-0.16.ebuild 754 BLAKE2B 28913bde66f2630596b289eab49f003eb727f7beb56e45cdbea3ee664b210f0df9aeeda19119d6bd6155e6488fb4dab84e120cd56038dbcf57753169c9bd7950 SHA512 a869252b8c140ead837f6c3eb2fd6b46ef199480ed2e67acf684b9bc1d5fb858e2bed875d8d6eee7b246c3f0e73fa5522a53b11983af98b374b31cc55c8d539b
 EBUILD re2c-1.0.1.ebuild 763 BLAKE2B 590b767074a8478ef7f3bd01f2c050ce868ff2b4795f2ff3762b917d45d6976ff29ebbd7da914d76e6ba56cb3e70e352f53b48ef4374743e8ec482fdba24b786 SHA512 ded3ef724bc5624a00994a80739483e7a21278bb45f7d54001e060b71d591c44cca59e7202e1af5f36ec84b39003c97f7f9161d735a8ba67925d29bdb65253a7
 EBUILD re2c-1.0.2.ebuild 769 BLAKE2B 90d97ac18d6faf57040988b9aa1f5fd50c726359012a1d3f6f16155cb29c2ea3202aad01ad7f9fdd5c0e97b9d956ef998549f1e86ce84636993825b22b48593d SHA512 2845c30b034de806ec2339ad15e9a966349006db475d614c0399988cc1f6fee866f37e6d5c671d73414c11a14c28b7e56645b8cdebf1f785f47c15c5ca225d86
-EBUILD re2c-1.0.3.ebuild 773 BLAKE2B 9aed71ffcc2750934d67d3469d6ec29ffb87798460946cc195c02cda774875b32e3e8d2f205d5a60ab324c26795f137b8bbe56899a07889f06eceab3063c6f94 SHA512 52b4730121172518d7ec0d1badf5ceae57a30c34a96b8aed6c00be821bb5bd31c59cb2212ef0e187b65e95ea57b76582e3f827020d4d9cd3c1d7fb2fc1dec588
+EBUILD re2c-1.0.3.ebuild 766 BLAKE2B 17750d3d69f2272944e09c049520998ec7fe92ec92bb793beb18514f880fd01652d88846ccb8637dca995bacbc70c01ae8862b4dac56a25b3730fb0368f6974d SHA512 c565b69bbe3302a6f9f30dbc68caba388ddbcfa4f131c5accb3fc2bbef3489b623dcbab741e449486e39974510c2e52381c4cb569fcd77efc1fe3d4f5a0e24d4
 EBUILD re2c-1.1-r1.ebuild 828 BLAKE2B 77af82ac7fe4bb64d21edb1bffea6b9709a50a6d0fbbd17ee930f2a9f224f03adf1dfc2909812f95d0bb5f981e990eef44165f672b81313ee2a9c38f30e7d12e SHA512 a8cfe105c87aa5e5e499e0f9443702bad00bc57a849a817a4b5e5cac294111dd3278deca9e4a415e73be303ad59c7c154f9dbe1e2ac2a35b4183bfea86309a58
 EBUILD re2c-1.1.1.ebuild 782 BLAKE2B b20b14e780a6bdf3f9a09d7b21f67b9d797d403d176b5b25bab866600614a7e0bccc5ce043acee34ca3db5a32f32f47240750c3c91d8c0ea1b00ef48a67affd7 SHA512 829c3ff138da03fd1867869509533a24b964add4594c6115b2df2a042825ac164a3117afff3f2b03f34fa6c10df0e4db42d07ceca52e6489598f2a009dc61bc3
 MISC metadata.xml 423 BLAKE2B 69ad12e8bd8cd2356e36736ab276efa0aadc2755f784fa4e7fe23ae4d4e7a27a06c8fcd4ee727f87847a7fdaf136d12e811a20345183d261d2b649724818f9f3 SHA512 997590e1de3136f7f87181746d9dccfd8c34a12e570d15a29a8abd4b4163bfa98405d928e932255c962d4af79e9913de563453891155590bff309d764c2b5bd9
diff --git a/dev-util/re2c/re2c-1.0.3.ebuild b/dev-util/re2c/re2c-1.0.3.ebuild
index 8eb9592cd7ac..d24154a91110 100644
--- a/dev-util/re2c/re2c-1.0.3.ebuild
+++ b/dev-util/re2c/re2c-1.0.3.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/skvadrik/re2c/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	default
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 511d7a65c4f7..8fe74c2e9830 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
 DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
-EBUILD spirv-tools-2018.4.ebuild 998 BLAKE2B 31de8c7235d648b5494b83160ce36aca43a1268f80de79dfafd8535f852db51bfb001f0b98aa879f8d747db0ac427d5e70e4193e2d7ff276d8a20054004050ff SHA512 017eee1ac06a0bd1a2e7655dc1a69ddb733007790c11b58b790f64e3b3d05459b507e7dbad6e9f0660c97bd1a6ba1bddf50e70e67afd86e610319b3c38c45226
-EBUILD spirv-tools-2018.5.ebuild 998 BLAKE2B d81e30dbc3f04a743833437f60d617343d7422b59b9ea52f652e02e9a889176508704630e84164d413c88a3d82aaaf4e7fb601f0206dcf5a5a2ddc041ee7adf5 SHA512 0b4683be044a495348b3040e7728874e14986f64278fe109f5500bb12dfbbaef03a4482ae59378346949968a9cf122ba22c72ff513e79a9bea6d51bf98d2778a
-EBUILD spirv-tools-9999.ebuild 953 BLAKE2B 25768a92be84719a8de0faedde634c1bddd263836db95eb037ac3d0683f4e8da79bb2604650e9d732e6d477a20cc5a05abff81284bc68286f933494fef8d247a SHA512 d86c4d153fb90eed2db08dcb1c86493e334b7905ac9b25a19bff434e92809269749c5e11874694ba6986f30aa941d3e1c46ff3b880972aa4178b46e1bb67b402
+EBUILD spirv-tools-2018.4.ebuild 1034 BLAKE2B 891188fa617878fd86b7847dc32cefeb69801fa89594763b212891018bd0e251fb64401fed9a4520ab82685843916f3b1f4f94017937fc1adaad4bf8bd847bc5 SHA512 78784487fe26c9a5562d8d7aff69b45e40c13b3850319b1f45b48ab84bfdb1ce90ebab3edcc112935bc3a64b63603e8505c2fc3ee7393d5541c2bc2587c51b0d
+EBUILD spirv-tools-2018.5.ebuild 1034 BLAKE2B 3270c8df1b2cab7bfda4d32d53455e707d5aaa9247f8fd985c2bcae77d3dfd27d51b07ecc984cc8440120b4ad27c98000ae6cf42e7db29ca0642485cb5df29fa SHA512 af8d8c0693873395f030d8fcf2557da979b5732bae9332d2a1ac9269110ad2e31f343ccae1976c0e9f14bdd5132997e787ee90ab36d5b7c56e3eba2ec89b5206
+EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 7eef54cb0af6249e2d86ace4ed2eb5cde0b23f46987c08b04bbf032363f3cdaeda5daf231bc3457282dcd4c3731b9a2190396de481bc492bed8427ac065d8625 SHA512 7c30383d141631e25430f6148d0bc6c816447de8c6b202279b0fb0a276621dae12c0fbfd227d83d2d2b28c33c8eb4ceb83e37fada15165cabc2b640974c5cab9
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild b/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
index 95d38ce604dd..f8f03ba31210 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.4.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.4.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
@@ -24,13 +24,14 @@ S="${WORKDIR}/SPIRV-Tools-${PV}"
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
 	)
 
 	cmake-utils_src_configure
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
 	insinto /usr/include/"${PN}"
 	doins  "${PN}-commit.h"
diff --git a/dev-util/spirv-tools/spirv-tools-2018.5.ebuild b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
index 23339df56f9a..3e991702fdfa 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.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=6
@@ -24,13 +24,14 @@ S="${WORKDIR}/SPIRV-Tools-${PV}"
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
 	)
 
 	cmake-utils_src_configure
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
 	insinto /usr/include/"${PN}"
 	doins  "${PN}-commit.h"
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 593054a38eb9..20c4b28437af 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.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
@@ -22,13 +22,14 @@ DEPEND=">=dev-util/spirv-headers-1.3.4_pre20180917"
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
+		"-DSPIRV_WERROR=OFF"
 	)
 
 	cmake-utils_src_configure
 }
 
 multilib_src_install() {
-	default
+	cmake-utils_src_install
 
 	# create a header file with the commit hash of the current revision
 	# vulkan-tools needs this to build
diff --git a/dev-util/squashdelta/Manifest b/dev-util/squashdelta/Manifest
index fbdd655fd08d..cd4645d6c5ac 100644
--- a/dev-util/squashdelta/Manifest
+++ b/dev-util/squashdelta/Manifest
@@ -1,6 +1,4 @@
 DIST squashdelta-0.1.1.tar.bz2 78504 BLAKE2B f9aa13b3af35bd97650b31fac718837763b73c2817548a3fde75841993092d717ea78826a3e29d472290d4f9164f8cfcc9f9999613f199c21251080584dbd9f7 SHA512 efe90831e412ed6627d44390054dc89339e85bcd3be452f16fb32d00989bbdc9480dbefcea624941b4866a686a356b0371c33de31903afa70af26eecbe902844
-DIST squashdelta-0.1.tar.bz2 77702 BLAKE2B c36a90e5bb0c22519fdd6229131039b881ccda82117a8180959e463debf767bc2382cc7e38645003cb23ae8e58492aaed849d1951adaedea56837900fda0025f SHA512 1ce93b59b6c51be49aaaee9576049677c8ba146fa3a17c7d3552440a1c0ebe93fb4d8cbe1182db691e2c9552713ecfeef0e50d95f7e94218c341c51364bf724f
 EBUILD squashdelta-0.1.1.ebuild 783 BLAKE2B 6905a7965dbd483b95770ee99d820dd2a813ff2502e686417d8805ea8e7227da4e52dc4f6cf6af1ae803171367b0d9570800efe440fdae183193db41a755d8d4 SHA512 0c7a13325141e16c869744174c448b4d1a8656dbb9e25f540a6397c69d5e970d400ca5fe7531ddeca8aaaade21fba952b382a16c6fd1bad8bec657da56a06e32
-EBUILD squashdelta-0.1.ebuild 816 BLAKE2B ed9e06f2b254d3907872234733ee3bd18f203efd18668c1072e44c36b571da7d83510131de61d388c4b6c1b5d58b91f6c00f62939f12d351f47b4fd52616a44a SHA512 db8727fd723ce993b06fc4c12f769b412971c9042609d48f14a6e6bfe681511652e4253bcf57c0a8a20a855edd53c0989462974ba15291a50c61f86e64ff359f
 EBUILD squashdelta-9999.ebuild 812 BLAKE2B 87a425b61222a714e4a4868d5c86ca37ef58c1840137214edb349b1fdf3b94175ee65ece4252be5af89f992b5be4675c2f6b3e92b2133e974b0fe0427bea1748 SHA512 d3551e272526a4c105623bce97879012d998fe57d2bf31d795d9051da3427a7900916f0f8b90d5a725e45fbf3e1282413c13eb32c6eb0ba2faf6ad6fcc799ee0
 MISC metadata.xml 617 BLAKE2B 1a732150f235099533beb0b3672648f3d4e501509d754bc54f1cb9093df38b2c411519417433b1b485c922844814923c2925d699881f07cb0512b5edeb5f93a8 SHA512 a08f732876cfc4455ddd980eb04cffbe73b4bd56426d420777782a93b1229277463f85c71f05699f152f2edaa4ee8e029e1e5185b5c7b47204a9e9b9ba5120a2
diff --git a/dev-util/squashdelta/squashdelta-0.1.ebuild b/dev-util/squashdelta/squashdelta-0.1.ebuild
deleted file mode 100644
index 64d107803421..000000000000
--- a/dev-util/squashdelta/squashdelta-0.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="Efficient (partially uncompressed) SquashFS binary delta tool"
-HOMEPAGE="https://github.com/mgorny/squashdelta/"
-SRC_URI="https://www.github.com/mgorny/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-# uses public-domain murmurhash3
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="lz4 +lzo"
-
-COMMON_DEPEND="
-	lz4? ( app-arch/lz4:0= )
-	lzo? ( dev-libs/lzo:2= )"
-RDEPEND="${COMMON_DEPEND}
-	dev-util/xdelta:3"
-DEPEND=${COMMON_DEPEND}
-
-# SquashDelta does not make much sense without a compression algo.
-REQUIRED_USE="|| ( lz4 lzo )"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable lz4)
-		$(use_enable lzo)
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index f5a34301aee1..a2f2d1bfb6cc 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -2,7 +2,7 @@ DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44
 DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
 DIST strace-4.24.tar.xz 1398252 BLAKE2B ca83adfb3ccd23a55976c2950ce5911203e1ad911147649127e49d815e4899b5fd72459c371c15aea701d0d30e994d0eca2b32aad240fccc4e8d1cecb3f97558 SHA512 69cbf8b2c32c7ea90ebe5955bc71b454316a3494ae6975203fe61ce1f42ec539438cec5ba8ee7f529f89661d964b4aa53656712706aacff6bf018304b7a09813
 EBUILD strace-4.20.ebuild 1927 BLAKE2B d296e1d01f08feef4712decf394dd451dd6fefdeb1bf5b4111c72e4a8c7651a119c176eb9ac0dcb65c7ecfc20ef6f434e4d50c7b44d862451a7afa9977797078 SHA512 55caeb0aee455a8925846313b768ebf7da341be986c9cbad396e469fee9939db3d813d91279eb9d62b9424da28bba9e1e39c4c06dc4f46fa984f30399e0130a4
-EBUILD strace-4.23-r1.ebuild 2256 BLAKE2B b7c7dc1cd0920968aca28cb49ea0469ca6aa368973a8085499c12a0348cbdbfaddc41d1d5ebbc8cf826510095dac0d333fbedd1bcfe8234f1d42b93118eee197 SHA512 607d0e7bd0c335f0751484ed7ed66d3a4c84c752361ec20b3b877a34c045f83eb35647513697442e29059ed3753821d2a3121214e9bfec932e7b96c207c456cd
+EBUILD strace-4.23-r1.ebuild 2250 BLAKE2B 646df74a9667e4855d3e116c96710dc5f5dbe4e183be4a7517707d1644d8bbd9f6cbb7414abd1296f7949bbb96eff265b07df8fa7184902362194b8d15e08c29 SHA512 6491184f507bfb9b39e17a30bfcba0f1677d0d9a9aebade5f70b58b94551e46bcd00ea4eeec0e90a473c0ae3dd5547c891ef4b7ea2f178900e8d701dce356765
 EBUILD strace-4.24.ebuild 2266 BLAKE2B a68da655172bba2180cc259bae15a13f535ebfa46a4050980158bbb700b6c91466b802c07a3a40ad4e426c88111ce7a3d30b59e392917bcbfde44cd96c864125 SHA512 9471fc12e8ea0ea45a82f64d99098eb6d082b9b8b5ee95c681f2e29703cc8bbd3598f37364b776714691bf86a71589ad21fa9e2b091513860d0580ac6e3c64dd
 EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.23-r1.ebuild b/dev-util/strace/strace-4.23-r1.ebuild
index acb8321fc72c..34d307fd4b9f 100644
--- a/dev-util/strace/strace-4.23-r1.ebuild
+++ b/dev-util/strace/strace-4.23-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	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 ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 6bb49f663979..709d18cd3a94 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,7 +1,3 @@
-DIST sysdig-0.23.1.tar.gz 830420 BLAKE2B 31a8c4cd8b570a308c81b4df53494cff2619d05724e509634671968025ebee0e46c5e59a7c877e6d9f1f1eba86a8a27a0cd9c5b66e75723ec8eec66c6782d4c0 SHA512 059a564a5d31381efae4bc50d2b83f83a1d051f1cfb9fa6bfb75a341305149073a6eb3b9a3ce4da12fa293e75b71f8b30c9021ac8d4c4a2f59a40e35a5ffd482
-DIST sysdig-0.24.0.tar.gz 846171 BLAKE2B fc65c6df7351e1e1f4afd168cf9eaaed8d714539822ede1ce1941ead191b0d6e9898bd1da36a78737d4662b8e47090d63978441ce01fe30f13c504a3fa09eb5c SHA512 ff8162fbd5941a7a5532e8c1d0300acdd2d7ae85044600021f12e76f3752b50c46c894ea2007d0467761927403a784b85cfc000e735004e5fdbd48c31c20071e
 DIST sysdig-0.24.1.tar.gz 846153 BLAKE2B bc64317e02526d9729c9fb3738f2982f4b425cdb43c64f77944938186cde4ed2d8d2649984efe0055bbaed250b08bda4008272805024e1d8993e17bc93509663 SHA512 a89ce82527b47104161668e134387a04f4a6753adcd881df25410b629603b58fc8f675de6941f4911ad2da42ffbfd46b38f9cc9837c0809c559fee9a739a204a
-EBUILD sysdig-0.23.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
-EBUILD sysdig-0.24.0.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
 EBUILD sysdig-0.24.1.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.23.1.ebuild b/dev-util/sysdig/sysdig-0.23.1.ebuild
deleted file mode 100644
index e366e6626308..000000000000
--- a/dev-util/sysdig/sysdig-0.23.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.24.0.ebuild b/dev-util/sysdig/sysdig-0.24.0.ebuild
deleted file mode 100644
index 3ba452c42e38..000000000000
--- a/dev-util/sysdig/sysdig-0.24.0.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index 7f701cc1e3c7..f76cebcc5289 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,4 +1,8 @@
+AUX trinity-autofs.patch 1688 BLAKE2B 99b068123ff2de6f47569c5286fd12326451be1816f8386ef82fcea97816f7d922cb7496fc8cd356878c1b89434fb033fa345c18d25368dca0f1e1c8973ea229 SHA512 4e8b8fb16d37a8de966ffdc6049743e73c978947b4cbcecd460bc548ea4dc5a2f50e326e5745d7b31c2aeebb53e46026a8504bb26a8d9c2996b375ec2891152d
+AUX trinity-irda.patch 1557 BLAKE2B 23dc97baab847ffe565af9d1b595a01dd2b4355cc265e07eb17a5718630a4b5534b00fc44d828a7186ea565714d94cc6dd49fe9f3e5033390353a25ab8e82e7a SHA512 e84f35f50dbffae42c2986e34f7b13b496d5f44ecadb2b1241682e0281356286cf88868d770fe6ac2a31f91ba2851b0f04970d595463988b44074d90c6babca3
+AUX trinity-memfd.patch 2092 BLAKE2B a29485126afbb6966969284977032bc63634afa0922206d487b1801d017bcae8990ee46f06f7cb63eaea957cb7b469f48a0a222a240efbe73f79fc8923157313 SHA512 ea9b77c5a37d53f329bb185cf6b33c6d26c27c4feead29c7c9e2999818ea5783ef92185ef9aa1676fced1dc24bbf1da9ef3a14056ee56f73baff4886da474bd9
+AUX trinity-net-protocols.patch 449 BLAKE2B ccc3f26e0c27d145a16463cb7573c79c2ebb3b6368b3fb4b63df4e053b8b4edf12e53174b7e967f138e0b8ae4d3c93ca727f8cb18e0ab1a56373550d37b8d93e SHA512 e52a7be4004472ee323e4c51cff65ecbad4464642abc8bee4ec94b588770ac49d814c0db6bce5c932a13fb6bffbe2491c80948d1f2f57835824253ce336319e5
 DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4
-EBUILD trinity-1.8.ebuild 824 BLAKE2B d98c9332cbdd60749c0a1bf3dd1277842fa543100e9681b5721f3477b24d4d70f7d9c6dd7e3ced2743a0bb743bf8fbd3f7adda5c41b8e9eb6f3ca907f11a215a SHA512 defbdf6d43dd3458fbf52bf4fbf9fc9b518ef0186f7f6662bea0014240dd0331db45563a9062c8b45adcaa021994ef28f2bada65c2e12c4cf71f6720b5db0f97
-EBUILD trinity-9999.ebuild 804 BLAKE2B 446dab373eaa541bcb57b407e64f737a4117f8ebc130bb83cd11f0e75ee85d9a60fc534208ff60efdee531b89691d5d8ba27d1b7c9d387355e95bad3d1c876fc SHA512 6183f9cba7341792b559fddc183027a7d80fdc7a5531ee26c94aa04ca82663492827b2ee1fb1986d136c69826e1a79183f6c2c6e9ee9b4c018d6af8fdb44c384
+EBUILD trinity-1.8.ebuild 1000 BLAKE2B 10318476f98c42d5239e17ae0f6811d048a9b6a5cffa457b5e5cfeafe235ae9d44225931a46955bd658a1b41d8fe1d7a5cb81508224e268a443acbe47d8ab08a SHA512 0a922df41ffe9246f99b751abc4b19ec2b3592c9aa066ac73cdab125c41e2b895ae0b6a792b3a7a9b9a6427ca9727c9d1585e3dd5b6c08fe97ab01a6f217b79a
+EBUILD trinity-9999.ebuild 800 BLAKE2B dc34511a94c365dc6f49b9e9465effd96da1e685065316cfb4a1eb4e3c7a10096c749fadc5be7ac5942ed13d41e63982deb4c0c72d4415b426a3b88c31493239 SHA512 dcb2c5cfdcffa77b9deb1f9abf85619f5d4d1a2a8b1279748335829b325549ab0a9ce3e5356f67924e003955517b9b877dcc6368f6254b8a5560903c0f6b207a
 MISC metadata.xml 253 BLAKE2B e7d65a21b41d6fee02d2ca3ed68a52450a11debfcdf7e029100f010f6bab26aded65447d29bf374ee41d224f8105b57a8b2b6b0400f8ee4844900e6f2025a5cb SHA512 c6d2490fa32bc6e044a6b051ba21210f47d7545271a7437b9ed16f49924837e1c88dffc33efb94557b818a508e068e1405fae056c881078c37a001e30947aa25
diff --git a/dev-util/trinity/files/trinity-autofs.patch b/dev-util/trinity/files/trinity-autofs.patch
new file mode 100644
index 000000000000..b8a6c9fdbd51
--- /dev/null
+++ b/dev-util/trinity/files/trinity-autofs.patch
@@ -0,0 +1,53 @@
+--- a/configure.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/configure	2017-11-18 14:25:52.095495407 -0700
+@@ -47,6 +47,29 @@ check_header()
+ echo "[*] Checking system headers."
+ 
+ #############################################################################################
++# Does auto_fs4 define AUTOFS_IOC_EXPIRE_(IN)DIRECT?
++echo -n "[*] Checking autofs headers ... "
++rm -f "$TMP" || exit 1
++
++cat >"$TMP.c" << EOF
++#include <linux/auto_fs4.h>
++
++int main()
++{
++	return AUTOFS_IOC_EXPIRE_INDIRECT + AUTOFS_IOC_EXPIRE_DIRECT;
++}
++EOF
++
++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
++if [ ! -x "$TMP" ]; then
++	echo $RED "[NO]" $COL_RESET
++	MISSING_DEFS=1
++else
++	echo $GREEN "[YES]" $COL_RESET
++	echo "#define USE_AUTOFS_EXPIRE 1" >> $CONFIGH
++fi
++
++#############################################################################################
+ # Are ipv6 headers usable ?
+ [ -z "$IPV6" ] && IPV6=yes
+ if [[ "$IPV6" == "yes" ]]; then
+@@ -290,6 +313,7 @@ fi
+ 
+ #############################################################################################
+ 
++check_header linux/auto_fs4.h USE_AUTOFS_EXPIRE
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+ check_header linux/if_alg.h USE_IF_ALG
+--- a/ioctls/autofs.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/ioctls/autofs.c	2017-11-18 14:21:14.487774564 -0700
+@@ -238,8 +238,10 @@ static const struct ioctl autofs_ioctls[
+ 	IOCTL(AUTOFS_IOC_SETTIMEOUT),
+ 	IOCTL(AUTOFS_IOC_EXPIRE),
+ 	IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
++#ifdef PRE_4_14_KERNEL
+ 	IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
+ 	IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
++#endif
+ 	IOCTL(AUTOFS_IOC_PROTOSUBVER),
+ 	IOCTL(AUTOFS_IOC_ASKUMOUNT),
+ 
diff --git a/dev-util/trinity/files/trinity-irda.patch b/dev-util/trinity/files/trinity-irda.patch
new file mode 100644
index 000000000000..eb298fd99d80
--- /dev/null
+++ b/dev-util/trinity/files/trinity-irda.patch
@@ -0,0 +1,47 @@
+--- a/configure.orig	2017-11-18 14:25:52.095495407 -0700
++++ b/configure	2018-07-21 11:44:59.235072132 -0600
+@@ -317,6 +317,7 @@ check_header linux/auto_fs4.h USE_AUTOFS
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+ check_header linux/if_alg.h USE_IF_ALG
++check_header linux/irda.h USE_IRDA
+ check_header linux/rds.h USE_RDS
+ check_header linux/vfio.h USE_VFIO
+ check_header drm/drm.h USE_DRM
+--- a/net/protocols.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/net/protocols.c	2018-07-21 11:48:09.065940013 -0600
+@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRIN
+ #ifdef USE_RDS
+ 	[PF_RDS] = { .proto = &proto_rds },
+ #endif
++#ifdef USE_IRDA
+ 	[PF_IRDA] = { .proto = &proto_irda },
++#endif
+ 	[PF_LLC] = { .proto = &proto_llc },
+ 	[PF_CAN] = { .proto = &proto_can },
+ 	[PF_TIPC] = { .proto = &proto_tipc },
+--- a/net/proto-irda.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/net/proto-irda.c	2018-07-21 11:45:34.330047712 -0600
+@@ -4,13 +4,15 @@
+ #include <sys/un.h>
+ /* old irda.h does not include something which defines sa_family_t */
+ #include <netinet/in.h>
+-#include <linux/irda.h>
+ #include <stdlib.h>
+ #include "net.h"
+ #include "random.h"
+ #include "utils.h"	// RAND_ARRAY
+ #include "compat.h"
+ 
++#ifdef USE_IRDA
++#include <linux/irda.h>
++
+ static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
+ {
+ 	struct sockaddr_irda *irda;
+@@ -53,3 +55,5 @@ const struct netproto proto_irda = {
+ 	.valid_triplets = irda_triplets,
+ 	.nr_triplets = ARRAY_SIZE(irda_triplets),
+ };
++
++#endif
diff --git a/dev-util/trinity/files/trinity-memfd.patch b/dev-util/trinity/files/trinity-memfd.patch
new file mode 100644
index 000000000000..d333aac2941e
--- /dev/null
+++ b/dev-util/trinity/files/trinity-memfd.patch
@@ -0,0 +1,79 @@
+commit c93bb184ce996c4d77eefbae2ab0bf74f396ec45
+Author: Baruch Siach <baruch@tkos.co.il>
+Date:   Tue Mar 13 06:53:06 2018 +0200
+
+    memfd: fix build with glibc 2.27
+    
+    glibc 2.27 added a wrapper for memfd_create(). This causes build
+    failure:
+    
+    fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration
+     static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
+                ^~~~~~~~~~~~
+    
+    Don't use the local definition when the libc provides one.
+    
+    Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+
+diff --git a/configure b/configure
+index dc0a87d8c1ad..c0166af33048 100755
+--- a/configure
++++ b/configure
+@@ -289,6 +289,29 @@ else
+ fi
+ 
+ #############################################################################################
++# Does glibc provide memfd_create() syscall wrapper
++#
++echo -n "[*] Checking if glibc provides memfd_create.. "
++rm -f "$TMP" || exit 1
++
++cat >"$TMP.c" << EOF
++#include <sys/mman.h>
++
++void main()
++{
++	memfd_create();
++}
++EOF
++
++${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
++if [ ! -x "$TMP" ]; then
++	echo $RED "[NO]" $COL_RESET
++else
++	echo $GREEN "[YES]" $COL_RESET
++	echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH
++fi
++
++#############################################################################################
+ 
+ check_header linux/caif/caif_socket.h USE_CAIF
+ check_header linux/fsmap.h USE_FSMAP
+diff --git a/fds/memfd.c b/fds/memfd.c
+index 210678e4571c..aaaac2f78f54 100644
+--- a/fds/memfd.c
++++ b/fds/memfd.c
+@@ -5,6 +5,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <sys/mman.h>
+ 
+ #include "fd.h"
+ #include "memfd.h"
+@@ -16,6 +17,7 @@
+ #include "trinity.h"
+ #include "udp.h"
+ 
++#ifndef USE_MEMFD_CREATE
+ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
+ {
+ #ifdef SYS_memfd_create
+@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl
+ 	return -ENOSYS;
+ #endif
+ }
++#endif
+ 
+ static void memfd_destructor(struct object *obj)
+ {
diff --git a/dev-util/trinity/files/trinity-net-protocols.patch b/dev-util/trinity/files/trinity-net-protocols.patch
new file mode 100644
index 000000000000..d2583b56ebd6
--- /dev/null
+++ b/dev-util/trinity/files/trinity-net-protocols.patch
@@ -0,0 +1,11 @@
+--- a/syscalls/setsockopt.c.orig	2017-11-03 09:14:07.000000000 -0600
++++ b/syscalls/setsockopt.c	2017-11-18 13:44:19.283946230 -0700
+@@ -90,7 +90,7 @@ static void do_random_sso(struct sockopt
+ retry:
+ 	switch (rnd() % 4) {
+ 	case 0:	/* do a random protocol, even if it doesn't match this socket. */
+-		i = rnd() % PF_MAX;
++		i = rnd() % TRINITY_PF_MAX;
+ 		proto = net_protocols[i].proto;
+ 		if (proto != NULL) {
+ 			if (proto->setsockopt != NULL) {
diff --git a/dev-util/trinity/trinity-1.8.ebuild b/dev-util/trinity/trinity-1.8.ebuild
index 1072988366ec..2cb2ae2a86e1 100644
--- a/dev-util/trinity/trinity-1.8.ebuild
+++ b/dev-util/trinity/trinity-1.8.ebuild
@@ -1,7 +1,7 @@
-# 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
 inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
@@ -14,9 +14,18 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples"
 
 # We need newer headers to avoid compilation failures in the BPF stuff.
-DEPEND="app-arch/xz-utils
+DEPEND="
 	>=sys-kernel/linux-headers-4.8
 "
+RDEPEND=""
+
+PATCHES=(
+	# Fixes from Fedora and Debian
+	"${FILESDIR}"/${PN}-autofs.patch
+	"${FILESDIR}"/${PN}-irda.patch
+	"${FILESDIR}"/${PN}-memfd.patch
+	"${FILESDIR}"/${PN}-net-protocols.patch
+)
 
 src_configure() {
 	tc-export CC
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
index 2e263c788cee..4245b613481a 100644
--- a/dev-util/trinity/trinity-9999.ebuild
+++ b/dev-util/trinity/trinity-9999.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit toolchain-funcs git-r3
 
 EGIT_REPO_URI="https://github.com/kernelslacker/trinity.git"
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 9345ef0ead46..53d86cbc524c 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -6,10 +6,12 @@ AUX valgrind-3.7.0-fno-stack-protector.patch 554 BLAKE2B cd87e1bbf86b82face9dbba
 AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2309f4b138915bd0315090cebd902747678a5b655a8178a8ec8e88782286470922aed505d2a69d6da4d295fd2053d640b035 SHA512 efdb017283b6a5829d1a5acc31b42ddd177a3ab468eb062b8c4fd90b2dbd06679e8d8bc2d6f813e3001efdda831d4410cc8da3a3e42ee2e49efea0423e4b3ca3
 DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
 DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009
+DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
 EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b
 EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
+EBUILD valgrind-3.14.0.ebuild 3688 BLAKE2B 7f353909403147180ba335c0d937fc30bf47da0ef99f61bcf7ee20c50de67e21b09ca7665e6c35b2c8151e947af8e930fb621fb990028cf0dabc3142d81b10a0 SHA512 d569eb947d00d9426af8959f8073c6c1b2110deba6be2b639a4b1d306818a5a0d9dfd34feb249614ab45ed8fab69bcad67cada53b423c5b35d5a8ebf7c77d7ee
 EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa
 MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846
diff --git a/dev-util/valgrind/valgrind-3.14.0.ebuild b/dev-util/valgrind/valgrind-3.14.0.ebuild
new file mode 100644
index 000000000000..e111e5fd3e23
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.14.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/webstorm/Manifest b/dev-util/webstorm/Manifest
index c40aab8787aa..e628809df85e 100644
--- a/dev-util/webstorm/Manifest
+++ b/dev-util/webstorm/Manifest
@@ -1,7 +1,3 @@
-DIST WebStorm-10.0.4.tar.gz 130242508 BLAKE2B e41158360fbab65ad90e81661becce4044f7609ff3532a1f45e65443e0e125f39e9d02c9a29f7dece5260738dce641d7342873dc34bc0ef493ac3acb3a8be594 SHA512 2523795dc3cc4395549313584e8e597b2782eb2c6ad577d0aae81b72656f00a2cc2f9bbac77f83f9e1f74350aaa762d8b7ba873558a37af316839784e506c6ec
-DIST WebStorm-2016.2.2.tar.gz 215535491 BLAKE2B 36e87c604f7e7d1d7d2c01ae7cc1872cc264577935c1693e96625bf659d4ad2c59137faa3eacb6b10350bc816fac472e011c617165df68c1a0fbb5cdc7811816 SHA512 84123bd5e169e87490f3b71f7259b6b13a7885b5a66b912957cd6e869b6f985db0f0a0f3a232436b1894096ec8d74c2b907c4162f2fdd212f96cb0a3d5f41f48
 DIST WebStorm-2017.2.4.tar.gz 257748171 BLAKE2B 2b0951e94f92a0d690bf9261573963dd6250d9b896784b7156dde8b39ec3a59f94da023bcd3183b404e4bfa16d27928d3eecedf54f5b9036e856af5237e8c5ed SHA512 283339f7757093affde698cfb751f7ced18d54159db7696c9fe6b4d37751e94ad1ca9f0c54db9d5ca256da35ee24454a3b48ced21d6db434c23ec94b023a4d09
-EBUILD webstorm-10.0.4.141.1550.ebuild 813 BLAKE2B ec251523438f6fdd460d572f4d0a8c5cdda176bf78e6f44b6facb7fc1855273fc550d250f50c2a4f5a4808798cb7cc3be31b767baa9e27fb7911299141c982d9 SHA512 6800b2d9cffc552e2bf2813898b5d03a33a8344bbf8c242a4d778f73a9a739be724a5b23980763d237a4f44ea769a9dd80b34097f8fd46fdec5cbbe247dfe8c3
-EBUILD webstorm-2016.2.2.162.1628.41.ebuild 813 BLAKE2B 490fd1a1fea77a0d6da3cfbd77ac55922c41284229c20167c427343cf30f1d47a7586b5b0493d9b633e326805dbd733218bf05f3746149c6063149376f30cd8d SHA512 a82f4821d479c824947f24f8bcb9d2159c57f9f624f27d4a4de188b05294fd7310e0a847a2d156d4b134eec277234470e314a093e7f25ffb743ce1ca93a83829
-EBUILD webstorm-2017.2.4.172.4155.35.ebuild 867 BLAKE2B 67f797ecb788bdf201e794d6df96487245bbd9c008fe07f8544f85a456a589344fb7bf20a8db51e80e96dffb3a48636e490ab972308eb4be802cea8a2554ca93 SHA512 27673ce1fe7ea8cc047b9bdb3a07852f992dd36461ce022ef050cbf57c5ef23b2c0092c603f881133cd0a4f7ce2246797f99aff85590776f286111c3a042f22a
+EBUILD webstorm-2017.2.4.172.4155.35.ebuild 962 BLAKE2B 4d02ab25da40ac32e7f459000739b4c7790bb8ed668afe4782877316750387634d4a9b26420e7d6ac61caaad164d968e97103b23d4ac77773d204cae8c18db97 SHA512 efa137495db4eeb93f46494bc00f2c5695f31ab58891efc0baa7ad048ce993eb7e3e020c121090cfd23d12ad533ab9216b2bd0b5b9af635a603b918fa9e97c1b
 MISC metadata.xml 353 BLAKE2B 00bc5dc6cf44dbf5b4efecf6f8960fed13737d92ecd2813af24d696a88a3d9fe63789584b4afe8ec6cb2068c77066f5c3260af9dc243dd03b2f85b3cd3bb902b SHA512 141b9620fe7a3839c6fdf2dad646948e413c85c3a9b1ae15aa2582db0af57461f741c038127627873d02c62411262cbbdc7dd21705ea304bc3072ae3491bdcac
diff --git a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild b/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
deleted file mode 100644
index d281ef919c9f..000000000000
--- a/dev-util/webstorm/webstorm-10.0.4.141.1550.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-5)"
-MY_PN="WebStorm"
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r .
-	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-}
diff --git a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild b/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
deleted file mode 100644
index c01948942f74..000000000000
--- a/dev-util/webstorm/webstorm-2016.2.2.162.1628.41.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils versionator
-
-SLOT="$(get_major_version)"
-MY_PV="$(get_version_component_range 4-6)"
-MY_PN="WebStorm"
-
-DESCRIPTION="JavaScript IDE for client- and server-side development with Node.js"
-HOMEPAGE="http://www.jetbrains.com/webstorm"
-SRC_URI="http://download.jetbrains.com/${PN}/${MY_PN}-$(get_version_component_range 1-3).tar.gz"
-
-LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=virtual/jdk-1.7"
-S="${WORKDIR}/${MY_PN}-${MY_PV}"
-
-src_install() {
-	local dir="/opt/${PN}"
-
-	insinto "${dir}"
-	doins -r .
-	fperms 755 ${dir}/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-}
diff --git a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
index d7dca526f308..4171a9a4f433 100644
--- a/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
+++ b/dev-util/webstorm/webstorm-2017.2.4.172.4155.35.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,10 +10,14 @@ HOMEPAGE="http://www.jetbrains.com/webstorm"
 SRC_URI="http://download.jetbrains.com/${PN}/WebStorm-$(get_version_component_range 1-3).tar.gz"
 
 LICENSE="WebStorm WebStorm_Academic WebStorm_Classroom WebStorm_OpenSource WebStorm_personal"
-SLOT="$(get_major_version)"
+# This package cannot be slotted for now, bug #592636
+#SLOT="$(get_major_version)"
+SLOT="2017"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+RESTRICT="splitdebug" #656858
+
 RDEPEND=">=virtual/jdk-1.7"
 
 S="${WORKDIR}/WebStorm-$(get_version_component_range 4-6)"
author	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-10-22 11:09:47 +0100
commit	64e107b9b6058580ff0432107eb37cefb0b2a7d8 (patch)
tree	9a44e603e2ae365e2b1fe35ac37f73e830cdee1d /dev-util
parent	957235cf19a691360c720f7913672adda4258ed0 (diff)