gentoo resync : 18.11.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2018-11-18 09:38:27 +0000
commit: 536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree: 697733f5cb713908dcf378e13fd15a798a906a91 /dev-util
parent: f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)
84 files changed, 1400 insertions, 578 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index b2e0ed2702a6..bbcd2be1fa90 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index e92b13b19da7..0b59acb6ae49 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,5 +1,7 @@
 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
 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
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.19.0.ebuild b/dev-util/bazel/bazel-0.19.0.ebuild
new file mode 100644
index 000000000000..dda30d679453
--- /dev/null
+++ b/dev-util/bazel/bazel-0.19.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="http://bazel.io/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# 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
+	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/catfish/Manifest b/dev-util/catfish/Manifest
index 528c34016bbf..0d4b3037a7d0 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,5 +1,5 @@
 DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
 DIST catfish-1.4.6.tar.bz2 150331 BLAKE2B fb59dfce5770ddfb7740f1f7b2deb22928f3bd49a1ac323827143fc6c41586adbe45521daae3b26bf748f14c859051bae43ea4f94a0be37c84b30f933f7a2bca SHA512 1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7
 EBUILD catfish-1.2.2.ebuild 1505 BLAKE2B faa976f3a9b71d1e3c61e3ff34a6aa994572d0f5e948e0d8b12cd09a6bc078d9e4d69d3bebfca9acbb64fd7e9a85ec0f9389fa407b35966a63663f3240cc73d4 SHA512 ad5ae1955a0fd0607bc42c40d05dd0fe7442a57ccdee60e150016d9e6fea7c7b8dcebda300dbca14db701a0589feac2ff8a4a8917c054eafd4a76d113daddfe6
-EBUILD catfish-1.4.6.ebuild 956 BLAKE2B 0cb8364bda30e1ba713fa6843c2b9e7b9b414ca54c27c54f5f8e1915a62b28f0b6aadc600664fc5191cebf04b8141522fa6d9cdf1ddb48f1766d540ac62d8df3 SHA512 fbd0059498c09846fc21ac2ac651535f984f90c097a2f180c0b437ef03984e303d4effccfc570eb0a89a4d9c1dbfa912032bd25cb2d10336556448d35cef0c64
+EBUILD catfish-1.4.6.ebuild 951 BLAKE2B 604b7dbefd52af2d03b84c3470f3d87544132a7ac2381b88d56e8240eebc565d5b45f10076976ec011890fb160454336d7e754555536caa0fe5f1cb891c86d6a SHA512 fa0c10c2b546fa033463782e125b47de71765cfb0ea34dea8c0a6469793ba68bc411c5d50255c81cf089aff8080fb0db313dbfd4dc99c4cb834175cfa9d4dfff
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.6.ebuild b/dev-util/catfish/catfish-1.4.6.ebuild
index 62bc7cee54e3..8d005bda8b69 100644
--- a/dev-util/catfish/catfish-1.4.6.ebuild
+++ b/dev-util/catfish/catfish-1.4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 5b06fb7ff54e..f8741b0183ed 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,9 +1,6 @@
-AUX checkbashisms-2.15.9-command-vV.patch 1269 BLAKE2B 78225d721d72871dd5512f2adc3f2d6e12c6aef55c5b712f925ecd4555eb5ebc26b865f17ee02181f1b01aa22b4cee8ff66afbfbbc69e1b337c7a6bacf129dcc SHA512 7b7966b2c5fc672b0a83f7949076af536a56e910853374b2ee876ad5032f847bd87c7d10c7836d9699e2a4412709b02f5769685acd392e94704549de639ea995
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.18.2.tar.xz 729456 BLAKE2B f620edf67f67e84697677117294b9d8bc90db30fe1e228d5043179d1ae1e65f10f7299870bef3ff920312fd7103abd6c5f0296055776318640a3a9535ec006c7 SHA512 a68e9eccb5662b1ae0860b3f6cdc812a3105df83cd36f4b98b339ba1637a165f45b06acfb9dbadcf1055b65a4d5aa0780c1b921ed422ed1f0334735adadf4b6a
-DIST devscripts_2.18.4.tar.xz 740128 BLAKE2B c43867b79904ebb72fbe0f65e0c5a49100dfe435f867afc3c3f40b33dabba25a5cb07cd9e27780b0198da4800a17be3f2de6ea8aad504b281b79dd1df59baaed SHA512 91a0ab2fa1f8d884d79f62d5cc8170c885c24af51de321a41f2111fe0fbc0fd8394e5fb3825eeee14d8090968be35761080a40cb55339b09522219d974f63897
 DIST devscripts_2.18.6.tar.xz 756772 BLAKE2B 70bdc87336558a6953fc91408fdb7e639f6fc60f8e698548d34aabd6384c2a1d67b871064f3679842c7629b2f84a3abe8612dfe3924552488a0b3e54ec0ca10c SHA512 6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014
-EBUILD checkbashisms-2.18.2.ebuild 893 BLAKE2B b3c7bc34946290f64a7d4c42ab24f93cb6a3c991baedf308dcee394957f546b8e3ab4d6593c60ce54eb6d66d9fabe499b4a50e772bf8dfd675a04fccc637bcd2 SHA512 22d4192fc8910faab251ac0127eeff9be1a28d42ed849c0a8dc4963d0def30a7b398691016d74f853fdcb785885e4c7beb3c24e8f22441b45394163c405bb1ca
-EBUILD checkbashisms-2.18.4.ebuild 895 BLAKE2B 52481361dbca66b0c706e80bc264dd3a8a15f461819df7ccb188c46d17e3aeb0a5e2de6833912e846ac0e21eae3e857486def02a07b95bf28c0d93822fc11c43 SHA512 f0a1ce1e79e0a480c1d901863a834b177cdc48b1457512f7904b0ec8ca1313767971f75d1f8a466e08f1d22f38a47656a64c372956b430c5131a67d473e6f7d2
-EBUILD checkbashisms-2.18.6.ebuild 892 BLAKE2B 2f56507c4802ab52e4567abb7c99ffab7170d7ffbcea6668bd875daf6311c5eae18d1b5be5a4fad969f82cba515c0ad3f1a2cb81407fddba7efdf39881c1ef36 SHA512 139b93b4a2e705f0a0ed76cd1a340c29419fb54f41a0e74b5a1604f0254b5088b6fe019b19642ece7e3af13ed6aa2b4baa805d91a223b0ecac9d571901b5548f
+DIST devscripts_2.18.9.tar.xz 767964 BLAKE2B bd955545753b52c98b727b13469e34a608a5fc7f54d8e641ed061d88e0a19a0cae22e89d901714a30d186d2725c68de15a25a551409f9cb68b78fb149a7cd104 SHA512 a17d7a25c72a7c558b1b4f536dd5ac76b3e96904ed732cf9a8fd02b5d78765833c6a3aedc5d27e9f399d445da7a06be76bde581c2b63f5c54227d2525ae1cd29
+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.2.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
deleted file mode 100644
index bc30ea8cdf00..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.18.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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.15.9-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/checkbashisms/checkbashisms-2.18.6.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
index 16cbdc16f649..17da65326d1e 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 # Requires python packages to check tools we don't need anyway
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.4.ebuild b/dev-util/checkbashisms/checkbashisms-2.18.9.ebuild
index be58ae776f20..16cbdc16f649 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.4.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.18.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
@@ -27,7 +27,7 @@ S="${WORKDIR}/${MY_P}/scripts"
 src_prepare() {
 	default
 
-	eapply -p2 "${FILESDIR}"/${PN}-2.15.9-command-vV.patch
+	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
 
 	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
 }
diff --git a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch b/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
deleted file mode 100644
index 662ccdfd2bea..000000000000
--- a/dev-util/checkbashisms/files/checkbashisms-2.15.9-command-vV.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-https://bugs.debian.org/733511
-
-From 50dac50bdfa7ab482bf2277cc1a620a62629c80c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 10 Nov 2015 19:39:19 -0500
-Subject: [PATCH] checkbashisms: allow `command` to use -v/-V
-
-POSIX permits the -v/-V options:
-http://pubs.opengroup.org/onlinepubs/9699919799/utilities/command.html
-command [-p][-v|-V] command_name
----
- scripts/checkbashisms.pl | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
-index 045328c..fe64a6b 100755
---- a/scripts/checkbashisms.pl
-+++ b/scripts/checkbashisms.pl
-@@ -644,7 +644,7 @@ sub init_hashes {
- 	qr';;?&' =>  q<;;& and ;& special case operators>,
- 	$LEADIN . qr'jobs\s' =>  q<jobs>,
- #	$LEADIN . qr'jobs\s+-[^lp]\s' =>  q<'jobs' with option other than -l or -p>,
--	$LEADIN . qr'command\s+-[^p]\s' =>  q<'command' with option other than -p>,
-+	$LEADIN . qr'command\s+-[^pvV]\s' =>  q<'command' with option other than -p/-v/-V>,
- 	$LEADIN . qr'setvar\s' =>  q<setvar 'foo' 'bar' should be eval 'foo="'"$bar"'"'>,
- 	$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*(?:ERR|DEBUG|RETURN)' => q<trap with ERR|DEBUG|RETURN>,
- 	$LEADIN . qr'(?:exit|return)\s+-\d' => q<exit|return with negative status code>,
--- 
-2.6.2
-
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index fb9c50eb33f9..824b4218ff65 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,13 +18,13 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f68592
 DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692
 DIST cmake-3.12.2.tar.gz 8388114 BLAKE2B 2bb28991527287da62d5416dfde3a9ff072534d52b124d1f73a555d7defb16f05300c78e4c258ba2d09d11cef285fe799c3d132cd1bd4e573aea67cb86beb2af SHA512 a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
-DIST cmake-3.13.0-rc2.tar.gz 8594563 BLAKE2B 848ce36f23df2482f56da470244759234e93788685a0115ad639bbd8dd7ec3c2c59e7725c479583397df707e631e4a86dafcd34e5461c8bc40965f23ae101d59 SHA512 b5b5b7eafec3d65e5d05f974ab9dbed723c598685cb64265465679590ee888a80f161a7339f35140de7414e6327ed968047478c8d5bd00c049cd66841ca8385e
+DIST cmake-3.13.0-rc3.tar.gz 8614538 BLAKE2B 5c1c8424f1328beba862dc642ab5db4cbbd63122c97cfd19089520610e890326537f5bc4869e61e2013571583556d0042ae15e6df84cd514e534b3ff9c065665 SHA512 8285d46545b05e0fe65d3d713ce42b2e771fdb17dbcdefabf270c272bc7a52e6a7fe437e06a28ca406910d3fdb190778558b1298622fd2ddcb87cfb8eb20f496
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6227 BLAKE2B 1ff1b9195e39fda2b03e5dc5d2148a53b959469b19fd7d423d5502e41c72a6791dba00302dab6d241fca639bbe80711d3c0ad77eaea2ff5aea7b621cb72d77e6 SHA512 7896c37bceb3300d554ec654b4500abc2c8d4a08af8b11bc488351e39652aa6b54d02e563f4de01c6d2d73f59b3545810221f3e35ab16883d50574b1bbff0af8
 EBUILD cmake-3.12.1.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
 EBUILD cmake-3.12.2.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
-EBUILD cmake-3.13.0_rc2.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
+EBUILD cmake-3.13.0_rc3.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.13.0_rc2.ebuild b/dev-util/cmake/cmake-3.13.0_rc3.ebuild
index 73aee46de553..73aee46de553 100644
--- a/dev-util/cmake/cmake-3.13.0_rc2.ebuild
+++ b/dev-util/cmake/cmake-3.13.0_rc3.ebuild
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index e2778de821af..564aed0c7ae4 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,3 +1,5 @@
 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
 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
new file mode 100644
index 000000000000..6ae39d5ba5d4
--- /dev/null
+++ b/dev-util/cmocka/cmocka-1.1.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+DESCRIPTION="A unit testing framework for C"
+HOMEPAGE="https://cmocka.org/"
+SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="doc static-libs test"
+
+DEPEND="
+	doc? ( app-doc/doxygen[latex] )
+"
+RDEPEND=""
+
+DOCS=( AUTHORS ChangeLog README.md )
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DWITH_STATIC_LIB=$(usex static-libs)
+		-DUNIT_TESTING=$(usex test)
+		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
+			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
+	)
+
+	cmake-utils_src_configure
+}
+
+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
+	fi
+
+	cmake-utils_src_install
+}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 83b3c2ceeacd..253cecef8ec3 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,9 @@
 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_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-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.1.ebuild
