gentoo resync : 24.12.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-12-24 14:11:38 +0000
commit: de49812990871e1705b64051c35161d5e6400269 (patch)
tree: 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-util
parent: 536c3711867ec947c1738f2c4b96f22e4863322d (diff)
239 files changed, 3611 insertions, 1981 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bbcd2be1fa90..7a565871177f 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 9a7bb104d545..d80c41c2e45d 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,6 +1,8 @@
 AUX 0001-use-java-home-before-bundled.patch 927 BLAKE2B 4a04243d6c6e3712bffca951225ac8d6019fbacb4d48472cc9e8915eb0e10fd569f6421f5daf541a82e96f494203336a9fa62f2afd14b654add82819d6971b22 SHA512 ab21686432190e47bdd8ad0cb4cb9cd0a6d9e89b7c376b589024fe04eebfc2c0f0d59d8c186921726f6960b896798ee69b147663f56f21501680938b03331832
 DIST android-studio-ide-173.4907809-linux.zip 897596053 BLAKE2B 6142cfc21d41a23d93ff064be457a28879ce80830bec79a38f6862d0f5b9de7b552d7175d7bf3e3ddfc70b10e0f7313e7ebcb7a3cdf16511c070551a27193775 SHA512 3fc01ffef5dd88dce088cc67fde03c62dadce7a700aace17ebd414ad0b1125b8370b5f132349424ff65ffc721ff383e6793737a0021826f08e35c893e33535be
 DIST android-studio-ide-181.5014246-linux.zip 1054392038 BLAKE2B 455ce3455710d0709746dc9c18caf61fd347f6c157873de54821601846be6e086646d6261d2c9bdd6986d8f2874e7a90c37b0db820326d2eb17afe438954e240 SHA512 37c622cab6d21e8a0e6d38e0f8c29e22910647df3e6d93ee86c71a39f171b1b51952a13eae2660e209c2eb7a093a9f7d2177562ea287353a30507b22c2617bd0
+DIST android-studio-ide-181.5056338-linux.zip 1055510234 BLAKE2B d22e4455ccbe7c6f12eacbcc2b707d840945586d9824bfbd2b6f093ef986d54eb042ba0ecc5bdca17c74a20b43e73821eaeefdfb28d4e129bebbb885c7b17483 SHA512 d1e225ed97f4737bdc9cddfc40e85ed5cfea7b4f911a088d2a1cc09558f010affe0a0661fb6f6911d47902b49bbde81868eb56363b90bbec70dd87b679850156
 EBUILD android-studio-3.1.4.0.173.4907809.ebuild 3100 BLAKE2B 82439e0e353c0409ec545dbe8cb4f8acef6d38184744b3e9d78250c5c6c2588a4d2cc097b277595ae506becf206a30d6aa506188e64a72c338d542258496ee75 SHA512 ff5570c0ea735078f9ebd22069f3d93c65d935e6e35d15c62231652f1f8b6260a27be7f71229a55635fb23debc3a1f3c6789af445050566d35a47c9ba56515e8
 EBUILD android-studio-3.2.0.26.181.5014246.ebuild 3238 BLAKE2B e055000aba0fcbbdd8663c75d452fa1241df2011abfe0fd1cd0012f83069b7eee7d4dc959f4d8d04869128f95489fd8c5791d60aea8e998e9af5a64bfaaa752e SHA512 c26b76a8658f9dc52004aeed53a23d0999742f4477107f922e611c8b95aa7efeda441b1b5640f4225966f0417efbaa49791a44db79d1a7c1a7e0899762023bc1
+EBUILD android-studio-3.2.1.0.181.5056338.ebuild 3242 BLAKE2B 5b67c76007c39951293c94e40c7409bbeb852c9a19502b72d2c91f334ec83d14f48ffb3e61c3d7b62fd7dbd3196cba002a476cc6514ed8ccf02011242b8501de SHA512 25fde89ca93ca6de06ca7e16b8d0743b594ed92a87884cc30ef675d7bf6bb2def9bc2452fb177d7bc54ee538313901c7fad1eca48318b09dd17eca0dcf128ca7
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.2.1.0.181.5056338.ebuild b/dev-util/android-studio/android-studio-3.2.1.0.181.5056338.ebuild
new file mode 100644
index 000000000000..d073498bc5cc
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.2.1.0.181.5056338.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 eapi7-ver
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/bin/lldb/*
+	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+	opt/${PN}/plugins/android/resources/perfd/*/perfd
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+	STUDIO_V=$(ver_cut 1-4)
+	BUILD_V=$(ver_cut 5-6)
+else
+	STUDIO_V=$(ver_cut 1-3)
+	BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+PATCHES=( "${FILESDIR}/0001-use-java-home-before-bundled.patch" )
+
+src_prepare() {
+	eapply "${PATCHES[@]}"
+	eapply_user
+
+	# This is really a bundled jdk not a jre
+	rm -rf "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	doins -r *
+
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	rm -rf "${ED%/}${dir}/jre" || die
+	dosym "../../etc/java-config-2/current-system-vm" "${dir}/jre"
+
+	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+	fperms -R 755 "${dir}"/bin/lldb/{android,bin}
+	chmod 755 "${ED%/}${dir}"/bin/*.py "${ED%/}${dir}"/bin/*.sh || die
+	chmod 755 "${ED%/}${dir}"/gradle/gradle-*/bin/gradle || die
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/apitrace/Manifest b/dev-util/apitrace/Manifest
index ac779728b266..76678e6ed159 100644
--- a/dev-util/apitrace/Manifest
+++ b/dev-util/apitrace/Manifest
@@ -4,4 +4,4 @@ AUX apitrace-7.1-glxtrace-only.patch 1022 BLAKE2B 1265fd4dc70702f6cba1d50437a551
 AUX apitrace-7.1-snappy-license.patch 240 BLAKE2B ef144dba8882466d0fce8da74ffaa008840ca1d9fc411f37e56ec7bfa3ab1637c001b87fb80186b1844abe7694419719a0c1ad011bba5002752d4c1fcc448e96 SHA512 0ea2d2fe38c0ecd12a41dcef66efda7e55d02c43a9a8ec52da621f711e50f040542efa65e855d52715fa0ab78d54b4c5620ee0cfc0795f4d9eb4a433d07da60c
 DIST apitrace-7.1.tar.gz 2343156 BLAKE2B ab450535a585d476726b0bb3fbb8f85f930dafd883419ac9a575ca0b487890b26d39baee920c5f4c29b929bce13450643bc27d7f5d269aa60c044dca9975bcce SHA512 b4ebe4eb0b16770a156cffe7cccccff2166634bee7b147d124c78c6e5b37e2ef5f0cb78d30ab7df9a489f25234073023c8bbee67e2b6c59aacfcf4e5ff2ceb84
 EBUILD apitrace-7.1-r1.ebuild 2439 BLAKE2B 37393fe352c333c50f870dea34cbcff7e53878bc84194d64c5bfe7eb0812e6dcad9477a6634444d37498b359d456a739a24b5fa6fe4a56152deb3360d56ca1f6 SHA512 c916ea1fd2a816d59979e9490a4d7cb8d0fadde7f47c5e32b53711d53cc59ebb078f57548bfad5b2dc206d89182b8c34fe12b18fcb4a22dd297a703c74312763
-MISC metadata.xml 514 BLAKE2B 3094b810a3882c520449a617d0d10d295d8970ba4f83e8a5deacf3f1065744b723de286c69e41b2df41d4afd326b002a2b30e3fbbced41a9ee6463db649341df SHA512 fc8837633a9b7e017c82ff1ceeea1034a73196767a5d28e71fb1c310f3cb9af25c1bc20899975765cf9af6f688e03a7c70bd1555dcf1267333f8fef1896fe7f8
+MISC metadata.xml 438 BLAKE2B f88a54537c6bd0c1f9965ec8d520928cea727ba4f8424b49993c4e310078676d9394ddaa64c3c0fb9e0f1bf9eca36142260148945f455e0700dbc362dce73fd6 SHA512 45a818f2bbbfd046e403940734323c027929de373f8366a7de29e4342fe3f98ea27ba2c151f80dbbd33d1110acf2f363669c3c4176d2c15d8b5a783182128cd5
diff --git a/dev-util/apitrace/metadata.xml b/dev-util/apitrace/metadata.xml
index 21c4bb8fe8d8..6ff16988eb41 100644
--- a/dev-util/apitrace/metadata.xml
+++ b/dev-util/apitrace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="cli">Enable command line interface</flag>
 		<flag name="egl">Enable EGL support</flag>
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 0b59acb6ae49..f68e7267333c 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,7 +1,9 @@
 DIST bazel-0.17.2-dist.zip 79230155 BLAKE2B 62a60011f9605a1d615e648fdbb98b193561e1d86a7562ccb10fdbb8b6986e17a72c4076dbdbf6baf8a7af83e320af2c4e4b65b5b2101d845597ddd688194ba5 SHA512 0d277e20eac6fc972a31be1c77a750f6585d16beabfe7dd096db4103f0f191958aa83b52203b91d4df5b486ff20004c0b4b22125e58379f64f68abc4a87ac326
 DIST bazel-0.18.0-dist.zip 86890953 BLAKE2B 53da2c2d4467f1f7dd2e613a347acd0ea547bd41fe49fa39cbbcb92c337dca43412ac9b65abf7a3e00c322b8fea075cbdef0da5b064bf4e22aaaa4c545c539de SHA512 128e1041ae0d85be26933bb107b406ca4ab177f00eec2ee1d791ec9089c0cb384857b532498276480d1063b82e7a9a809b9f8a0d0715260534c3e3d202d6cf13
 DIST bazel-0.19.0-dist.zip 87333329 BLAKE2B a9a0002b6a1dc98d3c753b9e37001f41c0e9b3e8628600d10d7ffb379686a2fef33032b8264e72cb787135be0a5a3c26aa452320b309da10ed8a1f8fe6667046 SHA512 ea67fb4d13487d24a0442084f42ff3c082a107c56a06d882f579064f17c545d6e9b5f0c4d724238c22e9b3bad12c68c60c58b59f82d9e957fe3af222d44bc969
+DIST bazel-0.20.0-dist.zip 87602213 BLAKE2B 0d10fc89a8bc2bf91a67317d42302b894abbec8c4e9f39dd4fbeae71fcba847d5ae35102e3ef4a26d7dfe2da9e47cec5660dd28e1804c3ad562583e9566b78cb SHA512 1628a99a2c95334b7b190c5cf1b80ad3ce61c827103844f68401ffe5cfa994d5b7edd9e314a2775b6ed5b8da70ad79bee0ef47b9acf409919a613069356623a3
 EBUILD bazel-0.17.2.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
 EBUILD bazel-0.18.0.ebuild 2870 BLAKE2B dca6242ba8027e5c2c62b2cae41f0962db415a11649a0850e9cef1f012e444d94f644734b6ddcfd208f16723c9907130d00e44767efca6b33b47992243964434 SHA512 dae913f3ffa15db53cdc5bcbabfed6a826bd6ff9d7ca8af7526775a5618bb415896b59f90ec10855900ffce264f5feed79c274b1419ef54123f01ca636664370
 EBUILD bazel-0.19.0.ebuild 3039 BLAKE2B c4db272e08d0ad60b54e93c66c17df0230cc447446e03d00a6bd1264422cda5f80ee7b8ab7609e00072d839a7b41addec6056b761908cb1a439300beca7f2fa3 SHA512 81affcd83028ee230aab7273eae66f1f951b867deddc0447d4fd1dca7ea66c2d343118f14ed8d06d24ff38b7baceea5f6245802cbfe2eac4995b2694d17514d8
+EBUILD bazel-0.20.0.ebuild 3059 BLAKE2B 6b0de8cd6626ed9cf8e280104bb4f831be5ff3fe6c480874b4bd44397e2924837037631ace144af1e811fd66e269871df20ff5fc74744bc6b5e3413ed153153a SHA512 2aa412d00943bc03e8600aa326e189a8aafc93cc324d10c0280fd6ba15297417a78484b8780d20f4d3f04328bbb84e6032f50ef1d4c0d14fe55532fde4f73760
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.20.0.ebuild b/dev-util/bazel/bazel-0.20.0.ebuild
new file mode 100644
index 000000000000..49ee78643806
--- /dev/null
+++ b/dev-util/bazel/bazel-0.20.0.ebuild
@@ -0,0 +1,125 @@
+# 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="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+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 || die
+		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
+
+	local OPTS=""
+	if [[ $(java-config -g PROVIDES_VERSION) == "1.8" ]]; then
+		OPTS="--java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
+		OPTS+=" --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8"
+	fi
+
+	output/bazel --bazelrc="${T}/bazelrc" build ${OPTS} //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
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	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/bcc/Manifest b/dev-util/bcc/Manifest
index 9f7c9b81430f..3d48fdefe7bc 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,5 +1,7 @@
 DIST bcc-0.5.0_p20171230.tar.gz 1773522 BLAKE2B bc5ec32570cf230f071c10d2925a8c8a777c60c22d31bbf72f3cad1718e59dacd604e45a326ff2a941aa519a2b3544bc7376dd40ceafe154c497b488e0ec1b9b SHA512 d8e810768b5801c0beef98a13ee23eb8aa756f7f8a3e35f6a391958e30affc5a8622a9b75c785f66d86761105045cb2b1c7ce284f3ac3b482a4605987bea9f30
 DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80
+DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e
 EBUILD bcc-0.5.0_p20171230.ebuild 1171 BLAKE2B 5d895b41e7608473e636fae524091fad9da737394216b71077cd364c5cf5f044b1409fcf6e90afb56de0a4fa852ad479491ec1d84be3c65dcd3727cab6e45be5 SHA512 d1b25d2299af9430a5814109c9be17b9047b18e84d57feb92f3d3efbc82e665afc849624384ff21812cf342c8cf3b9378ba164943e54d6702b365cccc4a71f83
 EBUILD bcc-0.6.0.ebuild 1137 BLAKE2B d9c11470ea2fc096cbeaba592d0181652376d8c4774c1e69c4b9a0cf38ae8835824a4090b75dc6def4dace3b26be263aa12c52f1283912c86580dc9334ff6f82 SHA512 bdbf5614a9ab1fb148594cdcf9c2c53069d2909bc88a244f47395bfc4b9b4851d965feec460ec08ea2289b6f0198cec2d41d3ad22de0c02626577df9d8528605
+EBUILD bcc-0.7.0.ebuild 1136 BLAKE2B 12bdef1faaaed5755813cef01a381e08b5bac2119c85f7bdcff4af1584d8cd46722c35daac1ecfdfd07288a568e3e514e0f0ba01aca6ba3c3ded5a1dbde0a0b8 SHA512 525502acf9faedca72bf34ab12e7ca85830e7e4ad474196b4968ed18d3a44d6865e51fc190ef83985ff766104d712d6cf23d857c8b8e7345ab2c98154ab58472
 MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
diff --git a/dev-util/bcc/bcc-0.7.0.ebuild b/dev-util/bcc/bcc-0.7.0.ebuild
new file mode 100644
index 000000000000..9d90ec40225c
--- /dev/null
+++ b/dev-util/bcc/bcc-0.7.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+
+inherit cmake-utils linux-info python-single-r1 python-utils-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+RESTRICT="test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/elfutils-0.166:=
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/dev-util/biew/Manifest b/dev-util/biew/Manifest
index 8d5607d6839b..8ca70f56dae6 100644
--- a/dev-util/biew/Manifest
+++ b/dev-util/biew/Manifest
@@ -3,4 +3,4 @@ AUX biew-610-fix_localedep-1.patch 1003 BLAKE2B 6c6d81692a4ed14e1f0a229e31aa2f64
 AUX biew-610-portable_configure-1.patch 4932 BLAKE2B 077f437ef02e20220c6f18b0baa472a73fc8de070b292e2ad5f75bbcd95616da110c3d723d42ac206eaa87d39500a43c893d623126dcf254e03ddb414bccfa06 SHA512 cce6564e9d65b6f8c6c4a8dba1919dcfffbc22641ddfcb4fdf1bcab45d56b437dedbee328c86426c1b821b57b923e3d8cc97fdcf140662deb794f64e29c6847c
 DIST biew-610-src.tar.bz2 860517 BLAKE2B 23ccb5e17dc3d99c6eeb303ad26a9779faa5a648208e0a7291b7f120f492db80f0995449ca2e6982de73543cbc7d9210c3f56077eeffceef46e4ea17cb838b5a SHA512 df8d3c10c30e30db1bc5fdba73601a148f7a1480e69a3d03a02ec303534f37db9c5a9eb7ac087d8f1d8cc64d4a0f6e11548c5b385e132e3a981a6f328e3b5742
 EBUILD biew-6.1.0-r3.ebuild 1737 BLAKE2B 9d0dea71af9358332d8e1f97583022c03ece983d6bdb9a51c5b6837003dfc64d11c05ea6e458da42cc23d83467d54f34008a18042e58a03ee0cdf49d3b7915f7 SHA512 17c0f8d50d00c1eb9a90ca1527737cf4728401c94845baba5c71cde5f1f095e4cadf2088ed2b939f6e3b4540718246e4c1ca3f2eac50f421cbf5b29e02c604f5
-MISC metadata.xml 327 BLAKE2B f4e3b7d00a6084b3b0cbffc2dcec2ffbea9d73717119295f8bb46b9a17c928086a61a01eccad85aedbd511ec5d9d73c52b5f0f3ab1944f9bce5d5da5c853abb1 SHA512 0e157ba1f9c8d78c203108d72e2871cda917a404223cd7d8b8ff261f72ec69be630a59e6e205112a0798d7daee06bfd60a3feaa950b327041187ae25701a24f2
+MISC metadata.xml 246 BLAKE2B c5d8540757618167d38a747711d69e9925b7995bf91d3b4ff4346829c594a7afd2fe4c8c0238d8c8e5da8a04cc92f375844e274a5c512a886f27e8036799df87 SHA512 3c9dd96ae51ac3ae8a9970a3b4ac250984a4d3f63a1f70132120c842f7229e8f67ffc2f2055995cd8580d429537eb91f6c8e3f98348a097b27669698edd1be78
diff --git a/dev-util/biew/metadata.xml b/dev-util/biew/metadata.xml
index 5894b06df22b..2c1788a22bfd 100644
--- a/dev-util/biew/metadata.xml
+++ b/dev-util/biew/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>xmw@gentoo.org</email>
-    <name>Michael Weber</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">beye</remote-id>
   </upstream>
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index f8741b0183ed..ff24de9e3783 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,6 +1,8 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
+DIST devscripts_2.18.11.tar.xz 793112 BLAKE2B 8c1d40a13f6ce1bd804d7fb1300721485aea88b3ea2ad35c59c87f8fd85057cd26b1f40ea73d1919d45b8f0765610724fd3018c05d09e287554725f4425e146c SHA512 4c6c4b0e08115accaebed89fd5362842e6b8daaf9e1725684d0af1ad8cada7bd7aadce8640b766cfdd3a5784bb32ea177019781b2f13bb5da6b55389579ff07e
 DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
 DIST devscripts_2.18.9.tar.xz 767964 BLAKE2B bd955545753b52c98b727b13469e34a608a5fc7f54d8e641ed061d88e0a19a0cae22e89d901714a30d186d2725c68de15a25a551409f9cb68b78fb149a7cd104 SHA512 a17d7a25c72a7c558b1b4f536dd5ac76b3e96904ed732cf9a8fd02b5d78765833c6a3aedc5d27e9f399d445da7a06be76bde581c2b63f5c54227d2525ae1cd29
+EBUILD checkbashisms-2.18.11.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
 EBUILD checkbashisms-2.18.6.ebuild 890 BLAKE2B dc319928f16962b09b62a01fe930159deb5989ee5c7c5295ab2a335fd95fa9df2b64c79365a79b6243bfe9f7dce1f2041de3547ef1dafcd6eafca04bc8d73272 SHA512 124a159fd7bb9c030f99c7840d18d4a88c838dcda02417e5a72798f43caf57550f95be8ec19342fa6c4d4f379028efee5c48afe8d777748fe9083e0ee8bb5b49
 EBUILD checkbashisms-2.18.9.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
new file mode 100644
index 000000000000..16cbdc16f649
--- /dev/null
+++ b/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="devscripts"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
+HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
+SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# Requires python packages to check tools we don't need anyway
+RESTRICT="test"
+
+RDEPEND="dev-lang/perl
+	virtual/perl-Getopt-Long
+	!<dev-util/rpmdevtools-8.3-r1"
+
+S="${WORKDIR}/${MY_P}/scripts"
+
+src_prepare() {
+	default
+
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
+
+	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
+}
+
+src_compile() { :; }
+
+src_install() {
+	newbin ${PN}.pl ${PN}
+	doman ${PN}.1
+}
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index f5af3d220a96..a3328be87982 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2018.2.4.tar.gz 462328661 BLAKE2B 18975d4cad41237377c4df1064adb9c31a0c24d305dd1fca82c1fe492d81705818d28d9fe001d660a468a66642b820c77cd4c087e677bfbb96418bbbd2dccdd9 SHA512 d8b6c7d0e07db64065ccce4937d8ccc9eb0d8c6462bf29446cd32349c8c19721e31e6b87adab4850cc9f52763ae7bc93f287c63fae72f1ffe237994906160c57
-EBUILD clion-2018.2.4.ebuild 1987 BLAKE2B 9ec201c1a5a15957b26c727d65fcbf44867d05577727a9e8e78e3f4d52cde3261eff87246c9fd7bb0e36b04b866a12b6004001dc84df57b05ddef278dd5cbb1f SHA512 454565193ae4f63b472ab6c7edf4331a6b15186d9b17fc23b8d545c86974cb3dbf12fcad179eb6e95dbb1d099b8ffb75068213ce8c8820bb5fa6fa6a55f84fc6
+DIST clion-2018.3.tar.gz 449404856 BLAKE2B 937903dad1d572f45c0079c49f224225c85b8b9ae677058ab894f44356820a1f9e966266c1a9885d256872e2b39d4cf5612b29cf269d12b98592ce0a07f40848 SHA512 86504e741f9da8559a4aebff4ebb181ef624756affecff13207ccbc4d3be4d95b52ec6e543d64e2457255e790135e41e215095bfa19b32ee4ef321ce96de1038
+EBUILD clion-2018.3.ebuild 1991 BLAKE2B 294c1c22d4ee903b931d4178ce87e26424562bf347bad2cadb64be45e035dd2e70a655c95ddfa956b6683781f670fc60e05e83c88bb6a91100232d84c1231f9f SHA512 d2167c1136838aa7e676b382c0ff4ba7ee611cd48ae8fb12e4186210fe1e706dcac59a68ece8a1c72dcdfffb8a7cf1902bcfb18d9ad11c47b6e727a6914d8b9e
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2018.2.4.ebuild b/dev-util/clion/clion-2018.3.ebuild
index d000021e40fe..73be14464fcb 100644
--- a/dev-util/clion/clion-2018.2.4.ebuild
+++ b/dev-util/clion/clion-2018.3.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 desktop eutils
 
@@ -14,13 +14,13 @@ LICENSE="IDEA
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 RESTRICT="splitdebug"
-IUSE="-custom-jdk"
+IUSE="custom-jdk"
 
 # RDEPENDS may cause false positives in repoman.
 # clion requires cmake and gdb at runtime to build and debug C/C++ projects
 RDEPEND="
 	sys-devel/gdb
-	dev-util/cmake
+	<dev-util/cmake-3.13.0
 	!custom-jdk? ( virtual/jdk )"
 
 QA_PREBUILT="opt/${P}/*"
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 824b4218ff65..deb5c7e353b8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -15,16 +15,14 @@ AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b5
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
-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-rc3.tar.gz 8614538 BLAKE2B 5c1c8424f1328beba862dc642ab5db4cbbd63122c97cfd19089520610e890326537f5bc4869e61e2013571583556d0042ae15e6df84cd514e534b3ff9c065665 SHA512 8285d46545b05e0fe65d3d713ce42b2e771fdb17dbcdefabf270c272bc7a52e6a7fe437e06a28ca406910d3fdb190778558b1298622fd2ddcb87cfb8eb20f496
+DIST cmake-3.13.1.tar.gz 8614663 BLAKE2B d05012a1b13de78388f96da1b28a28538d14e9851abee79618c10f7c126574c4c8cca3f3197970ec1acf4361f70f30baf7ef4f377e507e054dde20f2d5d48c82 SHA512 693520e53fa21e81f5f15e6f8979e5264e3bf7e194e4c19b884a44767b3b6d6535dee674f355440e7dcac480372882152c0523ac3c2f1c12d51b43540bcffa59
+DIST cmake-3.13.2.tar.gz 8614687 BLAKE2B 2917116870bf6248865502d093e7974da5e22b053fb7eb1fc93581ee8bc6bdc719f7250619ca5657baff9d5e8e796a62964503b32e199a57e5f44ece25331037 SHA512 da095d483326ed379bfc8fa54e95db3426149ab923479a757149a4aed5c90693c0244bc2c9550cf4b64385f5003ee2060fea1698d989ed13bd0198e718c40903
 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.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
-EBUILD cmake-3.13.0_rc3.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
+EBUILD cmake-3.13.1.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
+EBUILD cmake-3.13.2.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.11.4-r1.ebuild b/dev-util/cmake/cmake-3.11.4-r1.ebuild
index c6d6affe7043..9df56641cf19 100644
--- a/dev-util/cmake/cmake-3.11.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.11.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
@@ -62,7 +62,7 @@ PATCHES=(
 	# boost (#660980)                                                                                                                                                                                          
 	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
 
-    	# upstream fixes (can usually be removed with a version bump)
+	# upstream fixes (can usually be removed with a version bump)
 	"${FILESDIR}"/${P}-libuv-1.21.patch
 )
 
diff --git a/dev-util/cmake/cmake-3.12.2.ebuild b/dev-util/cmake/cmake-3.12.2.ebuild
deleted file mode 100644
index 1d2802087662..000000000000
--- a/dev-util/cmake/cmake-3.12.2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ${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/cmake/cmake-3.13.0_rc3.ebuild b/dev-util/cmake/cmake-3.13.1.ebuild
index 73aee46de553..73aee46de553 100644
--- a/dev-util/cmake/cmake-3.13.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.13.1.ebuild
diff --git a/dev-util/cmake/cmake-3.12.1.ebuild b/dev-util/cmake/cmake-3.13.2.ebuild
index 1d2802087662..73aee46de553 100644
--- a/dev-util/cmake/cmake-3.12.1.ebuild
+++ b/dev-util/cmake/cmake-3.13.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
@@ -120,7 +120,10 @@ cmake_src_test() {
 	#    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 ${ctestargs} \
+	"${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"
 
diff --git a/dev-util/cmdtest/Manifest b/dev-util/cmdtest/Manifest
index afae394a80db..f8f982f1757f 100644
--- a/dev-util/cmdtest/Manifest
+++ b/dev-util/cmdtest/Manifest
@@ -6,4 +6,4 @@ EBUILD cmdtest-0.16.ebuild 565 BLAKE2B 995a4abe2db0272e6f806937b4990fb89843ed2fc
 EBUILD cmdtest-0.18.ebuild 601 BLAKE2B 77c1b49917bf33964f7f2075ccd9e2b2f068a5d50d7d3744b388db2d69870605813486e6ac6858a19fce0c2bfedcda576af3a09b2b1386afb95e8e5dad4207e3 SHA512 432135a76f50e12791623ceab1e1866dfdce2b038f0a82bc6c884f85f2aa50ba6371c6ba0bd1a9e1ac5d155dd6467e012b566ec22c1512a5e19553a6bc39970b
 EBUILD cmdtest-0.27.ebuild 641 BLAKE2B 0719f9ee8398d9651210172815b72314c5ce0a4f4aca2b676c54144a182e12de4a1b33670584401e3080cea867f02a74f14989aa9578394f0cad5759cf3d7094 SHA512 47d71f682e2f37c913593a768097bc1c04ccbcb393057428e89de3ea7ce214160fc25b785b7689327d73ed8fedd4c0e6b3269b51cd2ec33463cea4aeb26091d3
 EBUILD cmdtest-0.30.ebuild 740 BLAKE2B 7389472d1479c094627eb8b89e81f077dae31219a4a30ff1855245f2d46ebaadfb5651c51e61ee965323af9a9011a3c0e006ee5c647abde709873fe34991e83b SHA512 8d8b8c897dcb2fa38b67006016f4af46b0264f18758eec9be88b02f2d0f988d05878fbeda63639441e7c639f6f57411f35eb2e3204c7cc8628762b0ead322b2a
-MISC metadata.xml 250 BLAKE2B fef48a48388f26a915c53bca9aa9cab62fb73ec006736542afb4cbbe0c7b81d23afe2884f52433c7d390fc38ac32f957a6f6efe285ee1cafaed76407a964cf9b SHA512 924271cfb32ceafc4134e19b53fbeed96f2e9056addc3c2cbdec28890254abf5f0714979a3ab698ca046e41ef5c2cca2932350830bd8bd3a8e214d99123c12de
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/cmdtest/metadata.xml b/dev-util/cmdtest/metadata.xml
index ea6b59e79026..7a38bb900964 100644
--- a/dev-util/cmdtest/metadata.xml
+++ b/dev-util/cmdtest/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mschiff@gentoo.org</email>
-		<name>Marc Schiffbauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 564aed0c7ae4..f7d0e8459b0d 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,5 +1,6 @@
+AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a840713767106039d6916479c8d0cfe502ccff60c08011be1c711dcdb827a391deb7976706d37c2ed3d3b3941370fa6b6481cc24 SHA512 63c00e774c3078ba784685887cd46790375b37bb957800951ecd1a82f5d2f29ec7c0fe77da8f4c7e9ff0a7860e801598b9dd231d43adcd460ca1d1c68a7a3f05
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
 EBUILD cmocka-1.1.1.ebuild 1099 BLAKE2B 52977ce6645176f20b7c1359e6f34f2cae15f815f4af86f520a4c6174e8e364f081fdbe3ec6f5bab78897bed97319df95d3ae7e5f922de19a6d3eb6a532b5e7d SHA512 367a29b47190f086a336a774450b59a18e762fa2090ce1bab742adc83e6f8e114a2b31ec89c75b12f6acb90d97d93cf80edd64c4cb6e32a05b8a5885ee63d8e6
-EBUILD cmocka-1.1.3.ebuild 1107 BLAKE2B 10ad8cfdf272bdb65287e2dc49fb067adafc40cdbaf89d4e0b7c1912f103fb5aaba5699e676c28124c12d41434442a62caaf560644401843978352164b730298 SHA512 593faed506b82d1baabab9ceb1bcd1a13cab7112ce371de8f4995ab3aa1513c9a069bac00c162cc8450903a0a73daf0272d78dd9cfe6396d8cd45ae8c3e54104
+EBUILD cmocka-1.1.3.ebuild 1157 BLAKE2B 608ba23220624edb55ab18552ab34bbf434ef7d0eefe7988e38af37baa52fbf391c81e23b017d2f9cea939c3e1ffc17a3fb076e20bbf54de1fff2ca8125745dc SHA512 3b45a507eb49c1180169846f4eea24bbf38ba0091ebc26c4d89422eafc2c3f5641cfd5189e97110f7e77666ceb1d05b6956bd935947d737de38bda8a153b9dad
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
index 6ae39d5ba5d4..4cdb5fbec971 100644
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.3.ebuild
@@ -15,12 +15,16 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~
 IUSE="doc static-libs test"
 
 DEPEND="
-	doc? ( app-doc/doxygen[latex] )
+	doc? ( app-doc/doxygen[dot] )
 "
 RDEPEND=""
 
 DOCS=( AUTHORS ChangeLog README.md )
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404
+)
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DWITH_STATIC_LIB=$(usex static-libs)
@@ -32,15 +36,14 @@ multilib_src_configure() {
 	cmake-utils_src_configure
 }
 
+multilib_src_compile() {
+	cmake-utils_src_compile
+	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
+}
+
 multilib_src_install() {
 	if multilib_is_native_abi && use doc; then
-		pushd doc || die
-		doxygen Doxyfile || die
-		rm -f html/*.md5 latex/*.md5 latex/Manifest man/man3/_* || die
-		dodoc -r html/
-		dodoc -r latex/
-		doman man/man3/*.3
-		popd || die
+		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
 	fi
 
 	cmake-utils_src_install
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
new file mode 100644
index 000000000000..c093021aa824
--- /dev/null
+++ b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
@@ -0,0 +1,43 @@
+From 1abfea55df24e83c2ea321b5f2b75e1a58963bc6 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Wed, 24 Oct 2018 16:33:39 +0200
+Subject: cmake: Fix doxygen generation
+
+Fixes #12
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ CMakeLists.txt     | 2 +-
+ doc/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88408a9..7778039 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -51,9 +51,9 @@ if (MINGW)
+ endif (MINGW)
+ 
+ # check subdirectories
+-add_subdirectory(doc)
+ add_subdirectory(include)
+ add_subdirectory(src)
++add_subdirectory(doc)
+ 
+ include(AddCMockaTest)
+ if (UNIT_TESTING)
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index a7bc65e..6ac7494 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND)
+ 
+     doxygen_add_docs(docs
+                      ${cmocka-library_SOURCE_DIR}
+-                     ${cmocka-headers_SOURCE_DIR}
++                     ${cmocka-header_SOURCE_DIR}
+                      ${CMAKE_CURRENT_SOURCE_DIR})
+ endif(DOXYGEN_FOUND)
+ 
+-- 
+cgit v1.2.1
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index f197b24f4912..64ee02976017 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,9 +1,10 @@
-AUX cppcheck-1.75-tinyxml2.patch 2294 BLAKE2B 78763d10fdddb3d7f0cdaca9271007e97cd981ce1a5a39a91c928def6611cc379b411f9f8380d8f3b4b23554277cfc5a9c6e0797a80378d6e956ee2668dcbc5a SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07
-AUX cppcheck-1.84-char-signedness.patch 4839 BLAKE2B 8ee84544dace4ac35a80b7356d44e30a5f9b5a738d2904728f2c9decd744a6230345a0bfd9515c682f7d577c5b100f7d33a43a9e77bf2ae464ce502bc9e7d305 SHA512 2203665c60e4fa121b18af90f390a8810b772d6b608a1d0d4804d475ca21de02b10f6f543443e81e0cc49980d9f71323800c3cb2256064c4519c93b6c8d366f8
+AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d0476f6a2a3eb8700238d85bbc32823c92fe9b72e1a4a3b01143e23df60996a21a669625b418e579441d85ef460fd38b5 SHA512 575dfe090885cbd8157b089def7a47750519b8ea459404d3755ce23ea98e0fde2da5f0c7551a69ac195c2e3c5d03ce5a71c3d66b3fb119609eba6aaa31c39899
+AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7
 DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
-DIST cppcheck-1.84.tar.gz 2051244 BLAKE2B 8e4b4c71da969addec6d1cb2919c39625054797ae730c85555695e872f87295c20e4564db2eadf536a762ca018882285d5d329f9a5789608e14ef17f1069753d SHA512 7f971f9097db6d2fee7483634afc697bddff499a7b09c4be0bfdc3f8e502d47202a8d4f4fc1a330d0fb1d34a7772065b96419b4b4f4f1467b997e62459304526
+DIST cppcheck-1.85.tar.gz 2150637 BLAKE2B 73a1d4e1fb0770103c8163f35b9e710a5863561df66e46e319b9246ed14e3c5d4d73511db6e70275de4f4510866d7e1888b0fd6b49e5b01fc4f08d081119b36c SHA512 cc984c751d87150839782e96b3762dbf918d9e3687562eabaff6473e48e3254995dd3bffe8605842f867d7ad76845ca2248a53bbd54b5c367281db8a1c1c7fad
+DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B 1eb2f1a4a41981bb77cbb125baca20ced0c3cbbaab514fba64183780f80dfb148cf6c84a4471c20f276a11a79954b52adf7f0d3861e172ec2eea32440b14470d SHA512 b62076fa8e84ddf38a61ed396fab9d4ee91cdc668e8b9ad8ede52f8f7e8451e3e8d38293adb221585baad7caf2ea810dd8add22ce200b9bda499aaf71495a581
-EBUILD cppcheck-1.84-r1.ebuild 2382 BLAKE2B fe170aa38fbef3ad33d396ea74b33edbe7101bad9b7f2dda1779068411045b9f1eb7601fa0b9e1f89207d4162bc8a75d3bfde9a66714e1a5569abe80eeeb7683 SHA512 fd3bf998cc319a7aa2472f8214417ef2c3f1af6e0edc43763acad0bb8f89b02b3be8d484c532a0472d328925c32163a4d4f60b15c6c598e2cd2d40260604f95f
-EBUILD cppcheck-1.84.ebuild 2326 BLAKE2B dede88da8145164fa86946ab19e69aa4a8ab284df9dbe888922330084a383cb3c4f5700e0c7c6d2fb3dffefc154a965d79e5c2a6b02db2a8e021bd2b7ea04808 SHA512 57307a88b07ec02b0b2344f43873547cb9931bee8e6ac987310d9c79bc008f88b04c7e9491dc3b9c828f275427f5f51074ef81bfa4d0e835b5500a0c0913ae30
-EBUILD cppcheck-9999.ebuild 2271 BLAKE2B 8e254632480771a07b58d0c28026801dc20e9ddd864c44a6fb956b86cd2745793f2cb84ee3aed63b72605f6c9a47f91bd8fc94a4d59614873adc7842f3601af1 SHA512 dd14de11d4138d6bc4113c025d033215ceb7a3958f289f113eebf82a86c793fb59901e856748c8da49ae5b8639fe5a09d6bfd938c955ef85484f54c6962af6a5
-MISC metadata.xml 397 BLAKE2B 4ed8f4270fb9d5cccf84c6eaa6feed2ea1bd662f50b85bd39afa0c715e535be35dd67efa462477d43e5b2c118838b11b9b613638d330be7999d4dc3d59193c42 SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e
+EBUILD cppcheck-1.85.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
+EBUILD cppcheck-1.86.ebuild 2342 BLAKE2B 10d7a73365ce28ca07efb5f7af20dfd80fa9b2e0394c22715a223c965dae227c68a5b837d8f9eb6517da03b943d768dbce32462dd51b3cbb8c34e71a5ef5a80b SHA512 154ef48eaa5bd91d3efadd39e2c44df88b4f10b29ce365bbac256d1c1f8ec68020fc952aac7354d56e3a5f52e5a8dd9ecce57a1b771c51eb22905ed9f646d195
+EBUILD cppcheck-9999.ebuild 2276 BLAKE2B fae2869f37c66579e943a6d9ba6cf76fe8cee7fff3da469b0a56b2bcd04d36fe1fbc9054642f2e3cfd5f2a4cba6de8fc9fe1000bacd327e27d8909fe1396d2b9 SHA512 71f7c9dc55fda1199755f4826c4d070abb52b4e9f7bb090fbb9801dfaf37d3c54fb480e32e674b67dc6089a4a6a0f58df00cd26c2447f57787fee3f912fe92d3
+MISC metadata.xml 321 BLAKE2B d5a81f7f1cafc279c08bc120e0feef7d74e2aa5f791a0c11df2a55738b18e35a4eac03f508501ffaf82e23c6f14aae441d2861a7b62bc5a3d8801941aa391b12 SHA512 c28c3db16b406dce013d82f8745530f7970a03738f89b418b0fae2a6cf0056dad078b77d5acf976403efa71315a33eccc8ab5973aa04512c41cab6c4e9f6ad79
diff --git a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild b/dev-util/cppcheck/cppcheck-1.85.ebuild
index 82a4ecbe4b9c..87931e60c7b6 100644
--- a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.85.ebuild
@@ -1,11 +1,9 @@
-# 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
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
+inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -31,42 +29,47 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
-
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
-	"${FILESDIR}"/${PN}-1.84-char-signedness.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
 )
 
 src_prepare() {
 	default
-	append-cxxflags -std=c++0x
 
-	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
 }
 
 src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
 	if use pcre ; then
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile || die
 	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
 }
 
 src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
 	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
 	if use qt5 ; then
 		pushd gui || die
-		eqmake5
 		emake
 		popd || die
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_compile
diff --git a/dev-util/cppcheck/cppcheck-1.84.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index 2fb1dddad4b9..87931e60c7b6 100644
--- a/dev-util/cppcheck/cppcheck-1.84.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -1,11 +1,9 @@
-# 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
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
+inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
@@ -13,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~sparc ~x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
@@ -31,39 +29,47 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
+)
 
 src_prepare() {
 	default
-	append-cxxflags -std=c++0x
 
-	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
 }
 
 src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
 	if use pcre ; then
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile || die
 	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
 }
 
 src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
 	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
 	if use qt5 ; then
 		pushd gui || die
-		eqmake5
 		emake
 		popd || die
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_compile
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 38d6d57ecc24..9d9977873aa9 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -1,15 +1,13 @@
-# 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
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs git-r3
+inherit distutils-r1 git-r3 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
 HOMEPAGE="http://cppcheck.sourceforge.net"
-EGIT_REPO_URI="https://github.com/danmar/cppcheck.git"
+EGIT_REPO_URI="https://github.com/danmar/cppcheck"
 
 LICENSE="GPL-3+"
 SLOT="0"
@@ -31,39 +29,47 @@ DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	virtual/pkgconfig
 "
-
-PATCHES=( "${FILESDIR}"/${PN}-1.75-tinyxml2.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	"${FILESDIR}"/${PN}-1.85-ldflags.patch
+)
 
 src_prepare() {
 	default
-	append-cxxflags -std=c++0x
 
-	# Drop bundled libs, patch Makefile generator and re-run it
 	rm -r externals/tinyxml || die
-	tc-export CXX
-	emake dmake
-	./dmake || die
 }
 
 src_configure() {
+	tc-export CXX PKG_CONFIG
+	export LIBS="$(${PKG_CONFIG} --libs tinyxml2)"
+
+	emake dmake
+	./dmake || die
+
 	if use pcre ; then
 		sed -e '/HAVE_RULES=/s:=no:=yes:' \
 			-i Makefile || die
 	fi
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		popd || die
+	fi
 }
 
 src_compile() {
-	export LIBS="$(pkg-config --libs tinyxml2)"
 	emake ${PN} man \
-		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
-		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+		CFGDIR="${EROOT}/usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
 
 	if use qt5 ; then
 		pushd gui || die
-		eqmake5
 		emake
 		popd || die
 	fi
+
 	if use htmlreport ; then
 		pushd htmlreport || die
 		distutils-r1_src_compile
diff --git a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
index 9d8558466595..67e4ac65a410 100644
--- a/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
+++ b/dev-util/cppcheck/files/cppcheck-1.75-tinyxml2.patch
@@ -1,15 +1,15 @@
---- cppcheck-9999/gui/gui.pro
-+++ cppcheck-9999/gui/gui.pro
+--- a/gui/gui.pro
++++ b/gui/gui.pro
 @@ -19,6 +19,7 @@
      DEFINES += CPPCHECKLIB_IMPORT
  }
  LIBS += -L$$PWD/../externals
-+LIBS += `pkg-config --libs tinyxml2`
++LIBS += $(shell $(PKG_CONFIG) --libs tinyxml2)
  
  DESTDIR = .
  RCC_DIR = temp
---- cppcheck-9999/tools/dmake.cpp
-+++ cppcheck-9999/tools/dmake.cpp
+--- a/tools/dmake.cpp
++++ b/tools/dmake.cpp
 @@ -123,7 +123,6 @@
  
      std::vector<std::string> extfiles;
@@ -39,8 +39,8 @@
  
      fout << "BIN=$(DESTDIR)$(PREFIX)/bin\n\n";
      fout << "# For 'make man': sudo apt-get install xsltproc docbook-xsl docbook-xml on Linux\n";
---- cppcheck-9999/externals/externals.pri
-+++ cppcheck-9999/externals/externals.pri
+--- a/externals/externals.pri
++++ b/externals/externals.pri
 @@ -1,8 +1,5 @@
 -INCLUDEPATH += $${PWD}/simplecpp \
 -               $${PWD}/tinyxml
diff --git a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
deleted file mode 100644
index ee1b136c9a9a..000000000000
--- a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 320a957bbc912325363cf86b61108db860195ec3 Mon Sep 17 00:00:00 2001
-From: Alexander Mai <amai@users.sf.net>
-Date: Thu, 28 Jun 2018 22:16:18 +0200
-Subject: [PATCH] Extend TestSymbolDatabase::findFunction19 to outline
- different results depending whether char is signed or unsigned on compile
- time
-
----
- test/testsymboldatabase.cpp | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
-index 0dafd2730..28473e8e9 100644
---- a/test/testsymboldatabase.cpp
-+++ b/test/testsymboldatabase.cpp
-@@ -26,6 +26,7 @@
- #include "tokenlist.h"
- #include "utils.h"
- 
-+#include <climits>
- #include <cstddef>
- #include <list>
- #include <map>
-@@ -5065,6 +5066,7 @@ private:
-                       "    long               get(long x) { return x; }\n"
-                       "    long long          get(long long x) { return x; }\n"
-                       "    unsigned char      get(unsigned char x) { return x; }\n"
-+                      "    signed char        get(signed char x) { return x; }\n"
-                       "    unsigned short     get(unsigned short x) { return x; }\n"
-                       "    unsigned int       get(unsigned int x) { return x; }\n"
-                       "    unsigned long      get(unsigned long x) { return x; }\n"
-@@ -5079,12 +5081,13 @@ private:
-                       "        long               v5  = 1;      v5  = get(get(v5));\n"
-                       "        long long          v6  = 1;      v6  = get(get(v6));\n"
-                       "        unsigned char      v7  = '1';    v7  = get(get(v7));\n"
--                      "        unsigned short     v8  = 1;      v8  = get(get(v8));\n"
--                      "        unsigned int       v9  = 1;      v9  = get(get(v9));\n"
--                      "        unsigned long      v10 = 1;      v10 = get(get(v10));\n"
--                      "        unsigned long long v11 = 1;      v11 = get(get(v11));\n"
--                      "        E1                 v12 = e1;     v12 = get(get(v12));\n"
--                      "        E2                 v13 = E2::e2; v13 = get(get(v13));\n"
-+                      "        signed char        v8  = '1';    v8  = get(get(v8));\n"
-+                      "        unsigned short     v9  = 1;      v9  = get(get(v9));\n"
-+                      "        unsigned int       v10 = 1;      v10 = get(get(v10));\n"
-+                      "        unsigned long      v11 = 1;      v11 = get(get(v11));\n"
-+                      "        unsigned long long v12 = 1;      v12 = get(get(v12));\n"
-+                      "        E1                 v13 = e1;     v13 = get(get(v13));\n"
-+                      "        E2                 v14 = E2::e2; v14 = get(get(v14));\n"
-                       "    }\n"
-                       "};");
- 
-@@ -5094,7 +5097,10 @@ private:
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 4);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v2 ) ) ;");
--        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+        if (std::numeric_limits<char>::is_signed)
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+        else
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v3 ) ) ;");
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 6);
-@@ -5112,7 +5118,10 @@ private:
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;");
--        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 11);
-+        if (std::numeric_limits<char>::is_signed)
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
-+        else
-+            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;");
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 12);
-@@ -5128,6 +5137,9 @@ private:
- 
-         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v13 ) ) ;");
-         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 16);
-+
-+        f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v14 ) ) ;");
-+        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 17);
-     }
- 
-     void findFunction20() { // # 8280
--- 
-2.16.4
-
diff --git a/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch
new file mode 100644
index 000000000000..84e892827125
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.85-ldflags.patch
@@ -0,0 +1,24 @@
+--- a/tools/dmake.cpp
++++ b/tools/dmake.cpp
+@@ -363,10 +363,10 @@
+     fout << ".PHONY: run-dmake tags\n\n";
+     fout << "\n###### Targets\n\n";
+     fout << "cppcheck: $(LIBOBJ) $(CLIOBJ) $(EXTOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
+     fout << "all:\tcppcheck testrunner\n\n";
+     fout << "testrunner: $(TESTOBJ) $(LIBOBJ) $(EXTOBJ) cli/threadexecutor.o cli/cmdlineparser.o cli/cppcheckexecutor.o cli/filelister.o\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
+     fout << "test:\tall\n";
+     fout << "\t./testrunner\n\n";
+     fout << "check:\tall\n";
+@@ -380,7 +380,7 @@
+     fout << "generate_cfg_tests: tools/generate_cfg_tests.o $(EXTOBJ)\n";
+     fout << "\tg++ -Iexternals/tinyxml -o generate_cfg_tests tools/generate_cfg_tests.o $(EXTOBJ)\n";
+     fout << "reduce:\ttools/reduce.o $(LIBOBJ) $(EXTOBJ)\n";
+-    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS) $(RDYNAMIC)\n\n";
++    fout << "\t$(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(LDFLAGS) $(RDYNAMIC) $(LIBS)\n\n";
+     fout << "clean:\n";
+     fout << "\trm -f build/*.o lib/*.o cli/*.o test/*.o tools/*.o externals/*/*.o testrunner reduce dmake cppcheck cppcheck.1\n\n";
+     fout << "man:\tman/cppcheck.1\n\n";
diff --git a/dev-util/cppcheck/metadata.xml b/dev-util/cppcheck/metadata.xml
index 3bf4b78228a1..7556003fff3e 100644
--- a/dev-util/cppcheck/metadata.xml
+++ b/dev-util/cppcheck/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="htmlreport">install cppcheck-htmlreport</flag>
 	</use>
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index dcb20c42077d..d459af47d683 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -2,7 +2,7 @@ DIST cppunit-1.13.1.tar.gz 841334 BLAKE2B 4c27d666900e46fb2146f939ce7f5f2b036c97
 DIST cppunit-1.13.2.tar.gz 953596 BLAKE2B 205a631dde2cdd2b543be3e39c66331499f7f76e734bf227e94958dc1a4ce57e3ec11a3d555ddf3b8bb8a55b34478b74ac766147630478a53af0c96b606b43e6 SHA512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd
 DIST cppunit-1.14.0.tar.gz 959716 BLAKE2B 581e3b73d6d152c249005ddf267100443e6c9cba12c52c43e9d6f81096b9cd13c3686fa2f73ebaf28c31193e41dbfd5d919dfb0143b190881345da65a5b7f86d SHA512 4ea1da423c6f7ab37e4144689f593396829ce74d43872d6b10709c1ad5fbda4ee945842f7e9803592520ef81ac713e95a3fe130295bf048cd32a605d1959882e
 EBUILD cppunit-1.13.1.ebuild 1519 BLAKE2B b947d09d79ae72338dcd884cea61ebfd4540f2cb8cdba41b116b6d73f4c28982b29676ac8904628ff75da8a4b1c9aff5d4e58190c4da05d90087e81040b03005 SHA512 828a553548f581e0de5c161e1c113943a87b4ce7a53389e6d0bdee808ac4acf75acef2c393a41cf142aaeccef1732f618a99500a91dc400a9c00f43f2b1362b5
-EBUILD cppunit-1.13.2-r2.ebuild 1727 BLAKE2B 9b1ae6e1f7c4390c8af78bd81fb59f0356453785613075f58c7ca707a0013e6878c74374b6525645c449e077603810164e4991627c4c8a628d5a69de483b1032 SHA512 1bff7dfb467e8cbd8b3ab440cfd0755cc7ca99824acfc729f579a3eb528947acb9cffcd7d9429853e3b8974cc5c9614da9edb5f7dd7826c7b8f09769d2036780
-EBUILD cppunit-1.14.0.ebuild 1726 BLAKE2B 3dd80a2efe5f5085fa6ef22b77967654389d767c01ade5a17b9c512afab779f35bdf323ae50393f1730bde8e7239c99e059a171a0866d17f098b8b661bf19c10 SHA512 c03a4a41c4faa5ad5337c97c24f3f268707250b847c7c9565ba1451bd2f84d2707708581e16fd92dbcc3a74f3c84c653656d3c37c3e59b9a5925353a3350fc6a
+EBUILD cppunit-1.13.2-r2.ebuild 1723 BLAKE2B 669773bfcd5343b03f4b23f3a39299d405ae686cc7c077f82d73c6b9e2778628648614b206e0ff81260c0b05237053a84b0f20dfa5ed40b4599fd9434b8d2b0e SHA512 97e501aabb9c2ed2589b3f7566b0990955816ecf7d052d6765d1e219677c08a8c75eb2f4486ab7090d51ac1123cdd0a67363b2dad3cd3891fb002405405ab2d4
+EBUILD cppunit-1.14.0.ebuild 1722 BLAKE2B ea258759c776266c6db28b138f60b31c60c628be29ccbb23afbe6dea75c0137d8c43f12742f0df12516e0016d5c62979c7170d975337b6b27cb3d4e7871b139a SHA512 713f4a0b7ed0c565744af7512cc0772976b1dbba81b46cb2aebe230a6497f5e75ed59f5d518de6578150e6d54e62392f43bffa5c554ef84b1c0d815989313097
 EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
 MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
diff --git a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild b/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
index 753684a176d2..9c300614235f 100644
--- a/dev-util/cppunit/cppunit-1.13.2-r2.ebuild
+++ b/dev-util/cppunit/cppunit-1.13.2-r2.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=5
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cppunit/cppunit-1.14.0.ebuild b/dev-util/cppunit/cppunit-1.14.0.ebuild
index 7d7191bbb95f..448262ad3b36 100644
--- a/dev-util/cppunit/cppunit-1.14.0.ebuild
+++ b/dev-util/cppunit/cppunit-1.14.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
@@ -15,7 +15,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061
 [[ ${PV} = 9999 ]] || \
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc examples static-libs"
 
 RDEPEND=""
diff --git a/dev-util/cpputest/Manifest b/dev-util/cpputest/Manifest
index bacccbdcb6d8..501c364082ce 100644
--- a/dev-util/cpputest/Manifest
+++ b/dev-util/cpputest/Manifest
@@ -1,3 +1,3 @@
 DIST cpputest-3.8.tar.gz 2722956 BLAKE2B 1da16c06d242703462dcaf9c6c26eb875c2622bcce4113fd0b990805d06ee7401a6776d2f0451eda49e7914caa59a5665a92387684ffb6dbbe884cf0fe07bd86 SHA512 a9592bdc9ffab8b42026ef2010f504e7e37d77fc2f197f89d23f7c9285a101059a0ec66418b914db0383974616d31b26addd1938fb27f45c3e7d9496ed0a0fac
-EBUILD cpputest-3.8.ebuild 485 BLAKE2B a1a2966cbd1e938415ec0087dfc59cb6e7dd38703389a515aca6e3f878ea1559b91e88ad54e71e887e521d31a95a2b073fb4fc773baab5693d31189c83ab4f17 SHA512 5f21962d6bb2e094164b8b0ef8e2e34b4e300429478c0f36669b1ded7b1038f7122ba1b3c1d3c0e23f8f082c53d775b002e09783b3ea0312736a3aa5a20f0f9e
+EBUILD cpputest-3.8.ebuild 487 BLAKE2B d5b0451cfcf95ae2366ff5f2b31fe16f03b819356019e6aba14f15c1d4e7d0a399b3e718e1cce5ab970e17bd6eeaf62a9a3424fe3f5db6a63e1d1011bfd0fe4e SHA512 849d2fd192fa93b5aa258a8f1eb8f0e1dafe6be7eb39b3909b2713900c4f6e8cdd2f5b8d15c24d41925f98d15cd9c843b05fd1d953902d54bd1d6c031de6b1ed
 MISC metadata.xml 328 BLAKE2B dbdadf9d2d03017d5e24445929a424c4c8b23382641b2abdec83a1da14ce67ea7f8e4087b1c0d36786da46068a47acf9a94247140b3bb539176c88bc586f5e91 SHA512 fc08c57ee29388f77cdd94b984673c63793f055b5a399c77ebbe4a71e546437b19727a497a9a5f20a1d3b90129e731c824d52f57d028dbcd9556a1fd30d8e9c5
diff --git a/dev-util/cpputest/cpputest-3.8.ebuild b/dev-util/cpputest/cpputest-3.8.ebuild
index af20f1f08b02..4c3046bb40e4 100644
--- a/dev-util/cpputest/cpputest-3.8.ebuild
+++ b/dev-util/cpputest/cpputest-3.8.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/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="test"
 
 DEPEND="
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 03d612376078..a54800dab5dd 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,12 +1,7 @@
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
-DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
-DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.0.2.ebuild 2647 BLAKE2B 6169a30d1088099f1f60fdd7f69511ee274aeef666e5a8191bdec4401339daaded672057d33e786110a2fed547cfb6b541a4a3be5a2ac81b9d7cd3b8951db2bd SHA512 f2aed1372c838cebdeba0cfb62040051a72b3d18e675b946c124e3c0ec803a41eb428504df63c0a4ae8c6a52dfb5a191ec71cedba8abe4a1a005eb3bb5ba8bd3
-EBUILD cucumber-3.1.0-r1.ebuild 2647 BLAKE2B d878d4265ac2bea4b53ffb3289a49e222a4e0a54543d196dd7461d770264f98637a47b0ddb1e52f2475af2ba7087959f427927eed82782fb6e43acc7f67901aa SHA512 7d4cf3e6c816ba46c831087919ac26145a69b2b65b24c1f76adf928de4be92f3a10f903e59018b733ac5dafebb03faded26c110591de424648eabebaae1c2178
-EBUILD cucumber-3.1.0.ebuild 2647 BLAKE2B a39172067580737b00f0e45119003068fd91fca2263b9d1078363b0eff8104d2c89d961c41af86b666f7dd904cea297f9e4600c2d636834ffce169602d823228 SHA512 d8421261bbfe1701356e5fc567e07d76980ecc23f96bdac3864c13b493082f7486b4653d99b182bfa2c1ae51e6ceefcabdd5b3466c086650799d98ff5980bda2
-EBUILD cucumber-3.1.1.ebuild 2655 BLAKE2B 96e9220a6868f3e8d06bc85d4fe9bf92ca9ceaa6d0c7628498c075f22cf80fd558ae271954a4007f8d8d382ef261b2d6fe4390421caabd1055d52a47da098952 SHA512 69f323164545f975dde2b2e2b05c16977291e02e3682fa4e474219266f28f6cb70a3f33b56a5515d63324291339e04c21b69d0bd361bf521191ace23882b07ec
-EBUILD cucumber-3.1.2.ebuild 2663 BLAKE2B 41c3fc62864bf37a0d3c6b2867269023b81c69bc5713eb0f0bba7138b9eec732b772f4b6607ea24bcf5d5d0250d9b9ab4a3f70fd93c3a85659df027b78e4918e SHA512 971f84ea474f6f52eb8de904f129884821f01e1f011ae80ccc932ca593343aaa12401bc68510ae9eb144a3b9731adddfb7a2c8533ecac01ee4ed611f17ac6dd9
+EBUILD cucumber-3.0.2-r1.ebuild 2667 BLAKE2B 6caa8fcc64b5ed621e5a3eac0b9f660b2dfb4fcabf7c5d29a9e62e0c86e6762c4f2b741d0569c947c57ec729c266795c7cba5e54957f0ef07df71d784233a4d2 SHA512 232ba5dce6b04745d8e9b4262b80aa6831053b0f7bfb91492c312e1ec0cfcd3feb221b734cd33afd2dd44678e21c0b454b13303dd96136a2d74a71cfa37c537f
+EBUILD cucumber-3.1.2.ebuild 2683 BLAKE2B b3bc22d0333937ed4085ceaee79ea168027f8028df92ea85397ed00c176c4a6d103f0d1d4cfd3505bce6ac517a7697f007acc55dc119fb18bdb8a2d3f5b75c27 SHA512 a2c3ae363556665d44446970f7f17e30df1b4a8273af406d30c8c7e1de25e26aac37538c1fad83e28382599a7e582cb579c9b6a6c152ba34919622eed37466d8
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2.ebuild b/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
index 4c7db705b892..ad857d32c3e7 100644
--- a/dev-util/cucumber/cucumber-3.0.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.0.2-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
@@ -25,11 +25,12 @@ IUSE="examples test"
 
 ruby_add_bdepend "
 	test? (
+		dev-ruby/bundler
 		dev-ruby/rspec:3
 		>=dev-ruby/nokogiri-1.5.2
 		>=dev-ruby/syntax-1.0.0
 		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
+		>=dev-ruby/json-1.8.6:0
 		>=dev-util/cucumber-3
 		>=dev-ruby/mime-types-2.99:2
 	)"
@@ -39,7 +40,7 @@ ruby_add_rdepend "
 	dev-util/cucumber-core:3.0
 	dev-util/cucumber-expressions:4.0
 	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.1.3
+	>=dev-ruby/diff-lcs-1.3:0
 	dev-ruby/gherkin:4
 	>=dev-ruby/multi_json-1.7.5
 	>=dev-ruby/multi_test-0.1.2
diff --git a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild b/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
deleted file mode 100644
index 6b671bfcda10..000000000000
--- a/dev-util/cucumber/cucumber-3.1.0-r1.ebuild
+++ /dev/null
@@ -1,88 +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"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.1
-	dev-util/cucumber-expressions:5.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	dev-ruby/gherkin:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.0.ebuild b/dev-util/cucumber/cucumber-3.1.0.ebuild
deleted file mode 100644
index 181b5b116503..000000000000
--- a/dev-util/cucumber/cucumber-3.1.0.ebuild
+++ /dev/null
@@ -1,88 +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"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.1
-	dev-util/cucumber-expressions:5.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.1.3
-	dev-ruby/gherkin:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.1.ebuild b/dev-util/cucumber/cucumber-3.1.1.ebuild
deleted file mode 100644
index 4235b44e8374..000000000000
--- a/dev-util/cucumber/cucumber-3.1.1.ebuild
+++ /dev/null
@@ -1,88 +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"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.1
-	dev-util/cucumber-expressions:6.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	>=dev-ruby/gherkin-5.1.0:5
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index a6ce2c1b0135..ba1a5c0bb15f 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.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
@@ -25,11 +25,12 @@ IUSE="examples test"
 
 ruby_add_bdepend "
 	test? (
+		dev-ruby/bundler
 		dev-ruby/rspec:3
 		>=dev-ruby/nokogiri-1.5.2
 		>=dev-ruby/syntax-1.0.0
 		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.7
+		>=dev-ruby/json-1.8.6:0
 		>=dev-util/cucumber-3
 		>=dev-ruby/mime-types-2.99:2
 	)"
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index 4cb88ab6058e..4577721d38aa 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,5 +1,3 @@
-DIST d-feet-0.3.12.tar.xz 184308 BLAKE2B 1e0bb31c768cff357db735ed924cd0d768cb0412ccb6b722569c906671fd4929f67d62cbc09d37b1176755dff228c659013c1ec27d785c4175e534a4458c3fd3 SHA512 ef7a8aa57893cc210327420e954d39d256733839e6a171b8e035f15089fdf963c708a39c3b931b8a85d9faf78a1be324576c5fa2440db8305c1bfc8a8d9e991e
 DIST d-feet-0.3.13.tar.xz 174700 BLAKE2B 66d2a8735011c64985889edf1acbb37e1547d6af52fc6499124ffae09d8cfd876051e12f231c26a1af848939b9a3e9c36d1083e8afb240575d4f580ea92fde65 SHA512 b5a4eb995e883406a13e8a4137b1ed751cfbfd0fd80fa26eb81cf6f8b69bca63f3a4ad940b1aeaed0a57d48d81c582b62f6c3880e7038136f2b40a1eef25328f
-EBUILD d-feet-0.3.12.ebuild 1371 BLAKE2B 4d4ec516e42720b5953b57803139b9abb87bd4f648a7e7cbaedb76c7672059f2a1a225d2078ddd9e2fc44b2a26adc7d2e7668d3e16aea050fd767ecfc6922ae6 SHA512 ca9ee296ba275e6404d8ec6534fbe408f34c54b14bcd34d0e93d545feccaa364fa43d76fe883b17d83aa06f318be9b5ff1ff0282b59974660038915430fe7c64
-EBUILD d-feet-0.3.13.ebuild 1373 BLAKE2B 76710316ddcb2cf75dff7aad6209c6562fa67ca9ade16ef2e6aca1397516e5ae962b87e39a2860bf78ad00d27c2572a411499de6ebf89e05ec38041a24c088aa SHA512 205a35c3e0c24296d0e62a025b995d94ab3695870f19e3c2d8431666ee6358b78ca942bd20159066a870cde6532120f20fb9f8bd4b15d4e841f59c89e4792d66
+EBUILD d-feet-0.3.13.ebuild 1368 BLAKE2B 43a9223eb66494160921db5862d447dbcb603db332fa8743ec0dd3d4675cb2e43e148983ea7b177ece40e38d40f74c69ab350e9c39f87db2e77442c259c45c06 SHA512 52eadfecd0e20f4b7870b6330226a694028270e7c860c98bbbfb33efad8c853a7ba5709ed2a8cff16b08091e1dfe45da0440f40f87d37bd8e3e93eeea7f3c955
 MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
diff --git a/dev-util/d-feet/d-feet-0.3.12.ebuild b/dev-util/d-feet/d-feet-0.3.12.ebuild
deleted file mode 100644
index bf844224340c..000000000000
--- a/dev-util/d-feet/d-feet-0.3.12.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 gnome2 python-single-r1 virtualx
-
-DESCRIPTION="D-Feet is a powerful D-Bus debugger"
-HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="test +X"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	>=x11-libs/gtk+-3.9.4:3[introspection]
-	>=dev-libs/gobject-introspection-0.9.6:=
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	>=dev-libs/glib-2.34:2
-	>=dev-python/pygobject-3.3.91:3[${PYTHON_USEDEP}]
-	>=sys-apps/dbus-1
-	X? ( x11-libs/libwnck:3[introspection] )
-"
-DEPEND="
-	${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.40.0
-"
-
-src_prepare() {
-	python_fix_shebang .
-
-	# Do not run update-desktop-database (sandbox violation)
-	sed -e '/^UPDATE_DESKTOP/s:=.*:=true:' \
-		-i data/Makefile.am data/Makefile.in || die
-
-	# disable pep8 - checking python whitespace style is not useful for us
-	sed -e 's/pep8 /# pep8 /' \
-		-i src/tests/Makefile.am src/tests/Makefile.in || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# disable pep8 - checking python code style is not useful downstream
-	# (especially when that style check fails!)
-	gnome2_src_configure \
-		$(use_enable test tests) \
-		PEP8=$(type -P true)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/dev-util/d-feet/d-feet-0.3.13.ebuild b/dev-util/d-feet/d-feet-0.3.13.ebuild
index 553e81b24062..7ca5c5d001f3 100644
--- a/dev-util/d-feet/d-feet-0.3.13.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.13.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 @@ HOMEPAGE="https://wiki.gnome.org/Apps/DFeet"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="test +X"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 1599d414324a..86a885ec0b61 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1058 BLAKE2B bb9b2eaccf2aaefb537c80aebed87e559f0ddd0cce091835ba9646ebba33a6e817d5203b8ac2ea410673439f1164e49b09e3315b915848a7edd10fdc9e078efc SHA512 fbd8733b87064272fdd2a7ad48e09d6389e47766805f7953deeb88b976ea4e53c7567ecfd6e568b5ce6f543682bb7ae46c57b0d4abbd4c7169c69a865f91cd48
+EBUILD dbus-test-runner-15.04.0_p100.ebuild 1077 BLAKE2B 47b93fa42e8f8e99a1aef9bb380e2fd94cdae12e15924484bebc62bf17254b6f9e4904807e27eddefc16ae4ea15c0881d03446066c3d211a79797eba8d2ea426 SHA512 35dfe14f974d5abe94fd86d252a919b284f82c7b023ec8dcd617cd792baf288afebaf1a065f5c20132a611f0d3ec6d99804e636a7fecda0a90004b8efd2e3261
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
index 25f42cf0e13b..f5ef58e3d858 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.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
@@ -21,9 +21,9 @@ RDEPEND="${PYTHON_DEPS}
 	>=dev-libs/glib-2.34:2
 	dev-python/dbusmock[${PYTHON_USEDEP}]
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}
 	app-arch/xz-utils
+	dev-util/gdbus-codegen
 	dev-util/intltool
 "
 # now optional:
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 253cecef8ec3..42893b9cdfbf 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,9 +1,7 @@
-DIST debhelper_11.4.1.tar.xz 475072 BLAKE2B 8220e2e199b174d811c8bf3dd7d1dc34a9d4a371f2ca249c9c210f4abb18e1de29692cbc094a9bdcf17aa2b8b917ced2736109fa8683d128cf50a95233888a62 SHA512 658456cfed3f8549598110b9dd3b9cfec52cddb28d85911d59ee973fbcb8f40b2f430224f48a0a3767a21bca977fface873125ba63f46290b7b696286d53749e
-DIST debhelper_11.5.1.tar.xz 476888 BLAKE2B d75d45d0ce1b91537822b07c85cd32d9c797d6c0c12580d72c44466cd856d5bb5e1b26eefad0f0cd9cbf361b6df046f0eefd962af05b6607dd10d9f94a266b3c SHA512 4bf296d0a61367a554f2fa50ebae09054a544311260532f870f7338cafd67381f85eb2095db01283cfa4ff186d5629e8284413a0e43076b2b1f53b5f3424e3b1
-DIST debhelper_11.5.tar.xz 477084 BLAKE2B 0d32eae102fbb91a42e4ed5d5c8f2456dad28526d2b7e89c6a9fee7a85f6fea4241f1e4c9303b2324806a98c33d161a6ca1aa5d4dbe2f659b377b532629bd299 SHA512 268b03bc9347dc2f396c38e1cbb0f7c8ca3bab765dca72bf5a9a21c26686445fb550daa92586ddae97858ca03fc3210440b4efe87c319ca045cc743ff5ad6af3
+DIST debhelper_11.5.3.tar.xz 478232 BLAKE2B 18ddbaf99d06d8305f5268448144f9149d3cfe09e22e89e6a3f88bf8fe315fd6cc6c863f2c832f47b54bbff3626198768563e321fc3eed37dfa199910c3ba60c SHA512 336da776cb8be7d9220985d04b8277466514b9daaec91ce5e905c63867b4db103d182212a245c47810908c213fc2fed6ed0cc9e5366be2f017d18c5b47437cdf
+DIST debhelper_11.5.4.tar.xz 478008 BLAKE2B 12ac91b2de8f8090f2cea7e746312ac79df15b09f9882010bf90761f99712214ec147134c7e02872778f1cb90dc172d3df3d32e8bff63e1ef3b293723a111764 SHA512 f9c9352db4df9cd3582223ffa70fd72f19d269f2b4a0b33015bbce87cbd7798cb15a2f0c0f732e33e2cdb4d77a71ef69834ba5021386729ed10f470794f2a081
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.4.1.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
-EBUILD debhelper-11.5.1.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
-EBUILD debhelper-11.5.ebuild 1507 BLAKE2B 1d5a6ece28106c6ada5472576252f20a7524eca1e2e90e08803a1798534ddd3f2a8ef1f1393c0c9b9a3a12d9d49b1469a156a0e417b72382faae5754fcd05297 SHA512 e6c826f165111ce1e36810292b9d13664b74356ffefae36905f3e78928e9391af9e67fccd7b9d2017e97bbeba14df3bcaa26100d507be904b8ca2ec130a12a72
+EBUILD debhelper-11.5.3.ebuild 1507 BLAKE2B 16b7f89886d274239047aaa9887f368a9451b3a7ef77de7527859aa6d76a4a586f4b6bad9006937fe32d38258d812fc789b547428173841d091be13f11a2e606 SHA512 f6699e202068bab231ef4f7d6419aafb7174e37405ba3cbf8421a16c2102c4a3a86aa24e9bf2897d409293faec481c8df9bc774550838f05ce6dcb2f22457e42
+EBUILD debhelper-11.5.4.ebuild 1507 BLAKE2B 16b7f89886d274239047aaa9887f368a9451b3a7ef77de7527859aa6d76a4a586f4b6bad9006937fe32d38258d812fc789b547428173841d091be13f11a2e606 SHA512 f6699e202068bab231ef4f7d6419aafb7174e37405ba3cbf8421a16c2102c4a3a86aa24e9bf2897d409293faec481c8df9bc774550838f05ce6dcb2f22457e42
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.5.1.ebuild b/dev-util/debhelper/debhelper-11.5.3.ebuild
index 9606374c12a7..49deff4eb2c9 100644
--- a/dev-util/debhelper/debhelper-11.5.1.ebuild
+++ b/dev-util/debhelper/debhelper-11.5.3.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
diff --git a/dev-util/debhelper/debhelper-11.4.1.ebuild b/dev-util/debhelper/debhelper-11.5.4.ebuild
index 9606374c12a7..49deff4eb2c9 100644
--- a/dev-util/debhelper/debhelper-11.4.1.ebuild
+++ b/dev-util/debhelper/debhelper-11.5.4.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
diff --git a/dev-util/debhelper/debhelper-11.5.ebuild b/dev-util/debhelper/debhelper-11.5.ebuild
deleted file mode 100644
index 9606374c12a7..000000000000
--- a/dev-util/debhelper/debhelper-11.5.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 8ab611283391..70d069dc307a 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,8 @@
-DIST debootstrap_1.0.108.tar.gz 74631 BLAKE2B 3b676f993843dc70bcbb38929f8e90357c1be45430178fce9ccf7320fc5cf9fed5e9f6eb3137878fe86fcdbc082315f9edecbec321453c22fa588c601206895d SHA512 69f71ffe6668e0fef95f88f74d8625ca32eed11a43b893ad79e4e1abc8c79156bc9a3f8d2465465577d83cfe2ea40692f2f616f173edab0b1d9ea3c3a04b9736
-DIST debootstrap_1.0.109.tar.gz 74602 BLAKE2B e22239076c917bedd346b1639c80d7faf5399f66518ed67b1f1278a7cef2dfa9b0babe7691597eb1038d5f7c23086c5427a71d587214463692c65c9919914064 SHA512 6e55e14d803617b33bc00381b53c465e403f4aaf8765aecb04332e6c87e9b4fed6a23f55eabc4c11910be42bf9cbf88dacbee992754aa4e233cb79a826177cbb
+DIST debootstrap_1.0.110.tar.gz 74847 BLAKE2B fe715bf7657aebfab40f4196f69c29ee0a3ee5c882e1618645cebb30e792a8bc5db3c0cbc7b0978b89462f1109a1257c9702260471f4d9c8231062f1947123b4 SHA512 5c89887073d1ddd06eeeb57cf36c908ae5a4094cafbbab1ea6cade376f6babc9bf6c981989a2a1b9b5da89f1ab8096b7283d3d7565a1d90af0174095d93f2a7f
+DIST debootstrap_1.0.111.tar.gz 75503 BLAKE2B 96489f3ea8af07b00c685b7454ea255354ea8c08e01ded40a14e9431287c6b7f347cb0960107588ecb583ddac675dd0cb92cfb876d08f91436e0015bbd5b4504 SHA512 554ad9c1b5426dcb9e1d89fff35d08c1048beabb882362b1d0b86eef76169c0fc72ccaa235717614abbacc739443dc4c8dd84119ee4cf186aa5b8f2f3cfe713b
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.108.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.109.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.110.ebuild 1179 BLAKE2B 481b0f80142e00e44ded4c051b4370f6d3ee36586346ff143efa42db547895cd507b98764ebc4db9eccc7cfbeb1b3596bf5c46c174f82cfb007732535b7ea1fa SHA512 0fd5460c8744da66aa94bfcef8e5a9f72990733baa72df714fbb52d9b4916bd00195ee402d7948fc687de5c8bd776fdca9bd02aadbab828bdcb29913a30325c5
+EBUILD debootstrap-1.0.111.ebuild 1198 BLAKE2B c9f7add824f8c5b8e765dcbb7cd8d1ae456f3308673da0b5a0e58e0edfd09314e5e38d28f3cf44dbab3a4b1ebee17459a542e1a50b31fa6fea39928219b76d05 SHA512 557b46429de974712fceb1012c6887bb7b4085588caeada14d20b472c340f6ee23924d1ba3e8cffc874ad2b3e8eb94e41de33bdb786a4db5b8e2d540f1291c18
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.109.ebuild b/dev-util/debootstrap/debootstrap-1.0.110.ebuild
index 93ffd5d2d1aa..6ace46fd199f 100644
--- a/dev-util/debootstrap/debootstrap-1.0.109.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.110.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
 
 DESCRIPTION="Debian/Ubuntu bootstrap scripts"
diff --git a/dev-util/debootstrap/debootstrap-1.0.108.ebuild b/dev-util/debootstrap/debootstrap-1.0.111.ebuild
index 93ffd5d2d1aa..7bfd4fa6a357 100644
--- a/dev-util/debootstrap/debootstrap-1.0.108.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.111.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
 
 DESCRIPTION="Debian/Ubuntu bootstrap scripts"
@@ -19,6 +19,7 @@ RDEPEND="
 	sys-devel/binutils
 "
 DOCS=( TODO debian/changelog )
+S=${WORKDIR}/${PN}
 
 src_unpack() {
 	unpack ${PN}_${PV}.tar.gz
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 63a3661e283c..4b41ee5ae0c0 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,7 @@
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
 DIST devhelp-3.26.1.tar.xz 613508 BLAKE2B a84d6bb55a81f0beda0603f343022b997e263934fc48ccc95503e156a0ee0984e1c945af785971c45f197865147c63be354ace72582d3575692dd5eed7e1e724 SHA512 76beec8846703004202229853a7a208b31bf56e2f10c102a3bb6e88fb9e54aded027e6ab9620706629dcb02cf5973f1d4fe88d217a7b3b8cb0efc948b02ca660
+DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B d3b3a2768b33fb47f05d35d9e6fe970d2f42c564c37916123d7377515dfb5a8277c51f543d103d4b34b11d72e3fbf4d7efc63296e118b1b6a6ac5ba557376a02 SHA512 a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
 EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
 EBUILD devhelp-3.26.1.ebuild 1720 BLAKE2B a3f309bbee7533f0f4e2f9002578a6f311ab5ed8cb134b5b73a5c7639068a4479479b64c1ec8b0b43cc0b7468cd9d8c6549cac84d97c2b9b79a6986b7cf7af81 SHA512 fb626b2203dd6dac9257eb135cecfa98a315094c5ef2c3faa0604f4d0cdd57571783ad1e7f54a72d33bbbab2398d1e85f029ae3049453a2bbc2399159cd6ad28
+EBUILD devhelp-3.28.1.ebuild 1783 BLAKE2B 06084e4718a94e83d7a8a005f37a021ae7c7d918ef05d531e7f5b01f05d2dc5c3c7dc67262a4e2057ea22a46521c6323fc67d200f21756a5b910f52f3a155a7a SHA512 3e2489ccda475a4c95b0f4f95445036ff88693ca43d11e67b142ccd899064eecac45ef391ce892aeaa11909e94ba962abffa316e4536f41f06bf795680977466
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.28.1.ebuild b/dev-util/devhelp/devhelp-3.28.1.ebuild
new file mode 100644
index 000000000000..f613f8f1f72b
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.28.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+# gedit-3.8 is python3 only, this also per:
+# https://bugzilla.redhat.com/show_bug.cgi?id=979450
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+inherit gnome2 python-single-r1 toolchain-funcs
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-2+"
+SLOT="0/3-5" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gedit +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.40:2[dbus]
+	>=x11-libs/gtk+-3.22:3
+	>=net-libs/webkit-gtk-2.19.2:4
+	gnome-base/gsettings-desktop-schemas
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		app-editors/gedit[introspection,python,${PYTHON_USEDEP}]
+		dev-python/pygobject:3[${PYTHON_USEDEP}]
+		x11-libs/gtk+[introspection] )
+"
+# libxml2 required for glib-compile-resources
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	>=dev-util/gtk-doc-am-1.25
+	>=sys-devel/gettext-0.19.7
+	virtual/pkgconfig
+"
+# eautoreconf requires:
+#  dev-libs/appstream-glib
+#  sys-devel/autoconf-archive
+#  app-text/yelp-tools
+
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if ! use gedit ; then
+		sed -e '/SUBDIRS/ s/gedit-plugin//' -i plugins/Makefile.{am,in} || die
+	fi
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	# ICC is crazy, silence warnings (bug #154010)
+	if [[ $(tc-getCC) == "icc" ]] ; then
+		myconf="--with-compile-warnings=no"
+	fi
+	gnome2_src_configure \
+		$(use_enable introspection) \
+		${myconf}
+}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index 6fdbffd017b7..2fa2050becaf 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20180621.tgz 529123 BLAKE2B bb085e93a0eaedd1fc517bcfe080f8dbf61bf0b28003b38356d66c324baed7dcd2f76917676a1894e76bf3a7d58d3090c95e45624dae37e3e2e885282ab9c5bb SHA512 1c6d794af50a12294e32b99fd9d3eb9451ac4a2f21c5567848b59c7a316b3058463c41fb8f9eb0bce68edbbe463234a6ec893f7a013ceb953eb5da0effe0d274
 DIST dialog-1.3-20181022.tgz 531815 BLAKE2B c6a34010eb991683356338009998964fde60bcae4181d8b07e6d5b9f0d0e9a61d3f0b112fad02c151b1774380e18b87f93f43fdfe35e0fba86914c029eaa274c SHA512 5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925
+DIST dialog-1.3-20181107.tgz 531872 BLAKE2B 7724d66bbb953ff118baf5f135810f40fca30bde6a4a340306da322e9adb4b40e105376c316945b7f70ee2be2698f1bee88bd040c22b5662685448145ccff0a8 SHA512 69cb367bc9a1d6dcd69b74f7eae9b4318f0bfd9c0eae48144da119df10f7f81ed4c215a8882d72dfbbd9ff41c5e591c80b168b9552e014454cc80c9aa37dca55
 EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20180621.ebuild 1276 BLAKE2B b21d421081fef21de326210e5117f0223203444ac0ae5ef1b4cc972d2fd57c46c0f2b50594a429ff7cd2b7a0e390f372d3781c5c42be65c7b4f2d84488e0137f SHA512 fd98134e5dd69bc3728b40b71933a5e49f3df34f8e22ec5baa02e8eb267ed2191d889086df23e263cd819d31b6363af4f6205a9989a03039ac0c84c9d8620bed
 EBUILD dialog-1.3.20181022.ebuild 1273 BLAKE2B 3bd67bec0a3e3b0bf763ac1b0e1b700d2a948037a2adee40500df18b5fc1b2300a328ab74e584c514d8bb12c172f65dace7a9656a4e76f745fcd0a34ad62d86a SHA512 b8ee4727dab3adb822e3b317ecfb6ef783ec153eff025b31319c2d342ac6979037e2d0e47eea84fb8f02c685a74fcfdcf575b4880807ed61d5b3addcb7f74c53
+EBUILD dialog-1.3.20181107.ebuild 1273 BLAKE2B 3bd67bec0a3e3b0bf763ac1b0e1b700d2a948037a2adee40500df18b5fc1b2300a328ab74e584c514d8bb12c172f65dace7a9656a4e76f745fcd0a34ad62d86a SHA512 b8ee4727dab3adb822e3b317ecfb6ef783ec153eff025b31319c2d342ac6979037e2d0e47eea84fb8f02c685a74fcfdcf575b4880807ed61d5b3addcb7f74c53
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20180621.ebuild b/dev-util/dialog/dialog-1.3.20181107.ebuild
index ffa55f6cd40c..1d1adc032578 100644
--- a/dev-util/dialog/dialog-1.3.20180621.ebuild
+++ b/dev-util/dialog/dialog-1.3.20181107.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
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index b4946bb24617..5d6f14f49d5b 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -2,8 +2,10 @@ DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
 DIST drone-cli-1.0.0.tar.gz 2619027 BLAKE2B 9941607393ff86682dfb3cdf27869ecd38ea83298587c54fcfa80d3d48a9ce2b5248251ab22489b711d192a0ee1b0960d40ce68c7a475c45d4385b7106c7f20d SHA512 40519096befec078f653c9d91440a942bd974da528c6b900cd613a88c21468b56c85fbb3d581e32a1a9d572b098e78549d7fe9f23a05faff1acd46c1266a2081
 DIST drone-cli-1.0.1.tar.gz 2619641 BLAKE2B 6c87defffe75e9bd67a67e9ccc4285cc35bbb74bef742d29d47bc8f1a9099d56040637431380f0c83b4e469fa7478de1860bc62b6baa99c3b70f963065aba1b2 SHA512 0fcafa7e71d1b2e2f94dcecd641dc5225d32f149966ede653434630c70b865f8beb134a926e1d39faf82626607fdccbd93d84b0d3a97aa12c73e201a5b916208
+DIST drone-cli-1.0.4.tar.gz 2623767 BLAKE2B 8822e93a354342393c333aa5240af04bb177991aa667e532c02488c2e351bcfaed8d349d114044c39ac980e620ed0661440b7006de5dcd63309899d40bbb2453 SHA512 241c2c9c8b449a8a29deffe6c537916f6698d0e0ac9b4287d5c441c7f09675b2fb717f0e8c846e0c71fb07609c32a1904579938f82d6c6b712c4b66d9484e2e5
 EBUILD drone-cli-0.7.0_p20170717.ebuild 784 BLAKE2B 22d5fbe09cbf07437a2b095caddf942fd5c0ee484e7d30404b5a109856ced11f99930601234fdab2bfe21d8ae32134909594491d435eef7fc74f4e8682ada7d4 SHA512 e0b0fe272d3fa48d84b346a6114e98b477f7d6785e9d214d70202e15c84a92bf80ea3af1ad98ff08e90121d18d3a39c4b7f97665db8d03736d8100a53eb49558
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
 EBUILD drone-cli-1.0.0.ebuild 699 BLAKE2B fb11a4d7748e8b55d99995982eb36ed66c5ae976a6c75915c4328d25f629c43e56924d22fb14b33cce934a6be410863b7d116ff3cd1a7015a81be6168305ee4f SHA512 e716f601b6c055be9bc251b855738dd6ca856154a79e2cc71f5127f95129751b3e15e4d71b0bbf0dc3c8bc312f5ce7831ecbd619c05587a0f839f1f30105a08e
 EBUILD drone-cli-1.0.1.ebuild 699 BLAKE2B fb11a4d7748e8b55d99995982eb36ed66c5ae976a6c75915c4328d25f629c43e56924d22fb14b33cce934a6be410863b7d116ff3cd1a7015a81be6168305ee4f SHA512 e716f601b6c055be9bc251b855738dd6ca856154a79e2cc71f5127f95129751b3e15e4d71b0bbf0dc3c8bc312f5ce7831ecbd619c05587a0f839f1f30105a08e
+EBUILD drone-cli-1.0.4.ebuild 699 BLAKE2B fb11a4d7748e8b55d99995982eb36ed66c5ae976a6c75915c4328d25f629c43e56924d22fb14b33cce934a6be410863b7d116ff3cd1a7015a81be6168305ee4f SHA512 e716f601b6c055be9bc251b855738dd6ca856154a79e2cc71f5127f95129751b3e15e4d71b0bbf0dc3c8bc312f5ce7831ecbd619c05587a0f839f1f30105a08e
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-1.0.4.ebuild b/dev-util/drone-cli/drone-cli-1.0.4.ebuild
new file mode 100644
index 000000000000..76b00a393dc2
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.0.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/dwdiff/Manifest b/dev-util/dwdiff/Manifest
index 38184e69e03b..7cd327ca9e93 100644
--- a/dev-util/dwdiff/Manifest
+++ b/dev-util/dwdiff/Manifest
@@ -1,6 +1,5 @@
-DIST dwdiff-2.1.0.tar.bz2 79224 BLAKE2B a201c300532757d293bbcdc61f91d81e3a2dcbc4847540bae278be561535b7ef2b6a191e2946b8af941f6550168893a17365e3020771a4468387567c4b3452f3 SHA512 63e5ea3ae510c84fa2353da55bbc3cfac3a3753e1cebfb42c387218289a5e19d8e68af663181720a55eca05e49ef075db7d5dafda9dc4d57b9af503553ae9021
 DIST dwdiff-2.1.1.tar.bz2 79628 BLAKE2B eb024d9c0eff18de9eee4a0fcf2d6a9ef6b049286ebb7f9715ddf18d920cacaab2738f04607b358be784f9d3e1c25f279ede620d412fad026f3280b9f8ee471f SHA512 b3392ef01c0701ea7738f1b539dab81727735e5de8ea77b56feae4e2f64dbda0155b479d7be0eedb65fc56ebc8d1a22c1ca67075abdec54205ad9c305b3751b7
-EBUILD dwdiff-2.1.0-r1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
-EBUILD dwdiff-2.1.0.ebuild 830 BLAKE2B 0f80d0d578d0ad1d2fb0c565ddb384bda81878f94bacd5b398b983b48c8ed003411748e104b926dd03f6ef2d01bb7fa9fcb2f56816117f79cbcee638a42d56a9 SHA512 eff5be39b231c56c647f5823f9c3c897e21718ef1ddef5e5a85b0cab43c34d15f69b81ec64b6f694c2f4228435b9098192bfc666766d2cfa1acf3742ec1671de
-EBUILD dwdiff-2.1.1.ebuild 832 BLAKE2B 0299a22120d753fc90df2c4237e8297cafabf916b491f85679f269da193eae89450d750b80ba32684889e5eb24cd817c3290072e56d7853fe25671460a9427e9 SHA512 9f27bae383dc6d51cf602ab6e0ddab3d31c125fadd3755e207eb7c62979b0bf0a1843e840c5fd2ea0eff209aea124e54b85f82b645311cfa0b71c9a2b1fbac73
+DIST dwdiff-2.1.2.tar.bz2 79282 BLAKE2B c938c9684d6ee1abacd77c1570b88157548e217e1837758f6c45266e29abc3857c6d4275d72126c29cc361e484722fe1d8c85a3714ac909b35a06d8390fb6506 SHA512 e4897ec3990261ddadf1fd4287902dd74c8350d11448714be8ea4b7808fc7d419ca2fd7fe65f347f46fdb1090d2d116c180a53fde3ff095027765f40acaa1c91
+EBUILD dwdiff-2.1.1.ebuild 826 BLAKE2B 56666408fce2fa065675d12e372b29601281b5c7ea1f7fa0a677ade24f843bdb863d5b5727cba9144352137e6007dde190702d67fb6822b69178ea79feeded01 SHA512 d3d7c79ead64fd11fa55a134d7027295bcabe0e5419c1fdad3c35c490d2f6dc9513cd40498db1e05dec6131d26ba44fbb8fa28f46c54f815fbdf827078292817
+EBUILD dwdiff-2.1.2.ebuild 829 BLAKE2B dc378595c30cf6dd3a0ff647d2a6e200f070ee060c55ad8e5a4515aa1b2ca0f71a119f64421677404eb4c49316de52d2a2cfd2bd0cc190bfecef5429e51b7ed4 SHA512 6e91426fcef7c02a9d7391559d659e7f7ec701fab711983822d48170947740e03cda1c1bb1e7294c65e11eaf5618b2a64c05912763bc6d3b2a175837ff278c7a
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/dev-util/dwdiff/dwdiff-2.1.0.ebuild b/dev-util/dwdiff/dwdiff-2.1.0.ebuild
deleted file mode 100644
index acd2c98c7343..000000000000
--- a/dev-util/dwdiff/dwdiff-2.1.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="diff-like program operating at word level instead of line level"
-HOMEPAGE="https://os.ghalkes.nl/dwdiff.html"
-SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="nls"
-
-COMMON_DEPEND="dev-libs/icu:="
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/diffutils"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	sed -i \
-		-e '/INSTALL/s:COPYING::' \
-		Makefile.in || die
-}
-
-src_configure() {
-	./configure \
-		--prefix=/usr \
-		$(use_with nls gettext) || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake prefix="${D}/usr" docdir="${D}/usr/share/doc/${PF}" install
-}
diff --git a/dev-util/dwdiff/dwdiff-2.1.1.ebuild b/dev-util/dwdiff/dwdiff-2.1.1.ebuild
index b549a993acad..87a39fe8de0e 100644
--- a/dev-util/dwdiff/dwdiff-2.1.1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.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
@@ -11,7 +11,7 @@ SRC_URI="https://os.ghalkes.nl/dist/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="nls"
 
 CDEPEND="dev-libs/icu:="
diff --git a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild b/dev-util/dwdiff/dwdiff-2.1.2.ebuild
index b549a993acad..0ed5a821f25a 100644
--- a/dev-util/dwdiff/dwdiff-2.1.0-r1.ebuild
+++ b/dev-util/dwdiff/dwdiff-2.1.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
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
index 652611d75d22..83e15e8643a8 100644
--- a/dev-util/fatrace/Manifest
+++ b/dev-util/fatrace/Manifest
@@ -1,4 +1,4 @@
 AUX fatrace-0.11-sysmacros.patch 295 BLAKE2B a7f5350f0158e1f0c529b3a67a59b4a4255cd640287822b57e1f0952029b899fbdaab15e2d22394357e1210bcbafe8678866462a8213a030d5dfed2ec57f214b SHA512 0b3946043f74b957eb1b8caad39cc1b031e40bad564a1ffaa593dd77d5f96f06a1103d8d0b3689b4fe58f4bb4ff105d81855c9088ea5eec9d4ce6876d4a6f7f9
 DIST fatrace-0.12.tar.bz2 19377 BLAKE2B 5279af5497408fdc614f090060e56552e0f396501a0d4155752ab44bfa666878ab4b969979314051b9b3f529e3870ffdc8071f332dbc146f0d2a7798c8b2549a SHA512 76dfc9dfc5c6b8e13f5d0c5c01c5c1b91093a5d980ded1f8fd776c9e861a6679eea193bcdd92b1c8770c9af346820300f186b7167ff4313e670f27ea31f765ea
 EBUILD fatrace-0.12.ebuild 844 BLAKE2B d20c3845d873391b4a429b541cc45a8f55adc6cff1423e9dd757d34500b3948a1769d812a13494ab5e91fee403bf92e9dfed3f8794b7c92c70eb02baf5297c3d SHA512 befb801bc29cce8b63e896355c68e99b28f3adb4c5eb1b73244653e62e1b576b9485a562295391ba3d507dc62685a6515d3739b9a26888995a775ce80b42376f
-MISC metadata.xml 388 BLAKE2B 3725d4392852682048ac5ef723a192389940988dbacec188d1956b73db5f2988b07c2b0a24912afdefa94765f70ababe8033f8778f82d016ac632d58b16cb84c SHA512 195cef9daf519cc93f44926498d1d58f3751bbdb54df19fe1745d245c4ded2c190da45637bb52a2682a6d2fc5ae692bed0cb3f5c111c4f6e156b11d0690e3036
+MISC metadata.xml 312 BLAKE2B ddb40aa2eb3e880241bcfc0a99e4a344a13a761d31ae2fd38e5f7050fbdc3087498e195e0725821bea6b824d892a2bd72aaab698ca387cf74f5d6ab9bad76449 SHA512 013d5658ec11cb683dcd6c30d8059099662cf3b27e68ae1312496a54c317965efc73693705db27f96254d7293cf9ea8019237f2ee550cc91bfa2aa7b63c161b0
diff --git a/dev-util/fatrace/metadata.xml b/dev-util/fatrace/metadata.xml
index 1c2ccfe5c948..dd6111e88545 100644
--- a/dev-util/fatrace/metadata.xml
+++ b/dev-util/fatrace/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>xmw@gentoo.org</email>
-		<name>Michael Weber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="powertop">Add powetop integration</flag>
 	</use>
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 87d023adfd4d..c86e155daafc 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -5,7 +5,13 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
+DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
+DIST glib-2.58.1.tar.xz 4906444 BLAKE2B 022da8624a8ae2ec7fdc45777556a518d056e7389158d96db36baccdb238ed6fbdb6f224ec8b1c1bfec78001aa0348d3fc1fd43d20908a8c4690a0e03038bf61 SHA512 115b74fcd43241e3c4b4babfb8170453b2a002ff02d5996f3c097876199cadccc1cf67b017c10c14c0d2a1bb4228027b743f4926bda0ef7d74012ed712ccd155
+DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 EBUILD gdbus-codegen-2.52.3.ebuild 1300 BLAKE2B d12be53feaf81713fb6751be44aa4f0bd28bf3a24026fbc9660db984b5fa5812a61870f19eeef6d2bb3f7292454f885cac1ff85f3e7fc31852a1b7e8df63b0ac SHA512 5627b321d5e552b3362bb13cf639fa56612f9af8f69368f3d2853bb1166c9c33d494e7a5dfc024f9d766758360b8586d4921d53759441a1c6001bcf37542334f
 EBUILD gdbus-codegen-2.54.3.ebuild 1292 BLAKE2B 768770f538d5520ff22af528ce5ee0ec6483cd33a9564853033f05caadbc834239fe2a198760d24bcc8dbb21ec127a5bc1f71319a023b8e8f595bb7e82cd5129 SHA512 56c148582a8055d39827632c3f89947fb9a57b9061ccc29e0c5aecd9770407bcba371d71a8c8c6e0d0542ec3b193eb4e596153f2732badf540c858ede1a57454
-EBUILD gdbus-codegen-2.56.2-r1.ebuild 1316 BLAKE2B 73ddee2a5f9b9ea035b15f349d77294c0c6a95218ff12eb5f1c17ff7c996c10b5cc08126fa30e1af6a5f5e18e10c6fb6f61fd0f4832eca1599f1315a7e22f0be SHA512 5eea87dc6d4453c40c61442bb586d89dcc09d75334ff4f827875b3738c8849c6640d34128632bb18c57ebb85a18986e34f000bb49dfa16c0d66048990f7724f4
+EBUILD gdbus-codegen-2.56.2-r1.ebuild 1309 BLAKE2B 7a02615b7a8cc26cd9be1b2452800628152914ce889ee676df75f245784f03aa0ce6a4a45bcd73f13e3976fc0ff762e18e360e2f06b2b63fbdc9580e3674ce08 SHA512 d9e16e1b9c6f9075bff59b0b8210d94ff67090be24824bef8bdb5305221fcaf486d3b74f36c2541674c40c5cbddcf5af120b6c30255677201c281e7b7b35750b
+EBUILD gdbus-codegen-2.56.4.ebuild 1312 BLAKE2B 065e5723611c16b97a7dc62953223794b3619d469322505ccfc5cfed6f76d6cb44a62f13b450762fc50db0ba636fa65cc3b8dbf255366534b934007c0ced9b09 SHA512 bf65a034db4c208226acb116465ecbd7ad303cf1b47ffd9096d33e68cd213a945f5ad602dfac34ca607b1545912d75a36838ce356a80db2bc27c5ed6534f16e2
+EBUILD gdbus-codegen-2.58.1-r1.ebuild 2130 BLAKE2B b58e9658ecdeaea3e5db2006133bf957993e3d74f98b66f18cd65ebfee45252f8e3bf2c357c44b7128f61da4b041716b42125fe5a50dad05d5d109ee73de9c62 SHA512 83cbd6cab6a158de848b9157a356fb0dc36a68dd4ad04605935a08b4254885e29f6099b858e26731d70173f7501382ce46f4aea9f18eabe0db0e89d79bea368c
+EBUILD gdbus-codegen-2.58.2.ebuild 2130 BLAKE2B b58e9658ecdeaea3e5db2006133bf957993e3d74f98b66f18cd65ebfee45252f8e3bf2c357c44b7128f61da4b041716b42125fe5a50dad05d5d109ee73de9c62 SHA512 83cbd6cab6a158de848b9157a356fb0dc36a68dd4ad04605935a08b4254885e29f6099b858e26731d70173f7501382ce46f4aea9f18eabe0db0e89d79bea368c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
index 0cb9126e1e01..91798e300e68 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.2-r1.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
new file mode 100644
index 000000000000..101c8fa1d8d2
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.1-r1.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.1-r1.ebuild
new file mode 100644
index 000000000000..9f7004d0f1c0
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.58.1-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.2.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.2.ebuild
new file mode 100644
index 000000000000..9f7004d0f1c0
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.58.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_REQ_USE="xml"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome.org distutils-r1
+
+DESCRIPTION="GDBus code and documentation generator"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+# To prevent circular dependencies with glib[test]
+PDEPEND=">=dev-libs/glib-${PV}:2"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index c1be159048a9..51ac8b34ccd5 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,7 +1,5 @@
 DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
-DIST geany-plugins-1.32.tar.gz 4655759 BLAKE2B afef1fd304b36daf4da5bd2a753c3de2c3c94d4274716fe726afc4164d98645f3f2436b306b894bb4245d86ee0782058b0181655d42764421b2d24c3e9e4c79d SHA512 0284aa28820361f419a4ca000a8781bc044e112732ea6be7e511841c18d075eceef4abcabc1153ba9ff8229e529d3e44f6aacdc668927323f2d78bb2f8897a06
 DIST geany-plugins-1.33.tar.gz 4671123 BLAKE2B 33471215480597b34e2733b7dc292e94ff12985b645fda76b2e25492573bb866766a3ea5a4598c4f643e9528f8062ffb9bf6ccabbb9be04aecbf23650d9c776d SHA512 d046eb0b7bd3c704b62c84b05564b973203ddabf6c09b94bf3008955735d672077bff1a7cda27d4eba97824231483f3e64b3b0f0234a97a1a2727d535fb28718
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.32.ebuild 3182 BLAKE2B 5003867dc35ec00ff63552dbfc57680c0014a8af897da13ab286ed57fba913968c54fb27a2f9758744db1f3d01ebba4118d84dc325b3dc43668d4b00c85d7da1 SHA512 2779d14f320a8dfbbdec5ab9862a5fc6eb2230d09774c018ccb6bbc248b0291ebde97de7b03bff998dd41f1b2d83717531948865c7c2936a500a5a2f18c1957f
 EBUILD geany-plugins-1.33.ebuild 3166 BLAKE2B 3e6beb940b81bd921424b6d1310c2fe402675a86815c6743483d7d9b5c05b4f4cdd1818bf92086430a03bc44b3a5c4bdaf58fb7e71af5da286dcfe2d71ee11a2 SHA512 7d3ac36a212e1deeeff6256aaf6593a65c0ade96e6da40fafe28a3672d46c4b3960c9c5b68c026acfe8c1bd8bed930a5aab9707168f3e7c4fbfdc9dbcb405d93
 MISC metadata.xml 1533 BLAKE2B 33a794171fd9b6a50ea6669c4bc782f40144d7efcf3145c742f4b427c1a2389d9370085ba2661498800324c17b3bfd5608b70c7e1f24892134e338108ae08354 SHA512 7c469c01a2afc24631d1260ca010c59031d61c63c903ce13ccc5147d960f0299c5cad02f4a839df8bef1f5566a49ef443bfdd0b40eea0a4401c8fa6625f532da
diff --git a/dev-util/geany-plugins/geany-plugins-1.32.ebuild b/dev-util/geany-plugins/geany-plugins-1.32.ebuild
deleted file mode 100644
index 305048062da6..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.32.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	>=dev-util/geany-1.32[gtk3=]
-	dev-libs/glib:2
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanylatex
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-keyrecord
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown --disable-peg-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	prune_libtool_files --modules
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -n "${LINGUAS+x}" && -z "$LINGUAS" ]]; then
-		rm -r "${D}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 4b4ca6ec5135..aa0598ff8ecc 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,8 +1,8 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.32.tar.bz2 4341296 BLAKE2B c12b5608929d308cd9ff66c04a395a48d7ae05e773f201ebce64b883a8b5da73d6e84b1799cfea35ae2c12b02177cc0d43328924daaf8f485a83305d0d8e763a SHA512 a5ec73f690368d735e20ba90db90ab9a10e504545374a0d82c82af1f2df2f1382edb966e442257a271602b9322e3229af6a07f9c883d5d2d32236dd8f7791b5d
 DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
+DIST geany-1.34.tar.bz2 4474601 BLAKE2B 92a2b8343512317ad90cd10bd58b2aca77d7f58dff3548cfdbdab121343b67dcaa7a9d5b57cafd196d599d8bb6a121fa5e49d65a69fa7fd87fe7703be6b8d5fc SHA512 ef506880fbba9acbd2003b207c9897e115d398e716631bc1e164e3455aa9172f34b9955c627fb2f2dd3a3cba0926cce0a774d641517bc94b700d866be00db1a7
 EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.32.ebuild 1571 BLAKE2B 70377944ac9e0c07aa305fcd23acbd6719c02bef77cb08e5e1fb87a7e8fec9c96b92e027e312a095af16008191c6e947fd5f073cd0c86ee61fe70e543ec64814 SHA512 0eedd429a1fb3241c34c5379c754ee71d1083cf518a59090fc352be6ebf0cb940437e0070a427bea019fdf85526e7c9854ce987c4f7ad9a69a2916c467a0a30f
 EBUILD geany-1.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
-EBUILD geany-9999.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
+EBUILD geany-1.34.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
+EBUILD geany-9999.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.32.ebuild b/dev-util/geany/geany-1.34.ebuild
index 568033fe57d5..f07d539b7273 100644
--- a/dev-util/geany/geany-1.32.ebuild
+++ b/dev-util/geany/geany-1.34.ebuild
@@ -1,20 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils gnome2-utils xdg-utils
+
+inherit gnome2-utils xdg-utils
 
 LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
 
 DESCRIPTION="GTK+ based fast and lightweight IDE"
 HOMEPAGE="https://www.geany.org"
-SRC_URI="https://download.geany.org/${P}.tar.bz2"
-
+if [[ "${PV}" = 9999* ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/geany/geany.git"
+else
+	SRC_URI="https://download.geany.org/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gtk3 +vte"
+
+IUSE="+gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
 	!gtk3? (
@@ -40,30 +46,36 @@ src_prepare() {
 	# Syntax highlighting for Portage
 	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
 		data/filetype_extensions.conf || die
+
+	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
-	econf \
-		--disable-dependency-tracking \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable gtk3) \
+	local myeconfargs=(
+		--disable-html-docs
+		--disable-dependency-tracking
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		$(use_enable gtk3)
 		$(use_enable vte)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
-	emake DESTDIR="${D}" DOCDIR="${ED}/usr/share/doc/${PF}" install
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING,GPL-2,ScintillaLicense.txt}
-	prune_libtool_files --all
+	emake DESTDIR="${D}" install
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
 pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	xdg_desktop_database_update
 	gnome2_icon_cache_update
+	xdg_desktop_database_update
 }
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index d99d1cea34dd..f07d539b7273 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-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
@@ -20,7 +20,7 @@ fi
 LICENSE="GPL-2+ HPND"
 SLOT="0"
 
-IUSE="gtk3 +vte"
+IUSE="+gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
 	!gtk3? (
@@ -65,7 +65,7 @@ src_configure() {
 
 src_install() {
 	emake DESTDIR="${D}" install
-	prune_libtool_files --all
+	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
 pkg_preinst() { gnome2_icon_savelist; }
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 348fb31c032f..ec8f0a35c68d 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
 EBUILD glade-3.20.2.ebuild 2390 BLAKE2B bcf33fb3b36f7f38c7b91343ed1c0a6ecbd171a42b1ee252009902569ea327c43e1b9b47d04c6c0a87ed9910e1873f9800c1bb566ef160c0258400252b83cb3a SHA512 b540957231160447eaf0dbe056a312e9fc9506db0b83271f7fff63c438be56d76b2bcf5d861d2ad3dd7f9be661250141531b7076a5ae14e2c582c89284170e60
-EBUILD glade-3.20.4.ebuild 2392 BLAKE2B bbf88955bf59219bf267237688428ae0388f0b0d0e0effd998ce9ebdae0b3a23105a061e8f4fc90a721d5e7fae185ec0445ca0627fbc5f3486e42c8374bc3dd0 SHA512 752f71915b7429278da6a7b4a10f14cbba5b858faec11b8cf31901fc7e7b99ce1fb31df964792c413fc69a00118a68896f0a803345adf00b5981165c4fb07328
+EBUILD glade-3.20.4.ebuild 2387 BLAKE2B 003c02a10279cb52ddc2ff94a990bc126439f7ef5f8fda5033a05587701d4b6de31b661cb6c417ec1b8aff5c55da73e7a4609df693951be702d39a7854a8446f SHA512 2619096c3f62994aff9022a68987f09c409c213e6cf076328d805915fcb183283c2fad7de4c5c4091573c4417fc94607c32f7e7013041a8582b45b304effb6a8
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/glade/glade-3.20.4.ebuild b/dev-util/glade/glade-3.20.4.ebuild
index 70eb30d633cc..517ed1022cfe 100644
--- a/dev-util/glade/glade-3.20.4.ebuild
+++ b/dev-util/glade/glade-3.20.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 @@ HOMEPAGE="https://glade.gnome.org/"
 
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
-KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 
 IUSE="debug +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 021ce7e1a72a..df5d5d5e2889 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,4 +1,10 @@
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
+DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
+DIST glib-2.58.1.tar.xz 4906444 BLAKE2B 022da8624a8ae2ec7fdc45777556a518d056e7389158d96db36baccdb238ed6fbdb6f224ec8b1c1bfec78001aa0348d3fc1fd43d20908a8c4690a0e03038bf61 SHA512 115b74fcd43241e3c4b4babfb8170453b2a002ff02d5996f3c097876199cadccc1cf67b017c10c14c0d2a1bb4228027b743f4926bda0ef7d74012ed712ccd155
+DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb71b8bd65df691e34d11bfaf79fdc4c844eb215df24b0f680991fb0d0c08c3bb3dea61f5157ccd8bec200e2059 SHA512 4017ae308f2ef6313abbff2eb9b21ec6f8fa38935007491ca0cb4d1ffac6fedab6f50e911ac088995d6212323ba1767399f18529a2620d60378ecade193b4b1a
 EBUILD glib-utils-2.52.3.ebuild 468 BLAKE2B 862493f148a7e42e6f7aa1e52ee0eeee924889c528b60da5d7ad1908f547cd1434a7b590cdf6c50b6693cc94f5749fa14a4a591e9ec9b00fbd6f6825bdc8e217 SHA512 0320dc667f5e53e0fa68570316b3432c9b3b7d3ba25bd3ecbd3641bead76204c066af0f54a436daba81dbdfc8067a656def6e71942eaa3c1a814e1669fc5caba
-EBUILD glib-utils-2.56.2.ebuild 1285 BLAKE2B df3bf4b9f140061bab67d09f832b6a948674347b311c229c3763fb78bd065bd966513ca77410de2bd99b44bfdd97b4ea50fbe0ed4924e8091b8777bcee28b62c SHA512 cc8029c69a0691e309106bde12aaa548424d050d62f89ba3f728a2410df9d222bbcf704ba767e81e4199720f611fda1148a4472a62356b17b6ab57705a153b3c
+EBUILD glib-utils-2.56.2.ebuild 1412 BLAKE2B 19d1c079c16b76facbd3e3660257c407b5e199a34699f2cdb8ce96994a2583dfd711e4645cb2dc7105fd93144a4a45c8549ac6c79b0b60f38412485219b776a1 SHA512 6877ea1e614ba2f94cae7f70793813a1e43195723cf469e936278996b9039f4890520c9df6f57297015f6cd07d1ea58ab248a4835edca66857938fc8f2dfcf97
+EBUILD glib-utils-2.56.4.ebuild 1415 BLAKE2B 6ea26697d5cd3c0cc5490b161394eb7948a9e7012c39b317bf93f62c258dc9648059df76adf35503d8725a4c4d5d9c361cf977a3f5ea7421c9432c9ee1b2c212 SHA512 516dfaf6e96bd3e9c6aa22e37932b0236dd7e2d67a77a111e3080b50259a9b2ec434b25cdee8b3fc5b7a2131b411e29617b0664df0039006a75872852506970f
+EBUILD glib-utils-2.58.1.ebuild 2290 BLAKE2B 9b350d5b20a2e00df86554a02272141c6675b79371385aae9dc64a86648c0fbc17b6644803d30d5b989e9705df9fe80d566344226cda96d912406ace766c405a SHA512 7d3b3e26fd27ed4fe3f311cbc6165cf02412e6b1cf5dbd18490a6d04fc174a0ecae57e20bb0049f4314239474270f620238d5cb7c6033b80fc21a566d543476a
+EBUILD glib-utils-2.58.2.ebuild 2411 BLAKE2B 3b498ea0da25ed833915203ac8f4cfa736b46fd8d7d389fb9ca59369a23c1ff04638a50b5ca24fb5db2d7812e68a1051428df0829afa7464739685c7a0ce4558 SHA512 b505bcee6d11c9fba2c05db68959c38456c58d5cb30ee66849e484844f94f1b691d9933f9b702c1afc0610dc52bbec525b23116ae26460dfbf453010a3932305
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.56.2.ebuild b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
index 3cc43debc629..fb0510c85f1f 100644
--- a/dev-util/glib-utils/glib-utils-2.56.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.56.2.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glib-utils/glib-utils-2.56.4.ebuild b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
new file mode 100644
index 000000000000..471add2b213b
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}"
+
+src_configure() { :; }
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glib-utils/glib-utils-2.58.1.ebuild b/dev-util/glib-utils/glib-utils-2.58.1.ebuild
new file mode 100644
index 000000000000..d0b5138514f1
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.58.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glib-utils/glib-utils-2.58.2.ebuild b/dev-util/glib-utils/glib-utils-2.58.2.ebuild
new file mode 100644
index 000000000000..f6a840920a6f
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.58.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+GNOME_ORG_MODULE="glib"
+
+inherit gnome.org python-single-r1
+
+DESCRIPTION="Build utilities for GLib using projects"
+HOMEPAGE="https://www.gtk.org/"
+
+LICENSE="LGPL-2.1+"
+SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+
+RDEPEND="${PYTHON_DEPS}
+	!<dev-libs/glib-2.56.2:2
+"
+DEPEND="${RDEPEND}
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 91636d62dcd8..724a31325985 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,6 @@
-DIST glslang-6.2.2596.tar.gz 2270084 BLAKE2B 234d7d201c5ddd91fdaeac1a84104b2b635131fa910315b1d14ae169f6141840a1559114fa2e07775120f56f57d59decd689f44609923152a2e15ecdda66207a SHA512 24c6e90c75767ffc2faf3f0868a7357d5f528cae8972c8b690cda0c573eac0f60f6b8795793534f39ccc2c649cb788101715e42cbdf7ca9d59c955f9b37a4f99
+DIST glslang-7.10.2984.tar.gz 2439082 BLAKE2B f736f0e1c7be39531360de97d0bfb64681fee32dfd324d48082ff286b0a0355f313fe71ddcbac380e48213ba5433e4d0a95fa65a7f0f99c3cdef603e9722ad73 SHA512 4b96ee59745f4ba91e8e89a9a926e93f00db11dba9c74c4997efae5c9252c4e04a0a2cad0c6b8fc2dcbf7d690887486ee59db930628f3284545f89d3d7a3293c
 DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
-EBUILD glslang-6.2.2596.ebuild 500 BLAKE2B 8ab8168010867e61588f4c66987c4d9956f67a517355c8558c77be3643a1cd181a4687f4b639291219a01a44dd72a64bc4fea6c995d8445a3e97f2cf0c8478df SHA512 68a655dd11c81e1bde33cf637e0e7220278b7ec13310abff759d8c3b3529e82d2aeb49843074eddba22525dd6bcdcd46dba3251042d8a50c708932db9f026162
+EBUILD glslang-7.10.2984.ebuild 498 BLAKE2B 35e49b22f515ae046d0f135075910572094af310007251bf7c4d31a262953a172c64419859dd60e8159935bf5578c1d2c8d79c8600332e0787f971d7eb489548 SHA512 a8a7cc0b63bdc91a3f36a50cf4518f44435f90855a9e3c41226b75126bd169cdc712b4a515d7010a646d2cf9f739b43e2887713e018adac26fa745ecda1deb4d
 EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
 EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-6.2.2596.ebuild b/dev-util/glslang/glslang-7.10.2984.ebuild
index 677174912af4..d4e70d8b409c 100644
--- a/dev-util/glslang/glslang-6.2.2596.ebuild
+++ b/dev-util/glslang/glslang-7.10.2984.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit cmake-multilib cmake-utils vcs-snapshot
 
-SNAPSHOT_COMMIT="6.2.2596"
+SNAPSHOT_COMMIT="7.10.2984"
 SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
 KEYWORDS="~amd64 ~x86"
 
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
index 0be30738c3f8..a6dcc1d161dc 100644
--- a/dev-util/gn/Manifest
+++ b/dev-util/gn/Manifest
@@ -1,10 +1,11 @@
 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
+AUX gn-numerics-arm.patch 7056 BLAKE2B c14f25fa03b5d31aa057d0992ff408176168afef0acc4867f345b4f52b513fc726afb458e0a3e9b45340892e497c03cce1d9bf8da10c90c83d8f6a9cbb9aa031 SHA512 051508e5917775a6ae11d03c69cb4b5260b4eae35a805715204e121cc112f888ff6026a041a942fe49feb59b21a5c7e31cb1a07de63a3d365f7ca13cb13cffdd
 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
+EBUILD gn-0.1479.ebuild 1230 BLAKE2B b3207bdea28d83aef19a657017d8715d6ed8b730e479c3155b0f5b93f7e799f34841195f72b773292006197525cc33fe48b6fe5e08db169327d1f4a126dc2f96 SHA512 27f0e899a344f5ba7c30a84d229044632c86372c8308179bf6f6ecc66dca2a846c76c0b5e6d07440ac1d64db429097a0c8dd0cce3c33d0701eae35f547d3e21b
 MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-numerics-arm.patch b/dev-util/gn/files/gn-numerics-arm.patch
new file mode 100644
index 000000000000..f822cdb40852
--- /dev/null
+++ b/dev-util/gn/files/gn-numerics-arm.patch
@@ -0,0 +1,201 @@
+From 8952cb06749d4bd390991878281bc7e72a6eef2c Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppymaster@gmail.com>
+Date: Mon, 10 Dec 2018 10:27:20 -0500
+Subject: [PATCH] Add missing headers for ARM
+
+Bug: https://bugs.gentoo.org/672862
+---
+ base/numerics/safe_conversions_arm_impl.h |  51 +++++++++
+ base/numerics/safe_math_arm_impl.h        | 122 ++++++++++++++++++++++
+ 2 files changed, 173 insertions(+)
+ create mode 100644 base/numerics/safe_conversions_arm_impl.h
+ create mode 100644 base/numerics/safe_math_arm_impl.h
+
+diff --git a/base/numerics/safe_conversions_arm_impl.h b/base/numerics/safe_conversions_arm_impl.h
+new file mode 100644
+index 00000000..da5813f6
+--- /dev/null
++++ b/base/numerics/safe_conversions_arm_impl.h
+@@ -0,0 +1,51 @@
++// Copyright 2017 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
++#define BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
++
++#include <cassert>
++#include <limits>
++#include <type_traits>
++
++#include "base/numerics/safe_conversions_impl.h"
++
++namespace base {
++namespace internal {
++
++// Fast saturation to a destination type.
++template <typename Dst, typename Src>
++struct SaturateFastAsmOp {
++  static const bool is_supported =
++      std::is_signed<Src>::value && std::is_integral<Dst>::value &&
++      std::is_integral<Src>::value &&
++      IntegerBitsPlusSign<Src>::value <= IntegerBitsPlusSign<int32_t>::value &&
++      IntegerBitsPlusSign<Dst>::value <= IntegerBitsPlusSign<int32_t>::value &&
++      !IsTypeInRangeForNumericType<Dst, Src>::value;
++
++  __attribute__((always_inline)) static Dst Do(Src value) {
++    int32_t src = value;
++    typename std::conditional<std::is_signed<Dst>::value, int32_t,
++                              uint32_t>::type result;
++    if (std::is_signed<Dst>::value) {
++      asm("ssat %[dst], %[shift], %[src]"
++          : [dst] "=r"(result)
++          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value <= 32
++                                            ? IntegerBitsPlusSign<Dst>::value
++                                            : 32));
++    } else {
++      asm("usat %[dst], %[shift], %[src]"
++          : [dst] "=r"(result)
++          : [src] "r"(src), [shift] "n"(IntegerBitsPlusSign<Dst>::value < 32
++                                            ? IntegerBitsPlusSign<Dst>::value
++                                            : 31));
++    }
++    return static_cast<Dst>(result);
++  }
++};
++
++}  // namespace internal
++}  // namespace base
++
++#endif  // BASE_NUMERICS_SAFE_CONVERSIONS_ARM_IMPL_H_
+diff --git a/base/numerics/safe_math_arm_impl.h b/base/numerics/safe_math_arm_impl.h
+new file mode 100644
+index 00000000..a7cda1bb
+--- /dev/null
++++ b/base/numerics/safe_math_arm_impl.h
+@@ -0,0 +1,122 @@
++// Copyright 2017 The Chromium Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
++#define BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
++
++#include <cassert>
++#include <limits>
++#include <type_traits>
++
++#include "base/numerics/safe_conversions.h"
++
++namespace base {
++namespace internal {
++
++template <typename T, typename U>
++struct CheckedMulFastAsmOp {
++  static const bool is_supported =
++      FastIntegerArithmeticPromotion<T, U>::is_contained;
++
++  // The following is much more efficient than the Clang and GCC builtins for
++  // performing overflow-checked multiplication when a twice wider type is
++  // available. The below compiles down to 2-3 instructions, depending on the
++  // width of the types in use.
++  // As an example, an int32_t multiply compiles to:
++  //    smull   r0, r1, r0, r1
++  //    cmp     r1, r1, asr #31
++  // And an int16_t multiply compiles to:
++  //    smulbb  r1, r1, r0
++  //    asr     r2, r1, #16
++  //    cmp     r2, r1, asr #15
++  template <typename V>
++  __attribute__((always_inline)) static bool Do(T x, U y, V* result) {
++    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
++    Promotion presult;
++
++    presult = static_cast<Promotion>(x) * static_cast<Promotion>(y);
++    *result = static_cast<V>(presult);
++    return IsValueInRangeForNumericType<V>(presult);
++  }
++};
++
++template <typename T, typename U>
++struct ClampedAddFastAsmOp {
++  static const bool is_supported =
++      BigEnoughPromotion<T, U>::is_contained &&
++      IsTypeInRangeForNumericType<
++          int32_t,
++          typename BigEnoughPromotion<T, U>::type>::value;
++
++  template <typename V>
++  __attribute__((always_inline)) static V Do(T x, U y) {
++    // This will get promoted to an int, so let the compiler do whatever is
++    // clever and rely on the saturated cast to bounds check.
++    if (IsIntegerArithmeticSafe<int, T, U>::value)
++      return saturated_cast<V>(x + y);
++
++    int32_t result;
++    int32_t x_i32 = x;
++    int32_t y_i32 = y;
++
++    asm("qadd %[result], %[first], %[second]"
++        : [result] "=r"(result)
++        : [first] "r"(x_i32), [second] "r"(y_i32));
++    return saturated_cast<V>(result);
++  }
++};
++
++template <typename T, typename U>
++struct ClampedSubFastAsmOp {
++  static const bool is_supported =
++      BigEnoughPromotion<T, U>::is_contained &&
++      IsTypeInRangeForNumericType<
++          int32_t,
++          typename BigEnoughPromotion<T, U>::type>::value;
++
++  template <typename V>
++  __attribute__((always_inline)) static V Do(T x, U y) {
++    // This will get promoted to an int, so let the compiler do whatever is
++    // clever and rely on the saturated cast to bounds check.
++    if (IsIntegerArithmeticSafe<int, T, U>::value)
++      return saturated_cast<V>(x - y);
++
++    int32_t result;
++    int32_t x_i32 = x;
++    int32_t y_i32 = y;
++
++    asm("qsub %[result], %[first], %[second]"
++        : [result] "=r"(result)
++        : [first] "r"(x_i32), [second] "r"(y_i32));
++    return saturated_cast<V>(result);
++  }
++};
++
++template <typename T, typename U>
++struct ClampedMulFastAsmOp {
++  static const bool is_supported = CheckedMulFastAsmOp<T, U>::is_supported;
++
++  template <typename V>
++  __attribute__((always_inline)) static V Do(T x, U y) {
++    // Use the CheckedMulFastAsmOp for full-width 32-bit values, because
++    // it's fewer instructions than promoting and then saturating.
++    if (!IsIntegerArithmeticSafe<int32_t, T, U>::value &&
++        !IsIntegerArithmeticSafe<uint32_t, T, U>::value) {
++      V result;
++      if (CheckedMulFastAsmOp<T, U>::Do(x, y, &result))
++        return result;
++      return CommonMaxOrMin<V>(IsValueNegative(x) ^ IsValueNegative(y));
++    }
++
++    assert((FastIntegerArithmeticPromotion<T, U>::is_contained));
++    using Promotion = typename FastIntegerArithmeticPromotion<T, U>::type;
++    return saturated_cast<V>(static_cast<Promotion>(x) *
++                             static_cast<Promotion>(y));
++  }
++};
++
++}  // namespace internal
++}  // namespace base
++
++#endif  // BASE_NUMERICS_SAFE_MATH_ARM_IMPL_H_
+-- 
+2.20.0.rc2
+
diff --git a/dev-util/gn/gn-0.1479.ebuild b/dev-util/gn/gn-0.1479.ebuild
index fc369d2c0db0..89fd565c9595 100644
--- a/dev-util/gn/gn-0.1479.ebuild
+++ b/dev-util/gn/gn-0.1479.ebuild
@@ -22,6 +22,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/gn-gen-r2.patch
+	"${FILESDIR}"/gn-numerics-arm.patch
 )
 
 pkg_setup() {
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index b4c6ce378eee..7d8ad935ef57 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -8,6 +8,9 @@ AUX 3.28.4-python37-fix.patch 2518 BLAKE2B 6e9025560bf84accee9ed8b88af65204342eb
 AUX 3.28.4-valac.patch 559 BLAKE2B bf7d217ea0d9432fe27445c0641f92361577deb50d81d5d52fd1b5c40d088946c05d2525e7b0a876681e33da65ecc7df8be417910a3be1a92c425479879f573d SHA512 98923a2db0c370f487d364ad909b79ae2e11bba680c89f61808a1708170f05a9e8171512914f084b583190a5b4b22f6386f38f4420e31cb9ede2ed361ccb4366
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
 DIST gnome-builder-3.28.4.tar.xz 9309060 BLAKE2B a4402452ffaf64cc767edb9cba65b74a88cb77d04ca2ffecd3b01c53382930891c2c03e2528861f4d28ca3643465b6767235e945f44cc37d2d716bcbb3ab25c8 SHA512 ef83b909f295d83478aa7d5deb8b5d8291ddf6134e147e88452cdba8ff449a2415d0381d63d3f82cf28942b1096a704de64540c8cdf5f06c21c8278c93fbbc03
+DIST gnome-builder-3.30.2-patchset.tar.xz 43720 BLAKE2B c444117232c6560e68cad46134327e94b361cf89c4f68f2e68940e8a46d2a42720aa5e881dcb3153a3c75057cfacd8c67287a8bb0740999d4628ab6498db7c32 SHA512 e17a0357d2a3e6c059ef27dbf591ad3acfa6f5d7d58f47ca8ebc6dc6883a1bb1bb87b15f3c564c2babc5857e9de4a7a47934398d0000880f233265d7254087d3
+DIST gnome-builder-3.30.2.tar.xz 9478508 BLAKE2B 546328df141582d0d15317166c27493ac1f0b813680607f05de3429301cf8e4937cfc51bff69db26cd4ef1a8ef02aadd5aaa643c857eeabf9b16606a2a3a5cda SHA512 39087e3a30a807b7374167ba4c5295a9161e3c8d8e409172dcd28c52db48e72cd9303c2d4ff8fd11d4bfc70af6c810e5dc254c4c74b646875206221cff3bad57
 EBUILD gnome-builder-3.24.2-r1.ebuild 5195 BLAKE2B 2d9dbfd2abcf2261221ef5310853501d93f64db9e235a0b0b1b843a754306033dd26ebc239ef46ee05d8109f35f85055359fc2ce66ea6bf2007dea80f621b3de SHA512 ac2295cdc97874f921a65cf6cd5f766b9deb94dd1cd171e8d0568964c0d2f9e5aa8addeb6410af5174c2c6f636332cfacd171c3d2862bb586baaf0e0bd05e227
 EBUILD gnome-builder-3.28.4.ebuild 7642 BLAKE2B efa930bf7f780419b101adf3e52428f4d6c9b971fa3e34ead9dedae6f2dcb9fb16cf187595359543e0c1a8a684a1f30e659ebc61fe2300c346d15442d77b8e30 SHA512 879a4d217c7b8bd9b5c3c7b6aaed99d8c8adff23717a84ed7bf56b503819aa6494f3b7d64b73b4c0a16291e640bc0f2b5203db0414cf8b74f6345ba6f1f50ad6
+EBUILD gnome-builder-3.30.2.ebuild 7203 BLAKE2B 520b057ce700e10ef365227d87cd79860c715c2aa058219f96822033f4e2e96b682a7f8ce158cc87a2755b35a4c4b2f6c51c2306ed36ccffea84d5cb83048e58 SHA512 0e48bbb51a694af872a590705f69d9dd36ffff6ff8e9dc9cd4264e43eb951e8e7ca05c4f3be7cecc6789f8b4f0dc611e1a232a3122ce19e6232be7a7b4fe81c7
 MISC metadata.xml 1114 BLAKE2B 34d8dba8d48edca606ec56c996b93a6e47736e5d92aa20b71bf8f2a4c46cda82d3023b4c253357c7126e91ece1d12d9043cd020a2de2a5390ee984f97be4e552 SHA512 1882f56d3f5f88db34f37559f4f64bcab0f01e9496c4316358229e5662347f66ad2eb987571df8596b12a4170cf9ba5a2a41d39d82f1687d21753b1c5716c2a5
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild
new file mode 100644
index 000000000000..09aad7b39c46
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.30.2.ebuild
@@ -0,0 +1,186 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{4,5,6} )
+VALA_MIN_API_VERSION="0.36"
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 vala virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git gtk-doc sysprof test vala webkit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: with_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and ${LIBGIT_DEPS}
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# These are needed with either USE=git or USE=flatpak (albeit the latter isn't supported yet)
+LIBGIT_DEPS="
+	dev-libs/libgit2[ssh,threads]
+	>=dev-libs/libgit2-glib-0.25.0[ssh]
+"
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.30.2[introspection,vala?]
+	>=dev-libs/glib-2.58.0:2
+	>=x11-libs/gtk+-3.24.0:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.30.1[vala?]
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection,vala?]
+	>=x11-libs/vte-0.40.2:2.91[vala?]
+	>=dev-libs/libxml2-2.9.0
+	git? ( ${LIBGIT_DEPS} )
+	dev-libs/libpcre:3
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4=[introspection] )
+
+	>=dev-libs/gobject-introspection-1.48.0:=
+	>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	sysprof? ( >=dev-util/sysprof-3.30.2[gtk] )
+	vala? (
+		dev-lang/vala:=
+		$(vala_depend)
+	)
+" # We use subslot operator dep on vala in addition to $(vala_depend), because we have _runtime_
+#   usage in vala-pack plugin and need it rebuilt before removing an older vala it was built against
+# TODO: runtime ctags path finding..
+# FIXME: spellcheck plugin temporarily disabled due to requiring enchant-2
+#	>=app-text/gspell-1.2.0
+#	>=app-text/enchant:2
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.47.1
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+
+PATCHES=(
+	"${WORKDIR}/patches" # gnome-builder-3-30 branch up to 2018-12-16 (commit f9a9dc02dd0a2c)
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_prepare() {
+	use vala && vala_src_prepare
+	xdg_src_prepare
+}
+
+src_configure() {
+	local emesonargs=(
+		-Denable_tracing=false
+		-Denable_profiling=false # not passing -pg to CFLAGS
+		-Dfusermount_wrapper=false # meant for flatpak builds
+		-Dwith_tcmalloc=false
+		-Dwith_channel=other
+		-Dwith_editorconfig=true # needs libpcre
+		$(meson_use webkit with_webkit)
+		$(meson_use vala with_vapi)
+		$(meson_use doc with_help)
+		$(meson_use gtk-doc with_docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang with_clang)
+		$(meson_use devhelp with_devhelp)
+		-Dwith_deviced=false
+		-Dwith_flatpak=false
+		$(meson_use git with_git)
+		$(meson_use webkit with_html_preview)
+		-Dwith_spellcheck=false # TODO: requires enchant-2
+		$(meson_use sysprof with_sysprof)
+		$(meson_use vala with_vala_pack)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index 9d072f7bce95..f66637273758 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,3 +1,5 @@
 DIST gnome-devel-docs-3.22.1.tar.xz 9298224 BLAKE2B 844f9ca5c9b9eb5a4cfdbca19b1cad9f8f21142c33c7810c64cbb8d9625f3f71d284d520a2c528983ba8fcaa170e41aca5e6ca2636608a4b2b988cf9d06a7325 SHA512 9d1c740fa2580ac4e5265d24463bd292df5db3e3bdf0ae57b55b0f71067bb88e28d4d51aa246e7e43f86fa77f73ac7c475cfaa688e009956d253117e650bb63f
+DIST gnome-devel-docs-3.30.1.tar.xz 10180956 BLAKE2B 65b0fec36fb13502567a0778affa301aecf52e236c5d06738087b883f3cb148548e0925b91ce15f0f20e78aadb5484ddd96b106d7e2ea3545792e8356454f282 SHA512 24d835defe34799d5236bc1d943ca1391c762fd1b722feaa5d2aa34313979a20177e41177269f805596e3dfdba7f9d08fb9fea25dc64b8da6e026ef634ddd549
 EBUILD gnome-devel-docs-3.22.1.ebuild 662 BLAKE2B 451d56f57437dc11de4fb8ee60ab39868fc8c19ca6434ea18490b88ebe097b8a19f003bbf0e54f6cfef728d1e223b0f76810669f159d16d964d7edfd197e428a SHA512 0a7a65213a2bc531187a5a8693c185be93f93dd314319e0922122a9e8a6ce68f0f368133e4ab759a26bd496f3bc0a5e1f1daeef88b689fc2b59004144b7733b9
+EBUILD gnome-devel-docs-3.30.1.ebuild 661 BLAKE2B 15a3bbff99de70cfc9e8ebe6d815fb4b9d8718cab806eee06d08382cac68d66598e5e30ba5dfadcd6d37312cd7884ce88eacdabe57c8b34247504064af0fd90e SHA512 96f6e947780ff15759b94c4dea3115ba32fc879486fba14497a137532025b25f45ae5dbdef21b52de01814a411deed54752d488119d287b1aea6c3c332bf045e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.1.ebuild
new file mode 100644
index 000000000000..68f3b8661a28
--- /dev/null
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="Documentation for developing for the GNOME desktop environment"
+HOMEPAGE="https://developer.gnome.org/"
+
+LICENSE="FDL-1.1+ CC-BY-SA-3.0 CC-BY-SA-4.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/docbook-xml-dtd:4.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+# This ebuild does not install any binaries
+RESTRICT="binchecks strip"
+
+src_configure() {
+	# Wants to build demo samples
+	gnome2_src_configure ac_cv_path_CC=""
+}
diff --git a/dev-util/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 26a05714bb1e..7e9698af2af9 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,5 +1,3 @@
-DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
-EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1143 BLAKE2B 312226957ba27d49f769307beccf1da2a7298a781d11a9cb0e5bdf49dd1052e37b3b1fbec5a85112ef583b72e9b604e78e8b1ebcc75b0a6a7c220062f0126519 SHA512 a5280de2fe70f0b77febf86f32d66e1cefd7949d7d97054ef5533ab8959e4f73556cd8fe6bc0735337c0280cf8eab16ccc81020f0e7a16c2f6cd2ee1c3039ddc
-EBUILD gtk-builder-convert-2.24.32.ebuild 1144 BLAKE2B 4ad87705cfa462a7d3ad4c7fa1265212fa0384d51d35480f4f3ec0760e65854bb9b6abd1ce6d21e9c026480f4148a10d0b7ee4a9e8cf05efc901be2c83803ad4 SHA512 b2a81ffb79ee9964e347f9366d9a81142503cdeb3406c90d22e57b1b47168651f5679a2bb0ee72722f884bc56e98ce64b3ba7f2078c89990beb0093494694ee0
+EBUILD gtk-builder-convert-2.24.32.ebuild 1140 BLAKE2B 0f806a2243e690b1e70731a4953356341038367029140de6d8091983674a22551085074c10ac8008b02b53fe787b769dfecf8dbf64c04026df64a5a9396db37a SHA512 ec8c27e3960444bb94eead1fa34ca032038b9dcd7e8f77a62795de29d598cec2138e606bf781b56cb31cf53bc14e22c80c74c18eafab36fb87c4ccb7c450464d
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
deleted file mode 100644
index 88f84ddcce5f..000000000000
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.31-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="gtk+"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Converts Glade files to GtkBuilder XML format"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}"
-
-# gtk-builder-convert was part of gtk+ until 2.24.10-r1
-# man page transitioned in 2.24.31-r1
-RDEPEND="${COMMON_DEPEND}
-	!<x11-libs/gtk+-2.24.31-r1:2
-"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-"
-
-src_configure() { :; }
-
-src_compile() {
-	xsltproc -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl docs/reference/gtk/gtk-builder-convert.xml
-}
-
-src_install() {
-	doman gtk-builder-convert.1
-	python_doscript gtk/gtk-builder-convert
-}
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 343a7787a024..5d57fbb6bfd2 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.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 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/gtk-doc/Manifest b/dev-util/gtk-doc/Manifest
index d609d0ca8e70..db974407d883 100644
--- a/dev-util/gtk-doc/Manifest
+++ b/dev-util/gtk-doc/Manifest
@@ -1,5 +1,5 @@
 AUX 61gtk-doc-gentoo.el 283 BLAKE2B 116d2b43d42b05130482c5bff7a10f13930a0d04f34874d25bfa6c61dc8920efe60ae615e6d54de1eeed87044a7232a992a37582d608b0756f0b099b5ee62d03 SHA512 d9e7c8bacd97a5147dbbe9ad568323356c9c38ad982ce88c63ef5f8e3955289274393a91e07d2159c082ac2a058455a1905c251ff3676f60bad596379fb12837
 AUX gtk-doc-1.8-emacs-keybindings.patch 582 BLAKE2B 9591f8f58dbd2c5897abf020f96a3ad8124830c274bfa581756ccaa43c67002264cc6d5a04c0316e4bb2dfa75a3cb08b5de6217a81a295b3a31e18dae8d1ad7d SHA512 360e97c0d2603c17dd1c1ca92739eb5ac229f3bcda6dc76267b95cac73db1008a52164ac9cba5a0e43f7b6359b5e6d3b242fde757fa1b7409051bade5f6f35a6
 DIST gtk-doc-1.25.tar.xz 673184 BLAKE2B 2468b70403c0334b52ce1bcb77d2015fe83e0af9fac861464db605de9744ec1c7300e9b9a4b4fe0a3641e016083df063d92e1b74e44771d7a88c66815a396765 SHA512 7ac8c73ab9f9ecb6a142bd2232450a6431c3e4fe2372ff40460145b5d0bcffa1953c8cf49436539db86c3a32461cbd4180c714cb19cdd68bfd557816b789339c
-EBUILD gtk-doc-1.25-r1.ebuild 2692 BLAKE2B 2884c13bfd715e12d6793671957d68b723d1fe3b381ffc6a1a9e4e1c449534f43571196cea008037de6f6f89a7a1dfb0f300455ba9f1309ff319420353c07f86 SHA512 fe3ec211a1e0ffe06952e11d21d4e63b758c585345f9c3578bc58f160dbc872755c708ba7132c23fe9c9dcecedcb7cb59ec6c840ad29d28ad4920fda68975e0f
+EBUILD gtk-doc-1.25-r1.ebuild 2719 BLAKE2B 6b9d84fdb7d3b1312821396dbbf9eb836e8af832688feed12c1f748d997a70e9ca37c43527a89c56fd610c912514800c485ed9adfa00b5c6a0152c3bd6cb88ee SHA512 7ee24f8c646fffaae08737571a08068e1c3a7275665e52ef00d6e490fcf106025f079c5c7d9608f884cd43e5bddf46f0ab7bd1517d5a9081ba926d7cd8451d24
 MISC metadata.xml 659 BLAKE2B 8c57567cad76724388d746e74bd1056a062c7280552494d6265b5fa38be518983188f22948bdb389916ec6384c17308e1ec292ec36f633b6ecd6f27102f74f94 SHA512 4ffcd239d0a5788ed94a204395a51d8b706663ac69139965e7d28282c473b55cd006cf3786a3cfd60386439f9ffa5d9242ed43ba05783962cbac002f8a00539b
diff --git a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild b/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
index f696a066e7f7..810335d8cd48 100644
--- a/dev-util/gtk-doc/gtk-doc-1.25-r1.ebuild
+++ b/dev-util/gtk-doc/gtk-doc-1.25-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
@@ -34,7 +34,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	~dev-util/gtk-doc-am-${PV}
-	app-text/yelp-tools
+	dev-util/itstool
 	virtual/pkgconfig
 "
 
@@ -99,6 +99,10 @@ src_install() {
 	fi
 }
 
+src_test() {
+	emake -j1 check
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
 	if use emacs; then
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 6b95e8034912..482f6b70062c 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,5 +1,5 @@
 DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 BLAKE2B be3fb3785776052eed0f102e9665628aec1bec93953de1cdb795af8db458cedd07fa717abee4dc9e6d8c4c8f45209371ac130fa29e8a77622290524b771b5c89 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795
 DIST gtk-update-icon-cache-3.24.0.tar.xz 372708 BLAKE2B 2a6bffd4453c2201bbb78e4ba581f6bd6453f650ca32de7e8002cb88f5872c868ef25973587c96b58b28d2b74fbbac192dd608e72cd5bbbc0823486a9c55c46c SHA512 9dada697ace2ea5f3b5ab64c6063c1a9a792f9b9aa23d4c3888e3a487fda9b1c99a5d0793bb0f9e182dc66a1a5c7ff944f8b9f2ca2f4de7ecc24c048d7a55339
 EBUILD gtk-update-icon-cache-3.22.19.ebuild 955 BLAKE2B a9cc7e17975fe5369821e464a9e258b68e305386f662b0357e73d0c3f06fffda03a6bc7a54acc7058ddd1e63e86c07782ac0d5661c168ab3c59b302d9478814c SHA512 3996827447bb70e5869886eb7585b55e8f528489293390d872b0661e8fae47dc099022d23b048764604d8b2e69f191768a57a4bef307d0b83841b5e6ffb38eb2
-EBUILD gtk-update-icon-cache-3.24.0.ebuild 961 BLAKE2B 74e512b9888506b210992a5e4bb035cc5c00f8f31d4cdfbd04e84053375617966ad7dccb3e113160bd5d9462b478fc53f6b00988335642c911154af7a0ebb266 SHA512 3016599cb553ebfc63242c5663602cde1034d6417d516f0366e0e1d6a73ff4731f1407e6e2781794f7ca19b895f68759ac9d195739c73a1fa0b26a338877f4a1
+EBUILD gtk-update-icon-cache-3.24.0.ebuild 955 BLAKE2B 6759f19b24bce88723690ddd62d36c877a3ac710e1976db863630b0e50fcd61f9c7106d63ec9c9734a337be2f4fb09208bbb2f9dd3b6f479ba62612984512584 SHA512 1630d9f7bafa9b3810bb553f90965c3216ad81f8bb6a4c0ad3270dd7426d897a52f9977059bf843ae111b15c80c7dcc592c969e169001ec786e709d21e59c08d
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
index 673999933a83..ba33bffbf513 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index b45bf6c3a6a0..44f778eea62f 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1,5 @@
 DIST ideaIC-172.3757.52.tar.gz 442963100 BLAKE2B e44f924e279a5b8f2bddbe65cffa24306920fa0f5b85e23b823b1e51fd49e2de2c8953a010b66ea325c4b70ae60268639293b67cd6116f4315ded5e5f6130da1 SHA512 a0178c5ef10aeab527bb8064840c53fff97bf9be468a4e5248b83dba96c5114878f5ff1e20436a67ee488580affa3fb3a2ea627407ed57b87949f64fc1a215d2
+DIST ideaIC-183.4588.61.tar.gz 541751086 BLAKE2B 51a5a4dae10d8fd00a0c239f87af3d53b86ffa50f7f9c4f1554265b349d866d60a8994a96f184cc9993fafe12de3dbfa77e3931626436a5f3d3854710b52fb9e SHA512 3e5956353fc0fabbe91b3a946e83b0b3229766a366fdf782c4c017acd7de5a86b3e0cc870a17abe2bdb8b090cb5c58b6c170555f60ba5e6a9a8198073545be87
 EBUILD idea-community-2017.2.2.172.3757.52.ebuild 1918 BLAKE2B b7fc3cb59edf859c51d9fa674ebfcbbcf3f88399f3f041f792930b98978edb0caaf59c576333bfa9eed5b5735666cbfea6562c1464f96d597658c04685cbb8e5 SHA512 53ff12fab08f75925e1627e8400c27a7868e0dfb2a157b0f10b0feea34222f3e71e0eb3af274db1e3aa4a24ee96e15a8e11adc4bf083ac8fe4cf1673a8272dca
+EBUILD idea-community-2018.3.1.183.4588.61.ebuild 1915 BLAKE2B b30df4353a74ad65d597026140b3d6d7e6ef2da3182ff800f84c33af87f6f758cc3a7424ac354df6804aa46683eb6a3db2818993e46389354aca57041cdbff76 SHA512 a195e09938cb1ca9126b31be4d645074dc00049cff5e2f0eab5d1867d0da3c8f991e6d1747781c904b9928fd7dec9171c857cc2bc3679b7a54a1358b53f817b6
 MISC metadata.xml 533 BLAKE2B 1c711c1c3f3527e91ac205b74abb70a8c163abe5a289837ed2a70dd7a37f510c3dae3e37d8540dad6bfa5d7fb7c82d7070df3dfd7e9ea0b1c85745d3eb66bd75 SHA512 b14bce0b72eb777929138e64a53b0069faf51ec4f1d8b3dbb24a9f2d7f9baf68d5e495e784c83c34c1190d52aea16de52485a815786de235091b75f2778d5e23
diff --git a/dev-util/idea-community/idea-community-2018.3.1.183.4588.61.ebuild b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61.ebuild
new file mode 100644
index 000000000000..cc1ffa36d7ae
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2018.3.1.183.4588.61.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils versionator
+
+SLOT="0"
+PV_STRING="$(get_version_component_range 4-6)"
+MY_PV="$(get_version_component_range 1-3)"
+MY_PN="idea"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(get_version_component_range 7)x" = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+IUSE="-custom-jdk"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+src_prepare() {
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+	fi
+	if ! use custom-jdk; then
+		if [[ -d jre ]]; then
+			rm -r jre || die
+		fi
+	fi
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
+
+	if use custom-jdk; then
+		if [[ -d jre ]]; then
+		fperms 755 "${dir}"/jre/jre/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index c1962da9b4ba..5fbc575af276 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,7 +1,9 @@
 DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23cae356db7f12aa01fefd39626600b3fa3dbd77688503e7332a2dbc673339145692625fd8fa3f10e0d405a77e2d5586e6bfeb0378 SHA512 c96b78ec8f8289bfd7830acaf533aea0077bb36311d3b8bb7f31464c1b3a5b3f353b24e81ffc581811b4083d3b5959e4e947e3a3d16cb7c77de00b05b9972a90
 DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
 DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
+DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
 EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
 EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
 EBUILD include-what-you-use-6.0.ebuild 1324 BLAKE2B b95d2bb55b44cd36657051c58a7c0272881ccacd8ead2e212458100d558bed579b83cf2dce03955ab82cdce1190257e26cb70313333ec572f469fe4e36e8adf5 SHA512 5a831edfd6dcb48621f2ea89531da736667b0d79a6e9f434e6eab1fa4c75626f2251a84fef8f76950414220b3b835521de242d32952a7b485be199d57b252f45
+EBUILD include-what-you-use-7.0.ebuild 1218 BLAKE2B 7d434cd40397611fb8944459a4040983cc2f5cdf52f1db384d79680e83145cda1965a967ff5d7053bae13a2090422111ad32f4520b8bd47d140fa192f2bdffc4 SHA512 bb7e12da2554927bd29a26dc06c380d909a58259d607aa3ac3a16b57cb54128100ea733334eca2226592a23fe1e99de9d1f61ae4decabc8ddbe19b5606a460ed
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
new file mode 100644
index 000000000000..0defc992f95a
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=7
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 02c288dc99ee..e2c056c312af 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -2,12 +2,17 @@ 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.138.1.war 75714886 BLAKE2B 9008f33ee79f99e029333ec9071021bf1bfa1f6984f28f9b99bfb88c88b24466c66e3b4ad85bb847b59c54480ef935007ee0b8dae42ab2a4296ae0fbb03e2de3 SHA512 22d64e1d895b8d8b82430eaa0f760910e299751e7ba3d4d9bdf206e8644dd2536c14ee3844f5baccabdea5e0b1c30937ecc7d7747aca6d9b03d53c4be04ddbd2
-DIST jenkins-bin-2.138.2.war 75728164 BLAKE2B 2f322d05f60d4fac93087cae45f5a2a31af03c386d8c3e8ca392a0897d1bb0342e2ce48f9d4d07bb18e5110966078a47f25fbfdadb857f8339ec6f0e289b8fe6 SHA512 593b08d1aa0021de1698c7c30737be45425b0b956c3a8b62b3ffebcdfaf9971bf65d16544106265a635e2d21df69b3aca38ddfa7ed6a1ebb34e7cffc24591860
-DIST jenkins-bin-2.138.3.war 75733340 BLAKE2B c285d6d9d9a3fbea4463b9413ddb9bb0970be1b0cfea64525ba84110a83cee1a0e99177dcc9a3b4b67bf31479af2438c98c9e086d0bd4c06508d3d54c86f1bce SHA512 8cd8388a3b0e596821ea9c3b316294489b14e24e9a7f332940be1bcb93af7e6b9c02bb077d1ba421c39a5399c241bcdcb516a8f19fd480181ec32e1ddbc5e596
-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.2.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
-EBUILD jenkins-bin-2.138.3.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
-EBUILD jenkins-bin-2.146.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
+AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
+DIST jenkins-bin-2.138.4.war 75751509 BLAKE2B 2601353b630ad2d7783460a7e5af93ccb9f0e8ce6a277a4413871df73c944e733284f5621a87ca741ab2ef683554700919be767e9ff7cfe7ff7816be3fcb4202 SHA512 4492d9576dbe8364fe2d8f110ee9eff68478f64b397178a96b1d5c427e98c413a8dc1ba574c43b4ff84b3848ca99ff05a24df31d568c367849a35f6b673ba5b3
+DIST jenkins-bin-2.150.1.war 75938045 BLAKE2B 363e359ef627947b2dfa30d164099c2864f2641c1ad3fa83532f9252a030bd973e4af3238fa09ba92f8ad65ab4463a21d86752b159d07049d5ccd88f8895bbdc SHA512 1158713b60923f7c1a3b90e403562a388ec3578f1a7ca267f91137a58571c26721075f63eda97b92bcf3ca360ce68d5129c9bd205b2ee138e13247d73da4e7a3
+DIST jenkins-bin-2.154.war 76032730 BLAKE2B ce107d6afd617c0335f0ec13e004f72fb497ed8a9cd7859169e049f1f62cff34dbffa7bc59b536afabde3dead439a4d3e4cbb4f71107b1752b29451997ab5c77 SHA512 d86723dd0b10a26c7d8764c0717114d990de49b2ade3e8b7af163c13350b55f8ec11e479f4743641d9a6530ffc6e98903d9fac20e964ca70b4795aa26202b720
+DIST jenkins-bin-2.155.war 76037370 BLAKE2B 69ca351fe0322564899bc7866174c1d2334c1881cffe49bce06273143b4f5303d544d77d8c372ec5c5380c045bf60566c77b1b9f6be5f9e1e58744d90ff6807d SHA512 b7ce35de687094161d55d50522ccf8f80d8369e383ba97bd2de2082b5b03eea5385ae5d8aa46d80112c4f3df30584c9ba7ab2e58542c9c9c0ce7c2b2e17b481e
+DIST jenkins-bin-2.156.war 76055382 BLAKE2B f02e8b92eea995a66dce9bf2cc8278f6af84cbdcf03ce78ac00601537ded97789f7458c4313c429c4e90abe2b21cc9201e5b9e12b0af5c5bb7b7a2e232bd61b3 SHA512 f9299241ec5e122ea47d7fe6671d13abb66e98c41cc31a47d8363f2ea1845270ab41a100bd5debfd195e24e335253bc2545feaebec976c59a98e8018b31322ef
+EBUILD jenkins-bin-2.138.4.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
+EBUILD jenkins-bin-2.150.1-r1.ebuild 1105 BLAKE2B a8a1dab6b1a8cd148c35cd352d04b691dcc712e96d5e3f8946574ab456727960334c60afdee7b71716f3ed0eea1cc8c32c32ce6e3921b90fb068b7a670693087 SHA512 eb011fcde8f1d97dd600731f311245925aa90c6523bfb75db36e92bcf2bd6372ec3c91ed8184af641e3f5c8fde3d40c1fd794e88eb03e368c1391fd88b5fa0ee
+EBUILD jenkins-bin-2.150.1.ebuild 1104 BLAKE2B 52ea4ed811e0bf4fb5fce526c508763611acccf5f423acc32286710eb429457c0b2f512b34d1b53a1e8051279aae7aab09460556d1103ab2857264c41fb8c2e1 SHA512 3b509a6a310a6fb98f2a3eac5fc609840a895ec62db95b88d7ad470fe6f4424c4d98c4c3a8da9a53c98d1e19d31095bfc078bef10c8f38988a7d8ec83449f5d3
+EBUILD jenkins-bin-2.154.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
+EBUILD jenkins-bin-2.155-r1.ebuild 1098 BLAKE2B 3ad40ac1b63b255dbc8b8861a2c1c05ed8749f8cc2f1e8a9583a33af69e5787d1e071f78feb66f116c790b57dee66c5d4bbb46092e4a96e72a40bdfa963a8988 SHA512 eac9ea6de659e8755f245d2aa6445d945256d334fc3433f81d83cbf9ac1f3c5aeffcf75a6d3f32d63f03aeaaa9b7aa1050d9caf28c48c19ad9273b39a5743c49
+EBUILD jenkins-bin-2.155.ebuild 1097 BLAKE2B 55f6b8ee92dce3c288cc29a976b2f03dff8d4743acd731564d24342d91afe76f17b235ca5fde756171e09ac768a31d1d7e8ad2f7260fa3845fda94058035bce6 SHA512 cc50c489cb9d48522376c1826a3bc0550241f7eea0fbbbf784d76cd80e919affc15f1d253b450fc289a4f97bd28bdc9b546efa2bc1f5b1637a117a94be802df8
+EBUILD jenkins-bin-2.156.ebuild 1098 BLAKE2B 3ad40ac1b63b255dbc8b8861a2c1c05ed8749f8cc2f1e8a9583a33af69e5787d1e071f78feb66f116c790b57dee66c5d4bbb46092e4a96e72a40bdfa963a8988 SHA512 eac9ea6de659e8755f245d2aa6445d945256d334fc3433f81d83cbf9ac1f3c5aeffcf75a6d3f32d63f03aeaaa9b7aa1050d9caf28c48c19ad9273b39a5743c49
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/files/jenkins-bin.service2 b/dev-util/jenkins-bin/files/jenkins-bin.service2
new file mode 100644
index 000000000000..f109fac02cc9
--- /dev/null
+++ b/dev-util/jenkins-bin/files/jenkins-bin.service2
@@ -0,0 +1,11 @@
+[Unit]
+Description=Jenkins Daemon
+
+[Service]
+EnvironmentFile=/etc/conf.d/jenkins
+Type=forking
+ExecStart=/usr/bin/java ${JENKINS_JAVA_OPTIONS} -DJENKINS_HOME=${JENKINS_HOME} -jar ${JENKINS_WAR} --daemon --logfile=/var/log/jenkins/jenkins.log --httpPort=${JENKINS_PORT} --debug=${JENKINS_DEBUG_LEVEL} --handlerCountMax=100 --handlerCountMaxIdle=20 --accessLoggerClassName=winstone.accesslog.SimpleAccessLogger --simpleAccessLogger.format=combined --simpleAccessLogger.file=/var/log/jenkins/access_log ${JENKINS_ARGS}
+User=jenkins
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.138.4.ebuild
index ff91a974c718..ff91a974c718 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.138.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.138.4.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.ebuild
index 3b701c29b1b9..c8cffcf979ac 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.138.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.150.1-r1.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
 
@@ -40,7 +40,7 @@ src_install() {
 	newinitd "${FILESDIR}"/${PN}.init2 jenkins
 	newconfd "${FILESDIR}"/${PN}.confd jenkins
 
-	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
 
 	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
 }
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.1.ebuild
index ff91a974c718..ff91a974c718 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.138.3.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.150.1.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.154.ebuild
index dfe46af57ae6..dfe46af57ae6 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.146.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.154.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild
new file mode 100644
index 000000000000..95c4fb759443
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.155-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.155.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.155.ebuild
new file mode 100644
index 000000000000..dfe46af57ae6
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.155.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.156.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.156.ebuild
new file mode 100644
index 000000000000..95c4fb759443
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.156.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 657afc98096e..41191b06de94 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -5,5 +5,5 @@ AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae7
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 EBUILD kbuild-0.1.9998.3149.ebuild 1792 BLAKE2B ffd6f02476b9f7a160e670b9d2d1af31a33803a2c26c2b6881c22f485c295c3e39ac4436b1f610faca4878326fa46f49231a21469e6a0d3eb8f6d1288ab83905 SHA512 01b1a7205a2066808642a61ab5ec067a99f3c631e75a715b434f92ce2e86bff8d0cf23a27236330c31e9bab751bde7c735177736ecc66b6a916994cb2287c351
-EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
+EBUILD kbuild-9999.ebuild 977 BLAKE2B 75187d2839087938c7da5e1f134f78040bcde9714957cff4b5ab90574f9b2164f9bce48e34a6b310afa2f03095d200f80320015350cc02e2fc935d09fbd34445 SHA512 bdf1b80acbc2a936aad71d5971410390f2ce5129d8110b0ac40528a1b8ff3c53fde6f02f664d773ce99afee41c0b057b04f6c71e6e07efafcbf99f533067ebcc
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index 5df4852ffb28..ccbf4507612e 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-WANT_AUTOMAKE=1.9
-
-inherit autotools eutils subversion
+inherit autotools subversion
 
 DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
 HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
@@ -23,24 +21,29 @@ RDEPEND=""
 S="${WORKDIR}/${MY_P/-src}"
 
 src_prepare() {
-		default
-		rm -rf "${S}/kBuild/bin" || die
+	default
+	rm -rf "${S}/kBuild/bin" || die
+
+	# bootstrapping breaks because of missing po/Makefile.in.in
+	sed '/^AC_CONFIG_FILES/s@ po/Makefile\.in@@' \
+		-i src/kmk/configure.ac || die
 
-		cd "${S}/src/kmk" || die
-		eautoreconf
-		cd "${S}/src/sed" || die
-		eautoreconf
+	cd "${S}/src/kmk" || die
+	eautoreconf
+	cd "${S}/src/sed" || die
+	eautoreconf
 }
 
 src_compile() {
-		kBuild/env.sh --full \
-		make -f bootstrap.gmk AUTORECONF=true \
+	kBuild/env.sh --full \
+		emake -f bootstrap.gmk AUTORECONF=true \
 		|| die "bootstrap failed"
 }
 
 src_install() {
-		kBuild/env.sh kmk \
+	kBuild/env.sh kmk \
 		NIX_INSTALL_DIR=/usr \
 		PATH_INS="${D}" \
-		install || die "install failed"
+		install \
+		|| die "install failed"
 }
diff --git a/dev-util/kdbg/Manifest b/dev-util/kdbg/Manifest
index e516e7ffae85..8982b36acec0 100644
--- a/dev-util/kdbg/Manifest
+++ b/dev-util/kdbg/Manifest
@@ -1,3 +1,3 @@
 DIST kdbg-3.0.0.tar.gz 430150 BLAKE2B 62411f95f1d109d95647e83defc2f5a84f9f7d7dc715f5a2f84eb6ecd18c7e1d02da0d68bf5bc8bb37216f98edbac11c24286f03ffc2ab9ad9fc7203ccd498dd SHA512 6398a7bbb9c744a837dd73645b497ab00eeaca9a326d61b135dc9040c616b4a2bdc0cf1da59c101dc68a159e12bc3b4a994a9d1dbf33f7d152e5c3003abb498a
-EBUILD kdbg-3.0.0.ebuild 943 BLAKE2B 247456ef0ea77b1e1661bda4f22398f336da707930070866bba8fb3c78110e85ce212da6fc03fb609eaefdf787191227d3ddd5696155af1b00a3f045d47bec13 SHA512 e7cf8c8c24c15169ee843ef9c0adee4f72a89ca929fccd0d37e5de0ede024986140958050e8c2aa233160e16aa5d871db765cc1f594bc51dfac6953e86c57dd8
+EBUILD kdbg-3.0.0.ebuild 1191 BLAKE2B affd50a6189911e15bf5566277a7a23142f38bb04392dafb4f89e8694eea72acfc3811f4e60bf40a65e1bcae6feed27b7f26fc6ade4e8daa6fe0e7ef88f05ca1 SHA512 7d1c924e50ec68175a6c4157044c5738a8f6abfc1b32a19d611e79842ee04ffcb3aee38c53cd016427c68d78acdefe634754eddf07c114edf772847ad01b323a
 MISC metadata.xml 371 BLAKE2B fe7d9700b798150f83b58f44ae125090c0af51f6d6e81d7c5048828e75d9b95147a01c009b5bb195e6d6fbeb047dc019059802e3f60e02e59596f2f027c7ec4a SHA512 70d360d6ff4a809578a61351cdd5bdc42b6bc72eb6551ef8083595d941909f1c6ab91a4cb793f1161eaad3a65e0313e498bef0cc5e763a918d2e83c7352f7805
diff --git a/dev-util/kdbg/kdbg-3.0.0.ebuild b/dev-util/kdbg/kdbg-3.0.0.ebuild
index ecb39833107d..d6e46f2cfd5a 100644
--- a/dev-util/kdbg/kdbg-3.0.0.ebuild
+++ b/dev-util/kdbg/kdbg-3.0.0.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
@@ -14,7 +14,7 @@ LICENSE="GPL-2"
 KEYWORDS=""
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="
+COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
 	$(add_frameworks_dep kcoreaddons)
@@ -26,10 +26,13 @@ DEPEND="
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
 "
-RDEPEND="${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	!dev-util/kdbg:4
 	sys-devel/gdb
 "
+DEPEND="${COMMON_DEPEND}
+	media-libs/libpng:0
+"
 
 src_prepare() {
 	# allow documentation to be handled by eclass
@@ -37,5 +40,12 @@ src_prepare() {
 	sed -i -e '/add_subdirectory(doc)/d' kdbg/CMakeLists.txt || die
 	echo "add_subdirectory ( doc ) " >> CMakeLists.txt || die
 
+	local png
+	for png in kdbg/pics/*.png; do
+		pngfix -q --out=${png/.png/fixed.png} ${png}
+		[[ $? -gt 15 ]] && die "Failed to fix ${png}"
+		mv -f ${png/.png/fixed.png} ${png} || die
+	done
+
 	kde5_src_prepare
 }
diff --git a/dev-util/kdevelop-clang-tidy/Manifest b/dev-util/kdevelop-clang-tidy/Manifest
new file mode 100644
index 000000000000..72be96e1e00e
--- /dev/null
+++ b/dev-util/kdevelop-clang-tidy/Manifest
@@ -0,0 +1,3 @@
+DIST kdev-clang-tidy-0.3.3.tar.xz 55804 BLAKE2B 30ec12d5a2bc7d8b5d111374c8954a65bebe89a4a192d6ecfde7065b54fcfb41e46137a328cd172a06ef3e00cbee42581b1ce7561b2b2a43430b33aebd70fa0d SHA512 448cc8e30cb6e237c43eb52f4694327900558a34a707d15195c2ad460f48e405315b5a667cfcf7a402dc6d9c2861594912159f63ac4cf61546a3ddf8777be489
+EBUILD kdevelop-clang-tidy-0.3.3.ebuild 1083 BLAKE2B f684a5520f87a6b2cc043810b2201cc35140028f461a43f0c77643ef158b5c2c711d0f8f533ce9fa33705e4b6f7eef52ca949cddb23d1420c92e0404610b584c SHA512 b2add913f9fcd7fc2c375b5df40ce44be265c93875b42d2689a9bda7130e6366528017f74f49edee9a99aba092bd2d15a1e58a01d0e0a998e8f4d386d97c1c32
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3.ebuild b/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3.ebuild
new file mode 100644
index 000000000000..4e1d831e0c22
--- /dev/null
+++ b/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDEBASE="kdevelop"
+KDE_TEST="true"
+KMNAME="kdev-clang-tidy"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN/kdevelop/kdev}/${PV}/src/${P/kdevelop/kdev}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="KDevelop plugin for clang-tidy static analysis support"
+LICENSE="GPL-2+"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep ktexteditor)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+	>=dev-util/kdevelop-5.2.3:5
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-devel/clang:*
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+	dev-util/kdevelop:5[test?]
+"
+
+src_prepare() {
+	kde5_src_prepare
+	# drop when upstream depends on >=kdevelop-5.2.2
+	sed -e "/KF_ADDITIONAL_REQ_COMPONENTS/d" -i CMakeLists.txt
+}
diff --git a/dev-util/kdevelop-clang-tidy/metadata.xml b/dev-util/kdevelop-clang-tidy/metadata.xml
new file mode 100644
index 000000000000..2fdbf33d963d
--- /dev/null
+++ b/dev-util/kdevelop-clang-tidy/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>kde@gentoo.org</email>
+		<name>Gentoo KDE Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index da1b4d710392..db4fda82cedd 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,4 +1,6 @@
 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
+DIST kdev-php-5.3.1.tar.xz 1008084 BLAKE2B 6e47c9a99b6b1f2408570f6cd31c05271b59af90bd0fb1f90f6dd4a66aed0976d18de3618906f970c75f056abe5527900a51f0ed428a07325e62e6c11d804760 SHA512 7dd6a58be583ec6e1e8eb079f7f14b01abc7f0c9d73eb9e7cd8be413bf43eef79d90c53a0b13446db9e354824b6d39e62a99bfe4a472b3e59f2dd50203726fbc
 EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a
+EBUILD kdevelop-php-5.3.1.ebuild 1086 BLAKE2B 8fad26d279e8f40c1fb6cfcf454872fe0255fb4b8979ac62cbff5df016aadb30276f5822b13fad809b6e035e9a1f56391d9f3ec48e5e859b9e58b00461035111 SHA512 b22871202a2a84457d5f26b3e09ee98e2b9c33e3eff40a3dd03e9a453ee99fe22bdf424baebfcd00b92e13e65ae4238296fef06407adc90c8a28cf02a98bb80e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.1.ebuild
new file mode 100644
index 000000000000..9b1c18f583ba
--- /dev/null
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.3"
+KDEBASE="kdevelop"
+KDE_DOC_DIR="docs"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="true"
+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"
+
+COMMON_DEPEND="
+	$(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 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="${COMMON_DEPEND}
+	!dev-util/kdevelop-php-docs
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-util/kdevelop:5[test] )
+"
+
+src_test() {
+	# tests hang
+	local myctestargs=(
+		-E "(completionbenchmark|duchain_multiplefiles)"
+	)
+	kde5_src_test
+}
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 8ac6199099fd..7a0890d41143 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,3 +1,5 @@
 DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
+DIST kdev-python-5.3.1.tar.xz 1074256 BLAKE2B dd122e9150c156276515213bb1326d60be43bdb5a1a2ab1a303de2521b63ac4e8b1609f4bb6c015e75cf57006bd12ec76b8b442b5e0f46a642a573e0c920324b SHA512 d8ffa2d842775b7bf6f1d5cace81b124c8979bbcf474b75f2565ae0efa7c809c4e66a86af53212a332ef6db77e8887c84b3fcbe8e1c4cdf51b56794b7d247829
 EBUILD kdevelop-python-5.2.4.ebuild 1165 BLAKE2B a66030af8d7e71e5cf494e88cb1d1f2d5b843ee7a0e1ce21243e528a9b6daf67dec0033dfb843061133846dae3b25db39149833cce52ff8250c225c9412f98e5 SHA512 7d4113a3e68919132ca8847a9b49cd41379d3d81da5010ba29dea68e1ef7269a25850555b2328dd03b198c1f26c6c9ebf4a8687b20cd8d99eadb64ac10fa116f
+EBUILD kdevelop-python-5.3.1.ebuild 1169 BLAKE2B 3a97ad6e437acecbce5c649c87cd6ab8ad3648ac4a1346be98163f23bae022f2399510624285f0b072d6c037ceeae7b2a1a32b1e55015e1fce7010ead9e56471 SHA512 c93d771a2f83b76dc5c3c8b4cac0beb55f9b66d176f28e474b605a54ae8310602dbcb62af8bd3fae9b03cdc9e113c34209e53460b49f98c109a39438b21a424b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.3.1.ebuild
new file mode 100644
index 000000000000..95cc296ddff0
--- /dev/null
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.3"
+KDE_TEST="forceoptional"
+KDEBASE="kdevelop"
+KMNAME="kdev-python"
+PYTHON_COMPAT=( python3_{4,5,6,7} )
+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/Manifest b/dev-util/kdevelop/Manifest
index 7585280f7bd6..751db4e9b642 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,3 +1,5 @@
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
+DIST kdevelop-5.3.1.tar.xz 6671416 BLAKE2B ac09bb2f9254279af662d472ddc712e09892509a7eae0dc0df8fa7fc1b36ec0b90c381503699f7844141cef644e33d70c8a3ca77267958e46bc56fe55f4c5c2c SHA512 3b8c9d839a0fab48a2ecb63cb3dddb96c096c6d244f95baaefcbeca5beb91557769773da367a02f1ad8bd33ec44d14157a988989576062894a081a4073928a0a
 EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
+EBUILD kdevelop-5.3.1.ebuild 3749 BLAKE2B 2f6d0b890acf4e5d6bf90df72cb5fa964c3790367d578d6cc4c976f6b7018d94f5672feecdac678601a151430b8f7c17bea85bf6b21f22b349d56b3450ea7f12 SHA512 6f9ea985cd3b23f994a9d04f1db853f03bb822d97f2dd3e9c1eba01977334504a197763e4a358c11674c33ce622909aaff5b3c2f763264ad60ab7d027f0b47e9
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/kdevelop-5.3.1.ebuild b/dev-util/kdevelop/kdevelop-5.3.1.ebuild
new file mode 100644
index 000000000000..53e691a99ab1
--- /dev/null
+++ b/dev-util/kdevelop/kdevelop-5.3.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_BRANCH="5.3"
+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="+gdbui hex +plasma +qmake reviewboard subversion webkit"
+[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
+
+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 'widgets')
+	$(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? ( $(add_frameworks_dep 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') )
+"
+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]
+	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
+	!dev-util/kdevelop-clang
+	!dev-util/kdevelop-cppcheck
+	!dev-util/kdevelop-qmake
+	!dev-util/kdevelop-qmljs
+	!dev-util/kdevplatform
+"
+
+RESTRICT+=" test"
+# see bug 366471
+
+src_configure() {
+	local mycmakeargs=(
+		$(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)
+	)
+
+	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
+
+	if ! has_version "dev-util/clazy" ; then
+		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
+	fi
+}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 43da9438cb3c..b8c733a18b37 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,15 +1,15 @@
 DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
 DIST lldb-6.0.1.src.tar.xz 19292420 BLAKE2B 9ec3304aa370781dcbc7c30e47f7becbd99b50f32d9eea36fefbf0e3608bdfe10796ecc14807ee17795de430409315a5dfad02db0fd3ec1a0ad51e9e240e4b40 SHA512 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
 DIST lldb-7.0.0.src.tar.xz 19403012 BLAKE2B e53f866aeb0151d114c415ed3aecfea9160e72439bce9803d749a648214ce77de74a3fff3d61ff4f243f6a000c41dce0fefe7109ad457f98758abdb6dc9b1382 SHA512 32d93276a07b5f7ca64fc45e7b51004825d1636ec3dff163c5de9f769046a81921c1d82f0aa6eddf3778e1ecf8d4f87c3d5e6bcd3f9ac8cae36278bf12e9e9c8
-DIST lldb-7.0.1rc2.src.tar.xz 19386056 BLAKE2B d1402eb1f38e42bdcc46bd1c19901bae392dc03b3ba8e7b4e6d2d1ccbd7967bddc0017452bac3f5f22baf1c598a0a340f7353083467582a547d3809a7afcf568 SHA512 804034e83b1c6225a189f008dab8f93620797a9b9fa54849009f6615388420dd694f22857e450b0187d940036024ee828bb010a12e29ef8e1c5fbaff720e5f5b
+DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 DIST llvm-7.0.0.src.tar.xz 28324368 BLAKE2B 10168ff9be8f68536db3b2263c85c1c98213ef03dc542b83628ff176542452582bc496bab236fdf40d4a6463a33f04b27f1458c072ad8b66b641f8df8d494046 SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
-DIST llvm-7.0.1rc2.src.tar.xz 28304444 BLAKE2B 245e45f77a2ec2d94b237d1015ccc1e409f0dc149dba3192c15293bc2d45ec40989081a930a5e55a4b0ebf906397c62afd910bc25c5c1eef7ea5e310d4172acb SHA512 cfc4d1926bae75f6f22350273ab76811f0b78ddad81717c9201d7814ebe7b902c5a9c6caa0232e2bdc14e819b008f914d055b23723e0ec4a5309809dc06c6bf4
+DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
 EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-6.0.1.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
 EBUILD lldb-7.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
-EBUILD lldb-7.0.1_rc2.ebuild 3019 BLAKE2B 4db922a9c9c16e4b16a7b03050ee8a77e8e5439c0e906102ceb11cecea9dbe515a0bed331b2631c881c41587c10d96ce459aa0cab6557868204096cb2476e58f SHA512 010cf45c6fba6fda7441ceae3f0811351e6b6030300b2b223a5ec4848b8ecf3c648fa7c707e904828114a30878296d58b03b97ea22047247dfc62a5c5fdf5e1d
+EBUILD lldb-7.0.1.ebuild 3010 BLAKE2B 9d82e23d83a5726a5c966d14e4660e7199e03716597c2be0bf2adf33037c1fb4cd459fda2ab44230e18efc681690f16e25753de7b3bca2932b1081e6feff887a SHA512 92a937daf00ab27650045dad8fae9e7a1e9e2b014b37ee9e13c8452f25fa58a78196711b0e5a41a65f12947a1a9fd85ddbf9c360c4036478a699417501c2c02f
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-7.0.1_rc2.ebuild b/dev-util/lldb/lldb-7.0.1.ebuild
index 43258b4386fa..e0f87be71fe8 100644
--- a/dev-util/lldb/lldb-7.0.1_rc2.ebuild
+++ b/dev-util/lldb/lldb-7.0.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
@@ -16,8 +16,8 @@ LLVM_P=llvm-${PV/_/}.src
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
diff --git a/dev-util/makeheaders/Manifest b/dev-util/makeheaders/Manifest
index 4cd3682ccdea..27cbc0244871 100644
--- a/dev-util/makeheaders/Manifest
+++ b/dev-util/makeheaders/Manifest
@@ -1,4 +1,4 @@
 DIST makeheaders-0_p4.c 99253 BLAKE2B 103d4b1d75fb3cb38fdf97dcf051f263c1ee7c08f8d2b4b791994948f0323cbf69fc66840464591ea8596c7ab6857eaf9ddd56bb69f2f035f57d99fbf5444992 SHA512 d46a23a4ee1436f1bad2f0d26e7de9be47a84b0c163430bdaf360c4c6a94b84949f2a427683265898312e56e9dda316992857e488202aa74afcc3939fa712a35
 DIST makeheaders-0_p4.html 35481 BLAKE2B a5e4e4804b612eb164f46cb8ef664952b3f1819a2915e2e905b58e6719cbc7480e4fd2f81f1d1d91b2029b15ed0c9b2c799ae99538b8ad77d49d3606d91b50d5 SHA512 903437c9d4b280af1cb9d5e29df150fb347ef9c62ec146daecfb5c4093554531c206bc73885cc7aacea1b7c24fb473e240a03a31c139caf6bc0e42901b518597
 EBUILD makeheaders-0_p4.ebuild 658 BLAKE2B 4262d895536f636a1037d784ce6ee55b28582f94820a6651e57e4bed44cf4827883483472501313139f515068015a949e6c1df641431bbda51a0448f57e8210a SHA512 3119779bde55879cc88056259db02233ac57e55f7c8b6d1fd7b6ec348b30f5677df0370987c66b9738cd2cdb3ddb3d8250366318482d80a3530f5bffdcbf7465
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/makeheaders/metadata.xml b/dev-util/makeheaders/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/dev-util/makeheaders/metadata.xml
+++ b/dev-util/makeheaders/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index 7be164255d3f..62baf7fd605b 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,18 +1,6 @@
 AUX makepp-1.18-install.patch 2499 BLAKE2B 51d127a82a662563aac996a0d1efef5a68bf9eb36ddc4496a7307121b4abf0a1bdd66351d663308dfb208180dc7d00f631b685d3cbd327e9f6fa46d4a9f7b6dc SHA512 fe1dc50fde876e95fcf3bdfcd619faf8cef2a519cbf9512f32d715b6ad946d2e6a0f4cafe24aa6a1319d61662726b5c7e958ef2a3e5583079dd4ac409edd074b
-AUX makepp-1.40.1a-install.patch 426 BLAKE2B 2d71ea3f9e6d452c6be0d7553616ab76d25d5bebdd4cf6dafa0dcf1aceccc6be990695e0c32de907379634dc62f2830561d2ae11a53ea612b2f11994f4c8330f SHA512 af78ac75655103177fdfaf6a3e28b35052b29ede4385f8e8f29c50ed8386da157e0b2fb114591ad004dc4aa605077706df54f17eb068f765e14624b90365d706
-AUX makepp-2.0-destdir.patch 254 BLAKE2B ecaa18802ac0e0585b58d48a48503b94724c20ae72810c6b728c235b9656cb86b0264d9f84a26cbbb59d239b899c7ff29f2e694df56af401c2005b8aaa4d67b8 SHA512 8bd13910c03d86e32f6713f733ad2a0079f4befa257efb9f5abcdf3cb578270483fcd59cdba97e24ea95f3801ccc0b7edec8161c80ca56eb81556a43efd989f2
-AUX makepp-2.0.98.5-perl526.patch 964 BLAKE2B 597194606fce15f997e6f9b5981c123e9b0921542925a257205398dfdce62c6e173bd526dc5c37dc087443a3c8b8bcc20a3d7b3eb26bbb76e7e8f6be5b5b59d7 SHA512 aec311f042c34018c31d8f3e7c4fdc5594eb14519c78b20c9498e1680728e1eba397aca3be68a720f1da49925e619be30b288acf1d83515aa5388a2f8ad72274
 DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
-DIST makepp-1.40.1a.tar.gz 278170 BLAKE2B ceac75583575c51f3da960368644259d414377694ec7e437b9aa8455a48ba37edf330131857d4ac255b7da5e55568cfc8f896064d40eb4ee46cb1a5c70d01b47 SHA512 554987f1ff51fd4d984d54a8bf1c36182418f57820899567aba8d961753ab4daa4f4fee9591557dac199c0a2e4ba33f5b2a789e237ae9684e5168201d0a152ef
-DIST makepp-2.0.98.4.txz 528092 BLAKE2B 8d315d5b00f08cf6455889f933315c8f2964db5c54c60892cc5aceaa8878e0503567b2b28cee6a03d950a890244dd012b295a929704b574b8f7a9e1f16c7693a SHA512 c04e67f62155ce398c1fccba350354b163367ef5a6db961277433a7c733a71512a48cf3427d02a7b6874ab33047f6b7082105ed78b8397dc430c9d6a34ad9d38
-DIST makepp-2.0.98.5.txz 529556 BLAKE2B d3112efa4a8c5abc0ce845dff1e7a9785e6ab1fa98dd1312cf55b4f4d65cf14e5177d319629a26bcb5dd231308bfd0fb0944f089859ef95a02b0d1dfe5fd8c7f SHA512 f4ad5ab3800148fc4527558374be765e0b7ac731220192c1105e9c688c5961b8d5dd42ed2177db2aadc879b2c66e4bde14428eaf3055a6ba52163d908c576b5a
 DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
-DIST makepp-2.0.txz 534708 BLAKE2B 9ea57e64199aef3765e74d0b4fe37a4803163c45067bc130fc02f2c28925f2f1f925b7757c03b31634f15bc755077944fc6e6ec85c9e83a248ed6915550ca14a SHA512 b8327fe475cb323352c6b89f1dc5e4a3fbbc71ee8b53777340449f610e3276465680ba3bc3bba905bb00754ca52ca56b82b9b1184db7bf7b272a47822b86aa49
 EBUILD makepp-1.18.ebuild 915 BLAKE2B 6004b382b36f5cb21f3a00598b825be8f7b67d0392816b0af6930b5cd44370f1a74afb548c98914be18968ac71beaa984f9be4b3d67add283f11cdad5d12650f SHA512 2cec8d117ae97166a4d9c5164ad09fd2d3934a36db29464bf4c6ea75b821adabb5037bf0e83195f383d3ee9836b86ac7f1f85574fd3a744015324966ce911664
-EBUILD makepp-1.40.1a.ebuild 872 BLAKE2B 15e4727b0a787e2ea30d526e4f4995eeb7bac953aebee07cd9f0e3073515bc261a91e8bdb18afac3dbdf324735cb43c3ec5ec96d20bc96a05fa17682786f3386 SHA512 9de9e041e96f0fdf66e21c20193b1048f79264611b65004bf03ab5e20be844653d3ff4736e0d28e77313a54a04560c3baaf340938a0dc7c1442b8e419b556531
-EBUILD makepp-2.0-r1.ebuild 1101 BLAKE2B 05111d35ecc47db06abbefa56e654982e9eaaf895dd61e93cd8d9ed750905a8b45165a6e361d1684dffd0b7af7d377c9f0c0cdc6cdfee1e98a259844ff71864a SHA512 fd8000e9b800a0dbae39824ba3286252ee63e25f76b5229e0e42e026ea731172b8c500a85370eda51e26d616a9d2f652241a1fae563494ad6dd46a33d0cdf416
-EBUILD makepp-2.0.98.4.ebuild 1049 BLAKE2B 7bfdd2926dd06b5bfbd24d3917f8248a67b60bb8f2350850569d966c84393a0b048e8d95334b9dc4797c1fafce1485c32c8667e26f0bc3c701974248987bb4fc SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c
-EBUILD makepp-2.0.98.5-r1.ebuild 1003 BLAKE2B a0c255f4009525028feaf0a606e762697bfce0d601a4ac8ab27fb7a1cf3d75a32d05717657ae560ef0b38483163d36a572f8f3ccdb5ec3dd65d5ea8a7cb59c44 SHA512 8541e1a75f5c8867bb9e5320090496d6f2b4b59fce8745aa689657c98f3bc782487ad3b48e2e6a29d0784c718c921cfff879ffe8fb64ec8cc4e96138d9d5214f
-EBUILD makepp-2.0.98.5.ebuild 1049 BLAKE2B 7bfdd2926dd06b5bfbd24d3917f8248a67b60bb8f2350850569d966c84393a0b048e8d95334b9dc4797c1fafce1485c32c8667e26f0bc3c701974248987bb4fc SHA512 872e6613230136f8fa8807720af8054086481f70fdc461fb08278adeb90f539e89f84a3b3cb3b7d08244f30153de5526b54db8406e15a1391e0e63f87c4dd49c
-EBUILD makepp-2.0.99.1.ebuild 957 BLAKE2B c515df0a863109bbf5ccdb90bb110faed698517b33d3ce57a76686e8250c221576ef5ba4f33ed27225f9995b957d9e8da8b5dca6e8f7f51c001173febac8d1b0 SHA512 2172c34461777f3ecde95e01e6dbd53a9d20fd41eeb1bb1f3bed86f6fd08762e595a203c3158917d55acca04177eaf089ecfbb967f28bc14c43c00b95baeda62
+EBUILD makepp-2.0.99.1.ebuild 956 BLAKE2B 271c4ab70048e97b3af955bae431aaa1887ed2e085c9f30d5ae5638a6e230d0665c59fc28401c282f33225d27627f87f9e3d1d0028332b51d73f1bd172006eb6 SHA512 3de74875fa845a954a481850ab32015affdac1f9ca6764dbfd1143ef9435db3845731953f586b9c6cedc3e50acacf6730117495d776dd73510136e08f09da670
 MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/files/makepp-1.40.1a-install.patch b/dev-util/makepp/files/makepp-1.40.1a-install.patch
deleted file mode 100644
index b1ee013add3e..000000000000
--- a/dev-util/makepp/files/makepp-1.40.1a-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- makepp-1.40/config.pl
-+++ makepp-1.40/config.pl
-@@ -34,7 +34,7 @@
- 	cd makepp-$(VERSION) && make test    # Make sure it all runs.
- 	rm -rf makepp-$(VERSION)
- 
--install: all
--	$(PERL) install.pl $(BINDIR) $(DATADIR) $(MANDIR) $(HTMLDIR) $(FINDBIN)
-+install:
-+	$(PERL) install.pl $(DESTDIR)$(BINDIR) $(DESTDIR)$(DATADIR) $(DESTDIR)$(MANDIR) $(DESTDIR)$(HTMLDIR) $(DESTDIR)$(FINDBIN)
- 
- .PHONY: all distribution install test
diff --git a/dev-util/makepp/files/makepp-2.0-destdir.patch b/dev-util/makepp/files/makepp-2.0-destdir.patch
deleted file mode 100644
index 7d7950b2dff4..000000000000
--- a/dev-util/makepp/files/makepp-2.0-destdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-don't break install paths when DESTDIR is set
-
---- a/install.pl
-+++ b/install.pl
-@@ -131,7 +131,7 @@
- 
- if( $destdir ) {
-   for( $bindir, $datadir, $mandir, $htmldir_val ) {
--    s/$prefix/$destdir/o if defined;
-+    s/^/$destdir/o if defined;
-   }
- }
- 
diff --git a/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch b/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch
deleted file mode 100644
index b5ed875b4dcf..000000000000
--- a/dev-util/makepp/files/makepp-2.0.98.5-perl526.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ruN makepp-2.0.98.5.orig/config.pl makepp-2.0.98.5/config.pl
---- makepp-2.0.98.5.orig/config.pl	2017-07-08 21:35:18.257017457 +0200
-+++ makepp-2.0.98.5/config.pl	2017-07-08 21:39:06.087026936 +0200
-@@ -19,6 +19,8 @@
- you on?), get the latest from www.perl.org and install it.
- EOS
- 
-+use lib q[.];
-+
- BEGIN { eval { require Mpp::Utils } or warn <<EOS and exit 1 } # avoid BEGIN/die diagnostic
- Please call this script in the directory where you unpacked it!
- EOS
-diff -ruN makepp-2.0.98.5.orig/install.pl makepp-2.0.98.5/install.pl
---- makepp-2.0.98.5.orig/install.pl	2013-07-05 23:02:38.000000000 +0200
-+++ makepp-2.0.98.5/install.pl	2017-07-08 21:38:48.441026202 +0200
-@@ -13,6 +13,8 @@
- #
- BEGIN { eval { require 5.008 } or exec $^X, 'config.pl' } # Dies with nice message.
- 
-+use lib q[.];
-+
- BEGIN { eval { require Mpp::Text } or warn <<EOS and exit 1 } # avoid BEGIN/die diagnostic
- Please call this script in the directory where you unpacked it!
- EOS
diff --git a/dev-util/makepp/makepp-1.40.1a.ebuild b/dev-util/makepp/makepp-1.40.1a.ebuild
deleted file mode 100644
index a46c2328ba7e..000000000000
--- a/dev-util/makepp/makepp-1.40.1a.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${P%.*}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-install.patch
-	# remove ones which cause sandbox violations
-	rm makepp_tests/wildcard_repositories.test
-}
-
-src_compile() {
-	# not an autoconf configure script
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--htmldir=/usr/share/doc/${PF}/html \
-		--mandir=/usr/share/man \
-		--datadir=/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc ChangeLog README
-}
diff --git a/dev-util/makepp/makepp-2.0-r1.ebuild b/dev-util/makepp/makepp-2.0-r1.ebuild
deleted file mode 100644
index a8d44bd7fca1..000000000000
--- a/dev-util/makepp/makepp-2.0-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${PV%_*}/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0-destdir.patch
-
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.98.4.ebuild b/dev-util/makepp/makepp-2.0.98.4.ebuild
deleted file mode 100644
index 1ecf18f24d1f..000000000000
--- a/dev-util/makepp/makepp-2.0.98.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.98.5-r1.ebuild b/dev-util/makepp/makepp-2.0.98.5-r1.ebuild
deleted file mode 100644
index d6b300f282ee..000000000000
--- a/dev-util/makepp/makepp-2.0.98.5-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND="dev-lang/perl:="
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=( "${FILESDIR}/${P}-perl526.patch" )
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-	default
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.98.5.ebuild b/dev-util/makepp/makepp-2.0.98.5.ebuild
deleted file mode 100644
index 1ecf18f24d1f..000000000000
--- a/dev-util/makepp/makepp-2.0.98.5.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-MY_PV=${PV/_}
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="GNU make replacement"
-HOMEPAGE="http://makepp.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
-IUSE=""
-
-DEPEND=">=dev-lang/perl-5.6.0"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	ln -s "${DISTDIR}/${A}" ${P}.tar.xz
-	unpack ./${P}.tar.xz
-}
-
-src_prepare() {
-	# default "all" rule is to run tests :x
-	sed -i '/^all:/s:test::' config.pl || die
-}
-
-src_configure() {
-	# not an autoconf configure script
-	./configure \
-		--prefix="${EPREFIX}"/usr \
-		--bindir="${EPREFIX}"/usr/bin \
-		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--mandir="${EPREFIX}"/usr/share/man \
-		--datadir="${EPREFIX}"/usr/share/makepp \
-		|| die "configure failed"
-}
-
-src_test() {
-	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
-	export CCACHE_UNIFY=1
-	ROOT= default
-}
diff --git a/dev-util/makepp/makepp-2.0.99.1.ebuild b/dev-util/makepp/makepp-2.0.99.1.ebuild
index 673b76c61cd9..1e24eea8bbaf 100644
--- a/dev-util/makepp/makepp-2.0.99.1.ebuild
+++ b/dev-util/makepp/makepp-2.0.99.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+KEYWORDS="alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl:="
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 23ca690c3f96..fb00c139dc96 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -6,10 +6,12 @@ DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d
 DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b
 DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
+DIST meson-0.49.0.tar.gz 1338576 BLAKE2B 6ae3152af337591928232c5dea8331185c8aa7f712019ed3635269544e4506fc0d9195d3d59128c5e5a286aff8ad1e3a0edf3afe28ab469989753c3c988ddae3 SHA512 6aba2a1c1dbf247fc30526215dd499b7c918c19f7f16a7216f5762e95cde39b7cfae2a1ebca1e2ea5323f2f855ed98c99af1b9048aa00bd1ffbe8da20ef2121b
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
-EBUILD meson-0.47.1.ebuild 926 BLAKE2B 779aaf05ce0d6481cdff78e5fbbe14ec5ca8b1494e28317bb7aeb2c8ad6554d8645477b29400ea1e29f2fd2b433c3424444084e67635d603281d7cad59ce84f8 SHA512 19b89992fb1b9cfc79d07ed6d12ef482eb88232b659887725e894fa2fafcb6b67093bcaf4989783ecfe9a9f1a2a3c2b85d52e7a074bd500405e33d8df34b09f4
+EBUILD meson-0.47.1.ebuild 924 BLAKE2B 8d581fd6b067bac2f1df75966404c52965200621efaf1e9c2ba49f66370c19bc28808c7bfd1e8f425f8a3417f140a906bd1e4705e64bd3dd220e18768e37ee76 SHA512 d4f8e48e3cec8dd09663ddf9a85bfa4b2e4882633d68f0a4f2766938da90aed1bcf84cc4a167fe56782258f9d5162f0eb6d24a59af311daeebe9913d18b1a61c
 EBUILD meson-0.48.0-r2.ebuild 1205 BLAKE2B 6b7b273e23e9e28e8fe78d20948802ed6834d017930bd8ddb286a0c01af68fb9d91443bbebbf8c1a82433759a6b74be85c744fb1fd812d3e2b2b8e3bdefe2105 SHA512 f107c74333c075cccae7e91afb465ced0c7f8d21b5c13849b425c6581567d854a663f0f452efb7ba7ad6bc145c2d8c8e5bdef80a12770c46fc7fd9e038646420
 EBUILD meson-0.48.1.ebuild 1139 BLAKE2B 813a717e745a1adf42be7e66a7fda714b9244a80859b8983470ae34abaeb4c1e09c28d8538ca7a9560131609ed5408c7f9699f92200847341d06ec86b6e02882 SHA512 ca5ce3d1069263b4b4a88535c15e768ee7131e0a8a1155c39c614dee20a8eac7f598ce7daa270853fa968ad0e2ab84078bcbff251d4744c0de7e9f91c433ba96
-EBUILD meson-0.48.2.ebuild 1089 BLAKE2B 67f08d54245c15ea50af9488c6325e1c995354dcf9bea444b5f9c96fa1f2781d9f02a8b91cb2aeabb6f6512296b56834bfce0058a53f786e0d95a1dcba5f3373 SHA512 379127b8f22c610c6b3479ed97f4eec880bbd81b0e52ac63e31fe1347003195031d8187a08c76fea5fca51b94d8094fd049c284e0548c56ce8009af8d15f2c25
-EBUILD meson-9999.ebuild 1089 BLAKE2B 67f08d54245c15ea50af9488c6325e1c995354dcf9bea444b5f9c96fa1f2781d9f02a8b91cb2aeabb6f6512296b56834bfce0058a53f786e0d95a1dcba5f3373 SHA512 379127b8f22c610c6b3479ed97f4eec880bbd81b0e52ac63e31fe1347003195031d8187a08c76fea5fca51b94d8094fd049c284e0548c56ce8009af8d15f2c25
+EBUILD meson-0.48.2.ebuild 1745 BLAKE2B d3e219ea50288bdc9caff3b1ee6334d02f85fe66f7b0dd0336f1e7f00a70001f87ec6d86e546ece16be2b9b23f01e6f3a490fbdd7f2b3e5a77e798dcd7661fd3 SHA512 194b0b9f9c707f71bf343f88d873ff32334c018b8bd85f16cf518a5c41a690dd888d6d65f398ee17b93aad349367ef7bf09a17fd954d02480ead899ecec90e8d
+EBUILD meson-0.49.0.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
+EBUILD meson-9999.ebuild 1750 BLAKE2B c7d068fab223b88dbae6d6cc32291b1f3e90b4304dcc5d0e0b21d9d07c59eafda94805c8a2576d10a8e7512c59164ad976fb10bfb7721e426c217fff1c225ef2 SHA512 3a102c115b36fc3c06e2abbe0e565c1a26ec80535a3d42f1c5cd21835d5464a5136dce25b17f33960ca8548b6007d5ef8b6822fa74c88d5d50f4cca700dd3c28
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.47.1.ebuild b/dev-util/meson/meson-0.47.1.ebuild
index 4fe83c922960..6a61d5bc6660 100644
--- a/dev-util/meson/meson-0.47.1.ebuild
+++ b/dev-util/meson/meson-0.47.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	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
diff --git a/dev-util/meson/meson-0.48.2.ebuild b/dev-util/meson/meson-0.48.2.ebuild
index d7d772117ac9..0c58e4314099 100644
--- a/dev-util/meson/meson-0.48.2.ebuild
+++ b/dev-util/meson/meson-0.48.2.ebuild
@@ -9,20 +9,47 @@ if [[ ${PV} = *9999* ]]; then
 	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"
+	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
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Open source build system"
 HOMEPAGE="http://mesonbuild.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	if tc-is-gcc; then
+		# LTO fails for static libs because the bfd plugin in missing.
+		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
+		# https://bugs.gentoo.org/672706
+		tc-getPROG AR gcc-ar >/dev/null
+	fi
+	distutils-r1_src_test
+}
 
 python_test() {
 	(
diff --git a/dev-util/meson/meson-0.49.0.ebuild b/dev-util/meson/meson-0.49.0.ebuild
new file mode 100644
index 000000000000..31b02901a507
--- /dev/null
+++ b/dev-util/meson/meson-0.49.0.ebuild
@@ -0,0 +1,73 @@
+# 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 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	if tc-is-gcc; then
+		# LTO fails for static libs because the bfd plugin in missing.
+		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
+		# https://bugs.gentoo.org/672706
+		tc-getPROG AR gcc-ar >/dev/null
+	fi
+	distutils-r1_src_test
+}
+
+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 d7d772117ac9..31b02901a507 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -12,17 +12,44 @@ else
 	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
+inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="Open source build system"
 HOMEPAGE="http://mesonbuild.com/"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
+IUSE="test"
+RESTRICT="!test? ( test )"
 
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	if tc-is-gcc; then
+		# LTO fails for static libs because the bfd plugin in missing.
+		# Remove this workaround after sys-devel/gcc-config-2.0 is stable.
+		# https://bugs.gentoo.org/672706
+		tc-getPROG AR gcc-ar >/dev/null
+	fi
+	distutils-r1_src_test
+}
 
 python_test() {
 	(
diff --git a/dev-util/mingw-runtime/Manifest b/dev-util/mingw-runtime/Manifest
index 5278bd0c3ee3..b3a5f791c8cc 100644
--- a/dev-util/mingw-runtime/Manifest
+++ b/dev-util/mingw-runtime/Manifest
@@ -4,8 +4,8 @@ DIST mingwrt-3.18-mingw32-src.tar.gz 391939 BLAKE2B 9d0164f9292d29937bf01d7110d1
 DIST mingwrt-3.20-2-mingw32-src.tar.lzma 302072 BLAKE2B 93f5efff918e48829fe75018da53d34de1d0eeb782466e4a022740213433d634a41512f44a90676e4bbf8476e81e74ec1785ce127a2c217c755fcb9d6e9f8e72 SHA512 ffb8e3d46a4646b236b67df0d9d21571a0ee8b78125989d506c176e03922e520201770a03093f27789f0e4373bf64f69d41e377d861ddd008b5e29da65fb1d55
 DIST mingwrt-3.20-mingw32-src.tar.gz 393946 BLAKE2B 1efe539aac86ea9fb7b0e258d086a52421d0d23b18670728703ad9153fadd84b9ef50b6d1367839a3dbdfbecfe66ef431d512ca91ca6d6e6ff4b7ed865afd07e SHA512 2d2d3c7decc7b35ab4759034dcd291c8e322a46205ae70fd4c4d68224c9d7c75454b908f61ba8ca7e0fdf18ff121c5b7ffd02e0658b7557e3af1f89ed28ed58c
 DIST mingwrt-4.0.3-1-mingw32-src.tar.lzma 1341612 BLAKE2B 4251c5737af3c209ea0fa22b604c24ffb6b67c6ab83d13e67ffc5750334f668005f321965a3d9cdf10e93e801730758c29cf64c10541a9e192e0a3355e2abd3f SHA512 2aa429f939038c86441ccfd32b4ddd40347582557f9427df92ea7454eb5bf743b8e1aafbb627b527be755976be807f415aad3920f700d93aa86d07bf40f12bde
-EBUILD mingw-runtime-3.18.ebuild 1741 BLAKE2B 9fdb3431ed214a0c2cef899bfba14f4d4fc77b62d1e82a88a504e3e0fad9c29b28c2a4d77cdddb15207f5cb4873368d1eab5889a19bd4ca6b7647fc5382598c0 SHA512 475dd9cf0da0eb3fee396930d03aa5b7bb703409feb468585c8a9aeaf19d19f9a2f47f76b388dd9e866df83c05d542a95e00713c5010509f6512bf8a1bda5b34
-EBUILD mingw-runtime-3.20.2.ebuild 1885 BLAKE2B 23c4e547442cd5fb45f4d20ed983fe1cdb47227f441bbd33fc5cf1889d63cb46ab43792e401b337f9fbfceac0c690e2338fbf29dba0d835d717098e5b110596d SHA512 acf010d890cdac866ecbc41336de4151ab1301755b64226afbdf9039f77b93d3799c33375c49ea2186bb37d46249a8ee4217b69bb297156c132b22668ca937be
-EBUILD mingw-runtime-3.20.ebuild 1813 BLAKE2B 87d775ccbfefcdfd6aadae32ba938ffda4a5ff771bf427b1cc192f42aa6aefbf7abce52259e30ebadb56d5848f753afcf8a92f87152e0869d79c10ad0c9d5645 SHA512 12ced00fc0e1ebd1837bc9105b5dd93158894301abde6e0db77e17316b48004ec4b577b9cb6af7052858824b915293f38b5985bc6e1832ab4836209b9eb19236
-EBUILD mingw-runtime-4.0.3.1.ebuild 1886 BLAKE2B 386b09ddab89cfd318edd224ccc827bb6a77a371b4186d5e39ec7a5a67ebc46f324810c0701d6e04a6c008afc6d9eb99945a12a1dedbf8870c00ae093fa38db5 SHA512 e0d87ea7eba4fa833c2b5bde35360dfd73aa6fa10140468a4654966e6e351ebe6c21b6c69dab94660544fde168239a76fa45905e286205c972a0b6668d9d74c6
+EBUILD mingw-runtime-3.18.ebuild 1691 BLAKE2B 29724a85561d0f9ee6117c42f74c9652366bea6da5db50bc9e49accf7cd5c6b393f932e11d6675c637f4c85a42b430986867de905f6d17124a453dbc27a37840 SHA512 8c7a41a197b6e28f4eb320f43b1ca2243741e155993bb04746acbb0511856afe6a451b44a69a6bc1f13349dcaac12426838fe9fe553fe44bd89511695b4f26fc
+EBUILD mingw-runtime-3.20.2.ebuild 1835 BLAKE2B 23e24d14e5b0532b7d85d124c16f0d11b3876d018e3eada513feee4fe2eeb4986159d18d762ec4cf87a7068721b84da00f9ec787200725226985094eb3be2a1f SHA512 c09ab84d1745d72dc65d31cb5d2fa0a8b479f567713b985a6e56edf5440bf84604f65a3bd864108da7e488b91f44e88b8c757a05fbba27fa53547d77262c5b3d
+EBUILD mingw-runtime-3.20.ebuild 1763 BLAKE2B 99ef27e8a2cd3b3c149e782ae81fa508e1e5562d787bedb0a1b8adabd441e840af1ef32d05831d547f14ce28e2e9a4821a90c7baa6c77b9c501ec27a9a3de3c0 SHA512 fd994d7bd5b1512802f09481462fd4f704ec3f794d2c32a1338fa2d6cac75e5c8669f0113b2df3df8ac04716222e27f23af86a2004fbfa2257bb312664c0168b
+EBUILD mingw-runtime-4.0.3.1.ebuild 1836 BLAKE2B ae3e693f7d8adc9bd3dac5cdaf3b14a6afc115753aea57ff6c8c415a23d7762dbd1b2543d5fec04df4c91246d5d37886293a97b1a6c5b2735b2f0a16365bb2bd SHA512 f2e6629afd51251e6e5d8b63e15810e4d09a34e64129d52ea244a75cea2be5e7abcbc13d74c4711ff1445637bc2d6927e68f73cd62c498fa4dbad1cddc8834f5
 MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
index fde71e0d98cb..74ba9950cae3 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.18.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.18.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=0
@@ -69,7 +69,6 @@ src_install() {
 			&& insdir="${D}/usr/${CTARGET}" \
 			|| insdir="${D}"
 		emake install DESTDIR="${insdir}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		rm -rf "${insdir}"/usr/doc
 		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
 	fi
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
index cd21a8f2e9f8..f1842bc41165 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.2.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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="4"
@@ -69,7 +69,6 @@ src_install() {
 			&& insdir="${D}/usr/${CTARGET}" \
 			|| insdir="${D}"
 		emake install DESTDIR="${insdir}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		rm -rf "${insdir}"/usr/doc
 		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
 		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
diff --git a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild b/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
index e75340a8d33d..ed32fcb768c7 100644
--- a/dev-util/mingw-runtime/mingw-runtime-3.20.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-3.20.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="4"
@@ -67,7 +67,6 @@ src_install() {
 			&& insdir="${D}/usr/${CTARGET}" \
 			|| insdir="${D}"
 		emake install DESTDIR="${insdir}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		rm -rf "${insdir}"/usr/doc
 		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
 		dodoc CONTRIBUTORS ChangeLog README TODO readme.txt
diff --git a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild b/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
index 0a13e7773d86..82167469e438 100644
--- a/dev-util/mingw-runtime/mingw-runtime-4.0.3.1.ebuild
+++ b/dev-util/mingw-runtime/mingw-runtime-4.0.3.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="4"
@@ -75,7 +75,6 @@ src_install() {
 			&& insdir="${D}/usr/${CTARGET}" \
 			|| insdir="${D}"
 		emake -j1 install DESTDIR="${insdir}"
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		rm -rf "${insdir}"/usr/doc
 		docinto ${CTARGET} # Avoid collisions with other cross-compilers.
 	fi
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 47fd5d0a858f..a981f43d31f3 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,5 +1,5 @@
 DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
-EBUILD mingw64-runtime-5.0.4.ebuild 2597 BLAKE2B 500aecb0c6f8a8fe314c18937515438c730e25d6637d0b641d90cbbef8cb0764ffd690c7313c6cbade86bbf8bdf725f2bc075460a1e96987f9c6c043609f72da SHA512 cca85d0666b28bec6abcd4c4d40b89f9fb6c76077b10b8e8111b1fb6a96f78bc3877392c7f03f17a733e421bb242adcb8b2058af82136fc9c32c18b9fb7120b7
-EBUILD mingw64-runtime-6.0.0-r1.ebuild 2908 BLAKE2B 5402e752fab1dd5c784bc743f1f468e8ab74fa0fa1c695e9bb1793298eb44aab9d8b99bd8e449bcf53c00fa8bad182120fee0b424dcf715b446e4bfdfe67280b SHA512 94e837d5cec4b00971dfb399d61db41f39f3c2f7e5907b04b535617f062be34b7af108bb72878a1608b0635ce60d084c9ad64969b09b089d70dfb2dc74ff17af
+EBUILD mingw64-runtime-5.0.4.ebuild 2548 BLAKE2B 82805af12130881e40369c5c2074bd622f4ce19e3d1ca1b845d6f03bfe84c271b22ee55d1ba639827d67506262a05f917509df2d632b34cca141d62a02487539 SHA512 bc4fdf9844d0b09ac4045cd51529b14ecf9fe8bb4f2fa428d141bdcb6352a0b1912d471ac133b768dcd26c65c05d345594123fade22f525b8fd803b234b9250d
+EBUILD mingw64-runtime-6.0.0-r1.ebuild 2862 BLAKE2B b10758329649069509ca617a9b1159f480eb1b84c89bf9130004b2d1e089dcdb02ac6a896b376dd7486c6fc86c12468162f089377ba2fc5390549476957ef83c SHA512 4dc7a111aab0b5a01cb1559efe7ca4126b32f77e88852ff2940cfe23fb78ade8561653c3f9d08a1e0530e875227ab50f51d820c887737454491306fc29b12ca5
 MISC metadata.xml 563 BLAKE2B 84e56e99482d2f7bb1e1095d84915b42190ba74fe7242ffdce548c4249a40be17018a29911d32b9b09df8fc5e04d912dcfe6f473e5eb2478f55d317808b24f4b SHA512 27dca35a3b2d5444b712802c3099c595d9b9fda21f29b6b709222e5bb0aad78f353d0170500eb3b632b254935d35cf43fc43d4ecb61722b711799ca4d28211bd
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
index 25722876100e..93965bb06d7c 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.4.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.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
@@ -103,6 +103,5 @@ src_install() {
 		dosym usr/include /usr/${CTARGET}/sys-include
 	fi
 
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	rm -rf "${ED}/usr/share"
 }
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
index 59982699b753..dbf9db4e858c 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0-r1.ebuild
@@ -108,6 +108,5 @@ src_install() {
 		dosym usr/include /usr/${CTARGET}/sys-include
 	fi
 
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
 	rm -rf "${ED}/usr/share"
 }
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 1a0c790bf0f9..0add6b2a727b 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -1,4 +1,4 @@
-AUX gentoo-helpers.sh 276 BLAKE2B 6a27184b85215e212ef19ba216b08025915a445de9cf963ac12062c58fb0878454d312de5e63f277effd4b3061c5f87bebe4767dcb5e06fc6920d3e0e0b766ca SHA512 19e421d068e151c807f15ea3cf7b14f3b17e868ed13c6164a510b801fe33017e26088426d8aecbd52e979382d6e0affec4ef23f4a9c3087ec638cfa6b6653e2b
+AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD netsurf-buildsystem-1.7.ebuild 675 BLAKE2B 0081099385806319e6330fa7007a10185c9d31e904cc9eafac2cc517a52f4ba59d5ffff1d22a65a36b945965112c6de2cf5ba15e2d264971b9f03775d9d8408c SHA512 04f09b53a34c4f796acc5fb9220c2dd74bff013ee7298fb4692c9449f911f3d8adec8ad5b88950d045c93939c68e43f644571654dfa3f6f3170969227478ab96
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-util/netsurf-buildsystem/files/gentoo-helpers.sh b/dev-util/netsurf-buildsystem/files/gentoo-helpers.sh
index e033a53f7672..ee81b3ccf88c 100644
--- a/dev-util/netsurf-buildsystem/files/gentoo-helpers.sh
+++ b/dev-util/netsurf-buildsystem/files/gentoo-helpers.sh
@@ -2,7 +2,7 @@
 
 netsurf_define_makeconf() {
 	NETSURF_MAKECONF=(
-		NSSHARED=/usr/share/netsurf-buildsystem
+		NSSHARED="${EROOT}"/usr/share/netsurf-buildsystem
 		LIBDIR="$(get_libdir)"
 		PREFIX="${EROOT}/usr"
 		Q=
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index fdf1858cb3a8..445d82e68f28 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,11 +1,9 @@
 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.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 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
+EBUILD ninja-1.8.2-r1.ebuild 2690 BLAKE2B e38c119b8a865e6e367999600ab69f996e782f0b3e7d21f286944c1c7ab235a9e843b046cfe1696131516e22442e61f35ea37299d5bcb6e750b0b316f5c9c643 SHA512 48177691154c54526ef986a43a2527c2c008f272dca54dbd39bc5b8c8a9b45f3c1b26a96240b0008a5f7336c9db6b3d0f7bbc972d1b1ddd7cd304197bc090f27
+EBUILD ninja-1.8.2-r2.ebuild 2690 BLAKE2B 2eb84e017da16e36b88908d6d8e418d8c624e5a70d92ca1bb39e3615098f1872b63f91d4bef9afac6f8e6b398e699897790d5b36bf1b7b0298f53740cbe0d698 SHA512 734a76d4b7e03d1a23af8785442f0fddfb04fb7073782b73ee5631ddbe931df0bb611fa0c2805db9ebc1d8db90f4ef997977e734825b8d00c5c3ffdcb499f78e
+EBUILD ninja-1.8.2.ebuild 2547 BLAKE2B 8234fa945a4908448d202f7fbea1415771fc810f93afc9a02c2696141e15f47c3f2035a434432d0c50494e6e852741b64dcce80ed56c463dd50e411ce4b50399 SHA512 42811e0c8e250c6eabe2bad9ad98c0d94ad81e42100763348f70da8b2e521ad7b3355d613bccfbb51512ba15fc1c204f86ddaac417dfa8e320fb3e5bd398ed65
+EBUILD ninja-9999.ebuild 2558 BLAKE2B 54b95fb5f5e12d9ed496f04eb9b83cd503554deb2917db3f0b1d1015fc8579f448f7a0512b1827d02bd48f669fbb81f44abb1ebc9433b32e6318ca7c34d7684e SHA512 3161b622c1a7147333954295fa99891245434aac5c0a4079cb0c329efa5c689a383739e0b78ae2142dcba7838e30f554850cb4808432995bdeddfbc4a78e2b17
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.7.2.ebuild b/dev-util/ninja/ninja-1.7.2.ebuild
deleted file mode 100644
index a314bc0103f1..000000000000
--- a/dev-util/ninja/ninja-1.7.2.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,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
-	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-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
-
-PATCHES=(
-	"${FILESDIR}/${PN}-uclibc.patch"
-)
-
-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/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index 84c7f67ce665..767546f3c055 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -44,7 +44,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -111,10 +110,8 @@ src_install() {
 		doins "${T}/${PN}.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index 18d8f1000a72..bc97b85a2b45 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -44,7 +44,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -111,10 +110,8 @@ src_install() {
 		doins "${T}/${PN}.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index f25829f0ec1b..3f5366eac1e6 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.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
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -41,7 +41,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -108,10 +107,8 @@ src_install() {
 		doins "${T}/${PN}.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 38f251adba32..0f378c4dd3aa 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-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=7
@@ -21,7 +21,7 @@ HOMEPAGE="https://ninja-build.org/"
 LICENSE="Apache-2.0"
 SLOT="0"
 
-IUSE="doc emacs test vim-syntax zsh-completion"
+IUSE="doc emacs test vim-syntax"
 
 BDEPEND="
 	${PYTHON_DEPS}
@@ -41,7 +41,6 @@ RDEPEND="
 			app-editors/gvim
 		)
 	)
-	zsh-completion? ( app-shells/zsh )
 	!<net-irc/ninja-1.5.9_pre14-r1" #436804
 
 run_for_build() {
@@ -108,10 +107,8 @@ src_install() {
 		doins "${T}/ninja.vim"
 	fi
 
-	if use zsh-completion; then
-		insinto /usr/share/zsh/site-functions
-		newins misc/zsh-completion _ninja
-	fi
+	insinto /usr/share/zsh/site-functions
+	newins misc/zsh-completion _ninja
 
 	if use emacs; then
 		cd misc || die
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 1f82dad5e612..1fd149d7b8e8 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -1,4 +1,5 @@
 AUX cuda-config.in 406 BLAKE2B 1f1bb67d1f13da52821d640ac1875affb0ba1562df8c3eb6d2fed24c0639f8e6ff43428701c5a2d1538e444356db5e9854e6ea629a1e3b2e1399ebacef2ca388 SHA512 df6d16bd2e800868bdf8401b6f82a387b701ea297ddf6e8feb0daf5222e62a33f156e5f45cf1ee4e1aa51559dfbd56b897c257dae1bb9568e839bf806bfebd5b
+DIST cuda_10.0.130_410.48_linux.run 2020126691 BLAKE2B f784f41c06d81b6f89d07e756347fb94148f79e5fd50650fc340feb6b49dcc2bedd05cf4c7c2662da39955f9393efc048aa17fa921aad86e182186fb6d98ec50 SHA512 409ea4cc6aa0fe7063450e77c3b67b9b41aab1bbe556db673fb1a80610b20bd52e2020bf94034a92ab68c721d3d5739500bae4bd7a3558b2d8e73730a3b4ea25
 DIST cuda_6.5.14_linux_32.run 76788277 BLAKE2B 75e79dce6cac5155bde8a3cafa945047c489b10272f8a3b94bf55d499df4b9c8b82506a81a20f9fd816bd4fd0514e515a6435399db1cb62b027c76490bd4dfae SHA512 89649ee0f4543b37037b7c8f5ed0b8bd502512afb4d93e3158b3df4786123be05a5288986b5abbfe15c14eb010777d2527b715225bea96a354a898c34e4a2fcc
 DIST cuda_6.5.14_linux_64.run 972320904 BLAKE2B 4a4361fb7a90989ec4b4aa433189e7b358e5a2272fb9b9c59429e0014ac14e3b8de1b247ee98dc30c3f3ee4cc009eca4fdd86027bd3b9527a683353d60bdf5c6 SHA512 fecca731b86955f5bc7b09d88b02951e3ee5d4b1f1cf5f92658227a029b87cd35d6ac22956a5fa0afe62dcdc57191f1d12bb08c9f7cc05128727cd8455947b1e
 DIST cuda_6.5.19_linux_32.run 81882112 BLAKE2B cf55ef7c969503c156431fc56301ed4e9a1234ae0cb867f12649636069f35e56bf6fc9df7482b6baade45d78c8baa2d98c41a28696da59294e0f575c4a0344ce SHA512 1ce9bd6b472b7e4f1fb181eb340dfcb757714d59a89aaa02146cfe1a97c8ccb7eb7699b4ec823276f277eb4d82d95050eaba17e7ed5fd2e47b9b5d78531c5d4e
@@ -9,6 +10,7 @@ DIST cuda_8.0.61_375.26_linux.run 1465528129 BLAKE2B d52ddf1dcf5246f230f210d10d1
 DIST cuda_9.0.176_384.81_linux.run 1643293725 BLAKE2B 4155de544f877f6c420c2463bc68679cc89774f0516d1885d5c3f483ad86e7f25ecf6042b8240431b814230136f3026196a013bb18184fa2ec9af555bb7ea723 SHA512 00e24638c02d049c575732dee5237db21f7c451b606f37cf95e44e89d47d0cb055255e9f70dc013298c9e0d224147f239488558904556b68572e3f31935489a9
 DIST cuda_9.1.85_387.26_linux.run 1639829845 BLAKE2B c9f6544893b8e4d0b4c51d66f1cf17a593e65af6e7748e2994abda8ffcb839a7bb19cb0eebfbc52347293296025f000241d1c9842af0c41d31928770c4639b79 SHA512 492a5fa58fc93ac718ca093f24bb5e74dd2586338c42f2e11e328c7f16756e3511a1c555b12cb1990bb782d0d1600976f4c9e5b3d4857e371b0431daf06b2827
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
+EBUILD nvidia-cuda-toolkit-10.0.130.ebuild 3344 BLAKE2B 37bb588383fdfb0ec480c8ad961d0faeb6fbce7159ffb6ce47efa600ade12c5f04598dc053dc44ff469ff9afabecfd31b00d04501ac541ea72378884a2f19475 SHA512 aa9e7a8afd6f3949006e3b1dd03db695126e77f01a38d1ba77ce8dc94137c9c89b7afada7f6deaf5dc160371f5ee0c61bbc3d09002169d5900b1baa12a870d44
 EBUILD nvidia-cuda-toolkit-6.5.14.ebuild 3818 BLAKE2B e368a3fa7258a86f920f53da56039b940cc84e551265d458e1a3c7bc7b9321c4020e5ada9b56fc588ef4708acc4cfe9a8d2e259ad12b0c71fb57635b05b873bf SHA512 7f73c4e321234f6a19166e6e28719f6c98cecb809f9878ee1182b812e18fcc6f8c29fb2ebd0ed520847f38bfddd6a0bc60fae6b711b75f563ab39a9b322468b2
 EBUILD nvidia-cuda-toolkit-6.5.19-r1.ebuild 3844 BLAKE2B 42603527c1f012d49c98026d3f96f5ecd832cc4f31fd1afcf6738dd4e3e2aeee0ac55beeae994bbff4f48562adfe11b72270e516f8fb70d32cf00ae59f55bd78 SHA512 f40103348972041a9d6c09a8c129b68603ce0fafa29df1fdf6b13014bb97156a44881161d4668beef8af9b77adea9df8034c88d6413a6ac2ad709285f785df79
 EBUILD nvidia-cuda-toolkit-7.5.18-r2.ebuild 3355 BLAKE2B 07076b6506902bcadb8f7b6430db04beb380b76da35c5745e313910518855bb7e4c5d746d880bf7f3bbd07fc06cbb17f0d7d76bb267f9679c3d8099e398f7d35 SHA512 4e8070e399766796b1589329db4de04fc0fda0cbd1dc8ec1984b8550f1bc10d490fed7b085066f4419d5cbdf98ea2ae8202b29a9d360fe3b2a3be6e20bc802be
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
new file mode 100644
index 000000000000..edfc48ca555e
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-10.0.130.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit check-reqs cuda toolchain-funcs unpacker versionator
+
+MYD=$(get_version_component_range 1-2)
+DRIVER_PV="410.48"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.nvidia.com/compute/cuda/${MYD}/Prod/local_installers/cuda_${PV}_${DRIVER_PV}_linux -> cuda_${PV}_${DRIVER_PV}_linux.run"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger doc eclipse profiler"
+
+DEPEND=""
+RDEPEND="${DEPEND}
+	<sys-devel/gcc-8[cxx]
+	>=x11-drivers/nvidia-drivers-396.24[X,uvm]
+	debugger? (
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses:5/5[tinfo]
+		)
+	eclipse? ( >=virtual/jre-1.6 )
+	profiler? ( >=virtual/jre-1.6 )"
+
+S="${WORKDIR}"
+
+QA_PREBUILT="opt/cuda/*"
+
+CHECKREQS_DISK_BUILD="3500M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	unpacker
+	unpacker run_files/cuda-linux*.run
+}
+
+src_prepare() {
+	local cuda_supported_gcc
+
+	cuda_supported_gcc="4.7 4.8 4.9 5.3 5.4 6.3 6.4 7.2 7.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local i remove=( doc jre run_files install-linux.pl cuda-installer.pl )
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+
+	if use doc; then
+		DOCS+=( doc/pdf/. )
+		HTML_DOCS+=( doc/html/. )
+	fi
+	einstalldocs
+
+	mv doc/man/man3/{,cuda-}deprecated.3 || die
+	doman doc/man/man*/*
+
+	use debugger || remove+=( bin/cuda-gdb extras/Debugger extras/cuda-gdb-${PV}.src.tar.gz )
+
+	if use profiler; then
+		# hack found in install-linux.pl
+		for i in nvvp nsight; do
+			cat > bin/${i} <<- EOF || die
+				#!/usr/bin/env sh
+				LD_LIBRARY_PATH=\${LD_LIBRARY_PATH}:${ecudadir}/lib:${ecudadir}/lib64 \
+					UBUNTU_MENUPROXY=0 LIBOVERLAY_SCROLLBAR=0 \
+					${ecudadir}/lib${i}/${i} -vm ${EPREFIX}/usr/bin/java
+			EOF
+			chmod a+x bin/${i} || die
+		done
+	else
+		use eclipse || remove+=( libnvvp libnsight )
+		remove+=( extras/CUPTI )
+	fi
+
+	for i in "${remove[@]}"; do
+		ebegin "Cleaning ${i}..."
+		rm -rf "${i}" || die
+		eend
+	done
+
+	dodir ${cudadir}
+	mv * "${ED%/}${cudadir}" || die
+
+	cat > "${T}"/99cuda <<- EOF || die
+		PATH=${ecudadir}/bin$(usex profiler ":${ecudadir}/libnvvp" "")
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/lib:${ecudadir}/nvvm/lib64
+	EOF
+	doenvd "${T}"/99cuda
+
+	use profiler && \
+		make_wrapper nvprof "${ecudadir}/bin/nvprof" "." "${ecudadir}/lib64:${ecudadir}/lib"
+
+	dobin "${T}"/cuda-config
+}
+
+pkg_postinst_check() {
+	local a b
+	a="$(version_sort $(cuda-config -s))"; a=( $a )
+	# greatest supported version
+	b="${a[${#a[@]}-1]}"
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		! version_is_at_least gcc-version ${b}; then
+			ewarn ""
+			ewarn "gcc >= ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn ""
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+}
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 43b67ab5efb0..7b35e2f362f2 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,9 +1,5 @@
-AUX oprofile-1.1.0-gcc6-template-depth.patch 454 BLAKE2B 5250e083156853905ca8e1107a0af51eeadbef93881c39f407ed28af41b5f75ebe4003c96b9bc6e5be8a6445e8b7cd6cd4e499d6d44769d258242c8ba0192a9d SHA512 c5356ff2e0b31b792eac13c4f19123f6fadfc5fa0154bd422a86185514410eef48eabc321c32d344b1dbf9357de888130e0a84336d08551cea7c787478f9f21e
-AUX oprofile-1.1.0-gcc6.patch 777 BLAKE2B a4def027ba0f8e8c1eb877105f4e0e215599fd5004a4c59d3e3b77c2bda356736b96dc2030a994a179c1596e452e7e7a9303f0676eb68997b4922c9fe3374899 SHA512 de907f9583255a313c719eaf8163385de15a40d4ea76eb13e91f223375597f9d1ef41ad21bf129e550536e6a6a316beb3cd2c528fd38cb17e3fc22256f1dbc38
-DIST oprofile-1.1.0.tar.gz 1468502 BLAKE2B 5c0abdf1ce6f3fa9b7140036ff654b2f5d5e29d996afec834014c141a4669e57c1d4ac60d6705c35ee1dce23ce790e07063b58508abd39b6562b7298744e2eb4 SHA512 b26f67f20172a4912c0aafb3adf83f9084ea62b9ca89e4cfcb3e13276114a05b07587f7d250028995a10c39ae993e2bce271be11688010473ab9f0fd81715758
 DIST oprofile-1.2.0.tar.gz 1533343 BLAKE2B 873433ddba11389a221ff3b6eb6b8b19748ac4989232bda7d9af698b95dedf8ecd1112dce3accab5e1b40c87287901c015eec167713b9ad11daa0a0f0e3255f9 SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
-EBUILD oprofile-1.1.0-r1.ebuild 1835 BLAKE2B 16d17d42849a4fcba8f3946aa39b7ccb517d257942405bba521bde11d278baa88a465f3ef9ff8c07178933748ab0fb6feca648e943272affbc9cc0e59a035da5 SHA512 d53e071b01e6f2e9247444ea9130debd07db16c6df589709ee1a3e71a3d5f923af5f2c22ef4f721ddce3fd37c26b4744284d0bbf43138040dbddcae79960b4ed
-EBUILD oprofile-1.2.0-r1.ebuild 1598 BLAKE2B 64a4a17df9ce3dcf1fb03a55355c800a1dfd47483cd5909d27679a259fa91beeb272ef4a9dfe0af66ac587dcd81573e72acfdbfc989904d8a81e6a2d3b94ba8a SHA512 2727999c46d8bbfa1f52e07f12ea2fdd065716a5c034d195fdd7498c401cfa879aebcbd08c48e9115349127567127b0b723d99be9cd5c122db8cc373e224aba4
+EBUILD oprofile-1.2.0-r1.ebuild 1594 BLAKE2B 9a571f914951aea903761991e020fb481602e3288a4ffaf53b14c5e46fbd0eb7e071e3689faa1422446a64b3f38d4fe915c28ca275d1d087ea8737ddcef3477b SHA512 83e6b5441251e157a3334a0b0412b31dddc7b9465fc9efdcdd5af672a11ecd513197b89b7bc164da723f95916e3addf23fc155c6c10b592243aa13e1581b30d4
 EBUILD oprofile-1.3.0.ebuild 1603 BLAKE2B c8dedc640704b79251bed321963bd048dd2a6d542d54e34eeebad6cfa9b5efdded9ee65d3aa33c51427dc68600723898141557d78433f88a14ca2f04d68c3b26 SHA512 a98f49a3b850744c4b6db4dc3aed7a3aca874fe256b18648805661e452475dac20679eb646386a7325a8ef8f7256bfe7141b126146748c3d7a11654a890ce2cf
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
deleted file mode 100644
index 01fc86910a3a..000000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6-template-depth.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- oprofile-1.1.0/configure.ac.orig	2015-07-21 17:53:27.000000000 +0300
-+++ oprofile-1.1.0/configure.ac	2016-11-22 01:15:31.329067697 +0300
-@@ -320,7 +320,6 @@
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-Wall])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-fno-common])
- AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-fno-common])
--AX_CXXFLAGS_OPTION(OP_CXXFLAGS,[-ftemplate-depth-50])
- AX_CFLAGS_OPTION(OP_CFLAGS,[-Wdeclaration-after-statement])
- 
- dnl enable option to use GCC test coverage
diff --git a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch b/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
deleted file mode 100644
index ab3ca7c1b142..000000000000
--- a/dev-util/oprofile/files/oprofile-1.1.0-gcc6.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/libop/op_alloc_counter.c
-+++ b/libop/op_alloc_counter.c
-@@ -171,7 +171,7 @@
- 	/* no counters then probably perfmon managing perfmon hw */
- 	if (nr_counters <= 0) {
- 		nr_counters = op_get_nr_counters(cpu_type);
--		unavailable_counters = (~0) << nr_counters;
-+		unavailable_counters = (~0U) << nr_counters;
- 	}
- 
- 	/* Check to see if we have enough physical counters to map events*/
---- a/libutil++/op_bfd.cpp
-+++ b/libutil++/op_bfd.cpp
-@@ -535,15 +535,13 @@
- {
- 	op_bfd_symbol const & sym = syms[sym_idx];
- 
--	bool const verbose = cverb << (vbfd & vlevel1);
--
- 	if (anon_obj)
- 		start = sym.vma();
- 	else
- 		start = sym.filepos();
- 	end = start + sym.size();
- 
--	if (!verbose)
-+	if (!(cverb << (vbfd & vlevel1)))
- 		return;
- 
- 	io_state state(cverb << (vbfd & vlevel1));
diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
deleted file mode 100644
index 2c8a16f7a16f..000000000000
--- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-inherit autotools eutils java-pkg-opt-2 linux-info multilib user
-
-MY_P=${PN}-${PV/_/-}
-DESCRIPTION="A transparent low-overhead system-wide profiler"
-HOMEPAGE="http://${PN}.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86"
-IUSE="java pch"
-
-RDEPEND=">=dev-libs/popt-1.7-r1
-	sys-libs/binutils-libs:=
-	>=sys-libs/glibc-2.3.2-r1
-	java? ( >=virtual/jdk-1.5:= )
-	ppc64? ( dev-libs/libpfm )"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-2.6.31"
-
-S="${WORKDIR}/${MY_P}"
-
-CONFIG_CHECK="PERF_EVENTS"
-ERROR_PERF_EVENTS="CONFIG_PERF_EVENTS is mandatory for ${PN} to work."
-
-pkg_setup() {
-	linux-info_pkg_setup
-	if ! kernel_is -ge 2 6 31; then
-		echo
-		ewarn "Support for kernels before 2.6.31 has been dropped in ${PN}-1.0.0."
-		echo
-	fi
-
-	# Required for JIT support, see README_PACKAGERS
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-
-	use java && java-pkg_init
-}
-
-src_prepare() {
-	# fix bug #594178
-	epatch "${FILESDIR}/${PN}-1.1.0-gcc6.patch"
-	# bug #600000
-	epatch "${FILESDIR}/${PN}-1.1.0-gcc6-template-depth.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-werror \
-		$(use_enable pch) \
-		$(use_with java java ${JAVA_HOME})
-}
-
-src_install() {
-	emake DESTDIR="${D}" htmldir="/usr/share/doc/${PF}" install
-
-	dodoc ChangeLog* README TODO
-	echo "LDPATH=${PREFIX}/usr/$(get_libdir)/${PN}" > "${T}/10${PN}"
-	doenvd "${T}/10${PN}"
-}
-
-pkg_postinst() {
-	echo
-	elog "Starting from ${PN}-1.0.0 opcontrol was removed, use operf instead."
-	elog "CONFIG_OPROFILE is no longer used, you may remove it from your kernels."
-	elog "Please read manpages and this html doc:"
-	elog "  /usr/share/doc/${PF}/${PN}.html"
-	echo
-}
diff --git a/dev-util/oprofile/oprofile-1.2.0-r1.ebuild b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
index 3a5dc70fb4a7..336fc665809c 100644
--- a/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
+++ b/dev-util/oprofile/oprofile-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 arm ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="java pch"
 
 RDEPEND=">=dev-libs/popt-1.7-r1
diff --git a/dev-util/ostree/Manifest b/dev-util/ostree/Manifest
index 05157ac3dbe9..17ec74303364 100644
--- a/dev-util/ostree/Manifest
+++ b/dev-util/ostree/Manifest
@@ -1,3 +1,5 @@
 DIST ostree-2018.5.tar.xz 1937184 BLAKE2B ff126d2963296eb9ac270816efed7d2fbfdbcc7b0dba69007ae83e4499a46ef21a5b4e5d387de9bd387af0fe8d4086427d1aa9043c246a49676d116e919a93e6 SHA512 03854c662cddc1e0c7150bb62bbdd2990cf091ef126ddc5bb94494fee2ffb0383afb067b89d63c3e4f39849e2c8b7cabfd887d0d6fc1e7a43fda4fe7da1dc2e8
+DIST ostree-2018.9.tar.xz 1951732 BLAKE2B c6fba1321fe21bff569fe1dadd1aa649f23059a35dc906c3a0b7dcca29f7acbe8338e19541d8f7d854452bf6a6b1ac293d4350c7056a9b13b9ed1eacf358d4b3 SHA512 407b6b67add54e80a55fc35f08bde56561009db93ec202a10dd1ec1e66bd32b439c1d66c759e4e173e44fce6fbc2c162cae928a477c9d7abafbf007ed8f7bfb5
 EBUILD ostree-2018.5.ebuild 1183 BLAKE2B 749134dbf4e826fd6535cdd94ff66704d136404a1864d8dbbb7bf075cc42d89bd7091100d31fdc0a81b13aa452075c3ae3f4c6fe9d4931ada5e20a6a9d6cc65b SHA512 f1bb169d68fc6658b986b6d443537e6e1a7a05386588a966de08ef9c6da370524abb11ce6b8b95e94a7eeec7cefa4ced461526ffd8abbb1ee123457cc5de02f6
-MISC metadata.xml 1644 BLAKE2B 3085135779d4dbefb278b1b7ca4e80e4b892f38585aea5a71fde726d55b9975c0c097917940045a0770a5d8bc2c3732a371773a8cb6750dd272ca0b4a9488182 SHA512 5fb6f77a5068d1ff4aab1635ba41ed895f6b31cce39b571b4f3487c68242bb5634e7454bce318d0c585cb581533d1fe239344a9eb7f1485c4b75a5a24d78f5ad
+EBUILD ostree-2018.9.ebuild 3219 BLAKE2B cfb584f4e3e8e38eb9df1016aaf7778eade21b6570d39c399c22facfd5dbce1c9d7e5e0db920820c645e0d9c2c04ca4b9c22668fa39bb0e499ad1e176592903d SHA512 8f32a3f915b1222850b3c1cbe75af5dff6013a38b6c8c3510aa4e5b27f8553fc9122c7df164bd30c96be832c00c695ab5dc7d8a0c881c96fbba077efc693257b
+MISC metadata.xml 1733 BLAKE2B 81ec9a732f50e49d589e385e6f88a99a629098d2f172aa398ac819fb4e343d2c172c86f92c778d402623f8b7b1143ca8f19f3f3c9ff30fab7fe89dd20ce1428f SHA512 56f083cd71d111275d59dc2759da9ec7685deb01890476da499b56ed82d873bdbe0a0e76f5c07a8c9f2efc3219c34884df2fe4c6b7407363abcc2b6ce066ddbd
diff --git a/dev-util/ostree/metadata.xml b/dev-util/ostree/metadata.xml
index d31a82267686..4fb7a62d6f22 100644
--- a/dev-util/ostree/metadata.xml
+++ b/dev-util/ostree/metadata.xml
@@ -30,7 +30,9 @@
 		it's just a more polished version of Linux VServer hardlinks.
 	</longdescription>
 	<use>
+		<flag name="archive">Use libarchive</flag>
 		<flag name="grub">Enable grub configuration generator</flag>
+		<flag name="libmount">Use libmount</flag>
 		<flag name="soup">Use libsoup for networking</flag>
 	</use>
 	<upstream>
diff --git a/dev-util/ostree/ostree-2018.9.ebuild b/dev-util/ostree/ostree-2018.9.ebuild
new file mode 100644
index 000000000000..495e21ac476f
--- /dev/null
+++ b/dev-util/ostree/ostree-2018.9.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Operating system and container binary deployment and upgrades"
+HOMEPAGE="https://ostree.readthedocs.io/en/latest/"
+SRC_URI="https://github.com/ostreedev/${PN}/releases/download/v${PV}/lib${P}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="archive curl doc gnutls grub introspection libmount selinux ssl soup systemd zeroconf"
+RESTRICT="test"
+
+S="${WORKDIR}/lib${P}"
+COMMON_DEPEND="
+	app-arch/xz-utils:=
+	app-crypt/gpgme:=
+	dev-libs/glib:=
+	dev-libs/libassuan:=
+	dev-libs/libgpg-error:=
+	dev-libs/openssl:=
+	sys-apps/util-linux:=
+	sys-fs/fuse:=
+	sys-libs/zlib:=
+
+	archive? ( app-arch/libarchive:= )
+	grub? ( sys-boot/grub:* )
+	ssl? (
+		gnutls? ( net-libs/gnutls:= )
+		!gnutls? ( dev-libs/openssl:= )
+	)
+	libmount? ( sys-apps/util-linux:= )
+	selinux? ( sys-libs/libselinux:= )
+	soup? ( net-libs/libsoup:= )
+	systemd? ( sys-apps/systemd:= )
+	zeroconf? ( net-dns/avahi:* )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-text/docbook-xsl-stylesheets
+	sys-devel/bison
+	dev-libs/libxslt
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	curl? ( net-misc/curl:= )
+	introspection? ( dev-libs/gobject-introspection )
+	doc? ( dev-util/gtk-doc )
+"
+RDEPEND="${COMMON_DEPEND}"
+
+src_prepare() {
+	default
+	sed -Ee 's:(XSLT_STYLESHEET = ).*:\1/usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl:' \
+		-i Makefile.in Makefile-man.am || die
+
+	# The ostree-finalize-staged.path file is missing in ostree-2018.9.tar.xz.
+	[[ -e src/boot/ostree-finalize-staged.path ]] && die
+	cat > src/boot/ostree-finalize-staged.path <<-EOF
+		# Copyright (C) 2018 Red Hat, Inc.
+		#
+		# This library is free software; you can redistribute it and/or
+		# modify it under the terms of the GNU Lesser General Public
+		# License as published by the Free Software Foundation; either
+		# version 2 of the License, or (at your option) any later version.
+		#
+		# This library is distributed in the hope that it will be useful,
+		# but WITHOUT ANY WARRANTY; without even the implied warranty of
+		# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+		# Lesser General Public License for more details.
+		#
+		# You should have received a copy of the GNU Lesser General Public
+		# License along with this library; if not, write to the
+		# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+		# Boston, MA 02111-1307, USA.
+
+		# For some implementation discussion, see:
+		# https://lists.freedesktop.org/archives/systemd-devel/2018-March/040557.html
+		[Unit]
+		Description=OSTree Monitor Staged Deployment
+		Documentation=man:ostree(1)
+
+		[Path]
+		PathExists=/run/ostree/staged-deployment
+
+		[Install]
+		WantedBy=multi-user.target
+		EOF
+}
+
+src_configure() {
+	unset ${!XDG_*} #657346 g-ir-scanner sandbox violation
+	econf \
+		--enable-man \
+		$(use_with archive libarchive) \
+		$(use_with curl) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_with selinux ) \
+		$(use_with soup) \
+		$(use_with libmount) \
+		$(use ssl && { use gnutls && echo --with-crypto=gnutls || echo --with-crypto=openssl; }) \
+		$(use_with systemd libsystemd) \
+		$(use_with zeroconf avahi)
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index a4854c02d7bd..c82a04596127 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
 DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
-EBUILD pkgconf-1.3.7.ebuild 1288 BLAKE2B 5400516d497ded4df958693d804fff728c3292b66b55b55c4e22b7a7c73924c14cce3956e00801f8c9dbae91943549574780ba3dcaca4ffa559872be13d3a5c3 SHA512 7f51e8db7ce6645f3dea4589c1ce2e87b3a47c0c052a7e7cfa3db9ae14e809a214f88050dd1572b72905252ab5bddd4e1d8a6d4af77b252d68bc367ebcae2648
-EBUILD pkgconf-1.5.4.ebuild 1388 BLAKE2B e842531227e02aafbc9a9061e4bac7569c5fdf81eff055915c5b544a0a2f0ef1e4f6b13de01bf022dd8a822b2dd9640873633ecbe0d3a0e84d003a2aca48d118 SHA512 22d0bbdddfd8e37613ec4c85ac65a0a5f22b31861bd2e55c565dee3f048f8855d11a518577dd82833ea214863d8b51c96a180a28a8ecb0769f731c79c9adf154
-EBUILD pkgconf-9999.ebuild 1388 BLAKE2B e842531227e02aafbc9a9061e4bac7569c5fdf81eff055915c5b544a0a2f0ef1e4f6b13de01bf022dd8a822b2dd9640873633ecbe0d3a0e84d003a2aca48d118 SHA512 22d0bbdddfd8e37613ec4c85ac65a0a5f22b31861bd2e55c565dee3f048f8855d11a518577dd82833ea214863d8b51c96a180a28a8ecb0769f731c79c9adf154
+EBUILD pkgconf-1.3.7.ebuild 1287 BLAKE2B 99233b83d9b45c266b6e256a88dfb103db262643b8e0a7573a8943294cc27a15380c0ff8fe3a165fd4cd6231d74b973084377766f2573e7931f819a1bdca0374 SHA512 cd36191e30ac23955b85a8dd4cb69b737a42c561431c996e7b39f250e7f750b0b8826ff91203a7c91739c1de348bfde62ab65cf07afc3ef99907479cf0950f83
+EBUILD pkgconf-1.5.4.ebuild 1387 BLAKE2B 21aec1964adf22dd313788b30c2f73d59c3f7edfb7c5df550987931bf24a57f875d4d94b156f28fbb83a0891d440a73a0ec339e9e5ec9d3f12ea6b4c9ebe66d0 SHA512 5c01e07320da7402caacdf360a587302797c5adcfcdbea08c4c6d31b1787e5786af6e6e40de0aa5f210de4dbf2a4be882649a9e059f786933f5b154bfedb6491
+EBUILD pkgconf-9999.ebuild 1387 BLAKE2B 21aec1964adf22dd313788b30c2f73d59c3f7edfb7c5df550987931bf24a57f875d4d94b156f28fbb83a0891d440a73a0ec339e9e5ec9d3f12ea6b4c9ebe66d0 SHA512 5c01e07320da7402caacdf360a587302797c5adcfcdbea08c4c6d31b1787e5786af6e6e40de0aa5f210de4dbf2a4be882649a9e059f786933f5b154bfedb6491
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index 01560acfc6f2..938d02b771a7 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
 fi
 
diff --git a/dev-util/pkgconf/pkgconf-1.5.4.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
index 4a4d43a5f74e..9e8d44de69d1 100644
--- a/dev-util/pkgconf/pkgconf-1.5.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 4a4d43a5f74e..9e8d44de69d1 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -7,7 +7,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
+	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 16b7167725b5..06779407c8c3 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,10 @@
 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
+DIST pycharm-community-2018.3.1.tar.gz 310702122 BLAKE2B c54153b9529bf03a09d92eb8b139da45bfb047cb1fdeacc9b64f17982edd237ed0633c391c15326ecaed7d9e599b3f87c0a16a2eb1302ceb37dfc1e0329693d0 SHA512 8d1f418bd97d8249481ad63fa699c141e498820698485b74c6f08674e4b0eee6054e9ad1e59260342fd615a5030ed932d1177ed8173ab9cf6026561c10fee9d8
+DIST pycharm-community-2018.3.2.tar.gz 310664794 BLAKE2B 2dd7e59514909da3e319b1d8eb8b3e24e8dc7d67868ffea621b1c3273b6daa32459f09fb2d2e5b94d8044d9c2a0ea55d5940551bfd945e3ed8dabc200bcc2927 SHA512 613c1556dcf86f448cb496cf492ee76636dfef22cc4eb55f57ca1ed91a53f8a78da6455cc6f49becaa6250e136d786c92014e23a4333fbf0a6477a2f1e67a21c
+DIST pycharm-community-2018.3.tar.gz 310642963 BLAKE2B b32f3c9a3c28bc1ee4658c1ef60cbbe2c4775b310512b3a7fd1b28839bf1c69a566198808b128d18cbbe2d987f61d80bcbcc590177b25d8e9c8fce5fb1754d49 SHA512 00121b4ee9daae92d5c389913f4dd9efcd634f9888b21f6bcae10a3a67cc4bc36a5012590e6836224168053521edf5ba848080f4fc1060df04dc4c58cfdd9fff
+EBUILD pycharm-community-2018.2.4.ebuild 1060 BLAKE2B 4f7fcf4d1ee8cffadac3b12f443783e65409292b46da396d9e7ed5de664c4e6af8275c9091e8c141b42e19d761ebac97adb7ae0fe3a76985164e4625bc67ece0 SHA512 b93caf199b4ba30b5cf1c3dd090acb8239dc75e4a9e449a1a7558ec503bbd31b573872dcf84e37ff54650f43f0e93c09939ddd29141e92857414a2760c804868
+EBUILD pycharm-community-2018.3.1.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
+EBUILD pycharm-community-2018.3.2.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
+EBUILD pycharm-community-2018.3.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
+MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/metadata.xml b/dev-util/pycharm-community/metadata.xml
index a535b8852829..d21de2d9f07b 100644
--- a/dev-util/pycharm-community/metadata.xml
+++ b/dev-util/pycharm-community/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<name>Mikle Kolyada</name>
+	<email>zlogene@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
index c37c85ebc8eb..2f2c58e1dab2 100644
--- a/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2018.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
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	 dev-python/pip"
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.1.ebuild
index 736ca5466e09..7a0fdedacc6e 100644
--- a/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.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
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8
 	 dev-python/pip"
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.2.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.2.ebuild
new file mode 100644
index 000000000000..7a0fdedacc6e
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/pycharm-community/pycharm-community-2018.3.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.ebuild
new file mode 100644
index 000000000000..7a0fdedacc6e
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index e5c0ee26e37a..b46dcdb33345 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,6 +1,10 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2018.2.1.tar.gz 343377232 BLAKE2B a8427902b4c7d1909e188130ab3688606ebc40b6eb8a633e9ccc36bf0a5cdd04772eb3cd0e7ba2cf77119f3efc9dfa8373c174db29b643bc9a350767524a4386 SHA512 3bb492932c5622771d39ebb66ee045e0affd2a16130f3a270af74bb75d8925bd3e29be5310f6003e5ff8a6f385b6376b9c77c7bf1e2b1e44c5671a04f86c8852
 DIST pycharm-professional-2018.2.4.tar.gz 343705704 BLAKE2B 69cb8a57f8daf8d986c201e549bfb68b048a2f78e819aeee000bab836c5a25b50d0d6aa9870f6ff8b35907ba9bd69fef7071d421c74970f68496e4448495d43d SHA512 3bc35cfeb1f1d4b95bbc490bfdb724ab76757a5f819c7acc2cbe85688493a9d8dc57cfa179a424fc24679f2093f55d5417a6859001093d58518a8b330d60f7f4
-EBUILD pycharm-professional-2018.2.1.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
-EBUILD pycharm-professional-2018.2.4.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+DIST pycharm-professional-2018.3.1.tar.gz 397871775 BLAKE2B e9f950125c5c1f355e48e16a8c047751a88c6ee6e4862c6dbb8df12aa3e0e57a3d0d61c2cccb5995f2763e0d99eaaa967c19c884c40a350a7148dae71a66be0c SHA512 9324315f865bce9b379ab9f698eb6e97917aa3cb4ef90612b22d33516c18cfbed9fb806dd9bd4884ead6e7a72e2b481e5636956630ac7da75234ff8ba4975878
+DIST pycharm-professional-2018.3.2.tar.gz 398099987 BLAKE2B 68ec7f409335b5f9f35f623fd962c2f975c6e1fa844b8f142ab3d4604e1e0a1f10c361d95281a414b1e15e60f6dfc0d1b061c1512533d5ce171f0ee34872f538 SHA512 69dd521a44a971f6a5620d879234a7f788ec44a94fd2793df41b8765c5e239ff1d04364172b53750cdc248a945f2f6df02e1b5687c61156286797441ba7fc9e7
+DIST pycharm-professional-2018.3.tar.gz 397608153 BLAKE2B 7130533fb3721d1f573105dec2289091cab23b6438acadda0c62f945e7a9b2a0a55b4d55260e1f472ec77d1fd8dbc9ac9e7f7220ef26424ffbe918874049071e SHA512 0e83fa9117d46a503a3afd790fe2512cf04abc327ff7efdf46e40a24bcd028d6d2033ce56cdb1c4cfd1a8552d7d31af6e97a203c6273a5fd1b79263575fd2ee7
+EBUILD pycharm-professional-2018.2.4.ebuild 1203 BLAKE2B b87a534b51b301a4bce7b3e954daf3637f83708029dd94e2383349e5af411d61fbf6ecbe894b2711a1198e957f7ea8ee4f5fdbd8d61b0ed8df999eb74db7ed3a SHA512 fa3a1e8dc8b969f3b84365200fc6176c6813fa825c692ca6b28743e8b4b653e6efc456013de78463f026099060c74a576d44fe71fff9c6aa57e17410d9577f82
+EBUILD pycharm-professional-2018.3.1.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
+EBUILD pycharm-professional-2018.3.2.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
+EBUILD pycharm-professional-2018.3.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
+MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/metadata.xml b/dev-util/pycharm-professional/metadata.xml
index a535b8852829..d21de2d9f07b 100644
--- a/dev-util/pycharm-professional/metadata.xml
+++ b/dev-util/pycharm-professional/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
+	<name>Mikle Kolyada</name>
+	<email>zlogene@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild
index 24928072aba2..9dff91df4d89 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-python/pip"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.1.ebuild
index 71fdc968f972..24928072aba2 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.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
@@ -11,10 +11,10 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND=">=virtual/jre-1.8
-	 dev-python/pip"
+	dev-python/pip"
 
 RESTRICT="mirror strip"
 
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.2.ebuild
new file mode 100644
index 000000000000..24928072aba2
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+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
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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/pycharm-professional/pycharm-professional-2018.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.ebuild
new file mode 100644
index 000000000000..24928072aba2
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Authors
+# 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="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+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
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+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/qbs/Manifest b/dev-util/qbs/Manifest
index 83a43477b34b..c35fae279431 100644
--- a/dev-util/qbs/Manifest
+++ b/dev-util/qbs/Manifest
@@ -1,5 +1,5 @@
 DIST qbs-src-1.11.1.tar.gz 4299125 BLAKE2B a2b2670b47bb122ccc586fee0c61d941533dc2dbc5e59028a7ab765eb18fe4a71b85cbd7373f88231b9cd75178982a17dddab0ba965de84ca197c49b2c9eefdf SHA512 90833792cb29b7b886df491263b620d2933c398ad8b2f495d0e5ae6acdde3f816ecd25638ae2e74d3efbf517a762644f751b7c01633aed3369bd7bf85c033ff5
-DIST qbs-src-1.12.0.tar.gz 4368992 BLAKE2B 5fce4052f349ed787a0948541fbe1397ed8dde5bb6191e6ba37718e4d803b30b1f7a4ba3abb00d0d10078b1cfddeedb45a4c5dc86d800b5a8b941abffb0a5804 SHA512 2d9f23231e3824d67f63f290e4d22bd3d56f161c32b9002e23e615cb2793678eadde033d6e2b744e89ad69f4b6104c69e80095881601d498d9587d3db06c2103
+DIST qbs-src-1.12.2.tar.gz 4374830 BLAKE2B 8ace5ac7fea9bcd944dd02280a36f0f275749512e44ab9e3221e154d80ccf8aa25e3452eb90b1396323b540ec97e4b72c29b3a1d4727a72791a0e267bd89df13 SHA512 eb8c5db94f6b4e2300951d9cb6e092b873381421a1bff31a9e8422859aee3c0b3d038b6a2927a4f5c8fd871a0a7d283f7b7c3be74834dd30d640a1ed9c87a147
 EBUILD qbs-1.11.1.ebuild 3066 BLAKE2B 0f44337978b215817f91a6bb6d2bc278a8d7765ef0c7c8ff450a64d2c0324267ddf3a3a7f00ace808db44da440d91bd6949513e7aac56d7afc0387f4beedf3a4 SHA512 09f81791a84a2fd9905b9e7cf9a9271cb88221321be12f69c887215789763de7f77df65a0d37402262aaa0015f68128875b5c1c3ed7b36ceb7d750203d2840d2
-EBUILD qbs-1.12.0.ebuild 2867 BLAKE2B fc50c95d5c2cf7b4e198c3c1dd9c2da64cb7067ff3bd26ebcc771b9e9e1129691d1b32eed98fbbf9f2382febcb09f238764689354a1f3c8fc1035b57e386954c SHA512 1fb957e2c1d777315dee3f9dc705ebe6f9c5f24ea90ea8ef5ec8a8adda63f9df9242b605564c5867ee1a719e0d42d3ddbfee4be92c68c3091f74c4291a9d5cdf
+EBUILD qbs-1.12.2.ebuild 2864 BLAKE2B c1b70e58f81cde7889ae07c5e0bee1f5b3d36fcd9b1b404b315090cf19f4eaea9c56367be5f24c99bb1ba56b2c66605b802bef946c5e4f3adfa6feecd9ca7f97 SHA512 2530d59f4a71ad0ba083b588943305af6a063d67aad509328428b2f9126e6438bc44faed40c89bceb2ec72be84e7ae052e224ff3bc71f93106cf675a9b2862ae
 MISC metadata.xml 920 BLAKE2B ba6000d6db0ee2a6fb2edd9b999fe406e427ebf14f8ccf0dca6f21338dd98b8173c71b3599858a9f89e063c3138a307ac281413e671d5a6c706c93118c2db99e SHA512 ca8c93f9630e818e2f567388fd5f61f47882b843eee39a78f2882ec0ba8c310e0689fb70925762da7548040892d606ef21497503c6fb2a655af608b36bcc98da
diff --git a/dev-util/qbs/qbs-1.12.0.ebuild b/dev-util/qbs/qbs-1.12.2.ebuild
index 87c294f41601..73267519de43 100644
--- a/dev-util/qbs/qbs-1.12.0.ebuild
+++ b/dev-util/qbs/qbs-1.12.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=7
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 73a3e6027ee9..b463f6d44946 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,8 +1,10 @@
-DIST radare2-2.8.0.tar.gz 6513419 BLAKE2B 51ee9fe82c09693e729b49e97b79a54e2b9f7de95ecf93c5e22107f68260ddc9fdee9291f200dba2770315487a85d1541abbb76281e6934d25c677a95e6882e3 SHA512 968c61eb5102125b232f9a74362fb90b0409da80b4cd4f109d11e49d02c80a5beee9e73065ef3b4a22fb8cdf43f86338fd21b648ddfa34001ed6cace47335803
-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-3.0.0.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+DIST radare2-3.1.0.tar.gz 6652526 BLAKE2B 8da52e93263b47261cadc28e0de637b177943ce978ff342e305c7c924c062458d4eee18d05a21c9ca5153b7ede13332c87e9cd2f22c6880d47fd8e05db21036e SHA512 ee31de49ff83ca1ed093eaf113201cb3709adcb3315671d88413aa4d5c80c37cf9e981c33b4f472b9aa5f67309cdaf9577c2085a8c58e4faf86b37d1ee19866d
+DIST radare2-3.1.2-r1.tar.gz 6664607 BLAKE2B a04bc70eee438e00b59ec0e699b9a4d56091c9698d0abb965a65c20bd28ee604f154f50d8e18d9233594aaf77c72708e864b7dbaaefc7ed7c300f46ef5e02311 SHA512 365d45b3b82551e4e146c5872d0d502f0daca70286682053f8fb4f61a6771d91fd1b1eda34b113125dcfb06e957496f07184a74c532b7872f37fbb305dda52ad
+DIST radare2-3.1.3.tar.gz 6662694 BLAKE2B bb4cec7fd05e4d43473ef2e67e8284c4b6a856ca1ef312153fbb236b800ed3e369ac9833d87e00e2aa5a560c7d8f7f9433d4b8aa9a3f01e7fabe3c26c3f3d60e SHA512 75b4966e8d64ffd341c50b22d12653e4ead23352d25a7a1f923ee6cb177bd0a9a16e7c02cbd5b58cf3da03f415168606cd67ed19f594dca75c66114e9c35903f
 EBUILD radare2-3.0.1.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+EBUILD radare2-3.1.0.ebuild 1153 BLAKE2B 32ef35f82d96bd43888ec2b5a94aa2cf901e0686de37e7468d0076e79c6f9160f26deb191bd23f27913e457b556e81270698fc16075231afcd705a75d6a3bb29 SHA512 3da239c69a475d594630892a7ff9d9586be836591fa0a73e97d67c2ae96c168c48bdf6ee951e72c4aa712c157e97c9440510967bf693feea6bac936ae54eaa82
+EBUILD radare2-3.1.2-r1.ebuild 1156 BLAKE2B ff6f7b0bf53f2960cd2b98e8721cf6f25650e740c5bc4e621e3d7dcc44a25da12cac1492ae22c18857b21c7b66a66c913043760f55ff948d6847d215fa91b65c SHA512 a3451ffe1c3c5dd75dcca3f25ea54b4eaf29f0f2889b40fd5b943b63b9bf1f3f84d1a420d420b6e5b987a48e04c95d5bd47e603a16491f28af0aa36c7980d00d
+EBUILD radare2-3.1.3.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/radare2-3.0.0.ebuild b/dev-util/radare2/radare2-3.1.0.ebuild
index ccba9bfa0ed9..ccba9bfa0ed9 100644
--- a/dev-util/radare2/radare2-3.0.0.ebuild
+++ b/dev-util/radare2/radare2-3.1.0.ebuild
diff --git a/dev-util/radare2/radare2-3.1.2-r1.ebuild b/dev-util/radare2/radare2-3.1.2-r1.ebuild
new file mode 100644
index 000000000000..a2b23dac6c40
--- /dev/null
+++ b/dev-util/radare2/radare2-3.1.2-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 eutils
+
+DESCRIPTION="unix-like reverse engineering framework and commandline tools"
+HOMEPAGE="http://www.radare.org"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/radare/radare2"
+else
+	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ssl libressl"
+
+RDEPEND="
+	dev-libs/capstone:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--without-libuv \
+		--with-syscapstone \
+		$(use_with ssl openssl)
+}
+
+src_install() {
+	default
+
+	insinto /usr/share/zsh/site-functions
+	doins doc/zsh/_*
+
+	newbashcomp doc/bash_autocompletion.sh "${PN}"
+	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
+
+	# a workaround for unstable $(INSTALL) call, bug #574866
+	local d
+	for d in doc/*; do
+		if [[ -d $d ]]; then
+			rm -rfv "$d" || die "failed to delete '$d'"
+		fi
+	done
+}
diff --git a/dev-util/radare2/radare2-2.8.0.ebuild b/dev-util/radare2/radare2-3.1.3.ebuild
index a3d09b6f37ab..ccba9bfa0ed9 100644
--- a/dev-util/radare2/radare2-2.8.0.ebuild
+++ b/dev-util/radare2/radare2-3.1.3.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
 
@@ -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/redo/Manifest b/dev-util/redo/Manifest
index 44636fff33ba..2f597c9082bb 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,3 +1,6 @@
 DIST redo-0.21.tar.gz 87347 BLAKE2B 1d97f6b4f862e61f9074d0dd57293b3ab61a4f3f26781b242450bd1e194b941a8a169767739ddfffd0a8d721a95229637e8c6d9083d2c67d664b19551db0bc6d SHA512 8fe9ba0a5b0b4bf9073456a4b4fa7bebcb51ceb4fb06a16dd671fc48ba480f2ee4ba1eae48cebc3c15687de43833324eb6f98642843be71ab7aa2fe471ab7958
-EBUILD redo-0.21.ebuild 769 BLAKE2B ca81f6cbe3599bcc65b5c61b4944e08f2738a0a482ac4229e494990d18d45a470ee430cc3ccb515108dc1159299f53fa38ed026635cbdfad44547cc9267fc775 SHA512 d7268b81bfa3af2061650000aac9796dc3df0c85558864a2d07f2f232ec6ab09d5a8b27e58ee933a765197bf1d01acc9b204c41a7d6c883d892dbdefc19e099e
+DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
+EBUILD redo-0.21.ebuild 770 BLAKE2B 0c7aa63ec92daee1ba01a118230a93a3f0a15f17521c04e1797856a0ab3cb5f937b36b069640fe02766d691a3de1e99368053a9628ba9e1ccad16a47d17b1d19 SHA512 7a6f55caf81a0fda662b32092c93aa3ffe827f4c517e672239130def5873ddd3dff6a3e346b607cb89a846541f38e240ce44d812f27b0deb99a73c952e2155d7
+EBUILD redo-0.31.ebuild 918 BLAKE2B ab6e9c3c0e9bb68bb23cd6171fdbb9f34787e7f648529c9f96ba8753cea215999620707a34236a80bc9c78de2bb61aa17a28991a28267e621aec84c5508fae99 SHA512 c7c652dabd307403f8748639dd4b6542b784c258964a9247c3e7a7b20ef91913ce32ed275c4981f385861182e0511edf7e7d54ae467407716bb1cd0091605055
+EBUILD redo-99999.ebuild 870 BLAKE2B 1976d982532c6d9581a4ed881bdbf0e2ac6c11131dfc5d2ceaca40208d3083b85720c9ff10880d132d4392be4131d8f525ce8e33a37148952f4f1bf83d1ea524 SHA512 5c15ae10196eb447bb8ef142367111d2fde7c783a1f0d02bc66f4e5d5101e475c4ddd7121104d6e18de588bcf2b3192318624ed664a28a1aad182e7f8286efb7
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.21.ebuild b/dev-util/redo/redo-0.21.ebuild
index a109d053e056..4c828aa449f5 100644
--- a/dev-util/redo/redo-0.21.ebuild
+++ b/dev-util/redo/redo-0.21.ebuild
@@ -13,7 +13,7 @@ SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-DEPEND="
+BDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 "
diff --git a/dev-util/redo/redo-0.31.ebuild b/dev-util/redo/redo-0.31.ebuild
new file mode 100644
index 000000000000..cc5f8333e277
--- /dev/null
+++ b/dev-util/redo/redo-0.31.ebuild
@@ -0,0 +1,42 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+BDEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_compile() {
+	./redo -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	./redo -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	./redo -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
new file mode 100644
index 000000000000..574d038e33d3
--- /dev/null
+++ b/dev-util/redo/redo-99999.ebuild
@@ -0,0 +1,41 @@
+# Copyright 2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit git-r3 multilib multiprocessing python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+EGIT_REPO_URI="${HOMEPAGE}"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS=""
+BDEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
+
+src_compile() {
+	./redo -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	./redo -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	./redo -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 6d24d1d6d670..f4f9db790d4d 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,6 +1,8 @@
 DIST rosdep-0.12.1.tar.gz 117102 BLAKE2B 42b0f6e7b6b0c2a4219bce24ff74ec01efb61ac0799a89baa5dc7f6b698e8f69a1578f744179252e7123c87c9fb0368b43a9a293609b28f6bfbc32c87b5f4627 SHA512 031bdfb4877865cacfab63a4494807ecf157d8514e89c7ab15e38fcbd4664df1247874975d7b1af42a8a1fc24cb62a558bd6b43732946f3122ffa6448a7631da
 DIST rosdep-0.12.2.tar.gz 118343 BLAKE2B 98163feef406707772a54bf6d1825900ac593113d635de92adcac0ae7ce201c2e312116104c76c13b9c1e3b1847ef4dcc0cfb4fd1edcb2795c6b323fa9cc7167 SHA512 0932a5ff9874bbdffa1160fe0a391d27eef9a2f2435d7a89fa3b5e4eab0fc08205d4417aaea1254ab7bfe679cfeb61a6f1b199f06d65154b30505e2a280c0b61
+DIST rosdep-0.13.0.tar.gz 301327 BLAKE2B 39c39903bb2e6c07dfd4e3aa9546acf434498db518c3bda04ef79c46ed5d13b7cd55978c78bea8294d8e5b84ddddef22814436566f3f958d91d3964650399a08 SHA512 c42aa17ee9b31f7013415e99a484a66a7a7fb52abef4cc9045658150ce0c36b475f2885ebfff537f9ce9f8fd5eeaef5482226c5bff5b4a3df03cc72b149db07a
 EBUILD rosdep-0.12.1.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
 EBUILD rosdep-0.12.2.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
-EBUILD rosdep-9999.ebuild 1493 BLAKE2B 14848d0cc919de003bdf86d87fcb942ca22aaa66b5c19eee08c288529682f152b0d25c542573261df6a18929dd54e7282df704c193e2f1bb8e9e3432d10ac418 SHA512 ec31c55b9e7c4de2b5eb7ebeec2b877fc10492324cbc46bb17961efde0fca52ad7be3f61559d845ea101afd9700fb01640b11b9ee30e32e07828b5bf4a1eab67
+EBUILD rosdep-0.13.0.ebuild 1501 BLAKE2B 0930c792aa1630d26ceea2c8cd884001f80b3883516abe2680704fa3df6fd6b0939915fe6caaca5dab1d1cbb45babf3c43163870451a763f3f1fd749b0b32035 SHA512 7ac5cddf69c5ccb31404d4c2b98030a7b63708e9602fae8fba086553a7afd0cd8013de7f82982830161a20e210186152d0450cd1b345778afa7d1a9b1ace4d66
+EBUILD rosdep-9999.ebuild 1501 BLAKE2B 0930c792aa1630d26ceea2c8cd884001f80b3883516abe2680704fa3df6fd6b0939915fe6caaca5dab1d1cbb45babf3c43163870451a763f3f1fd749b0b32035 SHA512 7ac5cddf69c5ccb31404d4c2b98030a7b63708e9602fae8fba086553a7afd0cd8013de7f82982830161a20e210186152d0450cd1b345778afa7d1a9b1ace4d66
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
new file mode 100644
index 000000000000..d406809d630f
--- /dev/null
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/rosdep"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Command-line tool for installing ROS system dependencies"
+HOMEPAGE="http://wiki.ros.org/rosdep"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/ros-infrastructure/rosdep/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/catkin_pkg[${PYTHON_USEDEP}]
+	dev-python/rospkg[${PYTHON_USEDEP}]
+	dev-python/rosdistro[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-python/nose[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/flake8[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-coverage --cover-package=rosdep2 --with-xunit test || die
+}
+
+pkg_postrm() {
+	if [ "${ROOT:-/}" = "/" ] ; then
+		einfo "Removing rosdep default sources list."
+		rm -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list"
+	fi
+}
+
+pkg_postinst() {
+	if [ "${ROOT:-/}" = "/" -a ! -f "${EPREFIX}/etc/ros/rosdep/sources.list.d/20-default.list" ] ; then
+		einfo "Initializing rosdep"
+		rosdep init
+	fi
+}
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index 842ec4941e9e..d406809d630f 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-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=5
+EAPI=7
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
 
 SCM=""
@@ -33,7 +33,8 @@ RDEPEND="
 	dev-python/rospkg[${PYTHON_USEDEP}]
 	dev-python/rosdistro[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	dev-python/nose[${PYTHON_USEDEP}]
 	test? (
 		dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-util/shc/Manifest b/dev-util/shc/Manifest
index cab20e346391..a9f5dc9b065b 100644
--- a/dev-util/shc/Manifest
+++ b/dev-util/shc/Manifest
@@ -1,5 +1,3 @@
-DIST shc-3.8.9.tgz 20536 BLAKE2B 68f2c18f79e28bcbf5116428ec16a4b6eceffba686aaf3e9075f14a77793831bbb9c80c7f44a849f152eb164000956a383343d4dc8b49fc8cf68758aa9a4d27e SHA512 e8a4f9b0ef6e90fc99ebeeb0af36b89d1020209429c9651a036ab1f51a293d9faa3b775b7f040e91997b6ff5a487cb45943fc3548fa6fa3e7282e0d6f74d2cd4
 DIST shc-3.9.6.tar.gz 122644 BLAKE2B bef9993f49ffc7a1119862c8bd4b520a6122505493a59269218c6d46a0780e0788d3c9acc3975e642f9ea0bfd5a3907f0c1ff54bbc20c01fc630b2da096fc479 SHA512 dbda4af6740a8a719976d7260133ab3d92552ea08416e2b1ec4815e83349507ed68eb1e52a78b34e2c129dd40eafcce84ef7bf0d97d28073ee3af4598f804ed2
-EBUILD shc-3.8.9.ebuild 825 BLAKE2B 035a2082aed05a8a71d901f914b6aa84ec4d0cfa93659a51c0b85f6e52e60ae6323a469b2b53ebb73ec322dffc041fccd5e00f80e9de772d99fdb481f0ca7f68 SHA512 048acb29321004230fb3da0713b4879d1c672633fe45212cef21ab72e3a9d9b55e2444449e1a25a333134f185b05641ea2393a475cef3b403666b7086c83168f
-EBUILD shc-3.9.6.ebuild 450 BLAKE2B b58546d213ce700e392edcb408e6763040be965224db85db66ac5cb06a63176120383ce7271efa17163bc41f7dc1ec31efa0033a0caf2b48d980e5ffbfa92d6c SHA512 96a715b5623ec9fb7236ec6c473d6bb72abbd5d42b253ed421037ea34194e30112cc0ad68ff9f47c47bd59419099fea68456d3e8eea54646a250cc597d9f3623
+EBUILD shc-3.9.6.ebuild 447 BLAKE2B 88a8ae951eef23d2fb06af65f11cd910e8d5f8dd568229406685a92a26efeb29ee702088fdde80857fb26dcf6ef0033e195b5fb45da4cbe935277b9e52f76b60 SHA512 ee96f953217b9511da6932c964ff72e2f1a3282ec5d2453dd427fbd849f03cd2191be68d5049ba66cfe91ec0b1888b3c91a7bbcc40551a9f66d11f6474c33fab
 MISC metadata.xml 341 BLAKE2B 9e21bf4fde239181d0dca080e08667fcf098398ea5f89b5e3b2fb27d3797eea6ef792f81b159a25c891c831dda165858172b11f1932469262117c12c155731eb SHA512 f5b2c355996851ad7c34e40f762e636295581148806b5a6129e79d39c564dcd16a8281b289598204048ca53c30b3f5efdea7f393e6ac47008d9a8af9bb54fe2b
diff --git a/dev-util/shc/shc-3.8.9.ebuild b/dev-util/shc/shc-3.8.9.ebuild
deleted file mode 100644
index 78178e4f1ae1..000000000000
--- a/dev-util/shc/shc-3.8.9.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs
-
-DESCRIPTION="A (shell-) script compiler/scrambler"
-HOMEPAGE="http://www.datsi.fi.upm.es/~frosal"
-SRC_URI="http://www.datsi.fi.upm.es/~frosal/sources/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ppc ~sparc x86"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	# respect LDFLAGS
-	sed -i makefile -e 's:$(CC) $(CFLAGS):& $(LDFLAGS):' || die
-	# fix source file name wrt bug #433970
-	mv {${P},${PN}}.c || die
-}
-
-src_compile() {
-	## the "test"-target leads to an access-violation -> so we skip it
-	## as it's only for demonstration purposes anyway.
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" shc
-}
-
-src_install() {
-	dobin shc
-	doman shc.1
-	newdoc shc.README README
-	dodoc CHANGES
-}
diff --git a/dev-util/shc/shc-3.9.6.ebuild b/dev-util/shc/shc-3.9.6.ebuild
index 60de37b13329..a72c0f210b1e 100644
--- a/dev-util/shc/shc-3.9.6.ebuild
+++ b/dev-util/shc/shc-3.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/neurobin/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 
 src_install() {
 	dobin src/shc
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index c112d849e358..ea81337eacf4 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,3 +1,5 @@
 DIST shellcheck-v0.5.0.linux.x86_64.tar.xz 3231336 BLAKE2B 5d94ed2e61fd363f645259eac94905cc4eed839b523c4392dd6a775f466e85a2164036c34cf0e1d993a43486fbbe0c7e64df2943d0748bee6e7bb25a5e3d0500 SHA512 475e14bf2705ad4a16d405fa64b94c2eb151a914d5a165ce13e8f9344e6145893f685a650cd32d45a7ab236dedf55f76b31db82e2ef76ad6175a87dd89109790
-EBUILD shellcheck-bin-0.5.0.ebuild 528 BLAKE2B bd8b23b3134b07bbe02d34dfd3147f8fa1a35cd1103cbb5688548fb661568021880e34809a5e30e2ea5225a4efbcae81522a187719673553a6fc2845af974a6e SHA512 1f6173ec7b569be874d60b126d0059f1c5a7777251fec25e2c83471ef704a6c9a725e28212e0e905e6536c15351656c48a6b2eb481eace03e70ca13c718e5604
+DIST shellcheck-v0.6.0.linux.x86_64.tar.xz 1484496 BLAKE2B 2f0d40b53a59dea15ae6bd972387071aea4e1d0f44bc1b7f74180d8744befd539a2e7e7aa4d5b78b65c82f8b94dc224b0730a9351a4fb1db1988c024fd85feac SHA512 6335d8888848a6fd351867c4f9732446b33c6b5e46343aebdbf1efa14ae99804d1e5af5b186b6ceba161d23b221b53d2a12e3a695231f8ac8f9ef46e2db9182b
+EBUILD shellcheck-bin-0.5.0.ebuild 527 BLAKE2B f4bdcf6460b48eb6fb401ba24158595cca5ed376e9e9d2dfc4daba71092e64440219abfa36946cdf5ba470f42d0a226306aaf8ab47cd8b189b859d0c5b6bc8ec SHA512 3f05dfc02e5c64866b38f59a59b99584d5582316782e851ee93fd786e21456ae33f1cd4b9ad7b866434a5c04db026f918976bd80dc3b778c4389539d6eac51b7
+EBUILD shellcheck-bin-0.6.0.ebuild 528 BLAKE2B bd8b23b3134b07bbe02d34dfd3147f8fa1a35cd1103cbb5688548fb661568021880e34809a5e30e2ea5225a4efbcae81522a187719673553a6fc2845af974a6e SHA512 1f6173ec7b569be874d60b126d0059f1c5a7777251fec25e2c83471ef704a6c9a725e28212e0e905e6536c15351656c48a6b2eb481eace03e70ca13c718e5604
 MISC metadata.xml 469 BLAKE2B 639f0079f57c613dff06b282358be8cdd287fbf2d361b053ebc62ede4efa2f4c17d9b27f420e97cde73f085446ded30d488e6f7efdec2584384688d68781ff34 SHA512 296cd96c77ffd3e87877ca773954954a08723d274ef91e7a292fc95f0b5a8d10f1d981a9c9ba2ed7c239347e3cd8eb47df2984071a58274a452e10abc2a58ad2
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.5.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.5.0.ebuild
index 633eb0107655..c2bfcaef3865 100644
--- a/dev-util/shellcheck-bin/shellcheck-bin-0.5.0.ebuild
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.ta
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DEPEND="!dev-util/shellcheck"
 RDEPEND="${DEPEND}"
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
new file mode 100644
index 000000000000..633eb0107655
--- /dev/null
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.6.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/-bin/}
+
+DESCRIPTION="Shell script analysis tool (binary package)"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.tar.xz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="!dev-util/shellcheck"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="/usr/bin/shellcheck"
+S="${WORKDIR}/${MY_PN}-v${PV}"
+
+src_install() {
+	dobin shellcheck
+	einstalldocs
+}
diff --git a/dev-util/shellcheck/Manifest b/dev-util/shellcheck/Manifest
index 5e6d75fe72aa..a0d7aea614d2 100644
--- a/dev-util/shellcheck/Manifest
+++ b/dev-util/shellcheck/Manifest
@@ -1,7 +1,9 @@
 DIST ShellCheck-0.4.6.tar.gz 116618 BLAKE2B 67cf8e882e95eaedfbb46e01656889e200b311e3701301da1df02add4c6f7446d275a1b132d6d7e1da0e4eb49205138fffce8d8cb0a2b91045f72cc7f006ca99 SHA512 b053a7f581d73f1e5be51046f2fd77f6e7452acecf841321ef363156a5f72d98c13a723885d1888ab366550625e05396ca207925539fec1d70a00212af920ca5
 DIST ShellCheck-0.4.7.tar.gz 126593 BLAKE2B cbb925c4760a3744381dbee293d5e28ce429a9c4244eb1fa5af71ad8ba2cbdd86a721bbc2b9202c7aecf4ad70025bacb13e696c4731cbfaba22511d773013d6b SHA512 bb9c79911701b3857d29fd63588115888f4d2b1d224066bb944ca00d29d973195ad1f4b1df8e2746fd0666f7438f46abc384f7f915c152f46fcd332163736792
 DIST ShellCheck-0.5.0.tar.gz 133265 BLAKE2B 703e3d994e6302d7bc6124ae064cbc5893c5119918a9a9b6cbda2c0415600b95545146061230b2e6ab07b6b2383a86b9bd3f153643c30c3f765a3424a1cd4bc0 SHA512 3b4b097f507c8910f5da1a739138511b9c30c156667c0887447043a7d0c3c371768953d7039803356f28e863266d3a34b5b1689889f3e524a3768e4d3223ce7c
+DIST ShellCheck-0.6.0.tar.gz 140211 BLAKE2B 5a103bd74e76905b64a882542d1f2bf5cac6b2ec94e9b0f55fdd052f5fd1fe17f9efc02ef9182e7e5965765b428b974bf94fa50d701396fef77bcbfe6185402e SHA512 51c2cc9cfd2f8a145095873f9b19d4fdd67a21eedab4ac2dbe5f43789fd0937a44bdc8480b2d0cceb5bc3802a8243dd3b701a07f1f6b5460291272ee453c7c5f
 EBUILD shellcheck-0.4.6.ebuild 859 BLAKE2B 666e8057d0e035efe735dfb76c6c58f24dc8a8a651752646a843f096bcf8ffd3bb2b89b7f50d7b954b2b73ec7ddf46f808ea9f96dfed9fa1cb6efd9694afd093 SHA512 6bbeb59349d018d45f9606683c723809a84aae507b9bae3b913ef53c163314dfbd30cf6632b18839266089551f4f4b8bb29356850c72d5577f0bed2cc251d022
 EBUILD shellcheck-0.4.7.ebuild 861 BLAKE2B 36567203b1e8cf28594109bf34de03f9d8030e5c5829e7bd16921639f55a774b74d46f75e9876e457b09efbf935f6cc947cd89072d7fff83892f85c738973c6d SHA512 adafc1f025ee6f3c2c04626873d5ce06099f2130ab977dcf6b2b38e6610553ad9ee9c30888b3ceff45a59b70192cb13c6a03470932bf56f6bbddc666a5d9643f
 EBUILD shellcheck-0.5.0-r1.ebuild 926 BLAKE2B 87532d0d1a95dafc036ebeccd92c3fee9aa48b37dc6eaf60ddab0b2afa4a046006ee861c7d972c2e8127740161ff596fa06c972f41fce4a47a2a4caec2608a6e SHA512 2b3e2d8f164c29091f28247a0db505e12ee81cef2d3295df17c4431606601fa82c9ed3389592732a284ff68f7bedb2f41b6d1bc19b19cc6d16369df6630e09fa
+EBUILD shellcheck-0.6.0.ebuild 925 BLAKE2B 9991ddeb39a593662a303547efc5ed65a990a9c648eb349c474ede7a1ecebc73c84a704294974350a71f522b5d10be6eaf18730e78f1420a8542653d9fc4e13c SHA512 4155688bac7c49cd3e341da0bfd560d9ed23ad21a0f064dcb10d889dd56b3a0366d7cf2609855df4d0ad9e6e190255b6f410b633b43048168162878a8b98850c
 MISC metadata.xml 354 BLAKE2B 147d2403f29d6faf487627ed1bcc9b16cc02936a1afe0f25f7bab24071b7b0009960ec950c2bcbcc3738033c5e10f5d790f0b90a7e75d3f9242b694e1bb96cc7 SHA512 033d85c60d488513cec6cbd63c406ff12882909629acd2417e4d0b1e2046ff9aebda7dcca7b95ee144deb3d876ccc422211cc31eb259f306deb35938b56183af
diff --git a/dev-util/shellcheck/shellcheck-0.6.0.ebuild b/dev-util/shellcheck/shellcheck-0.6.0.ebuild
new file mode 100644
index 000000000000..89bd3f1ba365
--- /dev/null
+++ b/dev-util/shellcheck/shellcheck-0.6.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="ShellCheck"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Shell script analysis tool"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="mirror://hackage/packages/archive/${MY_PN}/${PV}/${MY_P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/mtl-2.2.1:=[profile?]
+	>=dev-haskell/parsec-3.0:=[profile?]
+	>=dev-haskell/quickcheck-2.7.4:2=[template_haskell,profile?]
+	dev-haskell/regex-tdfa:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3 <dev-haskell/cabal-2.5
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	cabal_src_install
+	doman "${PN}.1"
+}
diff --git a/dev-util/statifier/Manifest b/dev-util/statifier/Manifest
index 9fbb2a7c62b5..3ac7d7e802dc 100644
--- a/dev-util/statifier/Manifest
+++ b/dev-util/statifier/Manifest
@@ -1,3 +1,4 @@
+AUX statifier-1.7.4-fix-build-system.patch 2104 BLAKE2B 019248feff682a75b90d1aca7eea425aded1b0f01e8dff4bd24410a474ef1350ed8215803915cb52df53866f6dc996428742d0a9187f55bbff17ce30894dd6b3 SHA512 a9bf5adf1206bbca84084df0680785e1f31902fb7ce4d455593ee35e0195ef9546de641d2f5372843afb7c8584fb04b1b13ee7973813ee8561a2282f2162cc87
 DIST statifier-1.7.4.tar.gz 73245 BLAKE2B 897b78b31aa4f148b6a6a986251ba9d4f40ebad3209f71896ffffb71e06ab25d337a4a79adc0217592051f917bc71428d3032f6216ec053f62c4632edef474d5 SHA512 22d4873130bafe06144c8f6ce7089aa25e3eb047bbee5709344fee1e8d85b24aac689c88d34537fe4a690e231d768e56a2fa13672b9eccf27d945b3f8bcda756
-EBUILD statifier-1.7.4.ebuild 1129 BLAKE2B 925e516a8711b4c71e39e0f77160f9f144d66139536a86a4daec55ee2debb29369d9cb87ea67463295ee0aa42c2ae8ca8ddcd7fe13a61ac0f58bfc0875b91914 SHA512 43321c83d8fbd0228f91f6dacdae168db1fe7fd1f73b5c41d42c731182e2bb5e7a9dd1508c1ccaea85bac16fdac3675e454bccfc637ce50682bbd337a3ced075
+EBUILD statifier-1.7.4.ebuild 1125 BLAKE2B b0b81af822f90d001cc7509a74334e8149bcc26d0f106d84aaa2ca27d5d79b033da1813d60bb37119c604eaf0f007f6c2a6c3553fedcadaacb53fbc49be116eb SHA512 9a8749dfce5361eb7771e0f330b300c1ce56f08ff6cd93abf1457a2ddcb81b3016c14c54df0fdb602f20b72c97d7f799ae496043024ddae347f3af43da19923e
 MISC metadata.xml 369 BLAKE2B 99bc89ce5469bce6e867ce73fa66fee3fa41bf2166453c3606b03b1f3879f837c46d41068430e217a7ab4b0d0096650762095ffe5f13382ab055e5815f90ebb1 SHA512 5d49b66d13a6055421fc9e9a180d6d5657e367cfdc6e74a13c16955cc1bfda765605f0ab7c0d7d5f67ce847e09306fef52a2fb621eccdf358e5d21e82129a2b3
diff --git a/dev-util/statifier/files/statifier-1.7.4-fix-build-system.patch b/dev-util/statifier/files/statifier-1.7.4-fix-build-system.patch
new file mode 100644
index 000000000000..ef8c6a516bd1
--- /dev/null
+++ b/dev-util/statifier/files/statifier-1.7.4-fix-build-system.patch
@@ -0,0 +1,48 @@
+Honour user flags and CC
+
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -170,7 +170,7 @@
+ 	echo "VERSION='$(VERSION)'" > $@ || { $(RM) $@; exit 1; }
+  
+ $(UTILS_WITH_ELF_CLASS): $(ELF_CLASS)/%: %.c
+-	gcc $(FLAGS_ELF) -I$(CPU_DIR) -Wall -O2 -g $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(FLAGS_ELF) -I$(CPU_DIR) -g $< -o $@
+ 
+ MY_GDB_CFILES := \
+    breakpoints.c \
+@@ -187,13 +187,13 @@
+ 
+ MY_GDB_CPPFLAGS := -I. -I$(CPU_DIR) -I$(ELF_CLASS)
+ $(MY_GDB_OBJ_FILES): $(ELF_CLASS)/%.o: my_gdb/%.c
+-	gcc -c $(FLAGS_ELF) $(MY_GDB_CPPFLAGS) -Wall -O2 -g $< -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) -c $(FLAGS_ELF) $(MY_GDB_CPPFLAGS) -g $< -o $@
+ 
+ $(ELF_CLASS)/my_gdb: $(MY_GDB_OBJ_FILES)
+-	gcc $(FLAGS_ELF) $^ -o $@
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(FLAGS_ELF) $^ -o $@
+ 
+ $(ELF_CLASS)/dl-var.s: dl-var.c dl-var.inc
+-	gcc $(FLAGS_ELF) $(FLAGS_C_TO_ASM_ELF) -Wall -O2 -S $< -o $@.s
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(FLAGS_ELF) $(FLAGS_C_TO_ASM_ELF) -S $< -o $@.s
+ 	/bin/sh asm.make.sh < $@.s > $@ || { $(RM) $@; exit 1; }
+ 
+ # Dependencies should be in correct order
+@@ -210,7 +210,7 @@
+ # Because linker give warning about _start function I specify
+ # pretty dummy '--entry=0x0'
+ $(FILES_TO_BE_EMBEDDED_WITH_ELF_CLASS): $(ELF_CLASS)/%: $(ELF_CLASS)/%.o
+-	gcc $(FLAGS_ELF) -o $@ $< -Wl,--oformat,binary,--entry=0x0 -nostdlib
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(FLAGS_ELF) -o $@ $< -Wl,--oformat,binary,--entry=0x0 -nostdlib
+ 
+ OBJECTS_TO_BE_EMBEDDED_WITH_ELF_CLASS = $(addsuffix .o,$(FILES_TO_BE_EMBEDDED_WITH_ELF_CLASS))
+ 
+@@ -221,7 +221,7 @@
+ # with -include processor.h, start.S and $<
+ # 
+ $(OBJECTS_TO_BE_EMBEDDED_WITH_ELF_CLASS): $(ELF_CLASS)/%.o: $(CPU_DIR)/%.S $(CPU_DIR)/processor.h ./start.S ./end.S
+-	gcc $(FLAGS_ELF) -c -o $@ -nostdinc -I$(CURDIR) -I$(CURDIR)/$(ELF_CLASS) -include $(CPU_DIR)/processor.h -include ./start.S -include $< ./end.S
++	$(CC) $(CPPFLAGS) $(CFLAGS) $(FLAGS_ELF) -c -o $@ -nostdinc -I$(CURDIR) -I$(CURDIR)/$(ELF_CLASS) -include $(CPU_DIR)/processor.h -include ./start.S -include $< ./end.S
+ 
+ # Additional dependencies:
+ $(ELF_CLASS)/regs.o: $(ELF_CLASS)/regs.inc
diff --git a/dev-util/statifier/statifier-1.7.4.ebuild b/dev-util/statifier/statifier-1.7.4.ebuild
index 08b4f7afec9b..b4021f0a1cf3 100644
--- a/dev-util/statifier/statifier-1.7.4.ebuild
+++ b/dev-util/statifier/statifier-1.7.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 MULTILIB_COMPAT=( abi_x86_{32,64} )
 
-inherit multilib-build
+inherit multilib-build toolchain-funcs
 
 DESCRIPTION="Statifier is a tool for creating portable, self-containing Linux executables"
 HOMEPAGE="http://statifier.sourceforge.net"
@@ -20,20 +20,23 @@ RDEPEND="app-shells/bash
 	sys-apps/coreutils
 	virtual/awk"
 
-src_prepare() {
+PATCHES=(
 	# Respect users CFLAGS and LDFLAGS
-	sed -i -e 's/-Wall -O2/$(CFLAGS) $(LDFLAGS)/g' src/Makefile || die
+	"${FILESDIR}"/${PN}-1.7.4-fix-build-system.patch
+)
+
+src_prepare() {
+	default
 
 	# Don't compile 32-bit on amd64 no-multilib profile
 	if ! use abi_x86_32; then
 		sed -i -e 's/ELF32 .*/ELF32 := no/g' configs/config.x86_64 || die
 	fi
-
-	# Apply user patches
-	eapply_user
 }
 
 src_configure() {
+	tc-export CC
+
 	# Fix permissions, as configure is not marked executable
 	chmod +x configure || die
 	econf
diff --git a/dev-util/stressapptest/Manifest b/dev-util/stressapptest/Manifest
index e62e430546a6..6fd547c6f940 100644
--- a/dev-util/stressapptest/Manifest
+++ b/dev-util/stressapptest/Manifest
@@ -1,5 +1,3 @@
-DIST stressapptest-1.0.8.tar.gz 218485 BLAKE2B a843330dfbf16b324a13e4156c819e8b9139288bd316d560410aeb704ff4e24c47d86dd3b1d1a65d325b86110015c6e893cd38aea99d59b7c68989ba2228f376 SHA512 b5fde353d15958052219c3e505a22aa914e03a7fe96c3a0ac5025a4c730643f6fbdd5088a7cc0dd4618d4998151e2374507845110af8f2cdb43ccd4c87d48916
 DIST stressapptest-1.0.9.tar.gz 219517 BLAKE2B 58fdb60b924bedd526cf31ed47a56cf4cca288abb43054fc6de5379ec2c6ea705c92eec1ef657274949009e40e8fa82ee9cc6e1bda2ef160a894ba95519fcfd8 SHA512 2680b9a4e148a2fe0cb7758ffde7624c8874bbae1e7650bb4df6916512be5949996da16d52f530b237fe4c6122fa9bb2d35b11092d106f59d614b44eec250595
-EBUILD stressapptest-1.0.8.ebuild 610 BLAKE2B e2c5db27457525327788a29e1b50a6f9e661e1807822e3374d41af2dbd3bb55af337506018b4d72c7838f2b4c9b126dfc6682cef5e8c0d1aeab8fed8d1e69d09 SHA512 36404057a349a6a5e66525235960becaafa4ef7013937170cb04eafd8e7202b19fa5e17be018e5c8cb540407c4c757154b0e4cfe00a89d16fa891611398cd969
-EBUILD stressapptest-1.0.9.ebuild 610 BLAKE2B 00167ba505bd365fd0fbccdb8e22b62d4b4ae88a70e457a21b5b6709bd668d6a501dcdc8fe7f477f6aff6174d4cbdfc6e347ae93789c7cd8197a85b7cc973523 SHA512 623e840e7dbdfc1c1221aad1612e6b67f6a673088c907e9320858c5bfdd1601458e3c25cc951632018160aa5fb128f37514f3949e491ac51967a2546f761440c
+EBUILD stressapptest-1.0.9.ebuild 679 BLAKE2B 21b9689dd993ed6247a2b15e1aa6baa5b73e1d9fcc094718e58fbfbaa69ffe875034456f22dbc79615a51685328d3cfcdd00ddda16818c04504d8b0dd6212518 SHA512 08e2dda71cfa7d41544ccf19550d8f0ba5199846602f434a0694aaa908bbc521f3427e119f6d74ad3ce362d0550e76ce652a7e5634ef702f50f7c90f76220e23
 MISC metadata.xml 259 BLAKE2B bf2f588235ba1f20b67db1404be3652d18c003fc52012eca6ed8175524b805a9d168779856994a16cdd2fc049db4eb6c4f3a71b61b50806d53b654877a89d7db SHA512 13357765b1f978b966b3d556a606bda30467379b2c33bc24d2940af28906ca337e8da57e936ba55c26de06d39b48f6729b4d8d4193e178033ea1f2e13e50ad7e
diff --git a/dev-util/stressapptest/stressapptest-1.0.8.ebuild b/dev-util/stressapptest/stressapptest-1.0.8.ebuild
deleted file mode 100644
index 927f546d91ed..000000000000
--- a/dev-util/stressapptest/stressapptest-1.0.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic
-
-DESCRIPTION="Stressful Application Test"
-HOMEPAGE="https://github.com/stressapptest/stressapptest"
-SRC_URI="https://github.com/stressapptest/stressapptest/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/libaio"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	# Matches the configure & sat.cc logic.
-	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
-	econf --disable-default-optimizations
-}
diff --git a/dev-util/stressapptest/stressapptest-1.0.9.ebuild b/dev-util/stressapptest/stressapptest-1.0.9.ebuild
index 27748ce9fde5..054b68fe3b0e 100644
--- a/dev-util/stressapptest/stressapptest-1.0.9.ebuild
+++ b/dev-util/stressapptest/stressapptest-1.0.9.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"
@@ -18,6 +18,9 @@ RDEPEND="dev-libs/libaio"
 DEPEND="${RDEPEND}"
 
 src_configure() {
+	# Uses uintptr_t, which is C++11, #651842
+	append-cxxflags -std=c++11
+
 	# Matches the configure & sat.cc logic.
 	use debug || append-cppflags -DNDEBUG -DCHECKOPTS
 	econf --disable-default-optimizations
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 709d18cd3a94..b9e31029cab3 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,3 +1,5 @@
 DIST sysdig-0.24.1.tar.gz 846153 BLAKE2B bc64317e02526d9729c9fb3738f2982f4b425cdb43c64f77944938186cde4ed2d8d2649984efe0055bbaed250b08bda4008272805024e1d8993e17bc93509663 SHA512 a89ce82527b47104161668e134387a04f4a6753adcd881df25410b629603b58fc8f675de6941f4911ad2da42ffbfd46b38f9cc9837c0809c559fee9a739a204a
+DIST sysdig-0.24.2.tar.gz 855317 BLAKE2B d394ac3bd7e405664da2b45d8cfd5d3433e20266a9489f63b7d4c3bb955a60640d13bb33e6dd2057b16b6ce0617afab88cad2ceab58aa50f6b43a64f6a50f45b SHA512 10ec381144733abc2c386f6570d4245ac2c1eec64d0f56800963acbd9cc38eece504f836f1ab0e24224ff44233945c8273b72efc77d7eadce98d7c4fc378740b
 EBUILD sysdig-0.24.1.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
+EBUILD sysdig-0.24.2.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.24.2.ebuild b/dev-util/sysdig/sysdig-0.24.2.ebuild
new file mode 100644
index 000000000000..3ba452c42e38
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.24.2.ebuild
@@ -0,0 +1,94 @@
+# 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/sysprof/Manifest b/dev-util/sysprof/Manifest
index e797581127cb..0fc9e52b68c4 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -2,7 +2,9 @@ AUX 3.28.1-fix-nosystemd-build.patch 1336 BLAKE2B f6292baad803ceca64be6a3b32793e
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
 DIST sysprof-3.26.1.tar.xz 609076 BLAKE2B fd10ce27b224100558ff5bb9c75cfffcb76b2331d2c4056bd73a9ace1ea155e61d705240acf6fefa805fba2333f6d439369d5b1cc16e0c537ab9fed408bf6d85 SHA512 ee03360e4971cd91129bac3cc9d2cf292d29aafe1cdacd078e404ee15c3ff02bcd0c0159502605c00eb2abd3a46917cf70458ad05e48b594eeb2835ead55c34c
 DIST sysprof-3.28.1.tar.xz 380720 BLAKE2B 0a3b93659e421b717230bff6e90d20b28f8abc8491fddb51bc3f106b6cd8b038254e1fd0260c6eee2c2b83d77765be43f394d49bd34c054c36d6427ef419fefa SHA512 ca75c279bcb8cb37bffdba51d5b3481c3ece104847b64c0b8cb534468c9350a96c7224bf261ef892817e53aff2cff90a2b808f5db5a9afd6230721664b83809b
+DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95ab1ae6d0f6678e6e80305b8a6d53c604ce54d9fc2a473e4679695cef709f0e1a9514f1091719f33a58b92c896eb SHA512 70c49f7c20742aad82c8d9b1e303d06ca5fd2d27a6868872d28affea22278d381bf3eb0d181cbd1bfa490bda2878c52748ac29273e9e608452e9bf4f29fd9e2a
 EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
 EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
 EBUILD sysprof-3.28.1.ebuild 2125 BLAKE2B 3b0c90203488837b33015d2048cbd066bf7b0800f1135f04c810885c6d336ee9bab33b0e7e7730e01681a4cea77101b87865e9c85a5c51a85496d408519f80ff SHA512 02a7727f8a58712bf3fc9c91c41a0a5ddedeaa513c69ab9d5a0c5487c10d9afcaa8cbc35065b5d477378c71a919bafbebfe5fc1ce9cba1ed64e072f130c902f8
+EBUILD sysprof-3.30.2.ebuild 2078 BLAKE2B 16e63e53f4669f64be0e1d1d9e1dafbc5d04f65962a3f3e4ddd3015cb87dde0c1f53ea78cea895ccbf222926c05620fd2650149c701e0743326f5d6a88ab5777 SHA512 376ade85ba12c517d755535c16c23181dbe4b8ecb383bdf511d94074b8c09809d791a90a96bd42cadd571af6dd96e3b3005c6c0a8dea8d6d6ece05ef26bf92fd
 MISC metadata.xml 842 BLAKE2B a36dfd049b5a5307006e5189a46fff5b6de8f16fbb8fcaffa8d737895e9864974478c00007b452c350b673fdc735e809ace65fb31d9a7e21c4d4905d9e1d3574 SHA512 cf90f7e7b64c02bb8ca0ec210959c39e004b0c4f6707b2c489ef2a566fd8d62961b902c00deec95f2f762c55d142f5d706a944553cd8e37bcce3d62c9eff8a9d
diff --git a/dev-util/sysprof/sysprof-3.30.2.ebuild b/dev-util/sysprof/sysprof-3.30.2.ebuild
new file mode 100644
index 000000000000..e3dd7be49675
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.30.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gtk systemd"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-auth/polkit
+	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
+	systemd? ( >=sys-apps/systemd-222 )
+"
+# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dwith_sysprofd=$(usex systemd bundled none)
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+	if ! use systemd; then
+		elog ""
+		elog "Without systemd, sysprof may not function when launched as a regular user,"
+		elog "thus suboptimal running from root account may be necessary."
+		if use gtk; then
+			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index 0bd6534c1172..7bbb079ea143 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,4 +1,6 @@
 DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad
-EBUILD tup-0.7.7.ebuild 2183 BLAKE2B 5a87498b280616342885129ce6c395667e378c9e5f54fa6583512e2b6a662a1e15555bc7003586702125d8300b1e71b0709b42bf5117b2f5eb765fb2be50f76d SHA512 6e78d896108cb77d45f97f25ec5dfe18a6be7272c0ab6383feaef92ab41f1a58add61bfec0a87598bfec586642fe11c3d16eec40e6f37514814a9aa0b842138e
-EBUILD tup-9999.ebuild 2183 BLAKE2B 5a87498b280616342885129ce6c395667e378c9e5f54fa6583512e2b6a662a1e15555bc7003586702125d8300b1e71b0709b42bf5117b2f5eb765fb2be50f76d SHA512 6e78d896108cb77d45f97f25ec5dfe18a6be7272c0ab6383feaef92ab41f1a58add61bfec0a87598bfec586642fe11c3d16eec40e6f37514814a9aa0b842138e
+DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5
+EBUILD tup-0.7.7.ebuild 2499 BLAKE2B 27dc4b8f2be59038c7256feeeb0edbd49580fe3b8c018834cf2255ea37f95b9e8898894620a10ff25098b8966aadc9c26a73650c663fb50ff0017a5e394c80f2 SHA512 ae2cdc51894567ae76ccf2b03ab2afbb07d6648e2230a2a94ac8edb4857e3cc40815e05a21343999bb40465922957196a88cc7debb1001bb772b0a6d8fbe53a2
+EBUILD tup-0.7.8.ebuild 2432 BLAKE2B b551f08ef0a190305eca5b3c6bc8151d85062c1e20ee9021faeabe96c367afb1def59f64fbdc6869bb24c79389cd57bc3d217b8bf9cb31b02546e9987eed6749 SHA512 49b29bb44d75761c0525a37472e3d1b245d34324e4dddbc936e0d1de10799e4d0cf56b58cf814f7d4a8600d0764df4902d811ea59d5913622f7935321782c7c5
+EBUILD tup-9999.ebuild 2432 BLAKE2B b551f08ef0a190305eca5b3c6bc8151d85062c1e20ee9021faeabe96c367afb1def59f64fbdc6869bb24c79389cd57bc3d217b8bf9cb31b02546e9987eed6749 SHA512 49b29bb44d75761c0525a37472e3d1b245d34324e4dddbc936e0d1de10799e4d0cf56b58cf814f7d4a8600d0764df4902d811ea59d5913622f7935321782c7c5
 MISC metadata.xml 326 BLAKE2B edaa58be0e147ba52e73b1e4ad70250ee2ebf7c31beda95bc4f639dc4759b4a2515a3f927b4c5c3e644a66a58180df7ef6874893908d6ffc55181c8a554f3a70 SHA512 cd0c6ad8e43779608355cc4bd23a03a88d2920ff15269f2b130395f955fe58d63029d6f8567b021c4f546d0c41e8af3d866c0de4b72d042be1ec6eff72cc0154
diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild
index 104dd83a9dbd..194cf670515f 100644
--- a/dev-util/tup/tup-0.7.7.ebuild
+++ b/dev-util/tup/tup-0.7.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="A file-based build system"
 HOMEPAGE="http://gittup.org/tup"
@@ -30,6 +30,10 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+CONFIG_CHECK="~FUSE_FS ~NAMESPACES"
+WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work"
+WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)"
+
 src_prepare() {
 	# Use our toolchain
 	sed -i Tuprules.tup \
@@ -65,6 +69,7 @@ src_install() {
 }
 
 src_test() {
+	[[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work"
 	# tup uses fuse when tracking dependencies.
 	addwrite /dev/fuse
 
diff --git a/dev-util/tup/tup-0.7.8.ebuild b/dev-util/tup/tup-0.7.8.ebuild
new file mode 100644
index 000000000000..2662d05de6fd
--- /dev/null
+++ b/dev-util/tup/tup-0.7.8.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info toolchain-funcs
+
+DESCRIPTION="A file-based build system"
+HOMEPAGE="http://gittup.org/tup"
+# Tup itself is GPLv2, but it bundles differently licensed software:
+# - lua: MIT
+# - sqlite (unused in this ebuild): public domain
+# - inih: 3-clause BSD
+# - red-black tree implementation: 2-clause BSD
+# - queue implementation: 3-clause BSD
+LICENSE="GPL-2 MIT public-domain BSD BSD-2"
+SLOT="0"
+
+if [[ "${PV}" == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gittup/tup.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	dev-db/sqlite:=
+	dev-libs/libpcre:=
+	sys-fs/fuse:=
+"
+RDEPEND="${DEPEND}"
+
+CONFIG_CHECK="~FUSE_FS ~NAMESPACES"
+WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work"
+WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)"
+
+src_prepare() {
+	# Use our toolchain
+	sed -i Tuprules.tup \
+		-e "s:CC = gcc:CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}:" \
+		-e "s:ar crs:$(tc-getAR) crs:"
+
+	if [[ ${PV} != 9999 ]]; then
+		# Avoid invoking `git` to find version, use ours
+		sed -i src/tup/link.sh \
+			-e 's;`git describe`;v'"${PV};"
+	fi
+
+	default
+}
+
+src_configure () {
+	echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
+}
+
+src_compile() {
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+	./bootstrap-nofuse.sh || die
+	unset TUP_NO_NAMESPACING
+}
+
+src_install() {
+	dobin tup
+	dolib.a libtup_client.a
+	doheader tup_client.h
+	doman tup.1
+}
+
+src_test() {
+	[[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work"
+	# tup uses fuse when tracking dependencies.
+	addwrite /dev/fuse
+
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+
+	# Skip tests which require namespacing or root privileges.
+	pushd test || die
+	rm -v ./*full-deps*.sh
+	SKIPPED_TESTS=(
+	t4069-gcc-coverage.sh
+	t4072-proc-self.sh
+	t4074-getpwd.sh
+	t4131-proc-self-exe.sh
+	t4132-proc-meminfo.sh
+	t4171-dev-null.sh
+	t4200-ccache.sh
+	t5083-symlink-fullpath.sh
+	t5084-symlink-fullpath2.sh
+	)
+	rm ${SKIPPED_TESTS[@]} || die
+	./test.sh || die
+	popd || die
+
+	unset TUP_NO_NAMESPACING
+}
diff --git a/dev-util/tup/tup-9999.ebuild b/dev-util/tup/tup-9999.ebuild
index 104dd83a9dbd..2662d05de6fd 100644
--- a/dev-util/tup/tup-9999.ebuild
+++ b/dev-util/tup/tup-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit toolchain-funcs
+inherit linux-info toolchain-funcs
 
 DESCRIPTION="A file-based build system"
 HOMEPAGE="http://gittup.org/tup"
@@ -26,10 +26,15 @@ fi
 
 DEPEND="
 	dev-db/sqlite:=
+	dev-libs/libpcre:=
 	sys-fs/fuse:=
 "
 RDEPEND="${DEPEND}"
 
+CONFIG_CHECK="~FUSE_FS ~NAMESPACES"
+WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work"
+WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)"
+
 src_prepare() {
 	# Use our toolchain
 	sed -i Tuprules.tup \
@@ -65,6 +70,7 @@ src_install() {
 }
 
 src_test() {
+	[[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work"
 	# tup uses fuse when tracking dependencies.
 	addwrite /dev/fuse
 
@@ -73,23 +79,19 @@ src_test() {
 	export TUP_NO_NAMESPACING=1
 
 	# Skip tests which require namespacing or root privileges.
+	pushd test || die
+	rm -v ./*full-deps*.sh
 	SKIPPED_TESTS=(
-	t4062-full-deps.sh
-	t4063-full-deps2.sh
-	t4064-full-deps3.sh
-	t4065-full-deps-proc.sh
-	t4067-full-deps5.sh
 	t4069-gcc-coverage.sh
 	t4072-proc-self.sh
 	t4074-getpwd.sh
 	t4131-proc-self-exe.sh
 	t4132-proc-meminfo.sh
 	t4171-dev-null.sh
+	t4200-ccache.sh
 	t5083-symlink-fullpath.sh
 	t5084-symlink-fullpath2.sh
-	t7048-full-deps.sh
 	)
-	pushd test || die
 	rm ${SKIPPED_TESTS[@]} || die
 	./test.sh || die
 	popd || die
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index 09dcb0a4be14..6df9bbdd18f6 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -1,6 +1,8 @@
 AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae9ee9c84c52a02fe16aaa86a94c4b84bcdad6782be590b0f163f679281764595b2679ff0898f502621ea6c2427533138 SHA512 3deb38bb44ea4bb2cf7f4b2dc88db0c0d71045ccaae48acecd3fde9e0006262111202c8e3ae490a5fccd610abf0c24ca11699720872998dfc55bc29f58f923b6
 DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
+DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1085 BLAKE2B 01d43b68297301bd5c4cf839202943f2da23d434ca46c1679bfba2f535f7e3da66068c2f2b765a7d895515b6b0c5f66349f63e6a94e1fb05b895dceef045e46c SHA512 83584d3a4cdea70aed750e5f3fa8a9c7bc09ad8d6abd5944f256893f646fb467d83e21d290c7d194541386f85a104647d583f1f58764741220c15dea43b60000
+EBUILD umockdev-0.11.3.ebuild 1042 BLAKE2B 4453ef595e762330e829f28e8bfb25b7495f176bb3ebb8f0740efc2e5501601f3b4436d72645c10c759bac2c277a9ee8c68f66ecfc0669cfbbc55ccf845fc64a SHA512 4b46cad4bbde01bc916fe0a15c6b292f34d9a8ca20dd7ef2d37d5ab19bfa026c01ad0233b2a2f928de0d86c931f5822e7b1b39e8c2387ddf6550613cf6bcdbe9
+EBUILD umockdev-0.12.1.ebuild 1149 BLAKE2B 1d32589e3da0ab0194c82edde328571354e202717bde4c32c5ce62d852655a9d528e676a5e0fd8c87d7d2f81568652d3a0bf1884330466ec4b1b88103028ccb6 SHA512 625feddb289a6c7c883cb0b37596d9cd18e77d07ceb2199b53c52109a1bf75a1169756a85a22e24e0ebdff84141da2bd251ce8cac4adb1445657f9a1706e221d
 EBUILD umockdev-0.9.4.ebuild 733 BLAKE2B cefe313e56cf836a624207c5f0fecf9b41400070ad1675404e34a84e6ca684ad3c3835d0af8eb5762b615f077945c126ee3afa8fc07366e3cca298f4df31c525 SHA512 585f9841137d1d74981e7d64d0bcaadf7834a0b1a5689458b8cff8462272e86a48b6878d289bb40a7c8a6b52cb696298008124f048eac9bf38619d0e145eef3e
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
index f92f538192f4..6d3b197721a2 100644
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.11.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
@@ -16,7 +16,6 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+introspection static-libs test"
 
 RDEPEND="
-	virtual/libgudev:=[${MULTILIB_USEDEP}]
 	virtual/libudev:=[${MULTILIB_USEDEP}]
 	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
 "
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
new file mode 100644
index 000000000000..62e7a21851ea
--- /dev/null
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -0,0 +1,47 @@
+# 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 multilib-minimal python-any-r1
+
+DESCRIPTION="Mock hardware devices for creating unit tests"
+HOMEPAGE="https://github.com/martinpitt/umockdev/"
+SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection static-libs test"
+
+RDEPEND="
+	virtual/libudev:=[${MULTILIB_USEDEP}]
+	>=dev-libs/glib-2.32:2[${MULTILIB_USEDEP}]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+"
+DEPEND="${RDEPEND}
+	test? (
+		${PYTHON_DEPS}
+		virtual/libgudev:=[${MULTILIB_USEDEP}] )
+	app-arch/xz-utils
+	>=dev-util/gtk-doc-am-1.14
+	virtual/pkgconfig[${MULTILIB_USEDEP}]
+"
+
+# Tests seem to hang forever
+# RESTRICT="test"
+
+multilib_src_configure() {
+	local ECONF_SOURCE="${S}"
+	econf \
+		--disable-gtk-doc \
+		$(multilib_native_use_enable introspection) \
+		$(use_enable static-libs static) \
+		VALAC="$(type -P true)"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-util/uncrustify/Manifest b/dev-util/uncrustify/Manifest
index f23a7dc3004b..d52643cf1658 100644
--- a/dev-util/uncrustify/Manifest
+++ b/dev-util/uncrustify/Manifest
@@ -1,6 +1,8 @@
 DIST uncrustify-0.66.1.tar.gz 1208142 BLAKE2B d642eb6c8e2a147aa17bd25f4ca0ee7e9471fa4f7d288c5e06e4814d0103032989e83349377d9d9a19371047fb82ad4d6e1aeec90bea3a068e8884ec4a698e0c SHA512 edfde1d46bded9febd47b77cbff86028e1d21c41fee6a46a8b43f0928bf937259be2f88fe4606f406f414601bb757e27eda373ca738606d1bb74b6cd27335f47
 DIST uncrustify-0.67.tar.gz 1514735 BLAKE2B 15bce3c596bd09393aa5bfd4780d2ca5ebfddf3a880765b74beffdfd6b1c30e9a3296dcf3e90568741ce79d933174514a091566c1e8c182f5d4ae31a5bba955a SHA512 5f9677adba7a211c0b8797bad9debb6fa52658d6775048e86a9b928d8e84ee334497c1455a0bb3b19084a32e0fbad79a291cf7ca50fe817131dd28feb85d65ce
+DIST uncrustify-0.68.1.tar.gz 1566201 BLAKE2B ca7423088a2059d522d915e23bf1cdecc70d0adf64b9e7af53bfb4185252e4938105696623ba53b7f8be817e9e5ebadabf63417256e6f2b484dbebce868392be SHA512 03df7d2c3130f44021bc86599eae3acbd8dc206f647b476f63b0fe6add207c105c15f9481d6efa6b624d55bfbaeea050d636eabafb30a71a4de9ec8db6fe92dd
 EBUILD uncrustify-0.66.1.ebuild 775 BLAKE2B 64727ab17bc2c317acd512299a09308d97a253ee1bb6ce00f00e9857d3425a830b5087389dd4dbb1cab4f317ceb8c7993668f21ebaa685fe81ceea436ee6f149 SHA512 04ea97f08d9f2ecdc5ab773e2f0905f59915645786916743bb0b2a53c0b8ef384e75d309a79a3b0501a76e11a2dd15e97bb8cf0221fccaa98ffc477ae828e3ed
 EBUILD uncrustify-0.67.ebuild 779 BLAKE2B 0969e712647d3da3402b3c0abc2378364e45df3976ab50d43fbd38dd48f512c2f7975bee2dddd78f522a2d547e992d9eae7f07037df74f24c767139ade22f5dd SHA512 a1b82a6e4ae9d03fbea15e24ba22716811671eb20d4595d1e3dee690c33c4deaaa57c62aa92e0da51d7c37dca11e936ece6b53b1dafaf76b7551804f67cb4a6d
+EBUILD uncrustify-0.68.1.ebuild 776 BLAKE2B 74f518b740f7cb2ca6571323dbd3772e23b35840e30ff54b5e4381a063210200f5114b536276066a51a8152ecd2652c9df4e649f994ff59e9ba3788cf5d1ad11 SHA512 7cc0cb54af6cdef08c1c84ed4b2bc9f0b77adf012a023781c54d5deed46ebdc8eaa8bf82dcdb9b615d6b78e104b6a42d0811c8c970bff6f8a7ef5c9db21cae57
 EBUILD uncrustify-9999.ebuild 768 BLAKE2B e165cd2ee7f56a3244cd9b315d03203a549e5c33215e5d05c4a3fffdc4ca7eeb3146f36521cb82605dff7c131b51947536172b20541b85a6ca396182b534ed36 SHA512 ddd9587992e64a9872591669e20301ae9955a533dc6dabb7e35ba3764edacf39155221f48107b30c852e863cb4c1e9a049f3efde5742233d4a81415f3d6e87e9
 MISC metadata.xml 499 BLAKE2B 9418af314e83877ee50d76d87b3fbe9223ed7ef21d53ab85d5a916a46bb631296ca2babb8b470049003e1b6889185df52bdb62c9fd1f2f371d6902885dc4f399 SHA512 e8a379440acebe626dc28ecd4de5e76e1a684e67441bcce6720eb4ea834102c4d020d91a5950ffd24fc297ccd5ea8386850b0bfe0771352539936345d8b1f3cb
diff --git a/dev-util/uncrustify/uncrustify-0.68.1.ebuild b/dev-util/uncrustify/uncrustify-0.68.1.ebuild
new file mode 100644
index 000000000000..61beeae246e6
--- /dev/null
+++ b/dev-util/uncrustify/uncrustify-0.68.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ $PV == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI=""
+	scm_eclass=git-r3
+else
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+	SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
+	S=${WORKDIR}/${PN}-${P}
+fi
+
+inherit cmake-utils ${scm_eclass}
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="C/C++/C#/D/Java/Pawn code indenter and beautifier"
+HOMEPAGE="http://uncrustify.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+python_test() {
+	cd tests
+	${EPYTHON} run_tests.py || die "tests failed"
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 71bd8a40edb2..43e4b8e1fb1b 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,7 +1,7 @@
 AUX vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch 1337 BLAKE2B e649394daae60a399b2659f666ecb42aa2e6aa65b9eda372d052c6d27915a7e51b0d81d7bf1916dbab442a7ba7cd585a5fd828600cd466039f9c4a7df30d7dd8 SHA512 89c869de7a3ec1c9fe98095e67879c15f5d45337393f680812d8e55d26a970e04baa584b1dc18a5ff9b50f2d9780a7f76607f153d20cf1d5c4085035731a33e7
-DIST vulkan-headers-1.1.77.0.tar.gz 459383 BLAKE2B 4c08cb5264d2cae036e7a5c9260915186ba237067a003f69300ef550f1d944123223dce3c1084cf2e2a44f571b957928771e4d907e5714415841cda60dd5387d SHA512 097d6d532215751715c9ce0d97f4e7793318c5e37633754cda2f451201ef34121e14e99ecbf8d3281a417d1ece11f1065852ac5409d7b16a1370e27f065c3a78
 DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
-EBUILD vulkan-headers-1.1.77.0-r1.ebuild 798 BLAKE2B f9e8dd53cea3c090bd4fec3db52a74ef465890b67faec0c6cb949ca944a2a5a4c9551dbea3f9b5ddeda5c3047eef3a294c20e9c7150d0d63055f87f8388889f5 SHA512 8be8f391a31ce52ee5eb780972da4cec319e46c01b98ef5cc7e36d500945225c45cc433752f98e5289d0ee1809b0437ff40fbc9a80d25b372243a610a9c330be
+DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
+EBUILD vulkan-headers-1.1.92.0.ebuild 720 BLAKE2B 83d2f9bdd309902116ea9a09d4584edf35a561fc3340071686ec972132c2cebf4ea332a817b4271d55513c60190f28b5d3bd213ca63c6f3c7e1229e003ad53ae SHA512 4170a3dc578d6ea744c3d053a5289b8484e4af6ef7afe10b7ef1c6459894fd233f42d20c674dd575d047228a4928d07d8422b5b41edb81c8176671f7b18a3a0a
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
index b41d734e0bbf..7c9c247d495e 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0-r1.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.92.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
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
+	EGIT_COMMIT="114c3546e195819bd53a34b39f5194b2989a5b12"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
@@ -23,5 +23,3 @@ SLOT="0"
 
 # Old packaging will cause file collisions
 RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
-
-PATCHES=( "${FILESDIR}/${PN}"-1.1.77.0-r1-Remove-loader-layer-dep.patch )
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 6f569adf8a88..39f866d061f6 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,6 +1,6 @@
-DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725
 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
-EBUILD vulkan-tools-1.1.77.0-r2.ebuild 2668 BLAKE2B d3f677d402b723cdc7ccdda4d33500656a68c1fa83b8bef6a17e8ea2ebc78bc9aaca066beb3f03b756c365a9e791ea723753bd78702b34a6cb02f2792e6f3c46 SHA512 0ad2d536ce9d84a54d52722c8a82dac94d237c0df576e8aed3e2b7910bc226084c421b054806829436c0a6b5d4b4349a112c4e49390b9293be048661483d5b93
-EBUILD vulkan-tools-1.1.82.0.ebuild 2668 BLAKE2B 92594bfe9057db8ff7c4fb1bcccaefc555b7ac4e056ffbfe52f135793b83d9629887374beb97fe59060259dfe552411198e450c782cf9b8e618406ec416ef79c SHA512 551425dfa25ff5d82364be1add58d45bd5d2aeeca43f69834aaf007205beae9755d93886ef96b5d5be55828c69cd43059792d1e04f22b851737d43a1cf4b2533
-EBUILD vulkan-tools-9999.ebuild 2363 BLAKE2B 723e6012a6634cfbb521b99f5fa7813062e4d7310e7873a8b5c95114561cafe2824f6f51f9277f8de73b8083d870bdb9514e2c238de42e8175dfccd838603c28 SHA512 9718904d1fda46a920c629f79a7642e137b4a94a3c15181bdd89175bf5d07c2415fb28f27426d1004afb020d5bf6d21b6a2330935abe09411f95487999215d35
+DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
+EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286
+EBUILD vulkan-tools-1.1.92.0.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d
+EBUILD vulkan-tools-9999.ebuild 2268 BLAKE2B e02628dea395006cb945bf5de4980709a2dc872f9364c4c6f12c54a75b54c897b4445a5e09b4e81405ae09e0094990abe7d699989e30ed5860ea718016b42f8c SHA512 725fa16cd4e1ecc2bcece9e412df78a4e969dc3fb7802aba6c6515ff65f01c7556178601dcfeeb0b24f0161de81b93f231393f585579a4ebf3fbf8b189b9887d
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
index 338431363f27..1c16cbb616eb 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.82.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
@@ -24,8 +24,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+cube +vulkaninfo X wayland"
 
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
 	dev-util/vulkan-headers
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
index 76c30998e49b..d3d1c9c446ff 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r2.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.92.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
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
+	EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -24,8 +24,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+cube +vulkaninfo X wayland"
 
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
 	dev-util/vulkan-headers
@@ -49,8 +47,8 @@ pkg_setup() {
 
 	if use cube; then
 		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/vulkancube
-			/usr/bin/vulkancubecpp
+			/usr/bin/vkcube
+			/usr/bin/vkcubepp
 		)
 	fi
 
@@ -93,14 +91,4 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	cmake-utils_src_install
-
-	if use cube; then
-		mv "${ED%/}"/usr/bin/cube "${ED%/}"/usr/bin/vulkancube || die
-		mv "${ED%/}"/usr/bin/cubepp "${ED%/}"/usr/bin/vulkancubecpp || die
-	fi
-}
-
-pkg_postinst() {
-	einfo "The cube and cubepp demos have been renamed to"
-	einfo "vulkancube and vulkancubecpp to prevent collisions"
 }
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index c30ba2f16111..d3d1c9c446ff 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="2cfddd146d666efe0ed06ef1d2bc5565821df144"
+	EGIT_COMMIT="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -24,8 +24,6 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="+cube +vulkaninfo X wayland"
 
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
 DEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
 	dev-util/vulkan-headers
diff --git a/dev-util/w32api/Manifest b/dev-util/w32api/Manifest
index 7740d6eb6b29..feaa1d83a0af 100644
--- a/dev-util/w32api/Manifest
+++ b/dev-util/w32api/Manifest
@@ -1,5 +1,5 @@
 DIST w32api-3.17-2-mingw32-src.tar.lzma 965844 BLAKE2B 9dec25676f57dd7886f83871fee2186e3f9750eba620492aa43e7eeb58e402506c7d30bbd71c26c59c0d2c97b2aff25ffade00df8a3cc7b8835b803da8172045 SHA512 4fc8f319ab895366fb3757713e2724f8f4c90593687f1ccfdbfa6a52881ddc430167326e782117ae937c7e456e029132b971c3a041889bcfb876a84741475a1f
 DIST w32api-4.0.3-1-mingw32-src.tar.lzma 1341804 BLAKE2B cd7811b1291775926b15128b5c5f126ab09b9f7e824d7cf24210473c09563cfc06b3aaea40459502869e4df45d2b5af311b8d14b2bdaf793be483a5c80571fe7 SHA512 9295b7e803b1551dfefbf527e98fa315d60c70f6b63b4565942f7bc3d6032483d5ec4f76265b376fc6776c5ecfd1ad47fd912764c390b0b6917b1ad382250977
-EBUILD w32api-3.17.2.ebuild 1498 BLAKE2B 66f97f967519205d73a8d4a4d14e2b7f8fee1d3c26486fc64e01f9dd8435e968704c613912a126b97a7de1692e41d7d8e067d7c760c5a1d0bf2bcfcf896821dd SHA512 7a6ecfd504b3c82ce7eb7231848680aa00c94c2faea38eb5ab77c039f7716b46aa61a143a876555c57afd80fdd08069a8ffb95511ac750ddee0309aa8034b613
-EBUILD w32api-4.0.3.1.ebuild 1598 BLAKE2B a7039078b084d49eb8438bcd3f3f4df18ded5e0ef8ae10cb976ad9e20b5a50b36bf2303d4d0e0b28fb2ff89fcb7d6b34a1e330aee81e5b451b451371dcd0a212 SHA512 02c252e36293780ff567cfc59dffb93f8ef914bd2eb396e4f40d7880d515ee77a2b5a007baf6e2167715c86c3482f6ba656e2f81bb6b5acc0745335c27e0e622
+EBUILD w32api-3.17.2.ebuild 1448 BLAKE2B c931c7ece14bc00cba7880d4544e79e7d57070b898e10b304c73ad2145feba72c9b10030e57d1e857db296f2ad64625341e5bc7013acd6b929b17599f87b52d8 SHA512 414133b6cbabb6765abd2b561af85cf2f8113a90679555a9f1ff31fa83b1fcff43763337e071914106f4400470f119b191a0ed09ca439b26e4c298fe4a740676
+EBUILD w32api-4.0.3.1.ebuild 1548 BLAKE2B 1a10faa217b01c79c95674cf99ce2cde5c73e5e3f72483c2c68a0f69e415df993d1d2392d44d8026b30f2fe151e22dd4a3f77f3d6ec013cc1256ee7df8590b74 SHA512 c2766ac499194dd2c1c1ece9f8c8a238b6425a340bad289ff8c12cf7d4c032960f14a62c742d9c0293857c6d4ea09f4575dbf028037af16fc1564b2593bd2c83
 MISC metadata.xml 336 BLAKE2B f5b695f0c70efe0aef9843aab32d906407185d04d70d0ca5dc63872ec3f30d08454f4c706ade2f5d6191ac39cb0c3252349f03a50cf9c1726562361634e7d928 SHA512 c15c4f7fe2796147558f99a89942b216159b291e18dfb02358f0985fef55e7ce166dbd0831ef24938a5bc76377634036932e0ce1526d01c2b07be35cac17cbf9
diff --git a/dev-util/w32api/w32api-3.17.2.ebuild b/dev-util/w32api/w32api-3.17.2.ebuild
index 02fce8e4df78..61232887fb74 100644
--- a/dev-util/w32api/w32api-3.17.2.ebuild
+++ b/dev-util/w32api/w32api-3.17.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=0
@@ -56,7 +56,6 @@ src_install() {
 		doins -r include/* || die
 	else
 		emake install DESTDIR="${D}" || die
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 		dodoc CONTRIBUTIONS ChangeLog README.w32api TODO
 
 		# Make sure diff cross-compilers don't collide #414075
diff --git a/dev-util/w32api/w32api-4.0.3.1.ebuild b/dev-util/w32api/w32api-4.0.3.1.ebuild
index 26a1f1cb5bf2..b3d1c3c93af2 100644
--- a/dev-util/w32api/w32api-4.0.3.1.ebuild
+++ b/dev-util/w32api/w32api-4.0.3.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="4"
@@ -59,7 +59,6 @@ src_install() {
 		doins -r include/*
 	else
 		emake -j1 install DESTDIR="${D}"
-		env -uRESTRICT CHOST=${CTARGET} prepallstrip
 
 		# Make sure diff cross-compilers don't collide #414075
 		mv "${D}"/usr/share/doc/{${PF},${CTARGET}-${PF}} || die
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
index 22a6c20deb96..08e4b805b08a 100644
--- a/dev-util/waf/Manifest
+++ b/dev-util/waf/Manifest
@@ -2,4 +2,4 @@ DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a230
 DIST waf-1.9.8.tar.bz2 620795 BLAKE2B d7c3ad5cf0c1b16aef84b311d7fe2d26e7e6fe0438373e19387cade0356469100063059e6900398c7bb4993d9440f79933ba59d1bdd1b71e41364d1659b18d55 SHA512 a86d29d32257ee5b82db28f20ef3056a995c4a47404ee47f216899c76332c6586bde83397db907b51c8d3d38efaa3e2f4befbf8f27d17d1f58e6b0808f070fdc
 EBUILD waf-1.9.14.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
 EBUILD waf-1.9.8.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
-MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/waf/metadata.xml b/dev-util/waf/metadata.xml
index a535b8852829..6f49eba8f496 100644
--- a/dev-util/waf/metadata.xml
+++ b/dev-util/waf/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>xmw@gentoo.org</email>
-<name>Michael Weber</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
author	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-12-24 14:11:38 +0000
commit	de49812990871e1705b64051c35161d5e6400269 (patch)
tree	5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-util
parent	536c3711867ec947c1738f2c4b96f22e4863322d (diff)