new file mode 100644
index 000000000000..9606374c12a7
--- /dev/null
+++ b/dev-util/debhelper/debhelper-11.5.1.ebuild
@@ -0,0 +1,73 @@
+# 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/difffilter/Manifest b/dev-util/difffilter/Manifest
index bcc0baf0b64b..b01d34f12b2f 100644
--- a/dev-util/difffilter/Manifest
+++ b/dev-util/difffilter/Manifest
@@ -1,3 +1,5 @@
+AUX difffilter-0.3.3.man1 7592 BLAKE2B 9df9c1d7c59f129d714820c3b102adec0dfef3d17c944aaf19bede55d1746a4112d75da118bd3b1b4e5c2b639e482dc0e76c39efe14c9a7df997d7160d77f457 SHA512 6fb0ee29cc6700a9cde54c46b526d8d944a5cacefb57b0f6f579055033b007250f476a3cb86fbe3ba0b500418cf6601dd4978d03dc898ffbf897e070e91dc0c9
 DIST difffilter-0.3.3.tar.bz2 291226 BLAKE2B 95a43e025668318c1d8e216ae4259e874983f899da8bff402b2fa60c7d8d1f7cb203854b76dfe12b2577f6e2ce8f86cedb93fe50b596c1782a436346069b5eb0 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8
+EBUILD difffilter-0.3.3-r1.ebuild 547 BLAKE2B ee771f3e7f090753ea4fec02153d79753d2ed5450050d366750136684133bc64b708b0d2d9fdc11eaa60eafeb6a8264ae5bf3b6be14f47d0f3542710d5c899ad SHA512 e3782c5c57b537d55a40cf3896e3998e0d5a824b78f54dcd1db073222815de549ac5a752e25aeff9d5adeb05ad0e20249d04737c38b863cb3ab48e47eabbbe96
 EBUILD difffilter-0.3.3.ebuild 627 BLAKE2B d5e374dfb6c47aaf1db7b0864a2b679272f1fd4757493642ca28af48a90a6f819ca3344bb2a89466ecc039e53653eeafc42a2e3dd9fc0d10c5ee394e521647f8 SHA512 f789e1b968d0d1f79e71ce8fad490e64104ce3f1cc5f67f3e841d78a426982aa2ec7bdc88b316f6701b25663370feb8221c53ad7c2473f0cf6ebe6783e9292b2
-MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
+MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..9a0c0387ec78
--- /dev/null
+++ b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
+HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
+SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+
+RDEPEND="
+	>=dev-libs/liblist-2.3.1
+	dev-libs/libstrl
+	dev-libs/tre
+"
+DEPEND="
+	${RDEPEND}
+"
+
+src_install() {
+	default
+	newman "${FILESDIR}"/${PN}-0.3.3.man1 ${PN}.1
+}
diff --git a/dev-util/difffilter/files/difffilter-0.3.3.man1 b/dev-util/difffilter/files/difffilter-0.3.3.man1
new file mode 100644
index 000000000000..ad7a6331827b
--- /dev/null
+++ b/dev-util/difffilter/files/difffilter-0.3.3.man1
@@ -0,0 +1,194 @@
+.\" Text automatically generated by txt2man
+.TH difffilter 1 "04 November 2018" "difffilter 0.3.3" ""
+.SH NAME
+\fBdifffilter \fP- Filter diffs out of multi-file patches
+.SH SYNOPSIS
+.nf
+.fam C
+\fBdifffilter\fP [\fB-U\fP <lines>] [\fB-hv\fP] [--] [\fB-e\fP <regex>] [\fB-a\fP] [\fB-e\fP <regex>] [\fB-x\fP] [\fB-e\fP <regex>] \.\.\.
+.fam T
+.fi
+.fam T
+.fi
+.SH DESCRIPTION
+\fBdifffilter\fP reads in a series of unified-diffs and filters out any file
+which matches one of the passed extended regular expressions. The remaining
+diffs are written to standard out. \fBdifffilter\fP is a traditional unix filter,
+reading input from standard input and writing the results to standard
+output.
+.PP
+If \fBdifffilter\fP encounters a parsing or input reading error, it will exit
+after writing an error message to standard output. In such a case,
+\fBdifffilter\fP's return value is non-zero. As the parser is not guaranteed to
+be perfect and badly-formatted input may be accepted by commands like
+\fBpatch\fP(1), it is advised that scripts use error checking on \fBdifffilter\fP.
+.SH OPTIONS
+.TP
+.B
+\fB-h\fP
+Displays some amount of helpful or unhelpful information which is intended
+to be helpful. \fBdifffilter\fP will exit without performing any filtering.
+.TP
+.B
+\fB-v\fP
+Displays \fBdifffilter\fP's version information.
+.TP
+.B
+\fB-e\fP BRE
+A POSIX Basic Regular Expression which a filename in the input
+diff may be matched against. The default action for a matched regex
+is to exclude that portion of the diff from the output.
+.TP
+.B
+\fB-E\fP ERE
+Like \fB-e\fP but uses a POSIX Extended Regular Expression.
+.TP
+.B
+\fB-a\fP
+Any following \fB-e\fP options will cause files which match the regex to
+be included in the output diff. This allows one to preserve selected files
+which later patterns will exclude. See EXAMPLE for an application.
+.TP
+.B
+\fB-x\fP
+Any following \fB-e\fP options will cause files matching the regex to be excluded
+from the output diff. This is the default state of difffilter. I.e.,
+$ \fBdifffilter\fP \fB-e\fP 'configure$'
+has the same functionality of
+$ \fBdifffilter\fP \fB-x\fP \fB-e\fP 'configure$' .
+.TP
+.B
+\fB-b\fP
+Attempt to make the patch appear as if it were generated using \fBdiff\fP(1)'s \fB-b\fP
+option. This is similar to \fB-w\fP but only removes changes involving changes
+in the amount of whitespace. This means that completely removing a block of
+whitespace or inserting whitespace between two non-whitespace characters
+will still be seen as a change. See \fBdiff\fP(1) for more details.
+.TP
+.B
+\fB-k\fP BRE
+A POSIX Basic Regular Expression which will be matched against
+the name of a CVS keyword whose effect is to be nullified. For example, if
+the CVS keyword looks like $Pizza: I'm hungry$, a regex of `hungry' would
+not match but a regex of `Pi.*a$' would.
+.TP
+.B
+\fB-K\fP ERE
+Like \fB-k\fP but uses a POSIX Extended Regular Expression.
+.TP
+.B
+\fB-R\fP
+Reverse the patch. This is intended to recover from accidents when the
+sources used to generate a diff are not available but the reverse diff
+is.
+.TP
+.B
+\fB-U\fP lines
+Reduce the number of lines of context of the diff to the specified
+number of lines. Specify \fB-1\fP or a high number to avoid reducing the number
+of lines of context. This is set to \fB-1\fP by default. You should set it to 3 in
+most cases so that the effects of \fB-k\fP, \fB-b\fP, \fB-w\fP, and other flags can be more useful.
+.TP
+.B
+\fB-w\fP
+Attempt to make the patch as if it had been created by \fBdiff\fP(1) with the
+\fB-w\fP option. This removes changes from the input diff for which only whitespace
+was added or removed.
+.SH EXAMPLES
+This command should be adequate to filter out many auto-generated
+files that don't belong in a Version Control System. This will
+filter out files like config.log, config.status, Makefile, and
+Makefile.in. It preserves Makefile.am and sourcecode files. Not that
+\fB-E\fP is used instead of \fB-e\fP because the command utilizes Extended
+Regular Expressions.
+.PP
+.nf
+.fam C
+    $ difffilter -E '(^|/)config\.(log|status|guess|rpath|sub)$' -E '(^|/)(install-sh|configure|ac(include|local)\.m4|ltmain\.sh|lt[^/]*\.m4)$' -a -E '(^|/)Makefile\.am$' -x -E '(^|/)Makefile' < dirty.patch > clean.patch
+
+.fam T
+.fi
+If a dirty patch is submitted to a bugtracker with random whitespace
+changes which should be ignored, the patch may be feed through
+\fBdifffilter\fP with the \fB-b\fP or \fB-w\fP options. For most cases, \fB-b\fP is more
+reasonable -- and is definitely safer than \fB-w\fP. See the CVS keyword
+removal example for information on how \fB-U\fP might apply to this
+situation.
+.PP
+.nf
+.fam C
+    $ difffilter -w < bug-34567-dirty.patch > bug-34567-clean.patch
+
+.fam T
+.fi
+If you want to see only changes made to a particular file in a
+multifile patch, such as README.txt, you may use the \fB-a\fP and \fB-x\fP flags
+to effectively invert the normal filtering convention. Any files
+which match expressions following an \fB-a\fP will be accepted if that
+rule is processed. To revert \fBdifffilter\fP back to its normal mode of
+treating expressions as files to discard, use \fB-x\fP. We use an empty
+regular expression after the \fB-x\fP because the empty regular expression
+matches everything and we want to discard everything but
+README.txt. One can also easily modify this example to extract all
+changes to \.c$ or \.h$ files.
+.PP
+.nf
+.fam C
+    $ difffilter -a -e 'README\.txt$' -x -e '' < changes-bigpatch.patch > README.txt-changes.patch
+
+.fam T
+.fi
+To nullify diff lines which are caused by changes in CVS keywords'
+content, use the \fB-k\fP and \fB-K\fP options. For example, a diff might catch
+changes in an $Id: $ line, which is likely to happen when creating
+diffs from tarballs, where CVS control files are not available. If
+the $Id: $ line has change in the diff meaning that there are two
+versions of the $Id: $, the user is likely going to be applying the
+diff to the same file which would have a third value for the $Id: $
+line. Thus, applying such a patch would be troublesome (depending on
+the method of applying it). With \fB-k\fP and \fB-K\fP, we can get
+.PP
+.nf
+.fam C
+    $ difffilter -k Id < not-from-cvs.patch > not-from-cvs-fixed.patch
+
+    - /* $Id: binki /var/test/etc/rc.conf.RCS 1.1$ */
+    + /* $Id: mgorny /var/test/etc/rc.conf.RCS 2.1.5.3$ */
+
+.fam T
+.fi
+to be nullified. This means that we end up getting rid of the '+'
+and '-' lines and end up with a ' ' line:
+.PP
+.nf
+.fam C
+     /* $Id: binki /var/test/etc/rc.conf.RCS 1.1$ */
+
+.fam T
+.fi
+To most effectively avoid such problems, the change should be first
+nullified with \fB-k\fP or \fB-K\fP. Then the \fB-U\fP option should be used. The \fB-U\fP
+option is used to reduce the number of lines of context a diff may
+have. It would be customary to pass the value 3 to this option. If a
+certain block or a portion of the diff has a series of 3 or more
+null or noop lines, then \fBdifffilter\fP starts removing these. If a
+whole block (or chunk, as \fBpatch\fP(1) calls it) contains no changes,
+then \fBdifffilter\fP will completely drop that block from the diff. In
+many cases, this may completely remove the block, especially when
+(as is often the case) the CVS keyword being nullified is a line in
+the header comments of a file where actual edits occur infrequently.
+.PP
+.nf
+.fam C
+    $ difffilter -k Id -U 3 < not-from-cvs.patch > not-from-cvs-fixed.patch
+
+.fam T
+.fi
+.SH SEE ALSO
+\fBcolordiff\fP(1), \fBdiff\fP(1), \fBpatch\fP(1), \fBhg\fP(1)
+.SH BUGS
+There are no known bugs.
+.PP
+There is a bug tracker at http://ohnopub.net/bugzilla/ .
+.SH AUTHOR
+Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
index 097975e3adc2..fed47a353275 100644
--- a/dev-util/difffilter/metadata.xml
+++ b/dev-util/difffilter/metadata.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+<maintainer type='person'>
+<email>jer@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 7d7263114d75..b4946bb24617 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,5 +1,9 @@
 DIST drone-cli-0.7.0_p20170717.tar.gz 1148862 BLAKE2B a631b546917c542dc9395a2390a8f22c6f041314ece6cd185fbfd312a636040098c7f50f1ae07bedaba5ca1d718ad2a6741a24322ad0d9c291addf11b9b74035 SHA512 f901b9409354c9dc3bf21024f82a188e789c8ab05e8bca179cc77069baf024f40ce13995230f48d5c40e7485ab31bb3f22fae0ca68a8669295cdfb11dbb1b168
 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
 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
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-1.0.0.ebuild b/dev-util/drone-cli/drone-cli-1.0.0.ebuild
new file mode 100644
index 000000000000..76b00a393dc2
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.0.0.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/drone-cli/drone-cli-1.0.1.ebuild b/dev-util/drone-cli/drone-cli-1.0.1.ebuild
new file mode 100644
index 000000000000..76b00a393dc2
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.0.1.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/drone/Manifest b/dev-util/drone/Manifest
index 30b642748fbc..43a2d9ad0eca 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -8,6 +8,8 @@ DIST drone-0.7.3.tar.gz 4133041 BLAKE2B 819976f11e37c4f2484b00648191f64818ab254a
 DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
 DIST drone-0.8.6.tar.gz 4767466 BLAKE2B 708fbe2fb4e6a647e8fc370c39c71fdbdbd67abd28a18348985831c3bc8dee2880c64a2be01ce50c3dbe56d27ee89605ee2fef00e643a66c641a57f664867cf8 SHA512 2227bad9a0067e9c235c3a30677032b4b54488727e44c9caa6bd7dcd804338ed62d8f76879310499e7063d7e84d2b23a6b389f6a60a43f138ed2c83d8df07435
 DIST drone-0.8.7.tar.gz 4770079 BLAKE2B bc2a71c09fa7d1086899175bc7042e8bf57833088ec7d1edccf26385f4a6c16335d8ba56af471697c86d0e19a2ff838e69eaa9e082d64cb5b6029d7c84c6e425 SHA512 1451de48a9397b877a7ef668d15092ed1d0ee7c899bc025ff16fbbf9d78c2807d6989685a39bca03070f9b1188cd9ea23640dc2b7f2389d13228d178923dc7ed
+DIST drone-0.8.8.tar.gz 4766250 BLAKE2B 27f99b2f6889cb9ea89b87b9a435595d73180ae0897710f4345a1816875023af343dc6948327b0c327b5a7f37db07d55fca766c1374951b273a3f872497f2e53 SHA512 db85df0974737ce31f72243b2269fe7cce8d39a3e7bd7779841e398b85ccd97a512fa50cd9f60be36bd81eb7c081d282fccc4b35e2527ae65283ff56c27b111d
+DIST drone-0.8.9.tar.gz 4767398 BLAKE2B 7c32f01a692e1a29e8b2e602a804bea3997efe01257f2fe5aa39f8d7f321f42f714b909a470f2ec7ee6d69bfdc2f06f75cb990e98769502b68725adc43ebd579 SHA512 97b773356bb770a8ca060e4696ba0d288a7204d0cffd966d1124a71ec1110981ac7cdce9ce4df04b8ce33faa745f853d59502b0bce5fc708435379924e3850ac
 DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 BLAKE2B 26d5aadcaee776c073bc5b4514f5c7b2925a7dab25a22162c10464f16a18e14cb564012b2b13ca929d7c5156dc5790d0d0659ccef8d8424ee82be2410ce0d211 SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca
 DIST github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz 229886 BLAKE2B 3681f8fc5f380da3c7ab6dd5f34903f44fbe1ee5b309f5d1db25cd72347690249943814bd9e1ea3f4eaf04b14247bbf53e9a817dcfa5ad0e0bbc7d5d1585d2ea SHA512 4bd9909b82b31ed0b872d39da79fea161fdd1408d9da262b8a92c8cb884caf3dceb953ab522daaf8c96747cf4b22724e8e1d6234d80f2859a9ddd436fb513345
 DIST github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz 230464 BLAKE2B 23641867938e85a716a8628209892861578d519e49b9e3aa70e08d9099b4628a744e5bb8bb3f622640ef1438eac50df21b5c32064328165c4aafc2496ca54361 SHA512 6f997ec14fa59859436ed995d52cce2105abab5aceca21c6740869c651078f1ffdcaff8b5a117d624d624cf47382f89824f7868dd8e8df3598d6e632db341212
@@ -21,4 +23,6 @@ EBUILD drone-0.7.3.ebuild 1406 BLAKE2B 857aef910f1354aed8dfec202e7c404da7eea3f90
 EBUILD drone-0.8.5.ebuild 1812 BLAKE2B d6eae0a8fd1522bcca6c7ad08e4305d6812f86bfe89d4ccf438bb1e2cef2eeb4e8a70b308ce5be7300ff2ab67df48f490dd5e995eee148d373ffa41c0dc479ce SHA512 077808dda006067faecd74149b1c7c01d08b32ce9cf96209e6d375c170b758309dcc6cf46e50a0a9ad94bef025c7ce1efcb348d5c04696114db5f06d48df1ec9
 EBUILD drone-0.8.6.ebuild 1812 BLAKE2B ea120485a659e5df726968281662c78acf84f104648244ee42d4919221e650b3a695dde6a8e5d8fdb82a10c14317b6bcae018d0c72c7c23bdaa7e7718875e35f SHA512 1e9ef7bfa863aa0b445fc5494ff43a097a81d52fa77cbdabf89e15495af8fd1016c57eaea7e83beaf5826b0bd6e3f4335205e0754f12aceb24cda94f8067c0dc
 EBUILD drone-0.8.7.ebuild 1809 BLAKE2B 8b0c91566f97633d96c3eefdf0f536890ba9748b9a871b7bed0c72793343e8fccc0657ff44607124effdb8b85ec498f69d466dded67212876638922f50d4042e SHA512 7648888b1089bc9372c53c84a507eeabf8e00a6c06e0e8088cb6d237307cb83d3f781f06d1e100d547a505ab9116adfb628cb1f51be78e0775b4ba6146e43f89
+EBUILD drone-0.8.8.ebuild 1809 BLAKE2B 44fc709e5e849a02d54ffa11d9b9a9d32870a73a8c442f030d2b1bbc70177c840f5ba6c8d55324eb1134eeff003965945b9ad5b53cc475aae506f834d185434f SHA512 3ed68fd9b7b98e7d125883afc8308970e2a2bb4a82f23e29a41cc02dfd5fa9ec4e8f33892d31d41d92a749edd965c25084de831a3d8b91f7c28e4879d7da29a6
+EBUILD drone-0.8.9.ebuild 1809 BLAKE2B eb267d27e338c193b4649232750b9e871c4eb67bd3e4c793e31b34902b63b46896b187742701884793bdda3b2c8ab49f4ea9013356186725c6d1f942d954801e SHA512 07f35547e83859460abeb9a091bc1a71510194abe25a279f8ae0da9306e43e5a7c6b46bae0d83ec19e3ad991cff426e98e090720f19ac1df292ee26e77ca474a
 MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
diff --git a/dev-util/drone/drone-0.8.8.ebuild b/dev-util/drone/drone-0.8.8.ebuild
new file mode 100644
index 000000000000..bfd3bc8970c3
--- /dev/null
+++ b/dev-util/drone/drone-0.8.8.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone"
+EGIT_COMMIT="bc22e226d0089b7d575a26f0e7755541aebbc09d"
+EGO_VENDOR=( "github.com/drone/drone-ui e7597b5234814a2c2f2a7f489b631a76649c335a"
+	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+	"golang.org/x/net 9b4f9f5ad5197c79fd623a3638e70d8b26cef344 github.com/golang/net"
+	)
+
+inherit golang-build golang-vcs-snapshot user
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
+HOMEPAGE="https://github.com/drone/drone"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs:="
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
+}
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
+	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
+	popd || die
+}
+
+src_install() {
+	dobin src/release/drone-{agent,server}
+	dodoc src/github.com/drone/drone/README.md
+	keepdir /var/log/drone /var/lib/drone
+	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
+	newinitd "${FILESDIR}"/drone-server.initd drone-server
+	newconfd "${FILESDIR}"/drone-server.confd drone-server
+	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
+	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
+}
diff --git a/dev-util/drone/drone-0.8.9.ebuild b/dev-util/drone/drone-0.8.9.ebuild
new file mode 100644
index 000000000000..c39a14f61765
--- /dev/null
+++ b/dev-util/drone/drone-0.8.9.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone"
+EGIT_COMMIT="768ed784bd74b0e0c2d8d49c4c8b6dca99b25e96"
+EGO_VENDOR=( "github.com/drone/drone-ui e7597b5234814a2c2f2a7f489b631a76649c335a"
+	"github.com/golang/protobuf aa810b61a9c79d51363740d207bb46cf8e620ed5"
+	"golang.org/x/net 9b4f9f5ad5197c79fd623a3638e70d8b26cef344 github.com/golang/net"
+	)
+
+inherit golang-build golang-vcs-snapshot user
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
+HOMEPAGE="https://github.com/drone/drone"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs:="
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
+}
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
+	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
+	popd || die
+}
+
+src_install() {
+	dobin src/release/drone-{agent,server}
+	dodoc src/github.com/drone/drone/README.md
+	keepdir /var/log/drone /var/lib/drone
+	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
+	newinitd "${FILESDIR}"/drone-server.initd drone-server
+	newconfd "${FILESDIR}"/drone-server.confd drone-server
+	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
+	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index cb77c3b7869c..87d023adfd4d 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -7,5 +7,5 @@ DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 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 1320 BLAKE2B da4d2559ba52667cce4e0fbcdcac825774f36f0234d38bbbc10f18ea1ba6d2e314d60df61b16b02dd40410db5dacf2a088940b9e8319093d06e1506f14afae1b SHA512 54d063627724e94cee970412ed5ce1602fe91dd3ebcd9b2e71a848815d5d7c3dd2f2422ea8c675687deca557f749e45671bc0a1094ae4fd87786151329a5fa0c
+EBUILD gdbus-codegen-2.56.2-r1.ebuild 1316 BLAKE2B 73ddee2a5f9b9ea035b15f349d77294c0c6a95218ff12eb5f1c17ff7c996c10b5cc08126fa30e1af6a5f5e18e10c6fb6f61fd0f4832eca1599f1315a7e22f0be SHA512 5eea87dc6d4453c40c61442bb586d89dcc09d75334ff4f827875b3738c8849c6640d34128632bb18c57ebb85a18986e34f000bb49dfa16c0d66048990f7724f4
 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 deb79385d3d7..0cb9126e1e01 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
@@ -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
@@ -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/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index f4bfa60f2f15..021ce7e1a72a 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,4 +1,4 @@
 DIST glib-2.56.2.tar.xz 8041756 BLAKE2B 1af5bb37378856e959602bcb9299266bba46b990839c923f6b9881624aed306af0779005281b3e3a46b5994c54812edc86aade9cb782c596fd63b6fd91baba51 SHA512 8201ea82d3613d2e879284abe01520b766da30957c5a1a22f3e6019b0cce6bf95d25beae78867b6a133401c4165153c0c92974dd459ab12f9e0e9dd0c95df5d4
 EBUILD glib-utils-2.52.3.ebuild 468 BLAKE2B 862493f148a7e42e6f7aa1e52ee0eeee924889c528b60da5d7ad1908f547cd1434a7b590cdf6c50b6693cc94f5749fa14a4a591e9ec9b00fbd6f6825bdc8e217 SHA512 0320dc667f5e53e0fa68570316b3432c9b3b7d3ba25bd3ecbd3641bead76204c066af0f54a436daba81dbdfc8067a656def6e71942eaa3c1a814e1669fc5caba
-EBUILD glib-utils-2.56.2.ebuild 1289 BLAKE2B 946b5b18db137b21ea2b4d77a685e40c6bd536ba5281079720a68cc485082b42d7952ef6c66a93fea74e1b2439ed6b26cb1199102106b2ffa62579a141e45d08 SHA512 9113b1679bcf2f4a7b409a4331d5908a8d62109f0c56a42cfa93a0f062896b95b31410ef85dc1ecab924f65c3bde6bf61c4299edfdc243bdd375662037700c48
+EBUILD glib-utils-2.56.2.ebuild 1285 BLAKE2B df3bf4b9f140061bab67d09f832b6a948674347b311c229c3763fb78bd065bd966513ca77410de2bd99b44bfdd97b4ea50fbe0ed4924e8091b8777bcee28b62c SHA512 cc8029c69a0691e309106bde12aaa548424d050d62f89ba3f728a2410df9d222bbcf704ba767e81e4199720f611fda1148a4472a62356b17b6ab57705a153b3c
 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 a8e60e261bd4..3cc43debc629 100644
--- a/dev-util/glib-utils/glib-utils-2.56.2.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.56.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
@@ -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 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index f35ca61f69e6..6b95e8034912 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 965 BLAKE2B dde653d03f83a3fab31954ef5e595015b8c93c5c3aef8b46f78e04c15405fef227992f334534acc157d94a603608c26f96a6cc1b477c62f429bc190d39289e54 SHA512 366f56457f17ada49b3b3c7f3062105dc900a80c86c36cf42a92580adbb438f36b2262b7005b9f64e49e975ef87fc234bd27209d6fa824b666e3b3c447a86796
+EBUILD gtk-update-icon-cache-3.24.0.ebuild 961 BLAKE2B 74e512b9888506b210992a5e4bb035cc5c00f8f31d4cdfbd04e84053375617966ad7dccb3e113160bd5d9462b478fc53f6b00988335642c911154af7a0ebb266 SHA512 3016599cb553ebfc63242c5663602cde1034d6417d516f0366e0e1d6a73ff4731f1407e6e2781794f7ca19b895f68759ac9d195739c73a1fa0b26a338877f4a1
 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 d5a67a8b0150..673999933a83 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
@@ -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 @@ 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/howdoi/Manifest b/dev-util/howdoi/Manifest
index a7da0dd13a4a..59131c88afd1 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,3 +1,5 @@
 DIST howdoi-1.1.12.tar.gz 8196 BLAKE2B de3b7560dac360102246c10e6076658fe6fdfbedd378f02e65928d2b83a3f05357b8a9aafd6ad22e402448dfcf96b72faaf5755774b83ed1656ae7cb81554c72 SHA512 c4f66941d608a3f1c2a441b81ec5b64d9ac4e53b70bf4bda08fd8fc68b1c34022abdddfa47e3812cdce063e5b3c440aa4b9ad39ea95bfad2f285b5ffa89d711b
+DIST howdoi-1.1.14.tar.gz 8421 BLAKE2B 40689f3ca1ce487fd5278406115b70e51d82ce2ff2f8b1e60c02fad6f92adfcb532c3ce73c4126027a0812e21b599bf5f9d20e8d3c23d6dc4e541a877e1ba52d SHA512 348125e666d42b657ee493a405207238aab12cb4815da52de2bc3d0635a85476e942ed73b6eb75e7ac51e744f01ebe987dd45ecc69b1774f264a6bd9c4a2826e
 EBUILD howdoi-1.1.12.ebuild 585 BLAKE2B 72315818c287c651e9f2d5e01aaa5f5e8631a755f0af650c3dfa7acbd1f7a466c1efeb34efd25d834a27c952a50b565f50bdcb740f6664bab7f7154a00ba53a9 SHA512 6ceb5ccbca17eda545787e77b1d2dacea24923102283837a2acc0c067e02e949940acfaa893bc1621e73ff96825a89eac1f5c93c267ac67ca0942e05cb0e3ac2
-MISC metadata.xml 290 BLAKE2B 49911a26acd9402378242b6d656e33951b594e09cd64ea6115460fb13f1c2a4026644cdaab5fd343790be4122df5426949ca0b2945240216f497542278ab427b SHA512 ede22af6bd7ec77ad0b831c42c0169dc8e43719d4f7c5d7df37e6abb79136d1699a923a587a056210c0cccc33aa887856a46f73baf476ff2c074351880299471
+EBUILD howdoi-1.1.14.ebuild 588 BLAKE2B 6cf26d1895ee3aaa5dda00c34d2044fbbe6f24d1021c162bfb46ada9aba3e26e4743020a02435ac7924966ac29f2eb93211e5e62467337b360d55d0ba34239a9 SHA512 4c0edbbcc37d410914b6ecc37d870ac472297bdd65438163743399c6b019cc133c119bdf79d9c6b16c685d6e342e959970d164ef96af77d9223f9a0252486052
+MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-1.1.14.ebuild b/dev-util/howdoi/howdoi-1.1.14.ebuild
new file mode 100644
index 000000000000..3d513af56bac
--- /dev/null
+++ b/dev-util/howdoi/howdoi-1.1.14.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="A code search tool"
+HOMEPAGE="https://pypi.org/project/howdoi/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	dev-python/pygments[${PYTHON_USEDEP}]
+	>=dev-python/pyquery-1.4.0[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/requests-cache[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/howdoi/metadata.xml b/dev-util/howdoi/metadata.xml
index 4230aede62d0..f0b5605e5be0 100644
--- a/dev-util/howdoi/metadata.xml
+++ b/dev-util/howdoi/metadata.xml
@@ -5,6 +5,7 @@
 		<email>kensington@gentoo.org</email>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">gleitz/howdoi</remote-id>
 		<remote-id type="pypi">howdoi</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index e50c0138aa9c..02c288dc99ee 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -4,8 +4,10 @@ AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a
 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
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.138.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.138.3.ebuild
new file mode 100644
index 000000000000..ff91a974c718
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.138.3.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-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="lts"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:0
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 5c3b08b149b0..657afc98096e 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -1,17 +1,9 @@
 AUX kbuild-0.1.5-gentoo-docdir.patch 358 BLAKE2B 978d4081821098a4e035fdd41b801c72f297e24187d2681ff7aaa2b09fa0fed35ce780884bf1cf0b0ea4428a16402c20b14fcc0e918d7175b98f04e94ba74449 SHA512 468dd844de34867c7ccafabafab4d5870fcb63f38fcb8d53580787cf9600027db91cb5ad962862d6a654dcec2b58654cc62fd6146fb0903c1b2d2079a7016020
-AUX kbuild-0.1.9998_pre20110817-gcc-4.7.patch 315 BLAKE2B b2b9b85b01500b326b66d7186e4ffb25ec21d4acfe962dc3e798c4b2bc076cad2730c30995c40c77a5239f4b3c895e2f2f00c4734a96f81d6dda07cdf6d40ee4 SHA512 843a90f52dc6163936a3bff5d11aedb92642baf66ec4adacf0705b484b4a2d624995ffa59dfbfde3218e0e2e763f64338a03ebf935ec23fdad66093824ced7e1
-AUX kbuild-0.1.9998_pre20110817-gold.patch 795 BLAKE2B 1615408f2f6f669ce05b88e703df18f9ca935a63347bf5c5b5e4c7e4803aeb83a6562c4d620235a0d07ec1102ccbc2766c1b39895660ffaf46773d7fc4b3978e SHA512 6ea5d896fdd632355985bdaa69e36aa091fdddc925049dfcb7eab37472c88fde954c6b987a0e647e65832cec5c91ccad7ad8270376a112af95df90d4a60687f9
 AUX kbuild-0.1.9998_pre20110817-kash-link-pthread.patch 296 BLAKE2B ffa7b0167e4a65c59510e20089a63d5c1949b5f14ce167725ee057d9ab75369758e491727d939a111de5bd63719b53a7744b08efe84d34cc81b4d7bba80a3522 SHA512 178da856a83631ca4d86a9b8c20e74b75b76426c177b87c26d4c4b3df86e72f3b6339e8f61948498ab9c4bf047119588f3df8ce78448160afa0840b2cf3aeabb
 AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae25a2ff9e82e38bc907f2771ee3599e9401b26e5b5d4e53a3958a4f8edb2a7c35794677bae141561cf515fd3587b9ac095a7bdd SHA512 2a311e2e79c1e85c3c2c26b3d187355167c237c334687494a8e532b84232340df44b0d896fe6638bf1a9d4ba1c5f1efb29978de3bac0490fe04f2e57f7fb1874
 AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae71f02b0963625eee06fddde79a4449a14fa235fc2dd5c7d8a450ce214dbabce9180c384f31cb2380e3fd49e8d987f56f7036a1fb SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521
-AUX kbuild-glibc-2.10.patch 756 BLAKE2B 50f0f90daad8f4b93cde4e1ca458ae79c6cfa876a0e92138a557461d5e22d1a1f40152d454bbf12936a17ae2a0cd7738813ce65f81b3f8bd98390e1e089d4314 SHA512 dd8a9464c7014205bbed655a42325653618ad902493d7c73d714f7504a539159771d64b7e0d82aaaf76fadf3eb46dd663e62b5960c17077b8c80ac5f414555ce
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
-DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 51d68203d38a6cc86a32e6c66431739a87df738e920bfc9ff902433a46279fd62c704d9bcae02f0a1cb6a1f97cf68dab059c636ebd425d2b15c50c9c9cb4fcc6 SHA512 66f418c0e052389d2b5cfc4d46bc8598ceaeded369151047e455e921bef494ec42099cdc368d24b572eacd809bb7c124d07e0fab54788af01664b72f571fb047
-DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf SHA512 b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
-DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72 SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0
-EBUILD kbuild-0.1.9998.3127.ebuild 1721 BLAKE2B dd168c90c4e722c36347e6ac5d40bd063fd338b7f5c179c83409bb7004c5ea8e39c1137b68b24c10243a29706ab6e5304b939bb07c28032a70f4035443f15dae SHA512 1ba75710985246a11c34ca3c3b1d1e4ae6732852c173c86b1493768b94cf65dadbdd6dec14b5518173f30667ca78bdaeede66b264a87bd2a97db54c84bb7a37f
-EBUILD kbuild-0.1.9998.3149.ebuild 1797 BLAKE2B 77af90d7312b90240f3ff3f03a7c16bf181b6aabb0a19c87f7618f495c7b11cc0f9d10a308da81563e58e5f46176756c8dd6510319afba5826cb5ea354ac1074 SHA512 11add83b15c24aafb276617a596a6e329eab3aed0c35b32c6da9540cada1e89e2e64d3da2f042573a2058ba680c4d3bea99ad18da65f25d46710f5760b8a93f9
-EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 BLAKE2B ce3518b0ab413a1a4aa3150d6fa3f13050cf49cae8fab1603da6912beba290135574570acb25fd2d7dffcfe65e54d8c9122ec1071cd589e7d5c46ec0de369805 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b
+EBUILD kbuild-0.1.9998.3149.ebuild 1792 BLAKE2B ffd6f02476b9f7a160e670b9d2d1af31a33803a2c26c2b6881c22f485c295c3e39ac4436b1f610faca4878326fa46f49231a21469e6a0d3eb8f6d1288ab83905 SHA512 01b1a7205a2066808642a61ab5ec067a99f3c631e75a715b434f92ce2e86bff8d0cf23a27236330c31e9bab751bde7c735177736ecc66b6a916994cb2287c351
 EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
deleted file mode 100644
index eb71fb02f4f0..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gcc-4.7.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
-+++ kBuild-0.1.9998-pre20110817/src/sed/lib/regex_internal.c
-@@ -781,7 +781,7 @@
- }
- 
- static unsigned char
--internal_function __attribute ((pure))
-+internal_function
- re_string_fetch_byte_case (re_string_t *pstr)
- {
-   if (BE (!pstr->mbs_allocated, 1))
diff --git a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch b/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
deleted file mode 100644
index 8ad2ab3269cf..000000000000
--- a/dev-util/kbuild/files/kbuild-0.1.9998_pre20110817-gold.patch
+++ /dev/null
@@ -1,16 +0,0 @@
- src/kmk/Makefile.kmk |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/kmk/Makefile.kmk b/src/kmk/Makefile.kmk
-index fe2cd43..135431e 100644
---- a/src/kmk/Makefile.kmk
-+++ b/src/kmk/Makefile.kmk
-@@ -59,7 +59,7 @@ TEMPLATE_BIN-KMK_INCS.dragonfly = glob
- TEMPLATE_BIN-KMK_INCS.freebsd = glob
- TEMPLATE_BIN-KMK_INCS.openbsd = glob
- TEMPLATE_BIN-KMK_INCS.solaris = glob
--TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL)
-+TEMPLATE_BIN-KMK_LIBS = $(TEMPLATE_BIN-THREADED_LIBS) $(kmkmissing_1_TARGET) $(LIB_KUTIL) pthread
- ifdef ELECTRIC_HEAP # for electric heap (see electric.c) - windows only.
- ifeq ($(KBUILD_TARGET),win)
-  TEMPLATE_BIN-KMK_CFLAGS = $(TEMPLATE_BIN-THREADED_CFLAGS) /FI$(kmk_DEFPATH)/electric.h -DELECTRIC_HEAP=1
diff --git a/dev-util/kbuild/files/kbuild-glibc-2.10.patch b/dev-util/kbuild/files/kbuild-glibc-2.10.patch
deleted file mode 100644
index d24a8f7439dc..000000000000
--- a/dev-util/kbuild/files/kbuild-glibc-2.10.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- kBuild-0.1.5/src/ash/output.c
-+++ kBuild-0.1.5/src/ash/output.c
-@@ -230,6 +230,7 @@
- 	va_end(ap);
- }
- 
-+#if 0
- void
- dprintf(const char *fmt, ...)
- {
-@@ -240,6 +241,7 @@
- 	va_end(ap);
- 	flushout(out2);
- }
-+#endif
- 
- void
- fmtstr(char *outbuf, size_t length, const char *fmt, ...)
---- kBuild-0.1.5/src/ash/output.h
-+++ kBuild-0.1.5/src/ash/output.h
-@@ -65,8 +65,10 @@
-     __attribute__((__format__(__printf__,2,3)));
- void out1fmt(const char *, ...)
-     __attribute__((__format__(__printf__,1,2)));
-+#if 0
- void dprintf(const char *, ...)
-     __attribute__((__format__(__printf__,1,2)));
-+#endif
- void fmtstr(char *, size_t, const char *, ...)
-     __attribute__((__format__(__printf__,3,4)));
- void doformat(struct output *, const char *, va_list);
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild
deleted file mode 100644
index 8644ad96da38..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools toolchain-funcs versionator
-
-MY_P="${P}-src"
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="
-	sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc
-"
-RDEPEND=""
-
-PATCHES=(
-	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
-	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
-)
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	default
-
-	mv src/kmk/configure.{in,ac} || die
-
-	# Add a file with the svn revision this package was pulled from
-	printf '%s\n' "KBUILD_SVN_REV := $(get_version_component_range 4)" \
-		> SvnInfo.kmk || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-
-	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
-		-i "${S}"/Config.kmk || die #332225
-	tc-export CC RANLIB #AR does not work here
-}
-
-src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
-		|| die "install failed"
-}
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
index 457775ebe06b..7c358202b885 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3149.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
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild b/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
deleted file mode 100644
index b4fd8a1a4f0c..000000000000
--- a/dev-util/kbuild/kbuild-0.1.9998_pre20131130-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils autotools toolchain-funcs
-
-MY_P=kBuild-${PV/_/-}-src
-DESCRIPTION="A makefile framework for writing simple makefiles for complex tasks"
-HOMEPAGE="http://svn.netlabs.org/kbuild/wiki"
-#SRC_URI="ftp://ftp.netlabs.org/pub/${PN}/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz
-	https://dev.gentoo.org/~polynomial-c/${P}-tools_and_units_updates.patch.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
-
-DEPEND="sys-apps/texinfo
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/yacc"
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P/-src}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-unknown-configure-opt.patch"
-	"${FILESDIR}/${PN}-glibc-2.10.patch"
-	"${FILESDIR}/${PN}-0.1.5-gentoo-docdir.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20120806-qa.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-kash-link-pthread.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-gold.patch"
-	"${FILESDIR}/${PN}-0.1.9998_pre20110817-gcc-4.7.patch"
-	"${WORKDIR}/${P}-tools_and_units_updates.patch"
-)
-
-src_prepare() {
-	rm -rf "${S}/kBuild/bin"
-
-	default
-
-	mv src/kmk/configure.{in,ac} || die
-
-	cd "${S}/src/kmk" || die
-	eautoreconf
-	cd "${S}/src/sed" || die
-	# AM_CONFIG_HEADER is obsolete since automake-1.13 (bug #467104)
-	sed 's@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@' -i configure.ac || die
-	eautoreconf
-
-	sed -e "s@_LDFLAGS\.$(tc-arch)*.*=@& ${LDFLAGS}@g" \
-		-i "${S}"/Config.kmk || die #332225
-	tc-export CC RANLIB #AR does not work here
-}
-
-src_compile() {
-	kBuild/env.sh --full emake -f bootstrap.gmk AUTORECONF=true AR="$(tc-getAR)" \
-		|| die "bootstrap failed"
-}
-
-src_install() {
-	kBuild/env.sh kmk NIX_INSTALL_DIR=/usr PATH_INS="${D}" install \
-		|| die "install failed"
-}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index c5f586e0c28d..43da9438cb3c 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,12 +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 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
 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.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_rc2.ebuild
new file mode 100644
index 000000000000..43258b4386fa
--- /dev/null
+++ b/dev-util/lldb/lldb-7.0.1_rc2.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+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 )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libedit ncurses python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index f0a3be8779c6..ccb750742818 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,5 +7,5 @@ EBUILD lttng-ust-2.10.1.ebuild 687 BLAKE2B e92c5051c63af6f75479fc703ea6167e96b03
 EBUILD lttng-ust-2.6.5.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
 EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
 EBUILD lttng-ust-2.7.4.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
-EBUILD lttng-ust-2.8.1.ebuild 664 BLAKE2B 018b9946fe227cafc977b9d0a53c17ee66bc10a595183a47d1074785cb82f03c2f9fc4c4c60984d8acda9d27f0f76b14915c0d61191c270544f13a7e84ef12a2 SHA512 1fda188b41588aa8fb693f106aa8424374d59c1b030ba7639579617182a93915f74227c17c5817ccc636dd2d460f43397766d8c10934e29caeb1b7a2db53b0d2
+EBUILD lttng-ust-2.8.1.ebuild 662 BLAKE2B 01b73d19f00f06bc77581888b6d5a7e00f1bb2f73809c9e092f4c3dd9ec4853fa8c1b62a139937119b45072f628758bcc9536ca54387126fa54675f05d06bec7 SHA512 0df31509c6f06bd60c8c8edd5d67435b318dda2ea0565d4ed12d0db4913da58d07f6271a77811935987a38727fac80587fb380ba6568fdf7068419cc9e31e342
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index 5c455cffe80c..b3bd0a0d3e74 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu:="
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index d12ab171c1f6..33d126bdc88f 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,8 +1,8 @@
 AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
-AUX mdds-1.4.1-buildsystem.patch 898 BLAKE2B 716559741402b82537d91698ebe78815c26e47ecb844bed37f0c188efbfa5c9fd7bd9be501afb4d3653840961fa7ace17d215eb035ec9a028bf775589f9dadf8 SHA512 0e5b735232b8409194f6d9fc1b1b171dc333d6388ab858cb79be4908ff1cbdcee276146365b3c6c70b192559489896ba50384b5d78a22fc8c1fa78d683d89b7e
+AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
 DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
-DIST mdds-1.4.2.tar.bz2 318164 BLAKE2B 322b53253cb8796f8def8d470bcbc61e787b25f687b6fbdca927de029f0f9813c863cdc57955e67e40124abccf4e77a16108669fd9a25473d952b7b7361fede9 SHA512 1d58d30c2c65167fda97c790739a2bf36802f72965007a141108320312316df9bf252c18ff84f867f3805eee4914fe748ae066d51b376791a723fd54ec21c3c3
+DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793 SHA512 fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
 EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
-EBUILD mdds-1.4.2.ebuild 1009 BLAKE2B 20c3dc414fc64ec899a3d6d36a66bcc264b0b50b371187801628a68e30a52bde2759bed4c24ec2e941c1dc0e1ebf2ce8af12fde0d5792895bb78c5b7f0a005e4 SHA512 f4bdd079f5928633624b4147db170eadd6e4952f26e1a3cc737a2355138c1f9a382889996aea245529faf0a8a0b35f007fa355af0f1e8c44376cc53260f85da8
-EBUILD mdds-9999.ebuild 996 BLAKE2B 9c0e219edb41aa5a8aa9d7f0fe38182d0a45322c614932ff0fda9d6888c9e89eb75208b4c6d77b1ac3a082015a81f77d6dd2ab96f312eb69d14c13ff3f3e1278 SHA512 d2b7462575b484f8dd4002addfb075189419495b1e744a4c818f7e87be3768ca39284a3d9579a64ef450b19468952d865c8e2019cdbb5602ed1f99d8f15c8f43
+EBUILD mdds-1.4.3.ebuild 950 BLAKE2B a258610a5f66f8c6d79619a24e18dbd757d0d186269509eaa7b96a92e987e53976c63d461581d8f18825c792b40c55f07f4d16eb763572b2ea7b201e0fe7a305 SHA512 696a2d9c38dfb6103d0e358d514864c48ac06f0cdde9c31c8d82d7439d9ed8f40b141809525ee57e8c87de6b7961e3ca36804f1272109ac13f5f9d64305bbeae
+EBUILD mdds-9999.ebuild 955 BLAKE2B 75a8c7ae5b5c447112991d5b31f57fda4fb48b7b1ee0a5f7f676ec50e1f2036f89181b3f33ca4a5d72a0f332171b947b582f4e2bd374e846ff9a6e928cf6e775 SHA512 e7c89d121a11aabaf28c1940975b868e5b0b98df4fe71bfa248edc046ef6b9047f7d0364d7347c321fd879fdc22c6f853734e3eb576f07cd5f91707208d4785a
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
index 212587e9dacd..ef3616d6f2fb 100644
--- a/dev-util/mdds/files/mdds-1.4.1-buildsystem.patch
+++ b/dev-util/mdds/files/mdds-1.4.3-buildsystem.patch
@@ -2,16 +2,15 @@ We want to install (not all of) those files manually.
 
 --- a/Makefile.am	2018-08-29 13:23:49.434860594 +0200
 +++ b/Makefile.am	2018-08-29 13:25:52.125789186 +0200
-@@ -4,8 +4,6 @@
+@@ -4,7 +4,6 @@
  
- AM_CPPFLAGS = -I$(top_srcdir)/include
+ AM_CPPFLAGS = -I$(top_srcdir)/include $(CXXFLAGS_UNITTESTS)
  
 -dist_doc_DATA = AUTHORS README.md
--nodist_doc_DATA = VERSION
  nodist_pkgconf_DATA = misc/mdds-@API_VERSION@.pc
  
  DISTCLEANFILES = \
-@@ -15,8 +13,6 @@
+@@ -15,8 +14,6 @@
  
  EXTRA_DIST = \
  	autogen.sh \
@@ -20,7 +19,7 @@ We want to install (not all of) those files manually.
  	doc/conf.py \
  	doc/doxygen.conf \
  	doc/flat_segment_tree.rst \
-@@ -164,14 +160,6 @@
+@@ -164,14 +161,6 @@
  	rtree_test_bulkload_mem.mem
  endif
  
diff --git a/dev-util/mdds/mdds-1.4.2.ebuild b/dev-util/mdds/mdds-1.4.3.ebuild
index bb6e3ab3edf1..8ca6d8fc087e 100644
--- a/dev-util/mdds/mdds-1.4.2.ebuild
+++ b/dev-util/mdds/mdds-1.4.3.ebuild
@@ -1,27 +1,27 @@
-# 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
 
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+	inherit git-r3
+else
+	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
+# 	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-[[ ${PV} == 9999 ]] || \
-KEYWORDS=""
-#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		dev-python/sphinx
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
 src_prepare(){
 	default
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index 65b5df3e9c0e..facdbc17f0d4 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -1,26 +1,27 @@
-# 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
 
-EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
-[[ ${PV} == 9999 ]] && GITECLASS="git-r3"
-
-inherit autotools toolchain-funcs ${GITECLASS}
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://gitlab.com/mdds/mdds.git"
+	inherit git-r3
+else
+	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+fi
+inherit autotools toolchain-funcs
 
 DESCRIPTION="A collection of multi-dimensional data structure and indexing algorithm"
 HOMEPAGE="https://gitlab.com/mdds/mdds"
-[[ ${PV} == 9999 ]] || SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-
 RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	doc? (
 		app-doc/doxygen
 		dev-python/sphinx
@@ -28,7 +29,7 @@ DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.4.3-buildsystem.patch" )
 
 src_prepare(){
 	default
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 03d6ccebf713..1f4c845607b7 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,3 +1,5 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4 SHA512 6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
+DIST meld-3.18.3.tar.xz 564660 BLAKE2B 2dc939e7d21408659de969e50eb8e790231391af0a30a44aecc359dabaf258e863512663d9e19a2b38fb42a419cfdbe1094e05eada8311f52cd615cd6db4e98b SHA512 7edd3c564616893732073995c8e161712964d8fc3abd8dad43183a6e36003bdad7b5593f04112e05244a59563b8d0fcf9d7c524f820d6145696ad0c73d67516c
 EBUILD meld-3.18.2.ebuild 898 BLAKE2B 8e4fafffdc83112a8012662e3b26a3e506599fbcfcc385572939cbe8f33852acd5e6077beda2e186cc06174ed25a62099dfc1ec59122b229c1787442355a8d62 SHA512 78ce7d28f88129ae9b461c9bd6240f39beb68e9d472368042e37a77e3cb9a64bdd5e5fa6f7eb26677f107b8f67298ec253428e56b75987c5891644b5f6c0b0c9
+EBUILD meld-3.18.3.ebuild 897 BLAKE2B 029ccd55648cd6ef13cee50448dc0b04faf39f4dd2fca4d80253282803311699b6d22a6026252edea18083618a9723fbd2bf5f1324668f81dc44ab5051f3c3ba SHA512 dbcb138264995d9e8beceb420ba1b447efc57fa123ceafff32ae3c86bf800cb9542ff95ad3c3ec3942efee9e1364f2f90d5f00ba5a842e2ec8c180df45cbf606
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.3.ebuild b/dev-util/meld/meld-3.18.3.ebuild
new file mode 100644
index 000000000000..e93d81db1f1d
--- /dev/null
+++ b/dev-util/meld/meld-3.18.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2[dbus]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.14:3[introspection]
+	>=x11-libs/gtksourceview-3.14:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index a40ccea14c1c..23ca690c3f96 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,9 +5,11 @@ DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236b
 DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
 DIST meson-0.48.0.tar.gz 1307251 BLAKE2B cafae408a219a8f31b756cae28178480eeadac877a6a694c1369c7524b68b88e606d51823aacde177410fd97c1ad14793a11a6d1a1a97c131d33b1014ca2d5f9 SHA512 99ba4ca4899a3174803e41fe5a010d4be304cf85d7392107c2a6ad65f03d758382b1b9104a0cc54bf6fdba28e7742ecd2b0c299d43be3a66fb1381b77418036b
 DIST meson-0.48.1.tar.gz 1310408 BLAKE2B e90c5c0b396883ac516eb3a5de04a1caff084a7f018e3f9b7565ec91e520bf4c0e05a72855b3b35e361623c6bf792e471846a7bac13fabd8b42c5256af017703 SHA512 248856cbab0aba959a01a9759261108baf93eef92d454b9ebb7f54edf1aa3e26f6050e389c9889ca23b19321d835617bacd361fc598b7185f6485bc6a403534c
+DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
-EBUILD meson-0.47.1.ebuild 939 BLAKE2B 7ef511941dfdf7919d03588c824cbc7eb8c2b205551836742e02edbd39b737a57efada2c4973826f77e711bc8a12e38f0b7aed085a329cbc267aff4bd03ef12c SHA512 0b886e2c31ba4bc3d72e923dcb9d17e16f5f17d7b5dcfae49a0dad4d628bdf86d3c0e0c397f6e56128a09765468986e1085418a8109e1f571876892ef1b1d488
+EBUILD meson-0.47.1.ebuild 926 BLAKE2B 779aaf05ce0d6481cdff78e5fbbe14ec5ca8b1494e28317bb7aeb2c8ad6554d8645477b29400ea1e29f2fd2b433c3424444084e67635d603281d7cad59ce84f8 SHA512 19b89992fb1b9cfc79d07ed6d12ef482eb88232b659887725e894fa2fafcb6b67093bcaf4989783ecfe9a9f1a2a3c2b85d52e7a074bd500405e33d8df34b09f4
 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
 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 0f0d9d52aa8e..4fe83c922960 100644
--- a/dev-util/meson/meson-0.47.1.ebuild
+++ b/dev-util/meson/meson-0.47.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
@@ -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
new file mode 100644
index 000000000000..d7d772117ac9
--- /dev/null
+++ b/dev-util/meson/meson-0.48.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+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/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
new file mode 100644
index 000000000000..1a0c790bf0f9
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -0,0 +1,4 @@
+AUX gentoo-helpers.sh 276 BLAKE2B 6a27184b85215e212ef19ba216b08025915a445de9cf963ac12062c58fb0878454d312de5e63f277effd4b3061c5f87bebe4767dcb5e06fc6920d3e0e0b766ca SHA512 19e421d068e151c807f15ea3cf7b14f3b17e868ed13c6164a510b801fe33017e26088426d8aecbd52e979382d6e0affec4ef23f4a9c3087ec638cfa6b6653e2b
+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
new file mode 100644
index 000000000000..e033a53f7672
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/files/gentoo-helpers.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+netsurf_define_makeconf() {
+	NETSURF_MAKECONF=(
+		NSSHARED=/usr/share/netsurf-buildsystem
+		LIBDIR="$(get_libdir)"
+		PREFIX="${EROOT}/usr"
+		Q=
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		HOST_CC="\$(CC)"
+		CCOPT=
+		CCNOOPT=
+		CCDBG=
+		LDDBG=
+		AR="$(tc-getAR)"
+	)
+}
diff --git a/dev-util/netsurf-buildsystem/metadata.xml b/dev-util/netsurf-buildsystem/metadata.xml
new file mode 100644
index 000000000000..88de5fc462b1
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/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="person">
+		<email>vdupras@gentoo.org</email>
+		<name>Virgil Dupras</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
new file mode 100644
index 000000000000..f8dd03f986a9
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="buildsystem-${PV}"
+DESCRIPTION="Build system used for netsurf and its libs"
+HOMEPAGE="https://www.netsurf-browser.org"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die
+}
+
+src_install() {
+	emake DESTDIR="${ED}" PREFIX=/usr install
+	insinto /usr/share/netsurf-buildsystem
+	doins "${FILESDIR}/gentoo-helpers.sh"
+}
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 46bfb6330d82..a4854c02d7bd 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,12 +1,6 @@
-DIST pkgconf-1.3.10.tar.xz 272704 BLAKE2B 7d39a17ba100818eecb64acc46d7000a5d7ecb2493d7d9b75a7f2451ac3499bb5de68a38cca2188b19937410b3a82bc8a910a8b7cec211315980c0d9c49f8c81 SHA512 22ccc6b41b4571992f00e0b2e6f9922fd7f1bf9ef1b790ff978d8bff8ca0697321f7a7ecf1a193ccb4efda2c5d6430c1ad24487a50d3ab27f9f16e6be9fb9e83
 DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
-DIST pkgconf-1.3.90.tar.xz 285036 BLAKE2B e56e3ea3a6552ff190f239bf4d8d7e3d63c0ecc6a771d0a7c33aeacf6da61190abfed1ac2268d28d64efc298bc4b2b3f032eeaf8b2be628bef1d12de4b1aec36 SHA512 8efca947546969fea63e97f23eb1b5af49a1f2378eec66ff4f403fa218bcb3d5fed62a32fd6be70d9ebf39c8024bb9714cd0c2a52e6960c98021cabefc274530
-DIST pkgconf-1.4.2.tar.xz 285548 BLAKE2B ad48bac309e90f2c2958ee19ebbf95ec90c55ebd98a44486f47cc403b8c193131377433a23f16adb64bf97832ff5a0c20e0a3d01da5c6adb2b70483dcf23b9cf SHA512 d9d3bfc7ddc3ceda65f7ad11b1a3c8a48aee0b5ac135aeb54b41091ca1ef0d9a5cda4a5c1ba2470ec12ce870a361eeddd802243eda3c2e2c0f2be3e7fe0ca236
-DIST pkgconf-1.5.1.tar.xz 289616 BLAKE2B 32cd7b3440635cacbc197ac6163c2d0c0a57281d060e27ba097f7845636e41160c25092f42e3d3dacacc0d9f01f6d3468ffaa2a18a82f98ce5fdc8e9f7267137 SHA512 a2e7a675fed6600fd38d90a98fa8295e1b79b4dd018f544ca777caf8cf6687029d0925ef33a08dd7815d5d3cad835bb9b70ab3161b6e083965fa60652661955a
-EBUILD pkgconf-1.3.10.ebuild 1300 BLAKE2B 1676e818f15a490f6006b24ccc3a9b943a8560d6b273ece690afb8259c76bb1fb65ef01ed9105d46ede0e62ca01a8803e86682e56a535eb8934dd71517f6abd9 SHA512 b1e869feae15b5710f1176d9885f923e8af96fd135ccca1050660af9d5aaebb90fec78dbc82cf854468856f9c1c89254a953c8fc04ed24ea7b524392449ee417
-EBUILD pkgconf-1.3.7.ebuild 1290 BLAKE2B 1b61b0efd185270da76d3be3251fcc9c735adf4d68aa7b900801268ea0558a72753ac19aa4ffc666be3dd577ff110aaa414ae349564799ea09eba53abbd003df SHA512 83835948caac96c0d9e1b0b84fbe5f12a3481b195c28e85f9babbc8803301608be0838f57d5d5079312ada5b47f520415613b36863ccc5c4d65aada059e9f1f8
-EBUILD pkgconf-1.3.90.ebuild 1313 BLAKE2B 41b8ec46f2aa403425fefa659747d7d749853439e928cee51ca5942a32daf85f5c3592b7fdd26ac18a47495ba6d618f9cdae38cd961598401c2308e0e71e8007 SHA512 ea72be69c717fedfc167fce696c1a9dbf549aa5cab4ec6c60b7641cef6ded07877d0847f941865a74ddc4a91f255424f553381203bdf0f1e2ab7242bd792c776
-EBUILD pkgconf-1.4.2.ebuild 1315 BLAKE2B 90e00841c795e7aadd1d5e6c6b064407fc8249d792df74a0433273e48c60024f9ababa9589df4c3f9b3eabd91b77e9a9400376010228aea7b580215606cc0638 SHA512 c0f77fe282688edfb8979c607da32464efb87f2154884e6bcc577b4e9c673087da65399773db06dbecf92d619bb4677dde5ce33a5ede337d1e59376b41db7018
-EBUILD pkgconf-1.5.1.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
-EBUILD pkgconf-9999.ebuild 1390 BLAKE2B 3bfa7423d6bcba99bbd063281c45aaecc1135df4f9375ba209cd40dc82a53f40392c8f622029fb97771b4fb564f204719283fba3d63124b65c047ccba49e08c5 SHA512 90c99e3bcdd205b8375b7b004acfc9788fb0a8833bff453204caad14238e9b80448e63d80fddc0dc8067cf3ec568aef1e553d2117e66280e400aa7712a68aaf6
+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
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.3.10.ebuild b/dev-util/pkgconf/pkgconf-1.3.10.ebuild
deleted file mode 100644
index 9b9f885eb7a4..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.10.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit ltprune multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	prune_libtool_files
-	einstalldocs
-}
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index cbfee8e34330..01560acfc6f2 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -16,7 +16,7 @@ inherit ltprune multilib-minimal
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
-LICENSE="BSD-1"
+LICENSE="ISC"
 SLOT="0"
 IUSE="+pkg-config test"
 
diff --git a/dev-util/pkgconf/pkgconf-1.3.90.ebuild b/dev-util/pkgconf/pkgconf-1.3.90.ebuild
deleted file mode 100644
index 538e513ea99a..000000000000
--- a/dev-util/pkgconf/pkgconf-1.3.90.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.4.2.ebuild b/dev-util/pkgconf/pkgconf-1.4.2.ebuild
deleted file mode 100644
index fe8a931fbf14..000000000000
--- a/dev-util/pkgconf/pkgconf-1.4.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# 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"
-	inherit autotools git-r3
-else
-	SRC_URI="https://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-inherit multilib-minimal
-
-DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
-
-LICENSE="BSD-1"
-SLOT="0/3"
-IUSE="+pkg-config test"
-
-# tests require 'kyua'
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/atf
-		dev-util/kyua
-	)
-"
-RDEPEND="
-	pkg-config? (
-		!dev-util/pkgconfig
-		!dev-util/pkg-config-lite
-		!dev-util/pkgconfig-openbsd[pkg-config]
-	)
-"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/pkgconf
-)
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	if use pkg-config; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/pkg-config
-		)
-	fi
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
-}
-
-multilib_src_install() {
-	default
-
-	if use pkg-config; then
-		dosym pkgconf /usr/bin/pkg-config
-	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/dev-util/pkgconf/pkgconf-1.5.1.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
index 5b9170fe2f87..4a4d43a5f74e 100644
--- a/dev-util/pkgconf/pkgconf-1.5.1.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
@@ -16,7 +16,7 @@ inherit multilib-minimal
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
-LICENSE="BSD-1"
+LICENSE="ISC"
 SLOT="0/3"
 IUSE="+pkg-config test"
 
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 5b9170fe2f87..4a4d43a5f74e 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -16,7 +16,7 @@ inherit multilib-minimal
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
 HOMEPAGE="https://github.com/pkgconf/pkgconf"
 
-LICENSE="BSD-1"
+LICENSE="ISC"
 SLOT="0/3"
 IUSE="+pkg-config test"
 
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
new file mode 100644
index 000000000000..44636fff33ba
--- /dev/null
+++ b/dev-util/redo/Manifest
@@ -0,0 +1,3 @@
+DIST redo-0.21.tar.gz 87347 BLAKE2B 1d97f6b4f862e61f9074d0dd57293b3ab61a4f3f26781b242450bd1e194b941a8a169767739ddfffd0a8d721a95229637e8c6d9083d2c67d664b19551db0bc6d SHA512 8fe9ba0a5b0b4bf9073456a4b4fa7bebcb51ceb4fb06a16dd671fc48ba480f2ee4ba1eae48cebc3c15687de43833324eb6f98642843be71ab7aa2fe471ab7958
+EBUILD redo-0.21.ebuild 769 BLAKE2B ca81f6cbe3599bcc65b5c61b4944e08f2738a0a482ac4229e494990d18d45a470ee430cc3ccb515108dc1159299f53fa38ed026635cbdfad44547cc9267fc775 SHA512 d7268b81bfa3af2061650000aac9796dc3df0c85558864a2d07f2f232ec6ab09d5a8b27e58ee933a765197bf1d01acc9b204c41a7d6c883d892dbdefc19e099e
+MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/metadata.xml b/dev-util/redo/metadata.xml
new file mode 100644
index 000000000000..cb9c806b559d
--- /dev/null
+++ b/dev-util/redo/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+<email>jer@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">
+Smaller, easier, more powerful, and more reliable than make. An implementation
+of djb's redo.
+</longdescription>
+</pkgmetadata>
diff --git a/dev-util/redo/redo-0.21.ebuild b/dev-util/redo/redo-0.21.ebuild
new file mode 100644
index 000000000000..a109d053e056
--- /dev/null
+++ b/dev-util/redo/redo-0.21.ebuild
@@ -0,0 +1,34 @@
+# 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 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"
+DEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		DOCDIR="${D}/usr/share/doc/${PF}" \
+		LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+		install
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+}
diff --git a/dev-util/shc/Manifest b/dev-util/shc/Manifest
index b83bf6222490..cab20e346391 100644
--- a/dev-util/shc/Manifest
+++ b/dev-util/shc/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 341 BLAKE2B 9e21bf4fde239181d0dca080e08667fcf098398ea5f89b5e3b2fb27d3797eea6ef792f81b159a25c891c831dda165858172b11f1932469262117c12c155731eb SHA512 f5b2c355996851ad7c34e40f762e636295581148806b5a6129e79d39c564dcd16a8281b289598204048ca53c30b3f5efdea7f393e6ac47008d9a8af9bb54fe2b
diff --git a/dev-util/shc/shc-3.9.6.ebuild b/dev-util/shc/shc-3.9.6.ebuild
new file mode 100644
index 000000000000..60de37b13329
--- /dev/null
+++ b/dev-util/shc/shc-3.9.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A (shell-) script compiler/scrambler"
+HOMEPAGE="https://neurobin.org/projects/softwares/unix/shc/"
+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"
+
+src_install() {
+	dobin src/shc
+	doman shc.1
+	dodoc ChangeLog README.md
+}
diff --git a/dev-util/stripe-mock/Manifest b/dev-util/stripe-mock/Manifest
new file mode 100644
index 000000000000..eb31240fa3a9
--- /dev/null
+++ b/dev-util/stripe-mock/Manifest
@@ -0,0 +1,3 @@
+DIST stripe-mock-0.34.1.tar.gz 340357 BLAKE2B 127d39b01bbd883141c75e63dc5e0b8834dbc86f375058768072b3de75d3f9e3fabebdfdd9d872c51ad52fec3e2057ae342887c25b496b987d64652c93b204bd SHA512 c9e35867c44bd7d127f91d0f668d39ff67ca9bb2937428f808122555360a77b91f9f5d5648478dc2c4fc04a7b9195fed0a927868fdd22b852022ae2fe0f1e695
+EBUILD stripe-mock-0.34.1.ebuild 579 BLAKE2B bee1b559fd7bd252da8bc9cf95b221c3359841d9653d83add51098699e2a5e44cee1f16d30278270ca6dd5a0a1721b1757be88ce498bfe09622d8c81ac39047e SHA512 c94a200b1976687bf500a5f9a11ab0dc21eaf06aaec2a3d469f2275f3fc20779677c7d679ea220a6f7a8b72061734d215cdfe6bf2f39f6cd79a7b28b10b011aa
+MISC metadata.xml 478 BLAKE2B d9507af9f6fb1e2aefb92dd06000d1043d1f3e022c3c1538cb59da9e8ae79afbcc9485bc7ccb3f607704c9db9cd927a944e85f96a8fb8603491f7e464345fc0f SHA512 9f8e49eaebacbc8dcde06ca7650654f95e33e3bef44e7eb6106e128accb4a809a364c0c3aa6cf93be2ea0e8510774c8f5bcde4cc72af269e6644dde44f21b5b8
diff --git a/dev-util/stripe-mock/metadata.xml b/dev-util/stripe-mock/metadata.xml
new file mode 100644
index 000000000000..afb8d27c3fa7
--- /dev/null
+++ b/dev-util/stripe-mock/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>m.seifert@digitalernachschub.de</email>
+    <name>Michael Seifert</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">stripe/stripe-mock</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild b/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild
new file mode 100644
index 000000000000..9e701cfd247e
--- /dev/null
+++ b/dev-util/stripe-mock/stripe-mock-0.34.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_SRC="github.com/stripe/stripe-mock"
+EGO_PN=${EGO_SRC}/...
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Mock HTTP server that responds like the real Stripe API"
+HOMEPAGE="https://github.com/stripe/stripe-mock"
+SRC_URI="https://github.com/stripe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+LICENSE="MIT"
+SLOT="0"
+
+src_install() {
+	golang-build_src_install
+	dobin bin/stripe-mock
+	rm -rf "${D%/}$(get_golibdir_gopath)" || die
+}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 42e09ba53b6a..95db1ff37d51 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,6 +1,10 @@
 AUX trace-cmd-2.5.1-makefile.patch 1152 BLAKE2B fc44b06f2d59d2c02ba7c1f9145d06c4b256177cf9cf2f1b9928b2f08d49a719e675a543ffcbdbe5c08e00d9f27eec01052d278d90fedb294296be68d61b1bf4 SHA512 e74742d3c050f9e7bdb566a82a5212e6474b34ee6fc46e9ffa313ad3f2c323f55b63521ec857ae44f39ef168135fcdf733314fb3e04709e51f03ef7aed99c416
+AUX trace-cmd-2.7-makefile.patch 1164 BLAKE2B f3bd1f27d473d9f71eb81cb5d635a798b520a21e25f1bc47f9b78c35c056b74c3644812ee06fb5c49b6cb84d442f2b8a68f230f60da955b1f631e0a2200621cf SHA512 fb96207c85f32d72a28466c9c7c145dea76d39b91fb024cf1d6b8a9dec4f07832d17f1e1d454628ab9535d376ad055fbc5bb00666dcc355aad64fc259a7d2ab2
 DIST trace-cmd-2.5.1.tar.xz 1577148 BLAKE2B 25436354315bcfe886cca26678017846ac95c8f19877bf9fc7ab24ed543406b61516ad56185e78c3a8d79bbbc672419fca468b205f178cdc01baaf0dfd140702 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2
 DIST trace-cmd-2.6.tar.xz 1584768 BLAKE2B 42b2b4ac37246d610a2747bf0cb025d0f0ef5954a40c57acb8df8245f71fb516e0c124034b44addfee119ea453f1e732f6a2a73fa5e3bfb18da5ea7e1f920ed5 SHA512 cf479a940825935aa89b282c7a617d56fa5dd1f82e3322a969c4e0a08343ceca16c40058ead5f5878260ce0a003102550808c5475110706580769dffb1897c54
+DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
 EBUILD trace-cmd-2.5.1.ebuild 1519 BLAKE2B 85aa750902bd3d6ba16431f78c2ed2a829b3ec03e257a466e91f3a4e824256c32b41ae246dec989abab19fbbe92b4c3cfff14ee443c4262fcb5b1ff388e19a1d SHA512 564125aa45004c07e27a83d2e78fbbfd9670c4079c7d8afc679c9c3445ceca54370bd168dcccbf65101752bfb8a5b9b7f04264f172d7b12be917d1388d2e5c5b
 EBUILD trace-cmd-2.6.ebuild 1500 BLAKE2B 04764f54ccb207b141349af6a3d1c2e976eccb3eb80d24ce929c3964ebf3f9d4aa2a8be034e3f85284c96725de30eb901e999078e070fffe398c9d42b7121167 SHA512 866ac85fd69cac13215ca03f3044bf2214a46c0d711c6e4305acab224e7df6dd8258189a1c11155ab385c76d1592834b5ff79b1a6e8619c8940100c2c91c522d
+EBUILD trace-cmd-2.7.ebuild 1715 BLAKE2B 31e68124a5048736e04d4d69d9b262eecb3baeaf8a4c46da8d2ab7706a6fa490289b42fdf1cb284873823e0657a06ac695f384b7f5eb854d815cd93d8f33c120 SHA512 f2f4cfd9d579b9cc63ecf1a60d3c9eaa0b436a418afdc33e7a8c6b7364ed7d7e2077f04bba7d4ec3486f61e971dc3bfffbcc1b1b57df92aae4732a4fd56e9781
+EBUILD trace-cmd-9999.ebuild 1715 BLAKE2B 31e68124a5048736e04d4d69d9b262eecb3baeaf8a4c46da8d2ab7706a6fa490289b42fdf1cb284873823e0657a06ac695f384b7f5eb854d815cd93d8f33c120 SHA512 f2f4cfd9d579b9cc63ecf1a60d3c9eaa0b436a418afdc33e7a8c6b7364ed7d7e2077f04bba7d4ec3486f61e971dc3bfffbcc1b1b57df92aae4732a4fd56e9781
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
new file mode 100644
index 000000000000..da1ca62e7c04
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
@@ -0,0 +1,33 @@
+diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile
+--- trace-cmd-v2.7.orig/Makefile	2018-02-01 23:35:28.000000000 +0100
++++ trace-cmd-v2.7/Makefile	2018-09-16 16:42:58.445655156 +0200
+@@ -63,7 +63,7 @@
+ var_dir = $(HOME)/.trace-cmd/
+ else
+ plugin_dir = $(libdir)/trace-cmd/plugins
+-python_dir = $(libdir)/trace-cmd/python
++python_dir ?= $(libdir)/trace-cmd/python
+ PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
+ PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
+ PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
+@@ -119,8 +119,11 @@
+ test-build = $(if $(shell sh -c 'echo "$(1)" | \
+ 	$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
+ 
++ifndef NO_UDIS86
+ # have udis86 disassembler library?
+-udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
++udis86-flags := -DHAVE_UDIS86
++udis86-ldflags := -ludis86
++endif # NO_UDIS86
+ 
+ define BLK_TC_FLUSH_SOURCE
+ #include <linux/blktrace_api.h>
+@@ -276,6 +279,7 @@
+ # Append required CFLAGS
+ override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
+ override CFLAGS += $(udis86-flags) $(blk-flags)
++override LDFLAGS += $(udis86-ldflags)
+ 
+ ifeq ($(VERBOSE),1)
+   Q =
diff --git a/dev-util/trace-cmd/trace-cmd-2.7.ebuild b/dev-util/trace-cmd/trace-cmd-2.7.ebuild
new file mode 100644
index 000000000000..edebefd435ba
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-2.7.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+
+inherit linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="doc gtk python udis86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	gtk? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? (
+		virtual/pkgconfig
+		dev-lang/swig
+	)
+	gtk? ( virtual/pkgconfig )
+	doc? ( app-text/asciidoc )"
+
+CONFIG_CHECK="
+	~TRACING
+	~FTRACE
+	~BLK_DEV_IO_TRACE"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7-makefile.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+
+	if use python; then
+		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
+		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+	else
+		MAKEOPTS+=" NO_PYTHON=1"
+	fi
+
+	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
+}
+
+src_compile() {
+	emake all_cmd
+	use doc && emake doc
+	use gtk && emake -j1 gui
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install_doc
+	use gtk && emake DESTDIR="${D}" install_gui
+}
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
new file mode 100644
index 000000000000..edebefd435ba
--- /dev/null
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=(python2_7)
+
+inherit linux-info python-single-r1 toolchain-funcs
+
+DESCRIPTION="User-space front-end for Ftrace"
+HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
+fi
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+IUSE="doc gtk python udis86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )
+	gtk? (
+		${PYTHON_DEPS}
+		dev-python/pygtk:2[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	sys-kernel/linux-headers
+	python? (
+		virtual/pkgconfig
+		dev-lang/swig
+	)
+	gtk? ( virtual/pkgconfig )
+	doc? ( app-text/asciidoc )"
+
+CONFIG_CHECK="
+	~TRACING
+	~FTRACE
+	~BLK_DEV_IO_TRACE"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.7-makefile.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+
+	if use python; then
+		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
+		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+	else
+		MAKEOPTS+=" NO_PYTHON=1"
+	fi
+
+	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
+}
+
+src_compile() {
+	emake all_cmd
+	use doc && emake doc
+	use gtk && emake -j1 gui
+}
+
+src_install() {
+	default
+	use doc && emake DESTDIR="${D}" install_doc
+	use gtk && emake DESTDIR="${D}" install_gui
+}
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 3422f7211e68..a5b84d4787f3 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,3 +1,5 @@
 DIST uftrace-0.8.3.tar.gz 894263 BLAKE2B cdd303eb3bb488bee24fcb8ea852b27cc1c8c8de6483d95a65618f8af7aa8c06af42b561cee3b18c5d58378fff49538f88bc9debb6e2452ebade23fc7f4a32ce SHA512 2c7155ef2053dddb6b2abbed28a0374b1c1c69898ecb85cd918a1e426b27f45a4a5f9dad4be512592c72ee80c2e131e2def2a9c7a45c3bc93d4cc0b13b0c2996
+DIST uftrace-0.9.1.tar.gz 967083 BLAKE2B 2e381f5cda92fadd963fc7e0ccebaec6b6796acd75d8436b66f9b6ee4257141f704471832e224712bb65e7570fe4997f953458455b2b0f257ead7f4093140313 SHA512 a906664f883e08f19063229e7dd43aebc9115b08829d866fb887dd281a0375a5684332920c3f7307a4d62baa14e982cb7535bdfe454ab3ad5d8ec7fb5792402e
 EBUILD uftrace-0.8.3.ebuild 458 BLAKE2B 0f215e5ecb97f0dcef4cdc799459cca23d206b05e8ecd147572fdeca183c4093141f60884d331b74b9b23990163ad4dd8bf1c6cf9999442788adb2cdcf876b72 SHA512 3e8a8f696a1ddf4ef4c74bcd80e993f3d105d463d3987419d0dafc4ccc65e5a0785b0ce6c58207ed0e9d87a73892fe8848afb5ef347bf20d468acb0b1f8a5018
+EBUILD uftrace-0.9.1.ebuild 569 BLAKE2B 1cf7567d53eb11bbbc78fde2486090b4a6d99c24cf8f1165887c986efd40bf948bc3dd163b372bcbdef6c8ffd7d3a75aa29fa6c5cc8cabadeb8fe00f76b2e2b1 SHA512 b7f361630c453e0cbc1282f18bb2c97e7da54ab825f1b0437f134ffb39747da82fbde61e81c79bf845142aed1a7fd72138b3bf29d488af4837841755abe7d6ea
 MISC metadata.xml 248 BLAKE2B 839a984864aeb89b07996cf03470a078ae558a5b832690c25adea12868e54f82b950d52e391262da8649e40b97f400a7a45040d54365ee581743e5b61e85fa3d SHA512 047ffd8442624867a708f2a0473700fc91ddcf36aa9a0617308c7cdf956a63b8fc21e7d5a77779ca76ea6abafe89a9d8b7a1fba521f9ccb5b966ea1b5e716678
diff --git a/dev-util/uftrace/uftrace-0.9.1.ebuild b/dev-util/uftrace/uftrace-0.9.1.ebuild
new file mode 100644
index 000000000000..60c4d3793442
--- /dev/null
+++ b/dev-util/uftrace/uftrace-0.9.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Function (graph) tracer for user-space"
+HOMEPAGE="https://github.com/namhyung/uftrace"
+SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="
+	dev-lang/python:2.7
+	sys-devel/gcc:*[cxx]
+	sys-libs/ncurses:=
+	virtual/libelf:=
+"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" Makefile || die
+}
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 3e31361d7f1b..6f569adf8a88 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -2,5 +2,5 @@ DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889e
 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 2668 BLAKE2B 92594bfe9057db8ff7c4fb1bcccaefc555b7ac4e056ffbfe52f135793b83d9629887374beb97fe59060259dfe552411198e450c782cf9b8e618406ec416ef79c SHA512 551425dfa25ff5d82364be1add58d45bd5d2aeeca43f69834aaf007205beae9755d93886ef96b5d5be55828c69cd43059792d1e04f22b851737d43a1cf4b2533
+EBUILD vulkan-tools-9999.ebuild 2363 BLAKE2B 723e6012a6634cfbb521b99f5fa7813062e4d7310e7873a8b5c95114561cafe2824f6f51f9277f8de73b8083d870bdb9514e2c238de42e8175dfccd838603c28 SHA512 9718904d1fda46a920c629f79a7642e137b4a94a3c15181bdd89175bf5d07c2415fb28f27426d1004afb020d5bf6d21b6a2330935abe09411f95487999215d35
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 338431363f27..c30ba2f16111 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -49,8 +49,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 +93,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"
 }
author	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2018-11-18 09:38:27 +0000
commit	536c3711867ec947c1738f2c4b96f22e4863322d (patch)
tree	697733f5cb713908dcf378e13fd15a798a906a91 /dev-util
parent	f65628136faa35d0c4d3b5e7332275c7b35fcd96 (diff)