gentoo resync : 30.06.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-06-30 08:49:38 +0100
commit: b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree: c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-util
parent: e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)
116 files changed, 1471 insertions, 603 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 62922212b841..efc599e625b8 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/amtterm/Manifest b/dev-util/amtterm/Manifest
index 383c3d9df487..480a4d9633f1 100644
--- a/dev-util/amtterm/Manifest
+++ b/dev-util/amtterm/Manifest
@@ -1,7 +1,3 @@
-DIST amtterm-1.3.tar.gz 37671 BLAKE2B 3e01cfd3fe62739ac5c3538c3b00d183ce05aa6d20320769d9bfcbead2c9ef4ca61b8cb91e6ad24d2e8f369e6ccaecf56a32b56ecb0838f6fa57eebdcce56ee5 SHA512 04514b7d7a38f7e579739186829f1aba95b3580d24a47fe82382e1c85e8a24a11983117e5cc75c1f7e1f360927b40a5adc1d2ed65a2e325e7abcc01320aa654b
-DIST amtterm-1.4.tar.gz 38445 BLAKE2B e957575c4390568bebe91ad82c12005c6e255d922e92e43e8cb540b032b3ffc0e65b8e014ea1f1eab183adf8bc4afa065e5e0a8deba919026c31b4395c61eef4 SHA512 64bad394a2526291daa72fd211952caff20c0aa1f1c580dcbae3c92882c9fd57238c140e14749a9d58580e49890abd447e7ca466b39221301e4108c19298502f
 DIST amtterm-1.6.tar.gz 40804 BLAKE2B a682bb6646e7ed57e3ee8f17f25bdd60fed37d614eb3e66f6b05fa4062ef99237c24d69e4795e7a9d8b83579728c8f8423389bf7e042d981b3e84a0037e56b0d SHA512 b10777727cf7f931e4b04fff7c621ea6e94989738833fe4f830bd795c8be3b0e983100b34a2ea5feb48221f022b3498a819c9f4fba9c7722226d56d374a1d986
-EBUILD amtterm-1.3-r1.ebuild 1004 BLAKE2B a138c866b46016e742a2444e5af07b0cdf856df69e5789fd1bc947c176817934654f1f1338202e6f81d93f48d30a2424b3564f0df1d88b3e410cbf5777224995 SHA512 d56198fb989376e9222af6db3fcfda37bd45f3bfdcbd8e351e4f760b77d40d265230fc38f332ca7f2da37b699e71b158949835cd0aef15e159121870d7543aed
-EBUILD amtterm-1.4.ebuild 1004 BLAKE2B a138c866b46016e742a2444e5af07b0cdf856df69e5789fd1bc947c176817934654f1f1338202e6f81d93f48d30a2424b3564f0df1d88b3e410cbf5777224995 SHA512 d56198fb989376e9222af6db3fcfda37bd45f3bfdcbd8e351e4f760b77d40d265230fc38f332ca7f2da37b699e71b158949835cd0aef15e159121870d7543aed
 EBUILD amtterm-1.6.ebuild 1007 BLAKE2B a6e31ec74289ee24c57c5bd328874a28f89ffa68cecd8812a8005e923fda2819f2b649296c5aa0d5b861b4c7782d50333c26e404e9ea137978626b5cc125895d SHA512 1404756ba763dcd93dcbee6de2bee4413940fc304f4ae88af4829a88f6e1ed6451e1ec1f25adf6cbcaa00d956c1169650f2ccf8834f7bf1d6576d259eefd7e20
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/amtterm/amtterm-1.3-r1.ebuild b/dev-util/amtterm/amtterm-1.3-r1.ebuild
deleted file mode 100644
index 7b6ed194957b..000000000000
--- a/dev-util/amtterm/amtterm-1.3-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A nice tool to manage amt-enabled machines"
-HOMEPAGE="https://www.kraxel.org/blog/linux/amtterm/"
-SRC_URI="https://www.kraxel.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="gtk"
-
-DEPEND="gtk? (
-	x11-libs/gtk+:2
-	x11-libs/vte:0 )"
-RDEPEND="${DEPEND}
-	dev-perl/SOAP-Lite"
-
-src_prepare() {
-	sed -i -e 's|\(INSTALL_BINARY  := \$(INSTALL)\) \$(STRIP)|\1|' mk/Variables.mk || die
-}
-
-src_configure() {
-	echo "LIB := $(get_libdir)" > Make.config || die
-
-	# enable gamt
-	echo "HAVE_GTK := $(usex gtk)" >> Make.config || die
-	echo "HAVE_VTE := $(usex gtk)" >> Make.config || die
-}
-
-src_compile() {
-	prefix="/usr" emake || die
-}
-
-src_install() {
-	prefix="/usr" emake DESTDIR=${ED} install || die
-
-	if ! use gtk; then
-		rm -rf "${D}"/usr/share/applications || die
-		rm -rf "${D}"/usr/share/man/man1/gamt* || die
-	fi
-}
diff --git a/dev-util/amtterm/amtterm-1.4.ebuild b/dev-util/amtterm/amtterm-1.4.ebuild
deleted file mode 100644
index 7b6ed194957b..000000000000
--- a/dev-util/amtterm/amtterm-1.4.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="A nice tool to manage amt-enabled machines"
-HOMEPAGE="https://www.kraxel.org/blog/linux/amtterm/"
-SRC_URI="https://www.kraxel.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="gtk"
-
-DEPEND="gtk? (
-	x11-libs/gtk+:2
-	x11-libs/vte:0 )"
-RDEPEND="${DEPEND}
-	dev-perl/SOAP-Lite"
-
-src_prepare() {
-	sed -i -e 's|\(INSTALL_BINARY  := \$(INSTALL)\) \$(STRIP)|\1|' mk/Variables.mk || die
-}
-
-src_configure() {
-	echo "LIB := $(get_libdir)" > Make.config || die
-
-	# enable gamt
-	echo "HAVE_GTK := $(usex gtk)" >> Make.config || die
-	echo "HAVE_VTE := $(usex gtk)" >> Make.config || die
-}
-
-src_compile() {
-	prefix="/usr" emake || die
-}
-
-src_install() {
-	prefix="/usr" emake DESTDIR=${ED} install || die
-
-	if ! use gtk; then
-		rm -rf "${D}"/usr/share/applications || die
-		rm -rf "${D}"/usr/share/man/man1/gamt* || die
-	fi
-}
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 173346e8dad8..f67e08029d5c 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,5 @@
 DIST android-studio-ide-173.4720617-linux.zip 894052929 BLAKE2B cc1ff03b24febf18e8ebd9a78ae0463e9552e20ee4c28e60e5e4f52379e66d6e5c6d91af1cd641b79c72590a081770a22882539612028915cd064834c8bc0ef3 SHA512 121d5eead42743127dfccf37b0b4bc4ceddc0df706bdddbc8c0ae2ec3711b4c8308d945b92ed5e8b3209d380e202dc08fbf8475ef6ad30016ca5cc9acb264d3e
+DIST android-studio-ide-173.4819257-linux.zip 894877040 BLAKE2B 159d57c0c0d6d6958d1a08e7ff4ff0314c0cb2b15c5126dd3d357e1dc696d32dfee78ae6b2d35a628cbf000bc014d61c20ad48acce12c10356b0db8183c27318 SHA512 c399897bc85ce1399ac8ce1df4749d7f1bff4501cb90b13efbd61a56173ab1f6f9b0c7c1f852dceb7a76bc631d83ca4efab9b39c4d3c76e3b4454f4803611251
 EBUILD android-studio-3.1.2.0.173.4720617.ebuild 3072 BLAKE2B 8c5552536ef579a96c6cd72deef2103996e00c8425307da0c286dd0f09b9a3c7166a2431e4bf668065925f5bc2c1266218bd7d698839458200459355c414c4cb SHA512 3230961e4108f533365f501567eb4f95d2617582a00858f06764452af0cc982c2b25e391de415f38d6f83e613c4f904872cbd50c5c66dd2641753ab52c1e5ab6
+EBUILD android-studio-3.1.3.0.173.4819257.ebuild 2946 BLAKE2B 8c832ef656ab9e82c5e48613724674fb48086b04faa1a856b1f1b8874ae775a874c74ebf695a9b27298cb4f6a1e60c354940be8ed57f85f037ce8d161175c331 SHA512 419443ce002b2bb60105681a5fb622265eb47e19dc6e9a9cf23488eaa33350abe95aee15707c5c989f938ae94d7b785fca32963f28b624ec21392f374970c65a
 MISC metadata.xml 220 BLAKE2B d2e2757e926d61fa1d52be7a4f8e61b94c2f09f9868089255d89dd548d58b5898d8be4e5ea0c5c36cba3436b12026702443d43af0e4f7d6d41754b5c84c1c879 SHA512 9316c4d43c1ca819f3d2111553313246af1166f9fb95a666797ff28ca6b0410e92fbe4f94cf70a046e8086d824b47bed8b3c0d1ec1498a3be779cf9a828e9868
diff --git a/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild
new file mode 100644
index 000000000000..1ac8561ea03c
--- /dev/null
+++ b/dev-util/android-studio/android-studio-3.1.3.0.173.4819257.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils java-pkg-2 eapi7-ver
+
+RESTRICT="strip"
+QA_PREBUILT="opt/${PN}/bin/libbreakgen*.so
+	opt/${PN}/bin/fsnotifier*
+	opt/${PN}/lib/libpty/linux/x86*/libpty.so
+	opt/${PN}/plugins/android/lib/libwebp_jni*.so
+	opt/${PN}/plugins/android/resources/perfa/*/libperfa.so
+	opt/${PN}/plugins/android/resources/perfd/*/perfd
+	opt/${PN}/plugins/android/resources/simpleperf/*/simpleperf"
+
+VER_CMP=( $(ver_rs 1- ' ') )
+if [[ ${#VER_CMP[@]} -eq 6 ]]; then
+	STUDIO_V=$(ver_cut 1-4)
+	BUILD_V=$(ver_cut 5-6)
+else
+	STUDIO_V=$(ver_cut 1-3)
+	BUILD_V=$(ver_cut 4-5)
+fi
+
+DESCRIPTION="A new Android development environment based on IntelliJ IDEA"
+HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
+SRC_URI="https://dl.google.com/dl/android/studio/ide-zips/${STUDIO_V}/${PN}-ide-${BUILD_V}-linux.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="selinux"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="app-arch/zip
+	dev-java/commons-logging:0
+	dev-java/log4j:0"
+
+#	dev-java/guava:18
+RDEPEND=">=virtual/jdk-1.7
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.6-r4
+	dev-java/commons-logging:0
+	dev-java/log4j:0
+	>=dev-libs/expat-2.1.0-r3
+	>=dev-libs/libffi-3.0.13-r1
+	>=media-libs/fontconfig-2.10.92
+	>=media-libs/freetype-2.5.5
+	>=media-libs/libpng-1.2.51
+	>=media-libs/mesa-10.2.8
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
+	>=sys-libs/zlib-1.2.8-r1
+	>=x11-libs/libX11-1.6.2
+	>=x11-libs/libXau-1.0.7-r1
+	>=x11-libs/libXdamage-1.1.4-r1
+	>=x11-libs/libXdmcp-1.1.1-r1
+	>=x11-libs/libXext-1.3.2
+	>=x11-libs/libXfixes-5.0.1
+	>=x11-libs/libXrender-0.9.8
+	>=x11-libs/libXxf86vm-1.1.3
+	>=x11-libs/libdrm-2.4.46
+	>=x11-libs/libxcb-1.9.1
+	>=x11-libs/libxshmfence-1.1"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+	eapply_user
+	# This is really a bundled jdk not a jre
+	rm -R "${S}/jre" || die "Could not remove bundled jdk"
+
+	# Replace bundled jars with system
+	# has problems with newer jdom:0 not updated to jdom:2
+	cd "${S}/lib" || die
+	local JARS="commons-logging log4j"
+	local j
+	for j in ${JARS}; do
+		rm -v ${j/:*/}*.jar || die
+		java-pkg_jar-from ${j}
+	done
+
+	cd "${S}" || die
+
+	# bug 629404
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio64.vmoptions || die
+	echo "-Djdk.util.zip.ensureTrailingSlash=false" >> bin/studio.vmoptions || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+
+	insinto "${dir}"
+	# Replaced bundled jre with system vm/jdk
+	# This is really a bundled jdk not a jre
+	doins -r *
+
+	rm -rf "${D}${dir}/jre" || die
+
+	fperms 755 "${dir}/bin/studio.sh" "${dir}"/bin/fsnotifier{,64}
+	chmod 755 "${D}${dir}"/gradle/gradle-*/bin/gradle || die
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+}
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 6135081794f9..f0ec6217ed63 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,8 +1,6 @@
-DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594ff0d07d9fc74539d08f56df57a826bd87ee2b78989dad24b9bee7e6bfad7c10277b07b67ce39c663dac SHA512 e783aedccd4be6915621cc1f0d8b61f8a2895204ff9e483fdbd4b34b6f32eaccc973938a5e507c5346f50f9f9166fc7b7a885700aa13c6c7b00ffdf0eed78720
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
-EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
 EBUILD aruba-0.6.2-r1.ebuild 996 BLAKE2B 80620a5bd3bdbc01901142c5feaffba15e3c95e2c55f38316af6f990c035e49dddcc76e15f11532dad444acac2aeb57151f72c22bce29d619382522faef064e5 SHA512 fea9848ac20fca8837763665d6771af000ead36a4552a24a55f42912374131b1f44999a3db2cb32716f3bbec50dc31f9baebe647edba1e003ca17dc8b0193171
 EBUILD aruba-0.6.2-r2.ebuild 985 BLAKE2B 157b93d1d0e018a7c58f07a839d06d4386392cc36df235880009ffc409b5c0dd9d17c78486f7512f4febf33000a33e6f9ddc6edbc08bda152655cbeccdac6d15 SHA512 5cee45c56b5118a10e681828d9e72fb3c81f4f9e67abf300b5b62210b9a456a0a9ea5264b47ee110060c5db1aacea7a6464a20ac5f96f43b3f0eaa20b9aac618
-EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
+EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.5.4-r1.ebuild b/dev-util/aruba/aruba-0.5.4-r1.ebuild
deleted file mode 100644
index c1e026d110bd..000000000000
--- a/dev-util/aruba/aruba-0.5.4-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_RECIPE_TEST="cucumber"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="aruba.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber steps for driving out command line applications"
-HOMEPAGE="https://github.com/cucumber/aruba"
-LICENSE="MIT"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-IUSE=""
-
-DEPEND="${DEPEND} test? ( sys-devel/bc )"
-RDEPEND="${RDEPEND}"
-
-ruby_add_rdepend "
-	>=dev-ruby/childprocess-0.3.6
-	>=dev-ruby/rspec-expectations-2.7:2
-	>=dev-util/cucumber-1.1.1"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rspec-2.11:2 >=dev-ruby/bcat-0.6.1 )"
-
-all_ruby_prepare() {
-	# Remove bundler-related code.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	rm Gemfile || die
-
-	# Remove references to git ls-files.
-	sed -i -e '/git ls-files/d' aruba.gemspec || die
-}
diff --git a/dev-util/aruba/aruba-0.8.1.ebuild b/dev-util/aruba/aruba-0.8.1.ebuild
index 5d89ae37b9e7..389a430d1663 100644
--- a/dev-util/aruba/aruba-0.8.1.ebuild
+++ b/dev-util/aruba/aruba-0.8.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby22 ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_RECIPE_TEST="cucumber"
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/automoc/Manifest b/dev-util/automoc/Manifest
deleted file mode 100644
index 5e5f904af7a8..000000000000
--- a/dev-util/automoc/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX automoc-0.9.88-objc++.patch 2971 BLAKE2B cf42668b7dbf5c3373db3184e0eb17fda47ec1d3cdc741d5c795ce837daebd1a4fac37cbe9f251e96a51cfa99b114b963116da3f92de597ab0caed7e14c251c4 SHA512 c965e4aa3de0c1c711d944f349853ec6e183e28070e86aee0a38321ae48d80c4dd1dc2e8d3fc501512efed9c923ffc98dbab5730959f3cc81c2aaad7bd13c170
-DIST automoc4-0.9.88.tar.bz2 9153 BLAKE2B 4fbe9a5e07a0ef964b0a4fc4efa898cedeb239129de3f9e83b6081ad6c54469019118f613c9d4fff2a22227e62b374be5541898abf047254806fcfcd63e709a4 SHA512 96dfa096a3793f93f6a4acf98c051c871c0285124bff09b12914a17e08a1f26cd63f0bb1c22fdf2c5c29550a1727a087b5de86bfa8a555c562e96052b4a2d820
-EBUILD automoc-0.9.88-r1.ebuild 759 BLAKE2B da2a7f9e9a13712bbc55b26b5e29365fa28bcd3705f6496a38bcf1ce1efc2c9002635a1dc27a3238c458f18ed8b13684b071ed2cd47f777732cabe2427a63322 SHA512 943a2b41663bcda600e933b612e6882aac7580bfc129e699ba6836186ada604625ef6b058dd4ee6ee954eddaaa66c6a3db9bec7cea53542702d6d9ea3d7115dd
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/automoc/automoc-0.9.88-r1.ebuild b/dev-util/automoc/automoc-0.9.88-r1.ebuild
deleted file mode 100644
index 60198cf0b581..000000000000
--- a/dev-util/automoc/automoc-0.9.88-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_PN="automoc4"
-MY_P="${MY_PN}-${PV}"
-inherit cmake-utils flag-o-matic
-
-DESCRIPTION="KDE Meta Object Compiler"
-HOMEPAGE="https://www.kde.org"
-SRC_URI="mirror://kde/stable/${MY_PN}/${PV}/${MY_P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="
-	dev-qt/qtcore:4
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=( "${FILESDIR}/${PN}-0.9.88-objc++.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if [[ ${ELIBC} = uclibc ]]; then
-		append-flags -pthread
-	fi
-}
diff --git a/dev-util/automoc/files/automoc-0.9.88-objc++.patch b/dev-util/automoc/files/automoc-0.9.88-objc++.patch
deleted file mode 100644
index 1f4dacdc06eb..000000000000
--- a/dev-util/automoc/files/automoc-0.9.88-objc++.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Please refer to
-  http://websvn.kde.org/?view=revision&revision=934696
-
-Adds support for objc++ in automoc, so that running moc on .mm-files will work.
-
---- trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:40:57	934695
-+++ trunk/kdesupport/automoc/Automoc4Config.cmake	2009/03/03 15:42:18	934696
-@@ -105,9 +105,9 @@
-       if(NOT  _generated  AND NOT  _skip)
-          get_filename_component(_suffix "${_current_FILE}" EXT)
-          # skip every source file that's not C++
--         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
-+         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
-              list(APPEND _moc_files ${_abs_current_FILE})
--         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
-+         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
-       endif(NOT  _generated  AND NOT  _skip)
-    endforeach (_current_FILE)
- 
-@@ -156,7 +156,7 @@
-       if(NOT  _generated  AND NOT  _skip)
-          get_filename_component(_suffix "${_current_FILE}" EXT)
-          # skip every source file that's not C++
--         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
-+         if(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
-              get_filename_component(_basename "${_current_FILE}" NAME_WE)
-              get_filename_component(_abs_path "${_abs_current_FILE}" PATH)
-              set(_header "${_abs_path}/${_basename}.h")
-@@ -168,7 +168,7 @@
-                 list(APPEND _moc_headers ${_pheader})
-              endif(EXISTS "${_pheader}")
-              list(APPEND _moc_files ${_abs_current_FILE})
--         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C")
-+         endif(_suffix STREQUAL ".cpp" OR _suffix STREQUAL ".cc" OR _suffix STREQUAL ".cxx" OR _suffix STREQUAL ".C" OR _suffix STREQUAL ".mm")
-       endif(NOT  _generated  AND NOT  _skip)
-    endforeach (_current_FILE)
- 
---- trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:40:57	934695
-+++ trunk/kdesupport/automoc/kde4automoc.cpp	2009/03/03 15:42:18	934696
-@@ -326,7 +326,7 @@
-     foreach (const QString &absFilename, sourceFiles) {
-         //qDebug() << absFilename;
-         const QFileInfo sourceFileInfo(absFilename);
--        if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") ||
-+        if (absFilename.endsWith(".cpp") || absFilename.endsWith(".cc") || absFilename.endsWith(".mm") ||
-                 absFilename.endsWith(".cxx") || absFilename.endsWith(".C")) {
-             //qDebug() << "check .cpp file";
-             QFile sourceFile(absFilename);
diff --git a/dev-util/automoc/metadata.xml b/dev-util/automoc/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/dev-util/automoc/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 4f5503cde6bf..969fe48cec64 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e7326
 DIST buildbot-console-view-0.9.13.tar.gz 640969 BLAKE2B e0c6449c8208a34e568ed632be61fda0ae6ef0b183cd53e2288e1b89e03df6a874ec363f3cfdfa15005bc2913084eaf8640e86abf1ad2d19609e7b4c818f7b77 SHA512 16a3186a97112473fa1f7e811ceffe9f829d6181544e62290172b97b898ddb189fe8e67e223a3e02c936e61fc857a05e0b353dda7e5d4a3ce782f74a32515d2f
 DIST buildbot-console-view-0.9.15.post1.tar.gz 640548 BLAKE2B d28d3fbe40a8ceeaf574d2e8a9a6938664659dc6221a9e7e288c98b771cf7601a8db125dfb3cd71c500aee470a2b476a9daa0d5ec55a83758a96e97e14441def SHA512 42ad7d9dfdf0b3b0cda8d8dcd3fb2bd6734a775755fdc4ebe79d562f5ffb45d0e25d3ece15dec4a7542dd29e45a721e683bec416582901dbfa519c8da76cfa78
 DIST buildbot-console-view-1.1.0.tar.gz 640524 BLAKE2B 038412232299b9dcf5b38c0dcc646bce0f02c817b319bc796268e0bdcd10db0a82dbeb692850ad252246a2a0b48ceca23fd5ac900d46774b64ea19839673f607 SHA512 c45962f73d8e8214518c09fc3163d20f93ac4f55ed547dc90f4116906b94a01384bdc28e52d1b850ba34077c4cd30cd3e1f2dae23c01e233e5745de181e2dc6c
+DIST buildbot-console-view-1.1.2.tar.gz 640509 BLAKE2B 481b8049e606d47be8b171c24a210d6c95ce13ee4a4d46fd689ee836857e8d054f1799ce53de3931f820f02061cdd0c4a47686cd1724fe1c39ab33ca0f274d76 SHA512 23a14d3264802b2cf9a6a7cab0592c6391dc55a8805c17529c3279b129aaab1df97999ffd5fdc0927e7d5fb204e4114b4672018102381523599310cf7223950f
 EBUILD buildbot-console-view-0.9.12.ebuild 1141 BLAKE2B 0f0e870f4063f2062efac2bc573d5e9dea7568ac2e4064299aa22eada3fba565ce1045f39c3c26918cba874125cf42233177c4b8cdf09236806de30cd2b307dd SHA512 e2b853c3c6039a9a70f2319c498f1ff2ca1ee2a9ee1016f55ba8a5cf5d6ccf9a550ba60e68e90180c51a3f1d1f3915cd8732ca5dfcc837d6e38d7cd238afca47
 EBUILD buildbot-console-view-0.9.13.ebuild 1143 BLAKE2B 97ebe285e528c2ba2123f343826a4dcd33669dbe2d61ab36cc4dd7c4a1852c3dfd47ddceacad2fe1d0a7ce082f3a0d1cf06b89378413d16c6989c26df9234ec8 SHA512 4f220cbf6fb63aaac0899a9b31cc003a641c92adbbcdcd3ac091dd903324f518c585fb023bb3e69557b9c492fcecf93b2b309e160a84185b1d0ad6a71ebf6540
 EBUILD buildbot-console-view-0.9.15_p1.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
 EBUILD buildbot-console-view-1.1.0.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
+EBUILD buildbot-console-view-1.1.2.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
 MISC metadata.xml 771 BLAKE2B ad890754ce96954df2723ffe6302a5eee847230b91df1dd3658ada80aea2d6bd92fdfe65cf21d5aff257d8e736635410642deb48fe7769a5651a5073f6ac42e4 SHA512 a8edc15d355234948b35fe2d563ddc7d27b82195f706eb935fd8145836a41b1ddf2adc40c402a806334b30a2ba0c156b89f5c355a53126f3ea69130b214bc66f
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
new file mode 100644
index 000000000000..23b0c0ae9c77
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 4e5e9b7dad38..67a5f6649c28 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23ab
 DIST buildbot-grid-view-0.9.13.tar.gz 639145 BLAKE2B 31194a53bdb60958178371e10fd2ed0ca05d112d9a3510147d965811bb31788bd432ad1ed1c4690f190070ec5dc683cc43ed8a187b26eec5b80b7f23663e7418 SHA512 2ae54f27cafdf1e4d5c283bbe60db8bcc38d3ec133069114bfa952ae2f49306c7a83d57fd4749eb923567e22fdb0577311532ef45eb8630fe01a7c3fea6e2cef
 DIST buildbot-grid-view-0.9.15.post1.tar.gz 638877 BLAKE2B 7ef5a309bebb1fed0ff1b0efd016c9d895b44a03d0c3743690d6fc04ab669d6409af93be62ffa1ef0cac9465ef7940b48984ab423a22023800211514335d8011 SHA512 741dc6ef728f291d44663bb6f031fd0895b67bb770db053695bf276ae3a6a0f2e6e73eae7c595befec2f917e766b13913486331297cb048f000a124916ff6405
 DIST buildbot-grid-view-1.1.0.tar.gz 638856 BLAKE2B ff6d055d6f0426dba6c8652da3f4dcd66dc98d6d85db19eda87e48c8107a06164ab7d6978d2aae9e76dbc3212a78d94e93598937d72e55728aae6b0bf53c50bd SHA512 64b2c3f1e45232d7dae10b4505f4aaf9ad5b72dd22ad5be4aa5c4265a6a315ae65f72b7a8006a6b0ee887e5d30b2d28fe5085afa683efeda2ede8a7c310bb750
+DIST buildbot-grid-view-1.1.2.tar.gz 638848 BLAKE2B c99e79af105cf07a6540c71fb7e604bca144ec5d462f6a38c50b525b2ba7bf9640b8d1d4e36e0beb121eafb042fefb67a8adb8b91d2ed8fca4daf982712fae45 SHA512 c2dddab25d1da173ae22d811a9c3261eaec6ac76389829cb1cfaa8b976573d6f12208541dce4065d45512c4c984d9a1d4c72f6e151ec3365ba1dca356ad0288d
 EBUILD buildbot-grid-view-0.9.12_p1.ebuild 1110 BLAKE2B ee3ffc432b8844906ded608e3eb7cf01c8a9c303c111f8fb8c1bd728c9f32e0cdb4b1f04c70156576848e6443b2dbc80bd32ac6a43a02f1ab4b420f7cff74cb3 SHA512 775e3bcbc9643aa6e7bbdc70a53eb6cedbb66f3acec99e6fdb313a41ae39baf6c6f69e26311d8de3730892bcf999e8e04ae5442ae9207dafb2ff8e1625048c26
 EBUILD buildbot-grid-view-0.9.13.ebuild 1108 BLAKE2B 702acb9e8edca38ee219e85bfccbf81608e09cf7f217662b0983e8d3574c15d597db9c699ff3e9c6ed15327f7e5520c9ee92ea3b72f89f39647167c74762c05e SHA512 00187c14fc11f36af5594059937b9610aebe19ef96163264721098118ca09a881bcb378c7f10ba64b05c90d9a2fa8edfa076cd359c130a07eb8ad0ef07a381e2
 EBUILD buildbot-grid-view-0.9.15_p1.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
 EBUILD buildbot-grid-view-1.1.0.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
+EBUILD buildbot-grid-view-1.1.2.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
 MISC metadata.xml 750 BLAKE2B 8f279073c8c3a1f6a12ab347198a6ed24692d1ab0271bfdbe479da28aaee5c51843218a93b18ab901bbf78a2c36af5940cd2bef9273c9402076b88bb46a5a104 SHA512 8ae01c42d25b7e2d957968dcbe8c89e6b1efc9005b5021a7190c585cf586f37ce9b6168b29b58844149a8e869de9374cb611df6668476152fcaf393e55577fb3
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
new file mode 100644
index 000000000000..e30008fccea8
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	=dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	=dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index bd45822f071f..5102455cc105 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -3,8 +3,10 @@ DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985ac
 DIST buildbot-pkg-0.9.13.tar.gz 4448 BLAKE2B ea270faafa4a271e11ea1e64191dac0aaf9b6bc08e4d70e71746f9e70eadbe9d70555677bf7e9b264ac9146db0cb1cc639d86194b5280ad53fbe29bf073ee718 SHA512 1cf3ea6237062a0d8c3955ae75b76dd1193ed28c32528f341b242fe6dcc50f4300366474dcdce27246166b35cc1ca31df556b5e6481f5027d073122f1c00362d
 DIST buildbot-pkg-0.9.15.post1.tar.gz 4916 BLAKE2B 17f38dd7c0d70a7d07fde7c53128901dee24bda0d6503bea1dacfbf6f14bba17b645f5067e0932a5f03660330c20f647fe6d4c2125fdbf714a5828de314881bf SHA512 1951de2df02d50ba1d7c3bc6db9084acf65f88a9f9f73bf26715c7d14521403580a26efd8294aa5f2de40b986032dd78fe52230e58ad3d298f39d229481fc286
 DIST buildbot-pkg-1.1.0.tar.gz 4855 BLAKE2B 29dddb28f8d5b3bbb82b24959077597e0832b2b85308132e2bdef03a28e84dcef400715b4d7faa33c42b3ec4085c10d825a50dc0b0d55aa23a13e1e02b0ca3c5 SHA512 e48d8086170d9c7fd8270a2401ee5f0980dcd2a4554218fd9ac1159d9f08f4a82fc03a2bbea27d169e9f0e4219d9ae8331a522cbf52bdd2e51bb13527f4dbd8d
+DIST buildbot-pkg-1.1.2.tar.gz 4838 BLAKE2B 437fd8c7d293622b8499c45072d03912cb196afa97f06220cd3279ad01d2426e399e9c95ee063146dd8713f0284981c8a42b79f44028aebd19cbd5a4fe518eff SHA512 11fcf96907274b699da23c667d7a634b1af3752b9edf651e3fd50f030bdd80d3170013ac2c789fc2943d2ca8a84cb02b5caaeb60e646a54cf8b89a5e701e21b5
 EBUILD buildbot-pkg-0.9.12.ebuild 1068 BLAKE2B 2db6c1832fd1305ac8a44b7c644d01a93b6c6f845bccce20c014986b6ec85824c505f758489b58c6432bf4d8007f85010f9415d8115039bc9b530bbb5432d0a4 SHA512 68f406a27589210f237334b11186d4d3ea56fbc0d18083923b119c0e22523f468a1f41998edabbf47e2b6fc44176aa953f22d8b67282e89a98b4bfe4dc44d5fe
 EBUILD buildbot-pkg-0.9.13.ebuild 1070 BLAKE2B 1d580c2f59c4f9540d69a1a4fb9eac94ac443d3abc16b235c71350e0d4318153955a0691e0c007d2b23f86712525fad489bc770ee2d8f2d74f993076b042eddd SHA512 a1cc5494e321b7373ce82214ee4a5bffc93848884f39a340fc7db25feb64d9dcdeb055aa5e84796dd61aa02491c5e2ac1cc7b4f260aadbabdd918f8a5a5931af
 EBUILD buildbot-pkg-0.9.15_p1.ebuild 1149 BLAKE2B 21ae9a3d626a5ffe3fa8b74411a91108f1b8b13b16d6894c6d2394809f45b5007bc084bf0c47740f5723500695e8673a00734156df91bd1ae69f22862d7ddada SHA512 eaec282d3963e29742e7f71a84593d0bd5f70314e0095631f0066bb75a898997917e97b3ae070f231e911711ed66533020ffbdaa75887a5109ebc0e1c90c983f
 EBUILD buildbot-pkg-1.1.0.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
+EBUILD buildbot-pkg-1.1.2.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
 MISC metadata.xml 1309 BLAKE2B f2c7d28ec175efb170fc4f556b4f0d8beb8e6ca809240739ade425d6258d6617ed97a6cd5abd9a0f9a54e07a520113ad65dd2b912497adb89ef2cafa74038a56 SHA512 8ef3eb044f5b1b072a48a26436fec067a2b299b1cb144df13eaa283370c291225dde8e895b6cefab18ff7632882c9adcc7344b6bd41f0fb8a102d65862102a19
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
new file mode 100644
index 000000000000..46595012d5d7
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch"
+)
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 987b4676603d..684752202c84 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149
 DIST buildbot-waterfall-view-0.9.13.tar.gz 714287 BLAKE2B addb1cbda2f751192533b7074bd5fcdd36f4d328ad555cba9c821b0648ceceb5ad63d2db85dbac9cc813d6665dad8f5725e5bb37123b6bbce8310740a3597d1f SHA512 448b1e0b63aaa1d33a7595262901373a4c9cd30e544bdc8bd2d672f8aebfb4d90aebb31ce4d78d59725bfdcba019c3643e9f6d66d1493fcb8c77fb8acbadfbf6
 DIST buildbot-waterfall-view-0.9.15.post1.tar.gz 713929 BLAKE2B 4940cf9224a1924bcb63ea7078d606ec919c0602e1c6c5d3cb53318a91e285add2a75b05ad46599857f2b73cea501754ac71e54d3ba6941a18685eb3c05e9d39 SHA512 841186372b8ada370c28bf07b2df9ad91d298913202c937e6d459dfede24293f9aef1d330ee07a6c97a91bf75b4ceae9f87b494f173082ceca1fb2c5f04abe79
 DIST buildbot-waterfall-view-1.1.0.tar.gz 713901 BLAKE2B 73366eac6a7e0c9e758209b64e2f086148612e9db3459a5babeb272f515d0aef2bf7bd3dddac6d57955a0ebb3e065fdd3eaee31196cf5bcb9afac269d154c4ce SHA512 f6151aab01b680aa77b17c6863e3d33557c2436a2ffe35db0b75416a1d7facd3927437c8bd659d8fbda339e4f77412ba6df605500e6b31559770fa3a3c0eca59
+DIST buildbot-waterfall-view-1.1.2.tar.gz 713898 BLAKE2B 0873ca7d44a9da7ad260032a8153c45e864c605c79cbd826d4f5cb306dbcdcd1fd1e89fe59df57decdcd9ce94330d80ed20d8d7d95b4dc93d6d7cdf6340eb30f SHA512 cc14894281b712fe479ea19116948f69fb43a4cc8c7a0f159fcf97eed0c36a11cc967a0663042f34f64cc4d65468c58eb4398d66fb0d125cde6dec9ef7fc7e08
 EBUILD buildbot-waterfall-view-0.9.12.ebuild 1145 BLAKE2B b04cf48ed5b4849436b4ea7e6414131307a1a3ffb9524543a6801b69df0ffc63282290d4b2ecedd88459d221e352d4e62f46bda68af1406466ba05a069166103 SHA512 6b6180ed60a93200a86adae7a006de353c9dad0ab8f5846896e4e76f255ecb2ff57e0431068288c3ff3daa01aa03992fd3be4246777ac12bcb6c2678c27dd819
 EBUILD buildbot-waterfall-view-0.9.13.ebuild 1147 BLAKE2B 0d51cace1706245d4d0ae46d0fef89b176226735d432093d1918dcea5872630d9a3390a01c85a2163cafd938f9b71e95518b999c07432f2f0444126d8957cd5e SHA512 e12a6f172c48da675b169041262e1b89e51456bfb54d9391459be065105a8e927b2f5d7ed79f7fd98a7241a06d4f6536cb8bf83b85bfe8d9cdcc9dbd4ca85534
 EBUILD buildbot-waterfall-view-0.9.15_p1.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
 EBUILD buildbot-waterfall-view-1.1.0.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
+EBUILD buildbot-waterfall-view-1.1.2.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
 MISC metadata.xml 791 BLAKE2B 4e469a57580b4fda1bcbbde4580bdfd8e19769784a1760ddbd08b9c79ebdacab273be9871d87afe32f21f12efc2697f53f02367672660932faddb230fb8981de SHA512 0a5df49353620d0c31e66181179c213e7add694cdc141715635650a1a7962cfd96f5a965e42ca8f860d6d24ad9be08001e4a9b2ca49ef31f529f9aec0878cc13
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
new file mode 100644
index 000000000000..85e04699e657
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index de4f5a3cc142..45cbff5d027b 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,13 +1,15 @@
 AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d106190f700313e050bd439909f6522a20ce2bf91e6e18205b52ca79f9f6ecdb98d8018e67059c0a74c00d56483 SHA512 0cfe04d4587b9befef451d2fb47125643d84bbf12eec99a84622c21f06d7a8e10eb0ceb67c9491b61639b6634b2942ebc42d2ffa8253afbec688dc4e03d70158
-AUX buildbot_worker.confd2 367 BLAKE2B 51ea7eacb99bec3e8fe31ef9933ddeebc4ae6afad1880f4acb76b0460b16336f00b1868b980315b09ba591be9dab9379466cfa6eda5b6d7a999a5e4eaa1b76be SHA512 d46ca9656ba3f4fa58208954ba80d0c8e3a2a6a1eb14a92128653e56915811ac1f1e0a4aba0755fe4844aa0d85907eef6c657236035d139faf030b5d6940b820
+AUX buildbot_worker.confd2 366 BLAKE2B bfd08d2c6ee89c9e9d09e3280ded65765789b701cd4aa31d953b8f87d24ec1d85260b22d978d152191c918c72569e77bdac91de07d3eae4dad9ac529b4c140d4 SHA512 2bcb93b739827566bce295bc508481c50b57c1202d858359733649d4f35f116d994e0285a53a84d1b89d371a6fd23c0a89f4e555c31555bf14783eb5f57f15b0
 AUX buildbot_worker.initd2 1640 BLAKE2B 17a40547260004b40d77219aefa70f08846741e328a2a20bb0b075d5fa0007cc6ad63ecf600eee49251de14c4abb41f70ca813a9429dbce251509121157da9b9 SHA512 8eae575cb001b4750cd2033f9cb82d3985ad9bc2a4bc20ff0e4aaa0cbd05bacf8d6d885ec08112da15e0ccf8fd895006eed39b0b9a4bcaee86911b5180fab0f2
 DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015869fd6115789a7ddcecdebdac8707850715c677ee248668f73035ea5656665973634829f2f97e3e75fe8e1515cb0838b88 SHA512 c2e86bd8818eddc2849626a0c7642169bc91fa2cc1d531977736e53c4ad3c87c3f0cb17d7b9acd137e783ae822f558a19f4668e3cd37e90a8435157485bd1d57
 DIST buildbot-worker-0.9.13.tar.gz 102710 BLAKE2B ab60bc2607a706ecc760c2439655bca3f328d773fbb07e73c994f079356341a251ca23c573a71cce92dbf71ba62ceaa70210f8925fd4d1cdfac335b2a485ee9f SHA512 920f76d70c88a660b1d4c15683847a144b8dfaa01b91742ff2fedbe013ab030d3c5f07b6308f8bfb3f7bf3c2f805f7735d007e67257ca5233d2b585518f79e40
 DIST buildbot-worker-0.9.15.post1.tar.gz 100901 BLAKE2B 5e4744fcd69e2920e0ca9ba0b1aa77ea5f62ed4aecc9f00df17953dc813e1f8d61a859ab0aacc26f88f51d281574a8089b849fe063d55c8649c4a53b528d8ba8 SHA512 6ee23f1dd52672646f28978cec3fa9e29b64cae84f524bbcb6f2614a4a56e49e8363975b89cd3508e78c9779233a27403e46fc098be0808d6cfc1e6aa6b8499f
 DIST buildbot-worker-1.1.0.tar.gz 102142 BLAKE2B 144587edf2adc9d99837dc549b4d0696761f6cb3c959d4c133a5136606934ce03836cd1fcb019e7bb8ec473526c2ac07146c4820ef4d8b17ed9d843acd6c06b4 SHA512 77c46b3c9a16847eaf72de1dafa871a3242b66235c94ce8109f953db39aa4b74de2a03ca7ff06e91f8ea0751ed57e6ec1f39336912d56346f1bed171f597f6ed
+DIST buildbot-worker-1.1.2.tar.gz 103013 BLAKE2B b44593b71e61fee4037911759fa4f686aaabf5ef4be9efaecd539e88c5fc2ed2059d8dd8d6d1c4b3ba57d3563f79aaa404176529622003070c136803c90beb10 SHA512 3dd3da7e87d667307fca264d91af4671f76c3aad93a0512ae5777bb2e3972efe349968cf72fa17b99e45f2d7cec1ec16b1180c48d296e2702c9548bf858951a7
 EBUILD buildbot-worker-0.9.12.ebuild 4808 BLAKE2B 56e8fb43e57c6a90054296637223fc719e4b52738a3d5037326713b10ef29ba9ac9c71c2f468c040e075310501720147d59b83f9e83a4cf45146784de22905e1 SHA512 9280d45f8db1a23af1aa1098b6dd8677a22036a5256f6bd36b54a45f488a7c4ea2dbda2b006aaa2bec2084c14fe30cec56b3e6d6d65ae5a00db86e3307c3c7f2
 EBUILD buildbot-worker-0.9.13.ebuild 4811 BLAKE2B aa27842388456ee6deb710df750bcc84d6550b4bc67d1e37892127ae3f174fa7c170e9c07e6d3e6447abc9f2240375c8139475cb6c97d34220596dd4bb003645 SHA512 883cb6457f5f71ceff7becf1ca035466dd30ee796a1a8e0ec7bf61f5bd0fde926d21b264e3c1bc5aab8144027baefdd5ff27c55a2a669059a5a6f5e9cd3b0098
 EBUILD buildbot-worker-0.9.15_p1.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 EBUILD buildbot-worker-1.1.0.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
+EBUILD buildbot-worker-1.1.2.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 EBUILD buildbot-worker-9999.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 MISC metadata.xml 591 BLAKE2B e5b06e8136a2adbab54c70e416a7117fccf3ae0a33bab129e1b5db13096cdb8716ca09606fd67a9c82088a0e40e0ae8bc3137262086c8ebb45bbc6993c14984a SHA512 d3273df1c8e6284b75ab5cd15cc5092d10db8ab8c0126e5eb21425bf3f2cab0f582a4e1bdf1e96881cc580a13047ac9fc72e09474f03dd788f85cd7962be6257
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
new file mode 100644
index 000000000000..dea70dbdd5e7
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user distutils-r1
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/"
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+IUSE="test"
+
+RDEPEND=">=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-0.9.7
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+[[ ${PV} == *9999 ]] && S=${S}/worker
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+		to support starting buildbot_worker through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		Set up your build worker following the documentation, make sure the
+		resulting directories are owned by the \"buildbot\" user and point
+		\"${ROOT}etc/conf.d/buildbot_worker.myinstance\" at the right location.
+		The scripts can	run as a different user if desired."
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-worker-0.9.10-r1, more than one instance of a buildbot_worker"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd2 b/dev-util/buildbot-worker/files/buildbot_worker.confd2
index 3ae1d865fdb1..f14e3210ca99 100644
--- a/dev-util/buildbot-worker/files/buildbot_worker.confd2
+++ b/dev-util/buildbot-worker/files/buildbot_worker.confd2
@@ -8,7 +8,7 @@ USERNAME="buildbot"
 # Extra options passed to twistd.
 TWISTD_OPTS=""
 
-# Optional specifiv python version to run in 
+# Optional specific python version to run in
 # (if not the system default version)
 # ie: RUNTIME_PYTHON="/usr/bin/python2.7"
 RUNTIME_PYTHON=""
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 0e88502d26e8..faf791e2e21c 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13
 DIST buildbot-wsgi-dashboards-0.9.13.tar.gz 627272 BLAKE2B 1b4b8b6a0eed9572923a0dba24a9194557074e84640cf57141014a92294c56f22330566ae995bfa5e6be63640549e42e5aae01911df6989dbe4861b7ca5544f8 SHA512 08eedef62e85d71cbfde0f57727974a2bc1a9d33fc3821aaeb3a003df3b212c2b1ce00afa986dad062415b0bf8d8a9c0c328810e9d3fc994cdcbb82de2037366
 DIST buildbot-wsgi-dashboards-0.9.15.post1.tar.gz 626856 BLAKE2B 13104173594f1f5326221cac1839b44e792212c772730f0632f8528e55f5249d61b72c97cce7e51b6b3a82b2490a7654b7deea04ba61da13158e6d40e0021429 SHA512 5bd089d38a87e1e1dd03343b96824dc227e35268971b9b541e761c289042412b7dd0bc42df2fc9c28da5933a995c5bdf7af7bc7aafff999ce2f9431881bbd58e
 DIST buildbot-wsgi-dashboards-1.1.0.tar.gz 626836 BLAKE2B f7323073f644e6b6b89595aa052ae1bc25d14b439c3d1d0f3601eb4a62b07563ef12a97bde8997495fe6260e31de55a29b220f48c0b794761e077de77ccd0246 SHA512 799c2a28bd874c864264247fa0d030b3335d63bec88cfc7637b8456615c0c299de4df91557178e5d3358450fea89ed0ddb82ae27bbf8304dc3b7f9711ce69e94
+DIST buildbot-wsgi-dashboards-1.1.2.tar.gz 626825 BLAKE2B 396fa858cafd6dc3958c37ea2e9e685357de2185ce0b73d946d3eb2e99472339e176de1b49d821337535904c521e8dbaa662217c568306e7b2d889d11fdeb5ed SHA512 1eee2a38b525145e50812dff421613291f6b0b6a80a531b54383d771393d2a12c1c7840e2dabf7949918ac3f31ce5f6bd9514c08dee8fe5900c99438e63d4ee2
 EBUILD buildbot-wsgi-dashboards-0.9.12.ebuild 1150 BLAKE2B e9354da5dc2bcb0ed8570ba566a483c75c5d99616c36a897d429a55b3ddf8106acfa8552ad00da622c74e7f9fda20b6bbdbf5ea692d68c9e5fbcb70dabfc2e21 SHA512 c5f35d782a8f6b642d28ebd0c4038a89a0efe89f16a0581c2769c03f03655b618dfaf0a9aad5e616662e3dc99f2447e514897c6d87a51eaab82492650c641548
 EBUILD buildbot-wsgi-dashboards-0.9.13.ebuild 1152 BLAKE2B 6154f9831fe307b66f29fd52fcf6336f173d36cd5195ad89d2ff70f225baf72b22d7057d81b86ad8d98d9d17d6dc558aec78e587da7f97b8cba27e883d99599e SHA512 1a1e4fa7fb876f4dffdc6bb2095520f79e379a030060e43a74ac01582c7d04a0ee93b881cd1c56fe3e037b29e3651884c252620f21a8a11cf520885bac87c1b9
 EBUILD buildbot-wsgi-dashboards-0.9.15_p1.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
 EBUILD buildbot-wsgi-dashboards-1.1.0.ebuild 1152 BLAKE2B 72c592e833649c305968394f432d40f3d995c1817fb61fe0aac99de8db235563d188e43fd74f77fa5b8b047f0efefad6a013f462fb1c40f86be29f765faf9d8e SHA512 6337e195e618f0541e4d5eca3ec426a657f17fb3e70a5884f48a6bf71fb7cfa445ac4ebd44f1e84bc94a19166c28f7bffa56c12b36d3071e4a82bd8f6fee53b8
+EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1152 BLAKE2B 8db351efce478167c868cefb3694c0027ee300daabea790f5d53ff37dc489707349ace7e1241f071b82608642831d5e7f426b9b758d883eab13fdb95f133141b SHA512 2930a358436bb9002505008ec1763aa5242a0e367ef5736c6e37d8cb026980a28c719265ba475160071e1eca70df914b58246d154e068f7bcee561e269ecb86c
 MISC metadata.xml 790 BLAKE2B 5441af355527235e9e12079b22918db4beca4cb79b2d479436ba050039e9d9de6971ccca8365b4fb7010408b00601b1a8095b3d8c23639cf0612a9baacd89dec SHA512 15928eff7b660deca2fa007e8924a8c878f4694880a3e0d2092a63b9fc745fbe91f77ae4af65d1ecd1f593519dcfd6b4f495cbef16704680826b00bfc5b4cf4b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
new file mode 100644
index 000000000000..d40978a5739f
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 8051beef3efd..84096fa13c5e 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -2,8 +2,10 @@ DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1
 DIST buildbot-www-0.9.13.tar.gz 691556 BLAKE2B cd3fe546c88308debc6dd621e8979c400816a11235b67c23e539bb3525746a864d76df2c4f8e04f63ba4459d2186094543115ab51bdc35f56b20c8c1a0ed5a68 SHA512 b092014e490ed46f2551ddeeaef5364c85b048cdda298af11acdf664d799fc52ef6f8daa17cf7a98d588c59abcbdfebb666345b44d551859d3db9b4fa358adb9
 DIST buildbot-www-0.9.15.post1.tar.gz 718007 BLAKE2B af64eb2e0fabea2af3c02c294d50c924211755358187bd0d52f43821fddcd6d566f8aad1136da3ca69f924aee3bce52cde1e48af3c3f0419c23d6c1be25c17ee SHA512 749fd6e763580bb0fd27f7ce1576ee193ccf9cb42616c3b393a0bfac9469d9a42372069d087ceae3557e72540a3e0cc37087ba4b7901cbb67877f17f27422a47
 DIST buildbot-www-1.1.0.tar.gz 718666 BLAKE2B 86bc329eb80aacf44c5bd01eaaf6b8f0631cb808080fe17f667f54746f841f9d88aa7b699e6083546b6e2dfb1171333ee173c484c9fdea285bdd5769d90a6528 SHA512 8e95a4faf393a81fccab225cf33ee13947cb72e441e2cfde833843838686a888cff24e45c6085d4ac431dec177d696441cb21014d172ae23b61ef70164fccb31
+DIST buildbot-www-1.1.2.tar.gz 718705 BLAKE2B 009ae0dc07693f9eee4e3982ccbecb32d64e7d27e374f539cd541a5f80d9b9bf798e8836502cd26a5477b0ee842dbfae2308608fa3320e682afd0bcda2f89f1e SHA512 e4a0f7aee5e38d0522d39c819d4b9865966e020fd89b156e79807417fd7f82d497fbceafcc8a89e5beb6def1f42e4bfc595053581cbe2634520ad2c806ce3968
 EBUILD buildbot-www-0.9.12.ebuild 1182 BLAKE2B 15e5f4e434388e046289db3cdab2419cff90b6878e2f206b33ee0add43709c1519a23d1bc9bb98f6538d16939e95b24f3e94a8f69045f1c34227effb42f6ef70 SHA512 040ec4dba0f0e5e15d64f368063a78244dbaa58ab1ba5ba12969d9e29a69a4c2a00d8dca1f42c84f08825c7f3a7aff682d34f8305df10b50d024201ca839ae9c
 EBUILD buildbot-www-0.9.13.ebuild 1184 BLAKE2B b9347644e9be3d66a84c455da583ed296dbe9ae8576ea8b4d55378f5d40b0ad49cb287b6f2c611a39efd2757334d7bae49132ba7bc77d4b3b4f502fa43c6a178 SHA512 84a11c2badc1dd43caa59cf092431ae9b4737945eeda60963b88c58af09adbd8c7d40d99a1cfd09a04cb18c9f5c3b8b5d8e511dfe031413a914e38f68798a448
 EBUILD buildbot-www-0.9.15_p1.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
 EBUILD buildbot-www-1.1.0.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
+EBUILD buildbot-www-1.1.2.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
 MISC metadata.xml 777 BLAKE2B 07ead3ebaabaa62d3d09fbe84329649742eb92d194eff89c94f422f14934e92130401daa97799e038152943e0055a3a4bef74815175a533d2821a07645c64bb4 SHA512 9cace9b96d46b5cf2775d4a1d328c5cfdf3448758f293c0b12855bca7f65244e34529bd51e019201f9d397cfefbeb503f6dc1e2cdc9fe1f5e456dce1dcb2a5c6
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
new file mode 100644
index 000000000000..8ee469d1634d
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit distutils-r1
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/"
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="test"
+
+RDEPEND=""
+
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+
+S="${WORKDIR}/${MY_P}"
+#[[ ${PV} == *9999 ]] && S=${S}/www/base
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 4abf58320e39..beb6cab3853b 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,7 +1,7 @@
 AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
 AUX buildbot-0.9.15_p1-buildbotworkerdocker.py.patch 947 BLAKE2B d0e4e1e97ac30d63d1167c64e6505b18573abb3183b970e24dd7cbd22db06094cb7a14be97f3fd3a4ac9ef6bb6bc37050613e83ddb4bb6dd2d61e88769336069 SHA512 1b92cde0a585521d4ce33fa4cc19b9322c64e004f58a4c8570a6ce34a551d77431dd761f59ac41553968a89459c9cb5ea49212e2ce7b2838adbd51b922edee81
-AUX buildmaster.confd 218 BLAKE2B b921db1ea03c73d4a9c9eddc79c5831dcc755a51d31a334e8b35ec0abacb76dee28185030aeaf5f70f2f660139ce1d5707c43c083d6966790ad136c2c1251860 SHA512 d9339c30d3a92e92b41b0e3139ec89ecbd1460b0e4ee6c6fe2560c4307b2eb3f29b838c2f2312b9c7049bd95eaf652d09039227c691af805bc25a36999ec1840
-AUX buildmaster.initd 1573 BLAKE2B bfd18d13345ab7dacc367867da3d0d70317250a3bec0d772caf40cdb16b0684eafcff6b3858608e2d317b48fb9e72b742dba5c3b0276a4183fc70d3b5aff693e SHA512 22d58baa3500de63ca3d278c2ed44c78694c8f022a9916b0f35344485dbbbe46b054ba9b0cc9a8c56948ea8726e419cb7e1177036124fc3fc5acc957d56f168c
+AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
+AUX buildmaster.initd 1576 BLAKE2B badfd427f40acced775fbf1e115ddf72792e9df80ff46dbb2b99cf01187885be360ada13b05ceec0ea181337f0ba07966f659a9f539f47cc3611555f051bbdf5 SHA512 0ad8173fcd732420c104ee3467d9df4c629165d82e75ddc8154249e69af3a8492a645e57e2da8e06372ba062aecbff82bfd0b24ff7d58515f87f0d255c8cab0f
 AUX buildmaster.target 138 BLAKE2B 7570fc327d2e002803f7d6691740f5885e6b54d3df2522c0439d551d0c01161fcd99779df0bff417dd66e1bacde2956bfa7b39f988f2fe204fb2abdb675adfe9 SHA512 c5f56688349af0adcfa644abc699445e2c61bb268d5407f8fc540ac80ea9be6aee615df16bbf0f41db272dd4159762d7be744b3116efc0f9bc7cb1d458edb050
 AUX buildmaster_at.service 375 BLAKE2B 1a4d829389298713bf66885a5bcd28202eec32b6356b43b9e0861b00052e3702593a2e2a4764246dd62e52805ba2f2e62a86d0ae8ec4cbed3df42400dc562f74 SHA512 c37f1c461a4c7ee741a839772a5feabf10103542e159c6ae4eddfa37a146732dfc23f91d867d69c3718a21714516a3847485ae4e6580c93a5aa94daec40dd093
 AUX buildmaster_at.service.conf 150 BLAKE2B c6931c3ebfd77553d52b650668c440ca17f37bf270ab807eb97702d23cc504c0a933453addeef4abd3ddb13e9441cd330dd4cff9dc9962bdabbed8f0fa6d892c SHA512 d533b95c5b180cda5aa73966c590b7828598d5b6bcd77147a88238941adaa4c3c78e5f17d771598f622212856b16ce4582ab915a4cb57f0dd633eb2ad6b4c10d
@@ -12,10 +12,12 @@ DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b
 DIST buildbot-0.9.15.post1.tar.gz 3088947 BLAKE2B c9a0265d3df2a9ac01872fc7106b5b787334bd899a43fcdb6ad06aab5e0e8f1ddb4374bf5211f251f26985c3b11a0b981bdd23fb668ac1717af36443831648e6 SHA512 c5c72132fd8446fbb14467851063d192dbb817506163eacc3022d563698453c66706a895613ca1c17502dd25957b31f6409996497d2e7646ab2fdbb3fb55c31d
 DIST buildbot-1.1.0.docs.tar.xz 23932 BLAKE2B 81da8b86bb269efd2cd3f9146f3d9b41d64b28fdd0c878708c323d040a7e773cd277a18c82b1ef3cb07759ba8aedbc604e1de84f6477205b1708c28b6e86831e SHA512 511d244ffd205989047b4514b164e194b30fe4e0513d3bda776fb4d7a1a5bf42d8b7f00540b88e427838ab43f45686a83e556687ab75ce55eae6b834426a8ef7
 DIST buildbot-1.1.0.tar.gz 3098781 BLAKE2B 5a4ba8b641765fd58c3b5e788fc20aa1fb6195655ce2d82929f0f62ff48d20672f21efe0c413387e583d095c3ffcee1055a287016fe87ec1f3eb6b0ccdefdccb SHA512 f850ba2cd93d54a8abc97503719f93f69dfdc3d03b519e2d05c02bdc11893529eb51d74b6584555689281aedb71c3aa6c23141cf5fbc68ae97e09f1c89b2c94c
+DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555ad90da85b26a7a43eca74f08361137021aec72ddca37cbb24f21519ebf45948e66214291f356b4a1fbada7c0b3b8 SHA512 14c28d6fae18a10d89d41509635188d881ac76e7b61758481a9afbb22eb384d7ab5080383242e5850af13bfe46877985a91036270c3c4fbf01eafee5b7699815
 EBUILD buildbot-0.8.12-r3.ebuild 5487 BLAKE2B 65e94e3913dfc194381b8c86b0743f2ddb278f90cf5f0d32e1ddeee50cb5da314a6c35c892264985841ebd6227453f699794db30786e329a6b5219e6ece0ec6b SHA512 b628b1cec97419b16289c219967eee1154a1b022004afb25981bc83ff60924e462cd652e2c88f51a799c8bec7acdd25dcaf6e2657f0d3f44a69a793d205bfcca
 EBUILD buildbot-0.9.12.ebuild 7108 BLAKE2B 3f1d6b553364fbc381e6d22ffc3a41be88dfb5359583aabe53cadbffca1c7e3dc18714693543a7b0422f1b4a6e842e64c77d49092fd041a28c65a61fc441227a SHA512 933fc9c4fcd252837b565d7442a9f617548a26cad8b2719d2f167f40d5abb0e000b98fda7994dc718399ed1428b6a67abd7b1e6ddc39d48fd49ca1d7bab233a6
 EBUILD buildbot-0.9.13.ebuild 7049 BLAKE2B 05ba09770db0a62bcfea80aba47362dd1ae1d76c6020c7b9b579373e5c0e7bc922a46a96aeb1508137d99c08588980f5430fd147a1852248bfa91654b344f1d0 SHA512 1438c1c66928f59421431852274fe8d86dbb70ada6b6172b080ee5851d3817edbfe643973577fe9390e8f05bb26a055656861563ba1f3ed607cb27d34993f84a
 EBUILD buildbot-0.9.15_p1.ebuild 7238 BLAKE2B f5e70ab74c1e116335aa48bbe5349f34493c5829cabbb69e98ba9971e5c6f6f1d1c29fda2235e15b3127266f29908009f292f5e3952217864b613e4a59e854c8 SHA512 73c7640b3450701711099233c2cc405ef23707bb6074c8ad4b11790d2940284aaf7eecfce6af4cdfaf7f32eb693cd1f329ab3eb1b43a8f65f8b98439a63f7234
 EBUILD buildbot-1.1.0.ebuild 7352 BLAKE2B 4565a431c481ffb3681e3fb47c54daaaf5f2c34476f41e696df012a77960b920942014aaeec8220d59ff75f481986777c0a57304f953dfbab1f5e01616334cee SHA512 6fee92726755e6c0fb6f3f55277669518c2da4435b0dbd2d09fd656613269822c80740d06b5486f6dea8e40d6731176fd61ee5cbafdfc64b10e0eb7872168997
+EBUILD buildbot-1.1.2.ebuild 6550 BLAKE2B 88e1fb4d2acc8f6876629ad933c54e0574ba179788f33416ca00c40ada8f0d355d49f5675d19ba47003090ad5f8f556568b3b65354925df95a9be39655148328 SHA512 1db8c11e0622f7ccf0c7237e7404736c40d55233d2b56778a2b85b30dd9e26843d9ab2e3c9fe2c63467dfe54f28141323688eed1ee43e3a0f7e483fda71a3254
 EBUILD buildbot-9999.ebuild 7179 BLAKE2B 8bf2ee184ffb4faebcf281f8884f8732dc51ec3e9a0293a6441f1eee85a118360750c4101b3e957616a7e1eda0858fef90db4cdaa0ff79d36ae66ecfa43b3a64 SHA512 c58491324b048e3d36c019ff9eeb226f1f1cadec45b58d6337fe2af3ded585426a1b4563069ca8e6c7528d74f1a2e520604ba8c7286fdcb8fe6e11282ad57c12
 MISC metadata.xml 1616 BLAKE2B cf5a0b7f346e9077dccbd4a9f1b9e95255f874cc8ebfdaec0a067f44c7c2b8015362cf590cb927f8ec87ca497ef38973a6acf5117968904c8762a84ef751cb70 SHA512 efb2ec3027be76f7d9d07bb19616ae4692acd07eefe79412f5983281db51095ad2f900155a26efafeeead403edfeb7fc0e570672f6b254bca83d5263c645d5a4
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
new file mode 100644
index 000000000000..0888e9cce412
--- /dev/null
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -0,0 +1,184 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
+
+[[ ${PV} == *9999 ]] && inherit git-r3
+inherit readme.gentoo-r1 user systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/"
+[[ ${PV} == *9999 ]] || SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [[ ${PV} == *9999 ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64"
+fi
+
+IUSE="crypt docker examples irc test"
+
+RDEPEND="
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/twisted-17.9.0[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-0.8[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-migrate-0.9[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/twisted-17.9.0[${PYTHON_USEDEP},crypt]
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/idna[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/pyjade[${PYTHON_USEDEP}]
+		dev-python/txgithub[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/setuptools_trial[${PYTHON_USEDEP}]
+		~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+	)"
+
+S=${WORKDIR}/${MY_P}
+[[ ${PV} == *9999 ]] && S=${S}/master
+
+if [[ ${PV} != *9999 ]]; then
+	PATCHES=(
+		"${FILESDIR}/Remove-distro-version-test.patch"
+	)
+fi
+
+pkg_setup() {
+	enewuser buildbot
+
+	DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+		to support starting buildbot through Gentoo's init system. To use this,
+		execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+		The scripts can	run as a different user if desired."
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+python_test() {
+	distutils_install_for_testing
+
+	esetup.py test || die "Tests failed under ${EPYTHON}"
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd
index e489d66f9d4b..eb3185aef358 100644
--- a/dev-util/buildbot/files/buildmaster.confd
+++ b/dev-util/buildbot/files/buildmaster.confd
@@ -8,3 +8,8 @@ USERNAME=buildbot
 
 # Extra options to pass to twistd.
 TWISTD_OPTS=""
+
+# Optional specific python version to run in
+# (if not the system default version)
+# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
+RUNTIME_PYTHON=""
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
index 29fd444d123f..933c6e2b4e51 100644
--- a/dev-util/buildbot/files/buildmaster.initd
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 extra_started_commands="reload"
@@ -39,7 +39,7 @@ start() {
 	ebegin "Starting buildmaster in ${BUILDMASTER_PATH}"
 	start-stop-daemon --start -u "${USERNAME}" \
 		--pidfile "${BUILDMASTER_PATH}/buildmaster.pid" \
-		--exec /usr/bin/python2 -- /usr/bin/twistd \
+		--exec "${RUNTIME_PYTHON}" -- /usr/bin/twistd \
 		--no_save \
 		--logfile="${BUILDMASTER_PATH}/twistd.log" \
 		--pidfile="${BUILDMASTER_PATH}/buildmaster.pid" \
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 08fd902eed4c..4c16470011b8 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,9 +1,9 @@
 DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
-DIST byacc-20170709.tgz 743677 BLAKE2B 453e0083671ae17e3401bbc474a9724091fb3314adcee0e13ba55a95a12c4cd351ef901b645cb46e0df89d2053054e46a05703d418706bc962a0cacf55bb3201 SHA512 81b6e2dfe674d7e7650e1583c46f67e20cc5ff56b06ef73a54ec2070abd7f4af1a0db7909f31264d0e6157acd3661c19c3478e06c9bab395f53d0371bc1e9097
 DIST byacc-20180510.tgz 744070 BLAKE2B 9ba861ffcd310462513d7eb4b663c5c44f5cb6dc06ecf1cbcb41c309054905781c4ba1ffada88eaf0071caf16d78a5746d53e66190081e388b95f4a148684cca SHA512 89ac9d4bd1edfdcfa304b0efacc478dbdd84cc2a1cd4ef75515863b1ea2731b106202c758b469c39a4379bb155c0a2365baa290797da0a6bb3904295431556d6
 DIST byacc-20180525.tgz 745273 BLAKE2B 5b4732cede6d284f9f866b8e7f7f1f48b7eea26fcf203e633767115a2ba324586590477b9668b2f7e961db4765e2602ba78d78a2ed55d0c102153b5ed15e9cea SHA512 ab200b7f1f0295731cda0aff08ee60c1f8a4e057ca9de265b916de690e900abe67ce9b5f6f5d0e69945485e9adb5505b079d82f8e126eb1ea12d22bc6015d73a
+DIST byacc-20180609.tgz 745317 BLAKE2B d544e2c81540c711fac57ac3179aec9f44b4db808e44318b3046443c29870351b5251383542caec9f65e06a6d83f481f2c8c4e73a28e59d5a57e854532404df4 SHA512 45aa6de839ca23385ab832685fdaa49225dcde6a40bdb990eefde8ab1be2cfe063875072e844629ac91e9533e6e310fa0bb8a6bd01e246a1cefc67bbc3c175f9
 EBUILD byacc-20170201.ebuild 610 BLAKE2B db86272365c30ac4a30d1538078bc3b6e436e624b70c1a403a8e6e878480c075910e72e188d91e60d2b4d71edea2dae6370d81b9bb2685dc8f177c069edddba4 SHA512 22ad1a4d24aa1ae4ec9b7de9e5d6a881547bd4fe4baec8a884313201c2193ca85a8fa30fed24b23ca8b4c6295388dda357f2e5a50a8368831a0ed600596c9755
-EBUILD byacc-20170709.ebuild 620 BLAKE2B 4a2997e5186c9100bbf77da2fb135b7fc552ac4621b36f6b7f72e3c663b37d437eebe7049657c67f24f460c36bb6121b255834296a085de55ff17d7e24c2ad77 SHA512 e7b6590d7bd61eef0a18cfb92cb0426a099b1e276edc0f5b00bbc4c5d48928c8c75620dc48abd5ce17b260ca3f9452ca800dfef57b61e4fc13e288625763871c
 EBUILD byacc-20180510.ebuild 620 BLAKE2B d907534063b452d07169f2dfd86b6a79c7114f0327243d0dca071b66a35e85a58194ea6499e7b88063220104ff910fc937c6444708274c2f495d5460f1c317bc SHA512 2171da36f607ae11b786965935816457f9b4472002bf85f65d92011ec1c176bf2c755ce3621afa07e007269b87533c54013789c5f8b41151634d88d4c6f7ce23
 EBUILD byacc-20180525.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
+EBUILD byacc-20180609.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20170709.ebuild b/dev-util/byacc/byacc-20180609.ebuild
index 1c82290565a2..e0e5a971f5d0 100644
--- a/dev-util/byacc/byacc-20170709.ebuild
+++ b/dev-util/byacc/byacc-20180609.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 DESCRIPTION="the best variant of the Yacc parser generator"
 HOMEPAGE="https://invisible-island.net/byacc/byacc.html"
-SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
+SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index c57cb4adfab2..814b6c2d6840 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -1,13 +1,16 @@
 DIST aho-corasick-0.5.3.crate 252052 BLAKE2B aba67d996b22c336165be78c89f53a2164605544f82587ceb1145bdb850326c2889d1bdcc3e95a6c5bb1dc0a996902130ab8425a7b0b88b38daffbfc9f58e309 SHA512 cc297b4882b869919edf9023ee2bd7100eb48709f6e7076fd26d1701dab3d8aa2cfb03752a764877cd92177ab7a4ce3dcdae76d16965eca2ff53667832afda31
 DIST aho-corasick-0.6.4.crate 25443 BLAKE2B b866fec3f2d7bf39152b30d4c95c921c3912c832cb5d7016c771bf19cb8bf02851ee942c891cc95f339b35c0545f9b45e26ce893486660b26227129aa7792b84 SHA512 0191f627896469bdb271f1b9d2f3d3b0f7952579cd07c2659996ad66a961dbe605c6a4a929100d6b9c246e65199c0e180b1e8349943f06a6f08250e003e62b65
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
+DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
 DIST atty-0.2.8.crate 5708 BLAKE2B e88f1155f51dd36eb38364994eeffc84683b43b8010909e058d9fd80fa492092ed49d6d05b5b7d10fd2585191dd1b6efdccf30be298f53dcb832027fd6187508 SHA512 d6aac03499b5e8187ecacd6060d34d3ad8747eb680c9f59ba13e00253d422b2d7d092236fc8eced93358f251d46672013463e3bfdc0aaa9e9e7c5c8e08a22195
 DIST atty-0.2.9.crate 5898 BLAKE2B fa8b45e670fc4147f0407e4a059569e3d4ec31f79aef01ef581c03396a73aa449482dba200bf49d6f60887853eadc8ccf483c0fa0ebcba9f219557cee9a907ba SHA512 2d7d2e52f3d3b66d4280dc3a2509c0125b1cf7dc136f3cc81e1a91aee0dcebdb4444544f631bccf299580f24ac8687f9b61e3b08fc961c040146959eeec1205c
 DIST backtrace-0.3.5.crate 27636 BLAKE2B db71be18b39a7aa25d2e1850fd907d3ea96d30af66b72c7b2b12a37acf6d6f46cdca1b9de884167e7567584848ea2ca4a1b03468e9158a62a3fde6aacd0746c8 SHA512 b554fd616780c706d8f6e7afef4800625a9fec5f7825e995a534103d1b773f0f28e09d49a1163eef9059681d669953ed1b7a8fb33209ee3b7be1fdeaa2adb3a1
 DIST backtrace-0.3.6.crate 28437 BLAKE2B 63f056086b8c56707e7a3f9719e211a70368584c85a6a3b05ed8ad31cf3ac86f6fc091c826392439fcaf9a0f4066de8da00449a9715d90c1585d450fff63bbdd SHA512 c42e9891a2297aefa08e6ec627520bfd3f93f7eddc2782cb5eb277092d588b1d84e75ac724d29548eab77de19de3400748b90bf2eccfed5ce1e20a979dd210e6
+DIST backtrace-0.3.7.crate 28432 BLAKE2B 5478adb8e5a028a5d5af62b2f6522c2a7bee65bcbfa76da252c57e4f17b682db486f3aff96501d49943d86567eb8187f1e37a42f324b3cf3181788d0cd760b15 SHA512 a3f0d8bfef2158310c65f41e246323b0953147a017dbe47143b8dc2e1734c945f13b49732a16f1712a3b5a27a23f27a38778d8185c64a7982948aace69c079af
 DIST backtrace-sys-0.1.16.crate 283418 BLAKE2B d15f9c692dd805c61dbd219c70f0b47bb6d2a18bdb2657bd5b5bf6f94f1df621f6be56e2774d2d5d218f044c1358b1af4251705123c5d48ce5575ff3a2f3b50a SHA512 2fd32fee7c13d1c83be5e86341a4c1c0da06876a73a9fb74c680994132510eac9a3444144c97ddcb78919da044e628650d604a20a06ca7852289168da8d754b4
 DIST bitflags-0.9.1.crate 12406 BLAKE2B e89527c5411150c09bc16072e0e4e5b2dde4b50fb2ed76984c1b58db225912db580f96c7954cbbf597036e9d743658364977ba24d0d7660312c3b8d38306d879 SHA512 3c106186aa8b5b8d0fba377818618e6428af38f60e4f707873142b44cb6f64d1d7f347840c8bfba084ff569ac8c57d87f2288c4a1d79e282bc02544d69f976c0
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
+DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
 DIST bufstream-0.1.3.crate 8375 BLAKE2B 6e64cfb797283f935ccf309fc054eda4c362fc482b68360619b1146698a0db5023013ded3f1c64ecfa29b55f10dcb8c230d853f5088f28da9ea1c018147d9247 SHA512 b615056dbdfb181c622acd734d7b7b67f2604161f90db81043fe109c2c7396cf81fa3a2b4878571968858311e46034072c54e3b181f9a8217aa276b2145c95b1
 DIST cargo-0.25.0-aarch64-unknown-linux-gnu.tar.gz 4858889 BLAKE2B 29ca3920b083264057b9d1d0e7dcb2ad945cd42e791b24cfce353085bcdeeab467530035f3e03fdcd9323097367c8cc20aa6eba96d15421aefe2ad99973efbb4 SHA512 e1d10ff096da535e3bed5275b31d8cb95d7135adadbec4218f77c187a6cb8e992088663bd21cd8e0b40627974cfcff39f508e387e32d07da0b5be486be45c42d
 DIST cargo-0.25.0-arm-unknown-linux-gnueabi.tar.gz 5828897 BLAKE2B 2b9d34839926ac3346eed98a5460551e678276c25b4c5ae62a6a43ac35d335f7ca0174f459049c58f4d7a81aafe8cecc9d2c4c9d07439d15073b2cbe5d220a9c SHA512 2e091155c9599b3a032c9d0698f64a0c1654e88a5c9df6c930063885ff0c3be6e3a8a6f9577982004e4b1c83d1c78727da8d364665da4d1a3e053bfacdaef546
@@ -22,12 +25,23 @@ DIST cargo-0.26.0-armv7-unknown-linux-gnueabihf.tar.xz 3694064 BLAKE2B 3ec859600
 DIST cargo-0.26.0-i686-unknown-linux-gnu.tar.xz 4104468 BLAKE2B 1325a2b0c4da3c4788e04f8d61f938fd7690ff031891f89d29d74f5a1c43425d4ade0b306309205782ae8624733b8f365ca033052ba95aeee730a69900a4ab3d SHA512 4e30b8091123af894493e8c704723945abaec21befabf54ba3d618d8c6586352ce02501afc0229494f99b7612b82e049fb5c35ac419282349673394c75a2c6d7
 DIST cargo-0.26.0-x86_64-unknown-linux-gnu.tar.xz 4134388 BLAKE2B 961df201fa4f87308a28b217296c7927e6b67f513e7eaaf5cf12675ab4c01c50e60bf8756c2f8fafe1e4b2d7e3e5a8daa446fc1b72014828d0233209434f1dda SHA512 476041cb12a49819250d96f246d900769ab83386e584b3264b4f47ef5a2182d410a8606054a330da653cf2b2a290193c7260af5c98a29d6969b6c7c5169876ee
 DIST cargo-0.26.0.tar.gz 698823 BLAKE2B a16b69818c029d9e2f6a704d6c5875d2cd01d4c120b9df18c9e33df56009c58870e7f48a0a3709dabbcc88b535a0762fca3ab11069e4ba2506566f89e8773533 SHA512 0ceba204f6effb0b636b8a4cab38ae876e32d548a158cc2a67f3f80f144d4a05ce5ec44df74eb7e17a3dcd57105298dae1ac599b917c0dbb4b7386d3cf424070
+DIST cargo-0.27.0-aarch64-unknown-linux-gnu.tar.xz 3447968 BLAKE2B 69ae05955214d37e05d62348cb006dadff258f600e3ba89c2d185c59c144486c7987eb154330dd203963c8d7761d8a74b8c41545eaed99761e7115ff5d19e345 SHA512 ba04d3c52ffbfc89bc92e17c6f850bd64335e15aedb4c884ea5a19fb6e2395d8054d3678b6e13d81903bc85a3ddd38bec3561266de783bc0f920f2d76c2834a5
+DIST cargo-0.27.0-arm-unknown-linux-gnueabi.tar.xz 4026932 BLAKE2B 4a7265f400675b671e94dd3e271621dddfaead6167ff659426afdcab18295286882105c548a31182b2753c91e0ae4c004c2952a6715883c2fc8893679e6785cc SHA512 e40ea55556bf901ab24df116c726298daa4d8cf734a39dc515ad3f0b93573b1200a4c8407dfc60365310ccb95b364c74f5b212f8840aae571d6766aca89f9cc8
+DIST cargo-0.27.0-arm-unknown-linux-gnueabihf.tar.xz 4057132 BLAKE2B a29264c2652ecca8d713e350aa927e7cc5318f8b5db6ea1bde3ee7315e019d222f19e9d1231e8964eb3cb75765df36b1115a975614f8094f4382c2c81c679581 SHA512 c672dd5814e0c3cbd598ab4a59c00624a3b79d54058682bc17540bc72554885f499c89ff3cdb5ec803afc90827ecf1c40ca7a1a557bc0229ba11d4e8251cdb74
+DIST cargo-0.27.0-armv7-unknown-linux-gnueabihf.tar.xz 4059300 BLAKE2B 2cc0aeca591b7dc16357d5210d18efcaff7e812ac72976dd1dfb0da97463b9ad3447080fa0fc81387023c6d74130a6cfe509f6a02b38532452a9834ff8219d3c SHA512 689ebba97c27dff1a0e9fc41d24c4534f01cb98b29c5967dce365717daed406407ced7b7d85884c214d25f5a5ab9c0882c59709397b32afce0b6e66c1f9fdace
+DIST cargo-0.27.0-i686-unknown-linux-gnu.tar.xz 4570084 BLAKE2B 9f62bcf03d8eefdc5681929fce4f7835ba5c4181324fcb43d2594cf61bd2e460496380abd8da37df0b2977a02e3c027a436297f06b6ca28da82e6b540df9f35a SHA512 212d5634e369c913612a2023cd0d1b81f4f1d8f37e504a07ce855573a6dd0fb2084ec9a0e00a86b457adb7e08b46215f73ede9222ad01213e4c9e5a4ff99cca9
+DIST cargo-0.27.0-x86_64-unknown-linux-gnu.tar.xz 4524080 BLAKE2B e2a65dafed7ce552f6fbf8b641409cd6fcd924c10e0779c7587fae5c3cba23626f7913cab3b8741d9bc9aac471c855e32b8647769a3750baee1d377031e9eb9b SHA512 c0609edeaebd3e851c94933b3e5c56e8fd394c5b3a572bdacdf32dba5a2de9bdf6468879017f97002bea990c1ec1a970e017d1cf2fbcb22f6cf1ac39dbd1d947
 DIST cargo-0.27.0.tar.gz 728885 BLAKE2B 1966e381b9c286786f8b28257f155d2a10d23727978f4f0a1954294c1b82ab0d2aecd511a72e39f9c6fe955bb237cee4e53f8542270eee8c2eea3cb7dc956fda SHA512 8b984a1a64427d09d29ed82cc736abb0a2e936a253ef3ec05b4934b2b541758bd4e3c68ca21c80649de83eac2742f84f2c81f29fe62d85a150ad0cf2c50a990e
+DIST cargo-0.28.0.crate 754146 BLAKE2B 4684dba85e40a3d2bbe13ea18f01c101c4783e132d302897dc95bb89adb0193b24ddca108e1886e8b2f7f292bc94f95826d479ac4daa963ef26db789cc6a039f SHA512 149b721ec91600e201162403773b22bb1c3f1c825c506a4665396e681864e953c3acf53eea0ab319a7932bb06fe0f5d02e82a54d39f6a0fa23798aee93469540
+DIST cargo-0.28.0.tar.gz 761690 BLAKE2B 0dec2524053ce56013108f031e57b7b8c69daa95f4d594fa7a849e91dc317e07ea0540c322c7473242640567c0bf9f565661e9bf91ee8b96008986c9a1e2fd89 SHA512 609ce0b7539511e5dc9f5d426c761dc074406cc3f2f4b4a8bd4b1f01dbd5288b33403b64b2078e5f5ef1cf40d468468099bfab24af751bb5b4d4912cd5f72030
 DIST cc-1.0.10.crate 41311 BLAKE2B 30dc4dc3efa8f2143341a7519c9a6a46b7987faed78b55b338bafac4f7550ac3534f5c876e174a938916d621435396a2066e001794f49d1e59be1e3815605d76 SHA512 b1f492cf2ab1b31ca11524703f02148a16bf54e57a05f2d988dea8b8f75c9e997b8c6ea6569ac9a47dbf0569adcc23b61db1537a0c6e7957fd736c64b9fb4ed3
+DIST cc-1.0.15.crate 41839 BLAKE2B a00d432720c168b0d69fc7d321d3abec3e18662c6e0c44e6092482e7215dc51688b1f01888150f060e57c88f3003e58b5f8985f1dd31731bb259921bd7a45d9f SHA512 220b88ad675b076b6fc322253f4f8de641fb2c3b27814a3fa5fdc2f79c52e93f2de4e6fc176a6d3a0b7a9fff46d9bd2d4396310cfde4a68f7082224510a9a831
 DIST cc-1.0.9.crate 41193 BLAKE2B 15643c05698e5e9cfb955495db401b11a28c0047fd35945d17ba4656d44551b73451b8c4399cb1338311228c4fa059318c55e3f59dc0ecae2374ba1b577a8d45 SHA512 7423164d85ac2d57782b6f259ea7e7e581fd8ecb7f3cfe4f8767c05caaf6e25d8cd73031123b60f0df96b2cd4c265d92a66933b7aaef4aae998cdc0e179618f4
 DIST cfg-if-0.1.2.crate 6668 BLAKE2B fd1960dfd30b3514bdb9943dba6418957068aaad3548667216d6dd4e4921a0df07d96cc4131f7b5121cacfb91aa59a802a47663a7b04ff401fa5b25ee1d321ea SHA512 ed6732d8ef2c99d99861f5dcfec3bcd2d1b62dcf6e8e4e88ca25148b5566f86418270dbbe9a7d2fae62a8320d432c5e0474059fa25a11c0f66787084e36f36aa
+DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
 DIST cmake-0.1.30.crate 12477 BLAKE2B 23529899687c844e3d0e864272d964d5d4ea1900afbee9e4c323a4712fe9341378f41667463cd3b9e6944bc56c123c6331161e25e8816143a8efc3109164e14b SHA512 c27e7b6e50e77409f1e7481a88839e2de64ce6d94345cd955e9b3ff6f5720a090f02adcc1067113471cd48125b236952c0177920be7e03cf15bf2baa323788b1
+DIST cmake-0.1.31.crate 12480 BLAKE2B a861b9481636ab9ecdcdfa13d599cd081924394fc60268e7baec36ba875e7c61a7ceee423fb97e44a1aa28db005f1ed3f855a8490dcfbcf86f6e637445a9468c SHA512 72523416f52e253fc4d5ab9b4fbf56cf6870ec21d71199c7dbe9c0ea09fd32a226c5eb5677347b32f8e82b40b9335ddbbe77a08ea8fa2c4f0db5f3cb5e6f319a
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
 DIST core-foundation-0.5.1.crate 22519 BLAKE2B bc411c7a7bd1dcb00b4f02d75cbdb9d8422c2802cd6a3aebb7ac5136b19756f7ad5e48553e15b6c5a7ff85fa3f4f3fa98e8644a0eb13b4525fe2edd3a5b3daf4 SHA512 209b06bf889ef75451b9d055505dcd19eeb8ed6b6f57f7b3288556ec9be90fbe716175679f7d0a650c1d55644b3c56eee9b1116f2c8b533b4b4580008c79cdb2
@@ -40,14 +54,17 @@ DIST curl-0.4.11.crate 70262 BLAKE2B feae6f6cf51fe4ba32b93090bac7c341daee4b973b7
 DIST curl-0.4.12.crate 70906 BLAKE2B 9b431f249f697608b3c295f385f90c452bb576f1cc0f34e17ad938f54c39f03575406061cbb9d55429c0c8a276d8fb81fb87b7c04453564bd2251604ea7e3cea SHA512 0f40d32b113787e89d5e9b12d84db77e629e67db6b0dea01eeb4a460299be4649221e286ae116656b314171a6021cfea68ccaaae5b27c242dffe8fa3e4f45434
 DIST curl-sys-0.4.1.crate 2982935 BLAKE2B 339b91b1634fd502b48d4f26923e1c9d8a3c9071f640442863cc811d02e03b018beca901b2a466467ec6d9ec1206b34db3e406763b8b3934aae1fa95c89f0d44 SHA512 74de40a631db102e73e133c9bad6bc093d7da744090e818e1173f237a410fe173e87fec937a902a6182e224c7e336523b73c42e136ef3b724949d3f407e78f03
 DIST curl-sys-0.4.2.crate 2983033 BLAKE2B 96967d56a7b6a412fe8cf927383eeae16786169b6f5b9254ff116fc85ed3ff2d38bd5766fded8d7972780e6c88c1b229658cc414b2bed9f301c13d6b91fac7b3 SHA512 3d7f9f089dbeda1bfba878cfd10ef3bb14096ee1701584c83c7d99ca859a60cef95ae46fc8b35e2845063fdf50ff8807501d2d45915bfcf827e3e2f6556d1632
+DIST curl-sys-0.4.5.crate 2983237 BLAKE2B 07f111f6274051bee5ce69c680b067f687e4fd741c6ea155535fc24bd447345529475eb4c329010f86fa30b3a08dafcbb34eade53ab341240674a9376b98fc4c SHA512 04b7213d82037d80676f553c2595ea0f3cc69f22f8a85a389075026a1d2325cb61c4f4c5ff6a2842e1a0bbf44d4617f18c47eca5c6686394c6e1e01b67a4d18c
 DIST docopt-0.8.3.crate 42774 BLAKE2B 91792f94920a39aa1cb1014493bf2a31367e44db62c68386df3112d4f8f058f143d8238048fefb2f2d1a1e489664c1ac7341e9bea17a00fc95ea62cd7c8f5dff SHA512 0af5a548640f06c408ae1ef0eef804aee5154d677648de9bbc3dff0f637c26cf8b2e212f472a6d30353a92e2ad2cf8d8efbda163f9572b28f867f2448a0bed8b
 DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
+DIST env_logger-0.5.10.crate 24849 BLAKE2B 2c386f8367aa940d41ea710652ba266cda7c12aac43e17ab859646d81264fada28d4b98bcdda46377adc86d6850b6f58559f9fe38fe9847b745e2544de9c9b41 SHA512 0943ec9707f187db4a6669b157c2bc5b606c865a9893eae18086cb9a6319b79b71fe3d97b4248339d30bd6daab2de5991f373a75a95c8fcea3afc293f333360b
 DIST env_logger-0.5.6.crate 23933 BLAKE2B af51e6dd5eb9a26773ad225346c341e8292f1a1b79bf140660f1c2c10f62750300cd5c3c96bcbcbd832a11b8a14ea1f5e16575e65db602f0eb72896f050714b0 SHA512 3f7507cc5a2251570dc061a0603bc69a91bfd13b5d61cf85547076415140215d3d322408187eb216f1588ceb5fea3579b9645bc6faa3bdfb27a230c9bd1c59cc
 DIST env_logger-0.5.9.crate 24834 BLAKE2B 430c10faf85b96a38fa9f465cd72193ae750e620815e52061b9a5c43261be2dada182e99cc8a4b10b3bfb8b1126fc91e0297b5faa294c80f3044186dff81b2eb SHA512 f73c6258a69289ae795241669aa16af8612e9a0c734adcf804389082a8d1c32520c9234551bcee249d47bfe43772d5c7d8c8b311a722b1d77001aa9ddb93a4dc
 DIST failure-0.1.1.crate 26782 BLAKE2B 6e00d30bc0189325e540a0a9290e517747ebbc79a94a884540de1f46fc0a64d257b59604725cdc30e62731b51e45b6aec215d2d488bffea6511b6ff53be50a0b SHA512 3c4075dc13c3ea6557582455ab3bb35ea81bd43892de5fac103e7dbcdf24ca3614e3b3673f694256d9fb9c6bdf97375ea17fbe290148881599403c01dab0e5e4
 DIST failure_derive-0.1.1.crate 9312 BLAKE2B 14dcb7bab17f874e5f3efa9abd059e079a4580d918017825de104851fab0b0cfb88aba4f71513f387ca645ab74a3199c5f0268853c156111c67351e1c7e9327d SHA512 885b45ebe5098f04699bc0c7cf2b6816d3afec6f111f8d244b0fa824c0198127ac3062e23c052186e196832755e9e0b271e5efb005df35e6d1e4d671640b8e91
 DIST filetime-0.1.15.crate 11211 BLAKE2B ee1661d356f7b6d7cf20cc0dbc822e04ea7e558118b41c29f060f02df4987ed7bdf69be5dcf66106c1573ed586b03dc0b0196be7716227d97c7fc857f81fbac5 SHA512 81d6e80f3da3ce12295ce8d85bf174eac3ee3dcc7d57e5a65f2ae91ab4f3dcf294582788af24db9ce2f18cb0e43080fb1baac76929dacec32d5ba4d09928b962
 DIST filetime-0.2.0.crate 11717 BLAKE2B 2e42a0499832fab0759a2edc54762bbbd5b11027df9f8b86bd62db3363bc4ef520831a5a1ac8435767eb136624bdc21af16ee73ad1078d2036174e1c30598d26 SHA512 a78d227f17b04800d8796511709db518daf76047bc7dc7dbd3a56419ab1b1a34cc063a6656033b893edc42729d2a08cf85b344e133b6da3fa6ad38eeffd536ba
+DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d
 DIST flate2-1.0.1.crate 61869 BLAKE2B 3f9b94327ae0d044f962759fe498776d7bef014fb93328e3454f5cd8f37c8ac8c8c5d3f38825e4744a07dc873f93ba5fb420450677a55622afca8492c9423057 SHA512 2be6cf3228e9df76643e7b45ab1ea4956e7618e90e9bf8cce62f6d0bac864e2bd7a808aad1b54728797831b170801acf43a6a254d9268c8fc57052f1e2d172b9
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
@@ -80,6 +97,7 @@ DIST libc-0.2.40.crate 327272 BLAKE2B fbad5d1e07d6ad43cf0c94d1e5e1ae9dc11490d7a5
 DIST libgit2-sys-0.6.19.crate 4663410 BLAKE2B f42d0f08c248ed5783f8a5cc2a08051c6ba881a28bf6af433ea632e88377ccb7acbc01f69cfeb0e3844172c95bd1660d7d92287d4353f0446040733a2e0f6d97 SHA512 3c5823ecadfb8633d3880552e6881265a21a3bc395120bc51c93424ef8fff6be6d4c1b20930d7f94ea5f826e005778878f61512ae4fed2b2b8e35d8fe1852495
 DIST libgit2-sys-0.7.1.crate 4717492 BLAKE2B 9e35b9e317b0423718bc28a87f66095e7c3f0758481868b55bc44044b698b2c91d9adad40c45c1f92ee8a41a4a964f25664715c9966e20a0edac81002a1187b6 SHA512 fb5ce69031dc07ea20a8ce03fcff05d44261f41f40f3c7db603b5afd494772c69e9b7d220714916774ae50b5b6f85015e048f02699a23d090ce4fc934a033460
 DIST libssh2-sys-0.2.6.crate 412381 BLAKE2B 17b16a73f2c3042891d26bdaac836e35f9839c8e500643d7b2bf8ade562b0af5f2f90dd7728b1b04861b40deaac69184dd8edc9791ff0c9fa97ee0a3b9065091 SHA512 2a02abf0b29025137d73d4b97a6287142f5677383f22085d3d49f76fd0c8324ef1baf5e9d763b6cc2dd1e339f697b9466341ded5ae2c8cfddf6eeb74e870f8ab
+DIST libssh2-sys-0.2.7.crate 417647 BLAKE2B a19d1af25964594c3c460febd469725740fc0954eee4d51dd204697f97d8149253e7eb1f90d4c08f3617642e3dfd33e80197cd1efed4ce7ae9525a7940713342 SHA512 817d6897aeaa92fea77ed5b23df68f5f10760f2f342947b178aa460fe3a75aee6913ec1ad7e34d52a1523637b7f3672a8e28f59c05ed03db1caee256ba76a45d
 DIST libz-sys-1.0.18.crate 632715 BLAKE2B 3c88d321f22d8c49a17d2af04361792247f7590e4b21163033e5de7b726b75f91ee15d4e9a8824f4ae894ab8a1856c637982e5f1c70de8dbd543b75de2d1af94 SHA512 fcc9e5bd9ffd5eb4f302d3c271f86370f04fe9fcb3b818ac8d605241a701e9d0c40cfe729ad8fcbe7bbb07df66539503415a00360c56831a511142ff225d0d8c
 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
@@ -98,13 +116,16 @@ DIST num-traits-0.2.2.crate 34777 BLAKE2B affa210c22e3c27f743d6b23393fc61749e37c
 DIST num-traits-0.2.4.crate 38463 BLAKE2B 9a44eebea444c2184855cb41b39b88716773be2d2f146ee603c999c377f3249b4580133608ec4ba968e27a976307b030414c23eb9dd1ead655c3aeb70431abc8 SHA512 4d1f378ea4ca6edf934ad92526b7556944dddfa00d77f2f6795c65bfb5aba4a20a747e01cbd1fb8250e565eb541a48dec8aab00d6505931b5cbc25be0dbf929c
 DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST openssl-0.10.6.crate 158082 BLAKE2B 2a9e6b77e8a6c55c2fce9b0961c2179cd6ce2534e714eff9c3c07d9d70177ec30e5f47092e18040c8dd9396563ea3f05e5a022af035ee359a1f16ec4e2b8c86c SHA512 9e4051c1c4d4b5143c9148f46083fba8df5c9e88e8a2d60398af21012d79b7a65feb5d6a6d1a704445b0ab74e9d23ebcf95d97df33a76ca488c3f188c9126e9f
+DIST openssl-0.10.7.crate 158397 BLAKE2B 4ab202e9f3bf989c3d22e57a016de5e11aec92e68a9ec9dee6e6ff13b29f6c50a720d3800e27c0c9a0c5232ff8b3bed2a53d2e4f0b5f70e5928c7c5d80ea0fb7 SHA512 17299119ff9dad330a0a060283a485d28e2ab85beb27ddbc2f156526780831a5d135e00721bd2d609994da3c0bde94c51892d05f5037b7066ad0b83fd3b9da28
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-sys-0.9.28.crate 40560 BLAKE2B c5a1f34ed11f37b8d842b4971810f83eb6e24d74ffae931224a5c9ac992030bd9f034ae057f0ce9efac3d4f2f20898f8c4ec33d5290f8747fed575c0d003c036 SHA512 a156e682dc7c7d8075842623b58a3f3386c330162cd9489ce96a33f72e0368a381e4d0e83c43885d221a29edf1926a11b106dbda273c863845ae28a51e2648b3
+DIST openssl-sys-0.9.30.crate 40910 BLAKE2B ac7d2d33e002e225665cbda05bce46affbf733361dfe2345ee2a0c846bae1da54d16d64de12aa0ee9358950be239a5900c0b487d16544d0c699afb16a6820bab SHA512 0df144ec31e665e406bc731cbb938763fbb023dc9076a1cf9c423fcbb8b230b639138bf16b563d2a3e9e6c2c2c89f04dd92d90afc043982ea0ee94785d2cedde
 DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST pkg-config-0.3.11.crate 13227 BLAKE2B f22a748d9330848379d9bcc32026c9ba4bcffc043495b864af95dde36ce3fe71344bf5b0534aa61574f677b9a3d1ec0e09f774dea0ee57c1810f1e6bd7edc1e4 SHA512 c5e53a9dd777bce55889fdf7028418443896890ff120beb2fda5e5fcc55624aaefc2ac058c2b4bc88519d48bacc477351b0ab1c4d4a65b4e4bf66a69a419aae6
 DIST pkg-config-0.3.9.crate 11055 BLAKE2B 8c8c9a4badcb2d2691a953b06a6c479794eae97e40d95509051ae34665ac467554849f050eafd83c03070c9239709b7873e1c33604a06acce396ddf678c96e34 SHA512 084e18e8c91ba6a1b305624d16c06f8f7df994c93cf86ccf443bc8f2669368a15bfa9875bc4f2933e94aa268e15fef783235c98558ba596cfc79dbd31f0b69d1
 DIST proc-macro2-0.3.6.crate 22845 BLAKE2B 1491c55e9e417900a12e9b2ddef34032f2141eda9f3863bcd0fa0deaddc106157e366976fcc185f2fbf6bd8e5036c378775e39d1ef1b21a1561425f56b374910 SHA512 4999d6f4916005e6691f3d865cd6d58fb26e672319e9d941d9fbc6403e10ca2b6ea761e5e2d84cb60324f235ec6a57dc2acb064997fcfbf63b90b48b1d0df9ff
 DIST proc-macro2-0.3.7.crate 23402 BLAKE2B a6c5eec8384611c7f6a0dd9840ebc6b292eb6f7711c6dfdae1ab376bc4a8231dd7006744a27ef5703f04900e0b5aa58998b1c02cf341607be130612f1d99d957 SHA512 dcc923271886a33df34e2385a72b3654b66081f97082ed8ac5d9e65cdcc9352a31812c18c958e2a0d00797b98e02b34e0d40b98ebbddd6773f51628b26ca6640
+DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
 DIST quick-error-1.2.1.crate 15112 BLAKE2B 615254207c47928c1053a4ecd1b1a64a32e9e550c8d74ad5564b31404469460e063aaeeea3e3a8d48ec2416edecfbeefb8f84fbb8f2d9eaebd6121de2d5ad9b4 SHA512 86242dc5a5b68d4d4df50db54b629256d8d33f9637c457c669d874685dd5218f96d0a2dbb16b5c77cca67480e2bc485b3aca6fdd100f615b4bd00004910d2ce3
 DIST quote-0.3.15.crate 12041 BLAKE2B c5796b464539b018351b41b5e2287398681ccb2ca76f46178b4f310e61a8184afe9ea2b8dd7638f27bf5bf37f60458895497e51c82b31326abf6feb4f69404d7 SHA512 2e5dbe725c0f76a81c6624181b43b60b95dceac208e2babaad3fa6d1487794805169e2ffd967659e4bb4e1abebe96505be5a1007c514d10f2a63ef282d699ea7
 DIST quote-0.5.1.crate 14960 BLAKE2B 123e12032797c8335ddc182c2e95016afc866cfc041f26d45e3482c6f689719bbbf6340ed07523acada93953a9ec672914b648d71e45008dacc033f72a7de5a2 SHA512 bbf670fbfdeec126de0a083415f11b2cefbefa30db8390c2b7b80a2e541030cfb8153f2cbd2641dad6d35e25eab9cc3143861ffefe536bd2d119f8d967bbb44b
@@ -186,4 +207,5 @@ DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e
 DIST wincolor-0.1.6.crate 4799 BLAKE2B 37e72b9603d912b65dd59fe74f1158dd87783ef10511527e50795efc28711348a4c34ee27a2cb4ab523389f443c66ede77c471dd8c2e1bfadb6e8f22726e634e SHA512 d8d9e3a16918844d82cf1cddd7ffdd35cbeb8367b661108cc392d5ce636c270a27a307a4d0307553103356db2958114f269b5a007e4271dd1e6039d7c737e374
 EBUILD cargo-0.26.0.ebuild 4718 BLAKE2B 5e6e064d0988f196816a726ae1cb46dd962ca7a3e3d6ea6edccb219c42448adb29ebd0e90f695ef72f244891fccdfa6d2f3e75baf133124d30bb39bbf25eda88 SHA512 6328f4196c0ab5ae4edb45237fc9a315a1b27be5ae77e7ef39eeadaa50396c98393fcbbe64d1bc938d681a87628e0813f3086869cb2d01290e969a5aca95c65f
 EBUILD cargo-0.27.0.ebuild 4499 BLAKE2B 5012de1e42da4a97744a48cd571e3a69c93fd6107bd6a53096bb72e96a6a9e19e126b5460f3ef321aa0d08db9ea0460780e8f8ee3f450d6852a6f51ade8fe49e SHA512 7df8362d68fe3a909d2f7692b45065652166c2230652168cf77ada8bf3465bb5b5ee97a41e435fc0526da575e6d2ac42ef60b41d917dcf5e547322e6ea3cb3d2
+EBUILD cargo-0.28.0.ebuild 4483 BLAKE2B 2846345ee39c15208ec01edb2a56e89141bdb5f814646b0f735932af519a26bdd9ceabf0a83c3f5cede74793bb683ef59f4b824512a1f3983847cff8364b65ab SHA512 62ec6d1dda78ba805de615131a2deb6da1cd248e411ce186f11ec24f148e663daeb7d0b1ad385e8a3c009cf92c8ae693b93d9d5dc0cfc3cdb059d9fa3e4b933d
 MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.28.0.ebuild b/dev-util/cargo/cargo-0.28.0.ebuild
new file mode 100644
index 000000000000..2518657803b9
--- /dev/null
+++ b/dev-util/cargo/cargo-0.28.0.ebuild
@@ -0,0 +1,214 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CARGO_SNAPSHOT_DATE="2016-09-01"
+CRATES="
+aho-corasick-0.6.4
+ansi_term-0.11.0
+atty-0.2.10
+backtrace-0.3.7
+backtrace-sys-0.1.16
+bitflags-1.0.3
+bufstream-0.1.3
+cargo-0.28.0
+cc-1.0.15
+cfg-if-0.1.3
+clap-2.31.2
+cmake-0.1.31
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.5.1
+core-foundation-sys-0.5.1
+crates-io-0.16.0
+crossbeam-0.3.2
+crypto-hash-0.3.1
+curl-0.4.12
+curl-sys-0.4.5
+dtoa-0.4.2
+env_logger-0.5.10
+failure-0.1.1
+failure_derive-0.1.1
+filetime-0.2.1
+flate2-1.0.1
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+git2-0.7.1
+git2-curl-0.8.1
+glob-0.2.11
+globset-0.4.0
+hex-0.3.2
+home-0.3.3
+humantime-1.1.1
+idna-0.1.4
+ignore-0.4.2
+itoa-0.4.1
+jobserver-0.1.11
+kernel32-sys-0.2.2
+lazy_static-1.0.0
+lazycell-0.6.0
+libc-0.2.40
+libgit2-sys-0.7.1
+libssh2-sys-0.2.7
+libz-sys-1.0.18
+log-0.4.1
+matches-0.1.6
+memchr-2.0.1
+miniz-sys-0.1.10
+miow-0.3.1
+num-traits-0.2.4
+num_cpus-1.8.0
+openssl-0.10.7
+openssl-probe-0.1.2
+openssl-sys-0.9.30
+percent-encoding-1.0.1
+pkg-config-0.3.11
+proc-macro2-0.3.8
+quick-error-1.2.1
+quote-0.3.15
+quote-0.5.2
+rand-0.4.2
+redox_syscall-0.1.37
+redox_termios-0.1.1
+regex-0.2.11
+regex-1.0.0
+regex-syntax-0.5.6
+regex-syntax-0.6.0
+remove_dir_all-0.5.1
+rustc-demangle-0.1.8
+same-file-1.0.2
+schannel-0.1.12
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.55
+serde_derive-1.0.55
+serde_ignored-0.0.4
+serde_json-1.0.17
+shell-escape-0.1.4
+socket2-0.3.5
+strsim-0.7.0
+syn-0.11.11
+syn-0.13.10
+synom-0.11.3
+synstructure-0.6.1
+tar-0.4.15
+tempfile-3.0.2
+termcolor-0.3.6
+termion-1.5.1
+textwrap-0.9.0
+thread_local-0.3.5
+toml-0.4.6
+ucd-util-0.1.1
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.4
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unreachable-1.0.0
+url-1.7.0
+utf8-ranges-1.0.0
+vcpkg-0.2.3
+vec_map-0.8.1
+void-1.0.2
+walkdir-2.1.4
+winapi-0.2.8
+winapi-0.3.4
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-0.1.6"
+
+inherit cargo bash-completion-r1 versionator
+
+BOOTSTRAP_VERSION="0.$(($(get_version_component_range 2) - 1)).0"
+
+DESCRIPTION="The Rust's package manager"
+HOMEPAGE="http://crates.io"
+SRC_URI="https://github.com/rust-lang/cargo/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})
+	x86?   (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-i686-unknown-linux-gnu.tar.xz
+	)
+	amd64? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-x86_64-unknown-linux-gnu.tar.xz
+	)
+	arm? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabi.tar.xz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-arm-unknown-linux-gnueabihf.tar.xz
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-armv7-unknown-linux-gnueabihf.tar.xz
+	)
+	arm64? (
+		https://static.rust-lang.org/dist/cargo-${BOOTSTRAP_VERSION}-aarch64-unknown-linux-gnu.tar.xz
+	)"
+
+RESTRICT="mirror"
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+IUSE="doc libressl"
+
+if [[ ${ARCH} = "amd64" ]]; then
+	TRIPLE="x86_64-unknown-linux-gnu"
+elif [[ ${ARCH} = "x86" ]]; then
+	TRIPLE="i686-unknown-linux-gnu"
+elif [[ ${ARCH} = "arm64" ]]; then
+	TRIPLE="aarch64-unknown-linux-gnu"
+elif [[ "$(tc-is-softfloat)" != "no" ]] && [[ ${CHOST} == armv6* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabi"
+elif [[ ${CHOST} == armv6*h* ]]; then
+	TRIPLE="arm-unknown-linux-gnueabihf"
+elif [[ ${CHOST} == armv7*h* ]]; then
+	TRIPLE="armv7-unknown-linux-gnueabihf"
+fi
+
+COMMON_DEPEND="sys-libs/zlib
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libssh2
+	net-libs/http-parser"
+RDEPEND="${COMMON_DEPEND}
+	!dev-util/cargo-bin
+	net-misc/curl[ssl]"
+DEPEND="${COMMON_DEPEND}
+	>=virtual/rust-1.19.0
+	dev-util/cmake
+	sys-apps/coreutils
+	sys-apps/diffutils
+	sys-apps/findutils
+	sys-apps/sed"
+
+PATCHES=()
+
+src_configure() {
+	# Do nothing
+	echo "Configuring cargo..."
+}
+
+src_compile() {
+	export CARGO_HOME="${ECARGO_HOME}"
+	local cargo="${WORKDIR}/cargo-${BOOTSTRAP_VERSION}-${TRIPLE}/cargo/bin/cargo"
+	${cargo} build --release
+
+	# Building HTML documentation
+	use doc && ${cargo} doc
+}
+
+src_install() {
+	dobin target/release/cargo
+
+	# Install HTML documentation
+	use doc && HTML_DOCS=("target/doc")
+	einstalldocs
+
+	newbashcomp src/etc/cargo.bashcomp.sh cargo
+	insinto /usr/share/zsh/site-functions
+	doins src/etc/_cargo
+	doman src/etc/man/*
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index bedf00b016c8..fe422b490a82 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -10,5 +10,5 @@ EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e51
 EBUILD catalyst-2.0.9999.ebuild 2901 BLAKE2B 6ad35b1e2bce193bdc50de8547c0918036b7b1db8339462b2a1e6bd3f4de680918ca514a5d9243c476af0a9358b8ab2c18409b2585ca0565bfee8b27dd11ae83 SHA512 ede4a30e85f2b9b55fa627ef6b7de8a2f0f83a15bd67cea54596bcbd73b4f89ae991087e55bc34187d3572f25c1c3d9d0f818626f3880e758832a58a3af95f23
 EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
-EBUILD catalyst-9999.ebuild 1752 BLAKE2B b4dce3d64505cf72d7d546be2107050e4840477a4ceb883cd3aa93ea2c6f5a3fc63470e6dfea172f15c5f37fcff30dc29d2e972314aba46c2890b6a73639904e SHA512 c6548d3b6cfa924e4ca5dab4fe9680d5a4562dcbe8cb1debeaf1088c1c9fd8bbc66c2cf7272a1fea1997fdc0d8f8ae833e3ed6c3b7b6b16a10eae17b61993271
-MISC metadata.xml 417 BLAKE2B 161ad5d6df19baf10cd3110f677c85aa0d4c08051fc3be98c28d3f02312a50460a1e71619c314921e23fa680506ab88375ea033ea945db78a82a5fed35c953dc SHA512 ba623747ea22b2e886740d771dcd80ac54df9b29762d1d1f3eb46701e9463d245a2e310eb03695dc9342a57da486a9a8d56892da709727476a2d6afed5e63cb8
+EBUILD catalyst-9999.ebuild 1893 BLAKE2B 0a4bd424b51cea43ff8812a3c267d3556e59c93e6322d69ca068b0ab553b83cea3e09e03405dd8763c9a943e2be2b6061a0c47c030911c5cc5a6505235dc88be SHA512 e4f6d6ddeada2ce6c09c4739634988fc020f4901512036005ae7f0357818b97c2567725469cde6f5acae6d74254deaf08a0dc4833c82e0410819b4696199bdaf
+MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index c5635f4c74e6..e3bf4c22c44b 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -25,7 +25,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="ccache doc kernel_linux"
+IUSE="ccache doc kernel_linux system-bootloader"
 
 DEPEND="
 	app-text/asciidoc
@@ -44,6 +44,10 @@ RDEPEND="
 	ccache? ( dev-util/ccache )
 	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
 "
+PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
+				sys-boot/grub:2
+				sys-boot/syslinux
+				sys-boot/shim )"
 
 python_prepare_all() {
 	python_setup
diff --git a/dev-util/catalyst/metadata.xml b/dev-util/catalyst/metadata.xml
index 6c4b9cdbccec..988e80de6cc2 100644
--- a/dev-util/catalyst/metadata.xml
+++ b/dev-util/catalyst/metadata.xml
@@ -10,5 +10,6 @@
   </maintainer>
   <use>
     <flag name="ccache">Enables ccache support</flag>
+    <flag name="system-bootloader">Pulls in the depends needed to setup livecd bootloader from the host system rather than using a cdtar</flag>
   </use>
 </pkgmetadata>
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 5a054a7e0c49..ee750dd09b72 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -4,6 +4,7 @@ AUX cmake-3.0.0-FindBLAS.patch 1581 BLAKE2B 62493ac0ed23748be1913a919d88937c929e
 AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577
 AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f0136312dcd0fec065ba76fa0b6a9f1f3e4ae0139af700494951d999bdf2eee57a5c22db5516b8b8276f4d8be4395f2c4cb675 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad
 AUX cmake-3.11.0_rc2-FindBLAS.patch 775 BLAKE2B 89249b37ca44cc9068a5fd81350637da16c3a92a662f5b30db7e7bbfb9b47c816122bcbe31cb01845bdec760d449d0babbbcd6638ad4975b39db73c7bc5ea2e2 SHA512 ab24736b64bff1f9213f3eef7acc6a78829c875e8e5ec7b0d96ad406517e5335b0e3930ef369a9d6190d25a298c6834965e4977e5062e87595169272339f7738
+AUX cmake-3.11.4-libuv-1.21.patch 1333 BLAKE2B 685edbc90e59ddf3f5d430d50edba040703958db0bc57cfc3a5359b2aa71beb8600b2d4232225612036d00bcb9b9cbbdbb5f357f4fae492b6ed960c1a2a59bac SHA512 ea9ec5fcebd5a5988f5588b20cbf7e547065db6616476500c1d2d89c8585cf2276f7ba4fb06e85aa85ed435f81ca276c44518ce8f9f0efb6fc363f82f3b1aba4
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.8.0_rc2-FindBoost-python.patch 6575 BLAKE2B 4a169862e81b053ea8077ed61001434ba2619230ab4a4d75a11e2ea2c18ad704792d6d37a3cfa78cb54a6bf6cd71bc9b0d6a7a1bba004a92212746001874f385 SHA512 bb156cc2b47f9928f2e6bae909e90866f4442e42d7357744aa2b00903a02a27cf8af4a788a74858bc51874c442c40788717c86e77690b91def80abaa38b90163
@@ -18,7 +19,7 @@ DIST cmake-3.12.0-rc1.tar.gz 8089283 BLAKE2B 5ad24f6bdaa002dd4f70570bf36d5187bb0
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
 EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
-EBUILD cmake-3.11.4.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
-EBUILD cmake-3.12.0_rc1.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.11.4.ebuild 5974 BLAKE2B 833e3a47fcdad582c6d46eea9c3bea63ef4542f7ec7e5a75eb9ad62f340ce17a80e00e4375541da2a014746aeeef238999e9073dbe21edfa5915bafc91997073 SHA512 e1b1feb91dc95811783600e3a571b028ece865ee0f91f6b82b3e6fd190d350bff646292bb7b1082a65e769a8faa03d430271806102dd6d0731369cdfc8fcfd2c
+EBUILD cmake-3.12.0_rc1.ebuild 5982 BLAKE2B db54500077f1035c2bb6ff1c2bfd22ff49f46c9eaf0a5ea4e1b71f028e4a86f2f03a1db5ee7d83140ccbeb9ea2daeb42747e86e5cd369f7cced4d3063ef5786a SHA512 29667aeab0feb79f9351141e5faa9482c124f53a818a261163851119f1a2c763b33a12316f17296145a0067934ff2cc8217fbcfe57898c315479936a14b79c61
 EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.11.4.ebuild b/dev-util/cmake/cmake-3.11.4.ebuild
index 050883851f5e..b9e25d107095 100644
--- a/dev-util/cmake/cmake-3.11.4.ebuild
+++ b/dev-util/cmake/cmake-3.11.4.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
 	# upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${P}-libuv-1.21.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/cmake-3.12.0_rc1.ebuild b/dev-util/cmake/cmake-3.12.0_rc1.ebuild
index 050883851f5e..2cc5baaef0ec 100644
--- a/dev-util/cmake/cmake-3.12.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.12.0_rc1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
 	# upstream fixes (can usually be removed with a version bump)
+	"${FILESDIR}"/${PN}-3.11.4-libuv-1.21.patch
 )
 
 cmake_src_bootstrap() {
diff --git a/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
new file mode 100644
index 000000000000..664c39aae90a
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.4-libuv-1.21.patch
@@ -0,0 +1,28 @@
+From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001
+From: Raphael Kubo da Costa <rakuco@FreeBSD.org>
+Date: Sat, 23 Jun 2018 20:30:07 +0200
+Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection
+
+Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory.
+Make FindLibUV aware of the file's new location for configuration to work.
+
+Upstream change: https://github.com/libuv/libuv/pull/1429
+---
+ Source/Modules/FindLibUV.cmake | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake
+index ba13d75..0554d62 100644
+--- a/Source/Modules/FindLibUV.cmake
++++ b/Source/Modules/FindLibUV.cmake
+@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR)
+ set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+")
+ if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h")
+   file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
++elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h")
++  file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+ elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h")
+   file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}")
+ else()
+--
+libgit2 0.27.0
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index 76b834c53dcc..a7a980554d62 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -2,5 +2,5 @@ AUX cmocka-1.0.1-fix-librt-configure-issue.patch 1641 BLAKE2B 71214b9f0aec0bfbc3
 DIST cmocka-1.0.1.tar.xz 80240 BLAKE2B eb6baae44e75c3237038dfd32bb2844ed368eba7e2b7c8ddef82984d6b4b086b1667a5d021355d918be7ff63306629e7c6286c2f0ee4f5977362d96b6a9363d5 SHA512 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
 DIST cmocka-1.1.1.tar.xz 85648 BLAKE2B de888cb0dace6ee598bbdf4521b909c7fd2e02702829793efd7bac5cebd581cfb5cc79015b39f33be0ad3af218575f47abf6b2b6a146dc5e21a491442fa557ff SHA512 801c4a3e1bb9047241b1cb5a90c1cbdee1b0aff5e3d0a84ec8b2dbaee79274618c24fbe5e9fedbf0b3ee18c6c98b55d93e135d037ac33ab872edc7665af41577
 EBUILD cmocka-1.0.1.ebuild 1150 BLAKE2B 3d184570ee233cd04095eba9d700798a15101fd01482acec0aa381185b34ffcf7e3c9023a9c9209fa673c8151bc3f7c48920032fa1304503f7681659195a17b6 SHA512 fe02af0cc7c5fef6b3655f07a7c23e7dedf9d973226391b0df31c7c3b62cd91b6f02ea0244faf76c0d3df0807704ad1ce39a2464becdd782b0130ed4b4c80a29
-EBUILD cmocka-1.1.1.ebuild 1103 BLAKE2B ad60b9dfe2f5bd7488b5d75fe2dbbcd9d99c0d305dc6c7da1d6eac2473578f2a9efa08e491faf9c6c5553fb4227b4816e5aaa5017b070d6c9f7d691a6216db6e SHA512 e730b7c1b6631572a44aa208692418c35cec596beb6492695d4abb7daba5f61d662b54bbe5e97e1d6e487b1b10e74b6b150e607bc7c316e135c3b2c008194f1f
+EBUILD cmocka-1.1.1.ebuild 1100 BLAKE2B 28f873b40e9ecf4bfbf5090070c5e96a1ea382ce24d85af4ee223fb757427b50c639571eb7ebd4cbb541e9455ba563116db7d75b088746ce961d4ce862d8c14f SHA512 23fc89853501f10bf78827f433653ae4e9fc92f5cf0ca4d64d41b64a885b47a91869d3b513179de93aaeeca2f2aadff799d51d6064550cad421fd9febacdc96b
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.1.ebuild b/dev-util/cmocka/cmocka-1.1.1.ebuild
index 76dbc78372c5..84edca5785ac 100644
--- a/dev-util/cmocka/cmocka-1.1.1.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.1.ebuild
@@ -11,7 +11,7 @@ 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"
+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="
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 2ff062e33b49..37285e8779c0 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,5 +1,5 @@
 AUX cppcheck-1.75-tinyxml2.patch 2294 BLAKE2B 78763d10fdddb3d7f0cdaca9271007e97cd981ce1a5a39a91c928def6611cc379b411f9f8380d8f3b4b23554277cfc5a9c6e0797a80378d6e956ee2668dcbc5a SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07
 DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
-EBUILD cppcheck-1.81.ebuild 2195 BLAKE2B 601599c02250a5609f1493707e257bdb7a04546f290e29f3dd78a5e2674997e5f40723a9fc3c8392ecc5c975e07c3718e74cc757da093c11b019fed3dfff96e8 SHA512 d6e7f6ccab581331f37860ce5cfc79cc7847098e651560b057924233a9655d2b665d173d514af938fbcb9553c2c92096857081d983e1091445aff9582b33a635
-EBUILD cppcheck-9999.ebuild 2177 BLAKE2B cf8b92882feb4ffc711994e8911322e0866df6622933096f27daeb6a59d608f3408922e6c7428d2a9606900b5d5e24f73b8f104f7dd61ab6420bffe163b86aba SHA512 035b46dcbb6ed598769849250e911957bf2575a209effeb099124a4930715b72cc0a3e8f8e4212626446bff29bdb9852c5bc2c1a0542b50c4d9266b6daf5c7e0
+EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B fdea3ee8878f094db25a6cab68d4b9698aae4c9b898630e3d05e606a111704db383d112c4f58b55fbc6d5c980b3f2eb2ee7655651021834cfec8b06bdcda73a0 SHA512 889b589a4fa15a5f558e80dbb15005959ed6aade00737a3af16e40d12f79f04d25b3eb6c4a4333b7784a224a087cdf904914a85b148cee4bcba8d9bcc9c1fb02
+EBUILD cppcheck-9999.ebuild 2181 BLAKE2B a1c647fda42b74ea213f10113dc1a3b788009fb578c41f36cf287f4ec962046b35ec40822e4255af487f10aaf99b37766be7b13158bbdd5db48e652990c81ff2 SHA512 1ca33c9a1cc82de5dec24baf64ce40b58d9a980e4d45bf5bc5c75b7cf7d1a3d277072fbc8d8e7c6ecf238146c0dc628043c790dfb62c0318d26cafda084f8aaf
 MISC metadata.xml 397 BLAKE2B 4ed8f4270fb9d5cccf84c6eaa6feed2ea1bd662f50b85bd39afa0c715e535be35dd67efa462477d43e5b2c118838b11b9b613638d330be7999d4dc3d59193c42 SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e
diff --git a/dev-util/cppcheck/cppcheck-1.81.ebuild b/dev-util/cppcheck/cppcheck-1.81.ebuild
index f5cd79c67e4f..ce60d5ec062a 100644
--- a/dev-util/cppcheck/cppcheck-1.81.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.81.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
 
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index 4ed390f176fb..2ef2f6f37cad 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs git-r3
 
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index b8927636da3e..2b3ef1b2d10d 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 483 BLAKE2B 1cfd9d53f13d765ee9c72af7bef57d4e85b7f7630e726d5e416662719b7302c25543afa4ac60f6da811cf3cc1669f2d65cb3deca8cf6b29f0c143712c93ab652 SHA512 24740105e2df30702344be4ce39d95d18c0310f1e18d44480f09619116c0b46318bfd2c2426997a0dfee056933d9829b6adce932563300e6ca383ee227f3c250
+EBUILD cram-0.7.ebuild 485 BLAKE2B fb18332acaa5fffa849f15f790507f785c1be0e99aa1b82a748ff4c9c8386e7aa6843222f9bfa8207e53dfe5ddbd4815d8c082381caac5384c97fd890a402633 SHA512 d8b3e3c81533c39b847dd9032e5efb9f330a8e13b304d53bfbbf6d2c8f1a6e3cea1d33a24317bc32cc21b20bb96b1f0c5719ea4e3325e4cdd54a2d92c727ea75
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index 3c164062131b..df20e5706629 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 
 inherit distutils-r1
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 2ed0933b081e..63efd3bbcf3a 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,9 +1,7 @@
-DIST cucumber-1.3.20.gem 279040 BLAKE2B 7615ab4041326b39193cdfc54c5016e5b9e87facb652d0cc17be3c7cfac5e38ee3558d06cbfe4167fb27f32a07eba92e9836100b236ed604c897c8af89349230 SHA512 050573d2d7ea111dd9c8ec402321960203f7fd8d591be4f15b09fbd5bed89f3cb82104b8306f88f53bd92468ba689800707845f55785e6d20ed9f66f4b949050
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
 DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
 DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
-EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
 EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
 EBUILD cucumber-3.1.0-r1.ebuild 2640 BLAKE2B 6153fd69023f41de353be99be0a2dd06f83b72da4b598e7c41af68a2613ed4a94886c9272256d5cf4191b37a9ff6228a0f4e51a49fd212e14c833f11a2af84ae SHA512 05c022ee6a27cc814aa7e2acdda3da8ec35b9f0e2ac50b9b9d2ad0f38effc43da82dcbffccce4d2e0f0c0d0516dee8ef3874644627549a71cf1e4607ccc4e781
diff --git a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild b/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
deleted file mode 100644
index 1de00dfd10cc..000000000000
--- a/dev-util/cucumber/cucumber-1.3.20-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby22 ruby23"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-LICENSE="Ruby"
-
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~sparc x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-2.13.0
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.5.2
-		>=dev-ruby/json-1.7
-		dev-ruby/bundler
-		>=dev-util/cucumber-1.3
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	>=dev-ruby/diff-lcs-1.1.3
-	>=dev-ruby/gherkin-2.12.0:0
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|rack-test\|ramaze\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix too-strict test dependencies
-	sed -e '/nokogiri/ s/~> 1.5.2/>= 1.5.2/' \
-		-e '/aruba/ s/= 0.5.2/~> 0.5/' \
-		-e '/rake/ s/10.2/13/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Make sure spork is run in the right interpreter
-	sed -i -e 's/#{Spork::BINARY}/-S #{Spork::BINARY}/' features/support/env.rb || die
-	rm features/drb_server_integration.feature || die
-
-	# Avoid json, they most likely fail due to multi_json weirdness.
-	rm features/json_formatter.feature || die
-	# Avoid features that break with newer rspec versions.
-	sed -i -e '369,398d' features/background.feature || die
-
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files/find/' cucumber.gemspec || die
-}
-
-each_ruby_test() {
-	ruby-ng_rspec
-	RUBYLIB=lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 1cca52e75a11..d9c9774e92b4 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_11.2.1.tar.xz 456036 BLAKE2B 31ed91d7546db6f81eb5c40ce8ea203e01281ce3b0ff0cc310a280338bb8138c01f78f0f74175c68dcc53e913aab4f8a2c808e5f4ecf3a8661a5b2d551758e2d SHA512 9ce70ba6c89c77ef6be6a67ac30e9b904235850b2d8671be1a138c681b356e6c48cfceccd49942ed297ef944f4d35eefc8727e06fe72e44a99cc7b542f2a1211
 DIST debhelper_11.3.2.tar.xz 463864 BLAKE2B cdfce5b74d8af2cedec4f4cdd2bd5dcd21a941c420d6be32a145a5ab83ff9ae9bef7e2061ff011e7ecf941e4d6e017f9bc1413865280f0efac9ae0b00478f142 SHA512 b2172638023540593d8dbf525417c8c07e803919d7c0d481f896cff6d562492d22859deab0522aca91f69bd4b8c3350cbbf508cce6859d5bc04596cee9fd4733
+DIST debhelper_11.3.4.tar.xz 467684 BLAKE2B 8c5bef040c231c91cef1958cf797b8ddcbb40cee5303c3d6ebe26945462abd6ccb09dc905c0034ec3c48c8c725a0bfe1ee567e96cc5495a08a630adad1863f32 SHA512 2d24948b05396767ce303f9ae73e0640e48510830f7113f494ee91825c6646b7420a65a195f9a68cd2ed21d47d4ab7bf122fee7d7ecf6d5d928e3c51b1b45d2f
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.2.1.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-11.3.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-11.3.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 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.2.1.ebuild b/dev-util/debhelper/debhelper-11.3.4.ebuild
index eb7e5fa626c2..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-11.2.1.ebuild
+++ b/dev-util/debhelper/debhelper-11.3.4.ebuild
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index bfc3d7185abb..6a7377c99ff7 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,8 @@
-DIST debootstrap_1.0.101.tar.gz 73074 BLAKE2B 293cd1016af3bb65229cc1fdf1a26a500eea099badd4d94db22d0013b878e6e054d38d2cadf7ddf87f32f1bea0c37a91718b6b20f0bee782c4e99a376ccdbe04 SHA512 692db9d6dcaa7e440e37b4c90e00c56933235f7462ebdfb640588c6cb1c08f7197997066529d2a03f1f3e857c390a693832c625a4de23dba1dd08801adfcfc9a
-DIST debootstrap_1.0.102.tar.gz 72977 BLAKE2B e5253a1317f586855cb33b56458ba7fec18d9ea330c999ad5d48830cc39311ad9a66b1f4fe7b8ce6bf0a7d0ccca50c00ebc07eb0aaf49ad9680ada46a66e863a SHA512 2ffb2f7d1ee19ea34c5d5f5a6951d6d5b4a298cea1438302cc0cc20cffeb1affa5774d7f77e332c5eb3f45698c9a10232415c89ad0aa34abec533768ea4a2dc2
+DIST debootstrap_1.0.103.tar.gz 73167 BLAKE2B 063e27c1d58826bb7fec7879a5876df33b0da27cdbbdce3aa5ffecbcb70dba2814817e644725a132100cc7c7d182576bb2ba813f96bb4b289d06622d073da9d3 SHA512 4b43db32c46e5b69db9885494bc1f91197a40311c05196bf1c6e17d0a1f0519dbf61c8f5731c8627a708b8dfc8f3ba78e822a21879a5caf0d70046e3b7e60aa2
+DIST debootstrap_1.0.104.tar.gz 73264 BLAKE2B 28b4d1d1ad389dfb13f049529e5d14e1d8d82abf58b802ff25787e5c791c5d25aa2fd349f923b4e4d29bcbed78f2d32769189e110b6788acb67fb5499454dc52 SHA512 cfefa225a804e353195dedf5fbf0b005e7ac988f66c934927a312a32e8bbe9fd1083647fbafc5dbb3c7b55613887beb2c6296e3a5b8ed705b9ce18e850ee27a4
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.101.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
-EBUILD debootstrap-1.0.102.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.103.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.104.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.101.ebuild b/dev-util/debootstrap/debootstrap-1.0.103.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.101.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.103.ebuild
diff --git a/dev-util/debootstrap/debootstrap-1.0.102.ebuild b/dev-util/debootstrap/debootstrap-1.0.104.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.102.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.104.ebuild
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index fde119a1ca0b..327e8c5d092a 100644
--- a/dev-util/dejagnu/Manifest
+++ b/dev-util/dejagnu/Manifest
@@ -6,5 +6,5 @@ DIST dejagnu-1.5.tar.gz 576269 BLAKE2B df7767e5b8adbad7315e3489d3f8a267043e2bf27
 DIST dejagnu-1.6.tar.gz 523969 BLAKE2B 1cc9498aacd681570cd8d8834cd2fe0594bb49e6664cfe934b824dba0bd4a6766f977de6a1dc4596095a11d68844873f5687000423f4928f0432981023d26451 SHA512 a494dd5cde8d275b397116049c93e183f5f1731d63660ee8d2f4263b099fc5be7fbddde927fab3ccd5f000c43d50242f94bbb4d95497b915ea53be418bc145bc
 EBUILD dejagnu-1.4.4-r3.ebuild 987 BLAKE2B 4691d1c0d8ebb2f3065e257baad8e9f9b098b45072fa055692e07d470599b2c7b19a41694158cfd9983763fd6f89638856ce1975da0d2383b2620ebc911ea027 SHA512 cfff2240532dd13861c68c5e279e55d9466dfe01275fa668700dc573b003305f03256b9ae86553c1e93f181b801cb943f49ddc0de8aca38749eb9cbbbc108673
 EBUILD dejagnu-1.5.ebuild 801 BLAKE2B c0486854835b12c998cd3fd273858f5c3230dadc2071e908c4f1ffdd3b93b8391f0a6830b517c74e1cfc0cb7de86da2af320e55c71921203fba11954b2eaba9f SHA512 809c6ce3913880be91f9efd9a76e26affa5a8269a8047443c87584659ed03b25ecf9f6f5db65a22a82e9000994420699d8ffbd90dacbb6b01ab28d6458bc169a
-EBUILD dejagnu-1.6.ebuild 747 BLAKE2B c0484f5ad2e8479e9c472ca66116243147cb61229cdba9e8b5172800190407f93f354ae348e42f0c62ba0d750ce36aee47685c6806c9a81e9169ce4e8b111037 SHA512 06cd549942eb088955e744512835dca5c5e79b9753e5b4073ccb2d47f3a14b62234d178a5dd588c57f7f5deebe794d7fc8908c1e7fd2c733fb732e56683109c3
+EBUILD dejagnu-1.6.ebuild 738 BLAKE2B 2044f98705168168eab2f6f4f4dc4237db7cebf190f5b5e6b3e87f35e139650f285f9d6dd9c54060a4df6de5a870867e3086d3850613c2ccd8bcdc7134fadc01 SHA512 22b4f13599d26671c6606fb7183cd5a331ec31d88f433fac35fe40609bd5aee248725da508286183cb3c4672569f7af80c91a42bfb4ba1126b7c62935ae8292d
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-util/dejagnu/dejagnu-1.6.ebuild b/dev-util/dejagnu/dejagnu-1.6.ebuild
index e27ffef09c26..0ee1fc96b493 100644
--- a/dev-util/dejagnu/dejagnu-1.6.ebuild
+++ b/dev-util/dejagnu/dejagnu-1.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/tcl
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index c6fdbec89fed..eb7e1491e7ae 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,3 +1,3 @@
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
-EBUILD devhelp-3.24.0.ebuild 1648 BLAKE2B 617aea54f102dc7e804f68afc80b1bccc24fadf7b3cc3be7c426b2b395d11bc728ad432d414f03b97640b5f48385c13b4032219c6d7688eb80b26dd5c2e61837 SHA512 aa01a059b3500401113d9d92b950f759ef01ff1e5b32050bafa10dfa682b9e1da84c63971307f25df38a0f480f069dd4a176aba18fc8e7d1e5175888765da3a1
+EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.24.0.ebuild b/dev-util/devhelp/devhelp-3.24.0.ebuild
index 34bd10cfdd15..b94f8d2e6f4a 100644
--- a/dev-util/devhelp/devhelp-3.24.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.24.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 # gedit-3.8 is python3 only, this also per:
 # https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit gnome2 python-single-r1 toolchain-funcs
 
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index a3f6c5ccd44a..266c8911cbc3 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,7 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20170509.tgz 509135 BLAKE2B 30f443953701f79db86a317d3c1a3a7743685388cf432a4d48e10f0df5181207e0a182f96566cd868d9ee5db8296f362e57f40a8e58c99d3b372eb967bc56ebe SHA512 dd3fe2041a15dd344ea39a1ba111d3b26daca1cda91a4e82f1223385a49cdf3de15f11129366a20c5a24b16b5301f215543850a390d70d0559f98247bbd49a56
+DIST dialog-1.3-20180621.tgz 529123 BLAKE2B bb085e93a0eaedd1fc517bcfe080f8dbf61bf0b28003b38356d66c324baed7dcd2f76917676a1894e76bf3a7d58d3090c95e45624dae37e3e2e885282ab9c5bb SHA512 1c6d794af50a12294e32b99fd9d3eb9451ac4a2f21c5567848b59c7a316b3058463c41fb8f9eb0bce68edbbe463234a6ec893f7a013ceb953eb5da0effe0d274
 DIST dialog_1.3-20171209.orig.tar.gz 511503 BLAKE2B db633f882cce8a0ecd1446c26b305f5567bcdc0fb8e073ff3a443fbf56662638685578040ecd21220192c069899998f587aa04db8185074b4c8af957df77c49c SHA512 0355578bc64e2c75a2aae3ae83aff62eae60556a2890d50a72988efa76b82055755922bc1156a92370d773524865e76b8a0ddcde77fb6e6b5774c987fc22dee8
 EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20170509.ebuild 1290 BLAKE2B a9cc5c942135ea7ddede6b99f89a2b809b845a96bc6048d079e407a7cde93824a24795b9b3a0054cccdc541dee503322dea52d5fab87feacd7de55c206839263 SHA512 d0446c58fa792ad28393ee9946b866a7b45280e2aaa8d63add0f8c53a68229eaef793d9b65822edc1de13e354476c12a2bbbffa9aafe6c06adfb92648a520beb
 EBUILD dialog-1.3.20171209.ebuild 1350 BLAKE2B a2ae71b554dc8f96da4422d00ffbb49cf3af2456a58e97e8151db89ff16903200108cee08da78fa2e8dab1b36909c2222ad4a6336beba1f4010bdf6d7266f790 SHA512 52522ede770c6101897f8eecc5b0c9ed82c5ddab01a092cde57f7e08052e31188386eae7fa0a9044317b5d25c63502b69aa09dfa535780473a89888f1342ad47
+EBUILD dialog-1.3.20180621.ebuild 1276 BLAKE2B b21d421081fef21de326210e5117f0223203444ac0ae5ef1b4cc972d2fd57c46c0f2b50594a429ff7cd2b7a0e390f372d3781c5c42be65c7b4f2d84488e0137f SHA512 fd98134e5dd69bc3728b40b71933a5e49f3df34f8e22ec5baa02e8eb267ed2191d889086df23e263cd819d31b6363af4f6205a9989a03039ac0c84c9d8620bed
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20170509.ebuild b/dev-util/dialog/dialog-1.3.20180621.ebuild
index 3f4945e5dc03..ffa55f6cd40c 100644
--- a/dev-util/dialog/dialog-1.3.20170509.ebuild
+++ b/dev-util/dialog/dialog-1.3.20180621.ebuild
@@ -4,14 +4,13 @@
 EAPI=6
 inherit eutils multilib versionator
 
-MY_P="${PN}-$(replace_version_separator 2 '-')"
-S="${WORKDIR}/${MY_P}"
+DIA_P="${PN}-$(replace_version_separator 2 '-')"
 DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="http://invisible-island.net/dialog/dialog.html"
-SRC_URI="ftp://invisible-island.net/${PN}/${MY_P}.tgz"
+HOMEPAGE="https://invisible-island.net/dialog/"
+SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz"
 
 LICENSE="GPL-2"
-SLOT="0/14"
+SLOT="0/15"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="examples minimal nls static-libs unicode"
 
@@ -24,6 +23,7 @@ DEPEND="
 	!minimal? ( sys-devel/libtool )
 	!<=sys-freebsd/freebsd-contrib-8.9999
 "
+S=${WORKDIR}/${DIA_P}
 
 src_prepare() {
 	default
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index 0854f28044b5..755803e4909f 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,3 +1,3 @@
 DIST distro-info_0.14.tar.xz 26460 BLAKE2B eb34e31514f7acfd283ae9405132884ccae31b77d6cf7af3a8a341ac349d589cbd5d7828e763911fc490d6504edae4c90551b3d3cc3518eec1f47ab1dcc6ac60 SHA512 aa0055f21523e30fc7e9c94c92f87cbd05fc5d082ddc109d092e94dabafac7533ced984197797252eb698232b3d8f512b3c345ed6abef0ae074bf2770224955e
-EBUILD distro-info-0.14.ebuild 1918 BLAKE2B 3b55324d5a28bcc1c0859bd7821e81649b541df5c3b35332bb4af2ab4a30d7be7f53b04d1a067bd7b85a80655e187cd4e6bd726a0c5a3e01f6fb798f56cb316d SHA512 4326d6dec91095416d8c674e409111aed71449f41a9db75ab17561a31786573648b0433531589cf68fa9c058a71f2820f2dda2c833f8c3e215478cb99d4044b3
+EBUILD distro-info-0.14.ebuild 1920 BLAKE2B adec92fe296311cfc572751e60c13df5cd32fdbf63b81a6e5c1acf474cc9e3777cb235155c80ce4ccb744e23cb8dc0fd9190a4dae76eddca29c37197394c2811 SHA512 4c75ee6a854e6c8afc78a27fdef03799ff5c0a1c66c0f92cc058a04e00c950eb49b94f320309417a8b56bbc2143171a5a2235e45457f5abaa71e73778495addb
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
index ebcfaf5ea72f..3f9afb1fe1d4 100644
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ b/dev-util/distro-info/distro-info-0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 DISTUTILS_OPTIONAL=true
 
 inherit distutils-r1
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index 8a6f1b4c6f77..6a5f6c67dfc1 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
-EBUILD dogtail-0.9.10.ebuild 1470 BLAKE2B 376e1801bccd63f12d11c2e6aae1c473f8e9a4ecfa2c8a19a453e65262591392703d2bdb9db7695a483f20c1466159105a84aa5a96aa10741e3e101638193cd2 SHA512 a4366cfe584d71cd369618ff38abf54bcfa3ec129d2f9691937979c60cbb43be936a14a7e8c8c32641eca9c7000235a4252deb66ca5bc47ba8adc5bd6bc7dbde
+EBUILD dogtail-0.9.10.ebuild 1474 BLAKE2B 1b4b6f087b7cbaac0b14591414d153adc330f846f281f8cc27adf332b0cf1bceac8bba4adfd10cf8897a4c48f47523a70c2f7d9a913dd5cdd3bb03a3b787740c SHA512 63a411d3a2566fc8a8760c5fdce6f6fdcaf3b6df52bdb729ba9bf99c87d034af55f095b0afdae4842de7b9760174080c9fe55a1805feccc12dd8b6180ff20555
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
index fc4ccb9f6311..935b8334b61f 100644
--- a/dev-util/dogtail/dogtail-0.9.10.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1 gnome2-utils xdg
 
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
index 4a4ac8d0f3a8..652611d75d22 100644
--- a/dev-util/fatrace/Manifest
+++ b/dev-util/fatrace/Manifest
@@ -1,6 +1,4 @@
 AUX fatrace-0.11-sysmacros.patch 295 BLAKE2B a7f5350f0158e1f0c529b3a67a59b4a4255cd640287822b57e1f0952029b899fbdaab15e2d22394357e1210bcbafe8678866462a8213a030d5dfed2ec57f214b SHA512 0b3946043f74b957eb1b8caad39cc1b031e40bad564a1ffaa593dd77d5f96f06a1103d8d0b3689b4fe58f4bb4ff105d81855c9088ea5eec9d4ce6876d4a6f7f9
-DIST fatrace-0.11.tar.bz2 19354 BLAKE2B 28abfd4ab166406b5b16158797e3a8de460f813fec07f9eb3bdc8d18b190e2267f561095808bc5cca71cb17ddbce8a63de16a663f662d8e6046c75ea19cc69ef SHA512 4849f5f2aff423f915caedb63323c3888146124f856e141090bdc8eeff812b473ed194116684edd7ca0f10239c7e765740f109f0da0d364cd231430f6f5da441
 DIST fatrace-0.12.tar.bz2 19377 BLAKE2B 5279af5497408fdc614f090060e56552e0f396501a0d4155752ab44bfa666878ab4b969979314051b9b3f529e3870ffdc8071f332dbc146f0d2a7798c8b2549a SHA512 76dfc9dfc5c6b8e13f5d0c5c01c5c1b91093a5d980ded1f8fd776c9e861a6679eea193bcdd92b1c8770c9af346820300f186b7167ff4313e670f27ea31f765ea
-EBUILD fatrace-0.11.ebuild 834 BLAKE2B ca4ea0fc2324d1f54053af51bd628b73be831fd254836568506032c96d1e9877d1b3c58c5da5aa2d571eedc7c4640ffaae6281fc70654d3e0c1095235622b478 SHA512 583e063aad477326eab947923dbd8b8b89a1e426f6c97af9bff8699d7bbb383c9a2b0a3287c43f733d1d27e352ef0578a71547b15102e994389b57bd9a53f136
-EBUILD fatrace-0.12.ebuild 840 BLAKE2B 2d66f24db7352a816569edc2c69bc07ef2c145b6c2e196f77bf708c4b01695eb9308a2f719da8d0b8dac477f08656bc29ea1b65bba7dde72dfd306d59f1e0b69 SHA512 6db7325865a9b569dacf0e09bb598d60e33e60ccc81e8a64497ae1a252e2edd571e6822320daa6b846826b90e07f8517cba4d0a387c49469929c2235e38d87d7
+EBUILD fatrace-0.12.ebuild 844 BLAKE2B d20c3845d873391b4a429b541cc45a8f55adc6cff1423e9dd757d34500b3948a1769d812a13494ab5e91fee403bf92e9dfed3f8794b7c92c70eb02baf5297c3d SHA512 befb801bc29cce8b63e896355c68e99b28f3adb4c5eb1b73244653e62e1b576b9485a562295391ba3d507dc62685a6515d3739b9a26888995a775ce80b42376f
 MISC metadata.xml 388 BLAKE2B 3725d4392852682048ac5ef723a192389940988dbacec188d1956b73db5f2988b07c2b0a24912afdefa94765f70ababe8033f8778f82d016ac632d58b16cb84c SHA512 195cef9daf519cc93f44926498d1d58f3751bbdb54df19fe1745d245c4ded2c190da45637bb52a2682a6d2fc5ae692bed0cb3f5c111c4f6e156b11d0690e3036
diff --git a/dev-util/fatrace/fatrace-0.11.ebuild b/dev-util/fatrace/fatrace-0.11.ebuild
deleted file mode 100644
index 00fc54446d86..000000000000
--- a/dev-util/fatrace/fatrace-0.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{3_4,3_5} )
-
-inherit linux-info python-r1 toolchain-funcs
-
-DESCRIPTION="report file access events from all running processes"
-HOMEPAGE="https://launchpad.net/fatrace"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="powertop"
-
-RDEPEND="powertop? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-REQUIRED_USE="powertop? ( ${PYTHON_REQUIRED_USE} )"
-
-CONFIG_CHECK="~FANOTIFY"
-
-pkg_setup() {
-	use powertop && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580082
-	tc-export CC
-}
-
-src_install() {
-	dosbin fatrace
-	use powertop && dosbin power-usage-report
-
-	doman fatrace.1
-	dodoc NEWS
-}
diff --git a/dev-util/fatrace/fatrace-0.12.ebuild b/dev-util/fatrace/fatrace-0.12.ebuild
index 2f7b0af07d15..e6bad36cf676 100644
--- a/dev-util/fatrace/fatrace-0.12.ebuild
+++ b/dev-util/fatrace/fatrace-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
 inherit linux-info python-r1 toolchain-funcs
 
diff --git a/dev-util/gcovr/Manifest b/dev-util/gcovr/Manifest
index 1be2389ddaec..90e5fd32af94 100644
--- a/dev-util/gcovr/Manifest
+++ b/dev-util/gcovr/Manifest
@@ -1,5 +1,5 @@
 DIST gcovr-3.2.tar.gz 343748 BLAKE2B 721643e837d6469546a3bc3a191dfebff032e17c9a843c56c16c4440ab09a9db35596bf3e92c46784077e164ea1a97bc8b43151f8bddceb8071596ceec42049f SHA512 b8a810cb156acc1bbff108002f49b358c5b4044a6450c9b6a7a682c841e95f8159d42e4a8a1c4742fa82da1e99085ef4ede29a483291be4d79dcf09003829a45
 DIST gcovr-3.3.tar.gz 323226 BLAKE2B fe3d6ab4d24032f57ee17c3fc44b10e0b177aad01b072306a99abc7dbfee07b5f14ef34412d36938302bc279dffb2a25502981ba952339c1b4e896762defabb0 SHA512 e5046bc4e38c99691c3bcc58abdfbbe965c46d02c8c50dbf135bd5108bd9bba1fa450ab0b5e23157a178f7c1303ec9c285470e9be1a14274528e5d7051013a08
 EBUILD gcovr-3.2.ebuild 443 BLAKE2B 9b27a284631c1d23988ff1f0b7e96ef63399bfacdd04d600b0f523e6e8938cb84250da9329d2dd5d559e0103a83313449be85424f1e8ec5b27136a44005c8bbe SHA512 6e2095f225deab3771b83816477e6d9a59d2625d1554bfc810073d60b413059d539d2a9c45c75a107e06337c61c517e7a78aef02b03cf29adb48a296641cf414
-EBUILD gcovr-3.3.ebuild 447 BLAKE2B 0eb25331e469262e692e218de506aaebd3647f3ea98a232fe89468b2818f495531f5bc0bff1e17baa1b9f0e5b1fd261d272d6efaeb5d4b27e22f7267da42eee1 SHA512 c95862473a54452564e356e2c617aef63b37870d028cca7afcf5e9ad492145e11e26d91542bc1545030afadb7d30d7c6eac9c97329ba32e96b6eeaa5750b6809
+EBUILD gcovr-3.3.ebuild 451 BLAKE2B 566f180c178204fc7db0b9ba5bb8f92263a21120d63a1024de77ac8f6f40fd803e4dcca6773c4bfd979a920feee21dc16febeb83063f415d2ebfaae34f64454c SHA512 a00a118ff852939f363f8db716b02a9d2cf5af229a591a18cdbf397ac1909cf035eef49669cb813269ac038704b5d141c023eb76741b70e35611a021f4efa9c2
 MISC metadata.xml 329 BLAKE2B d81db6e30052ad893c6545b86d613ba960324f98b6dc3587c5becc2e0a92277f61f6c1f5005322cda86eeef50213e1f3c7c8b448d20d1cb5f4c6de1cc27c37fa SHA512 f6ba1f1e9cc2036097acb46bee3d5c4c18788862195613026a7678baea38e591fbc13e4dc9570d7ee0bf93a1f03a3bf198147f45de50411253c109c2163dad8d
diff --git a/dev-util/gcovr/gcovr-3.3.ebuild b/dev-util/gcovr/gcovr-3.3.ebuild
index a9aa0ffe6950..457c4f4c6415 100644
--- a/dev-util/gcovr/gcovr-3.3.ebuild
+++ b/dev-util/gcovr/gcovr-3.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 51d6cc86eb75..03a2def48352 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,10 +1,8 @@
 AUX gdbus-codegen-2.40.0-sitedir.patch 1086 BLAKE2B 7c3a460c3ceb90e35ce160eed36229e99459062e2b9166003408aa8a1b10b529aa419f18943c6d225a89c2378f9405f8f54b40fe460428a81544359562a2b8db SHA512 e860da78f31cb61896c450b4728cfc1d8eb57f0c06c9440fa4c3d4344429e41b12531b59e6ad6c8cb4ff146f9f63ddd9ed0e6b7f493a11adba46ea628bcc3499
 AUX gdbus-codegen-2.54.3-sitedir.patch 885 BLAKE2B e63cdb128735fa8fbdf2ae1e324f9ba602149c6a36e69752e948a2be0c559625154a6d6036478d9f30da9d628ada9d62930142fc351686aca0e7f55ec7cc4386 SHA512 122583e4d4f84144c822a37ee9b259e9f3be0dddecaee1d19575e53836122b3c5a283d201e1864c15d1f9b3f7f9827f8e6040a7f856ea1d471842acc28f0dd1a
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST glib-2.54.3.tar.xz 7836536 BLAKE2B 140e7cf09a41b72a5b22e5b87e9674cbfdfe1b82f3cf5f0fd3ecb2ed6b1f62a90f8b4c0bc2f655e297f91394f771f6ecad210357e31f104ee49ca178be6b9d76 SHA512 23eb4458684624f80c17aa784eab42a38eec87bb5979fcfe56f0bc63b5c7bcf8251a0d4ea916fe2c8109ff5b14a4b60c6260755d079ff984c0d8e6a2871d307d
-EBUILD gdbus-codegen-2.50.3.ebuild 1305 BLAKE2B 5aecff45e4829b32d3404c81f664620a54a2127bf066ef3af51e9be9ec3b70d4f5b18c674bec23d1b061f32af4d4346bef508ec0cf9111c94ebb7f2c7b01cd0d SHA512 cb018c694e4639888ff696c72b9df895de46946a0849668b3ccce9d6dcdae8193bc84cbf7ff2a0ccdd75108c8b4358d76cfe547dc8849cfa22c69ee42f8d3223
 EBUILD gdbus-codegen-2.52.3.ebuild 1313 BLAKE2B feea720780058dd1f086d7142cbcbf8ffbbd40ede7667a8f1e95f9a17ffdc4ce75acd524d269d9dfa4b6649d9f49d48e21501107745a227eea1311041fd68e12 SHA512 6a135d73e6a2d02ae545f617b3d227c6e86737374b4611034c4d9868c3cd266038c413a1281ff6fcb3dfa65813a389ee0428f740741c8d77e970f414f535fdc3
 EBUILD gdbus-codegen-2.54.3.ebuild 1303 BLAKE2B b0e9e2582ee7f4d9fca636bf37a87a48bb596c9c3c196c0d2233c03e1c989d455524a99a516190b06dadedd72223f44b16db4c024853b4b3c0a0f58e2732aec1 SHA512 f7bd9a848fb0b32153545083876663d1f8d11a85bedebcae7bad7dede1b0f47e6455beb30dffb2cf5404563c24b585958e03d5fe71f006625a7ce3858346f36c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
deleted file mode 100644
index 6fd9a6b75776..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.50.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-PYTHON_REQ_USE="xml"
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.40.0-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:#!@PYTHON@:#!/usr/bin/env python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 4a4c687cabab..33e9ba370f25 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,7 @@
 DIST goland-2018.1.3.tar.gz 221579069 BLAKE2B 16ead14bc3401fe7b031576eb9581613cac1352b42933acc83af77946376017b6658fb04b556b028a6f89f86a65b60290e1f6f9b5febe2dc10c85b5c6004879f SHA512 24f1c384139276301a27a9df1056560f3ee89ef9817690c00626eb0522fed8a58ded3bd3632aeac8f25855dd2c031c40f937761625f6545504eb2f3e7d0d509b
 DIST goland-2018.1.4.tar.gz 217585781 BLAKE2B f4bdd554003b2397911cb767ffba558fcf06ab9cfd20c0017579cf82c6af93681e16c23db82c3cf0b47c4bb6a2c37c564be5ee9d6400cf91cb3a0938309166d5 SHA512 972c15d6636728e214b355ce4ce7174d08e0e842c6ca4e4385fbc4330930a2fae3a964b1b3753c38fe77ac2b8073fd7366fd0085d00fcf05b832c985d6243325
+DIST goland-2018.1.5.tar.gz 217591227 BLAKE2B 7a45497f8706c77bb8e729b1e6affc88e1b9230a396738bad235d55bb40ed5a728bc674d210b04eedcc4b144f60ac91f6216ed010940257227cefcb167b81aaf SHA512 cf861bed38f0678f9734632d988c37cc1bd5c596fb23dfd3f9d60642f82c5f356809de116a138888638ebd7f464201d0ea780e694f9f5c5c66d3245a2b15f484
 EBUILD goland-2018.1.3.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 EBUILD goland-2018.1.4.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
+EBUILD goland-2018.1.5.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-2018.1.5.ebuild b/dev-util/goland/goland-2018.1.5.ebuild
new file mode 100644
index 000000000000..d46b730ae466
--- /dev/null
+++ b/dev-util/goland/goland-2018.1.5.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/gource/Manifest b/dev-util/gource/Manifest
index 67ae58945c4b..ba264a7796b5 100644
--- a/dev-util/gource/Manifest
+++ b/dev-util/gource/Manifest
@@ -1,3 +1,5 @@
 DIST gource-0.48.tar.gz 873333 BLAKE2B 95b876b486f0215f7516cb2bb940dd00771f67659cb2d10ad23e9da0732a51e3f2030d8f7599a8be901f0211bf1c484964f1fb66696be01c990a7b99d1123084 SHA512 5b638cac9b464c0d8f0df87ae0115c36d314cce9cd0ce269b05e0a635ff6f23e62d06d0def484b796267299041e4de675cb13a0381b19d9144bbdc1d3b7f1b16
+DIST gource-0.49.tar.gz 874349 BLAKE2B b7d24f415944921deb7df33be4e9918291f5df6dd4813bf98727894e0192b881a583a1dacec2d6e8f2d1a0d6b644bc3b735ef8d7c0b7882d77bcd80913fe08c5 SHA512 cb3482dd06cf38bd775f2ac4b8f3bee78e480dd51e37527024df6e59d6e613290297d65e167a21364aa6251eff78a50ecc8a5fd3772a6e9a4ad22ca21b4b615e
 EBUILD gource-0.48.ebuild 1060 BLAKE2B 5b3e6c4c560bdbef5c052b275b31c28f05bf2fb37bcfba7000efc24fc88b0987d03c22fbbb59e063a4314fc61f0758936a42cea0fe651bdef27ecc0f7d37bed5 SHA512 a2b87b1e273fe48737aefebbbef8f0c01616dc1b74eb430149c21bf0f51f94290944f8b2c7c325e27a0b00100ab06e4e8c71a1ac8ba49ff6bf0bf7d66356d660
+EBUILD gource-0.49.ebuild 1062 BLAKE2B cc5904ad53ef11df22c22b5547a6fa3b07234c640aca6c96de1e7fe9c7ac44ac053c8955c62bf91bb92345952cbf7c5aaa4dc46ca6f0ff0ec65720718830d8de SHA512 6709d71956fcbb491e279f7180c166e871ef7fca7bfe96fa84b54b83df2480ed69fa14881dd779d6f8515b2c9f4cd78b401584116356968811a17c7dc7e6c985
 MISC metadata.xml 353 BLAKE2B 86c28b45e78dacf7183e323130cd947f36f88278cbfca6d5e50d52268f309394d934836ca6a150af8297a153025c1be7756ba7cbc5ac7088bf2fff763f3b85d9 SHA512 d203593d1819671dc81ede02a2c7fdfc81f69b9d66a6587fd096ea89ca3274adba144f06244792f2044f8c8bfc788fbebbc6eca20a7cd9b5da18f3c1fb392729
diff --git a/dev-util/gource/gource-0.49.ebuild b/dev-util/gource/gource-0.49.ebuild
new file mode 100644
index 000000000000..cd54b4eb2266
--- /dev/null
+++ b/dev-util/gource/gource-0.49.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+DESCRIPTION="A software version control visualization tool"
+HOMEPAGE="http://gource.io/"
+SRC_URI="https://github.com/acaudwell/Gource/releases/download/${P}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-libs/boost-1.46:=[threads(+)]
+	>=media-libs/glew-1.5:0=
+	>=media-libs/libpng-1.2:0=
+	media-libs/libsdl2[video,opengl,X]
+	media-libs/sdl2-image[jpeg,png]
+	dev-libs/libpcre:3
+	dev-libs/tinyxml
+	media-libs/freetype:2
+	media-libs/mesa
+	virtual/glu:0
+"
+RDEPEND="${COMMON_DEPEND}
+	media-fonts/freefont
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+	>=media-libs/glm-0.9.3
+"
+
+DOCS=( README ChangeLog THANKS )
+
+src_configure() {
+	# fix bug #386525
+	# this enables gource to be compiled against dev-libs/tinyxml[stl]
+	if has_version dev-libs/tinyxml[stl]; then
+		append-cppflags -DTIXML_USE_STL;
+	fi
+
+	econf \
+		--enable-ttf-font-dir=/usr/share/fonts/freefont/ \
+		--with-tinyxml
+}
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index 11d092143b18..c63277423c7f 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,5 +1,5 @@
 DIST gperf-3.0.4.tar.gz 983500 BLAKE2B b83bb45fb88143f2847405efd769472c5b3ea9277af88568bf8860ae653563ff3c23a9705651eac50949fdfad3efd957856f712f7810b21cc6dd32dcf40adb12 SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 EBUILD gperf-3.0.4.ebuild 755 BLAKE2B 9ce77ac7852ef68d13f526b34cd8294dbd50d281ea6e73cf70d3e0da899b10d4868edad16894ab868df44e9ebd1ceaef68716b776b470a208820dd55913b03df SHA512 a3780b8647c196f856564753935978d8a80fa0849dbf804fd8822c83b64087376ab80376ecfd22102898fb7339974e4e4ce4090b91e8c7b8055d4a3159978950
-EBUILD gperf-3.1.ebuild 745 BLAKE2B 10a76da388105fcdc9edb5b3207c925f90f320b37f37ec2d5b46aaba8e121ccf612c8ac4b9ba7eb3374a2446996a95398fb0b73495d05eba940004f45d04a40c SHA512 e81b061d160669cde446db7b7298edf0ec92c5bb23fd46cce55d2ecace9ad880a18801eaf461715d75312d9bfe1b5d2891ea3cae806889684f906d035aac26c5
+EBUILD gperf-3.1.ebuild 744 BLAKE2B 5dee2141981177528b258258fcbc1b02841cb2ead405fe293d7cf9772e9960a1adb207eec365e9dbcac9a6334fb73e201efc353d2c00ec48a4d4e6aeccef9472 SHA512 3060859181c93ae26bcabaad679059ebbfded56ba96bafb022df6fbf96b19e8c1633c5b10db124df1f5be9d2b1cdd9eea54663dab578677d989981072ac9de37
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index 3553aebc5a5d..a687dca494e0 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index f094a294f0fe..7af7c69caa38 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,5 @@
 DIST howdoi-1.1.12.tar.gz 8196 BLAKE2B de3b7560dac360102246c10e6076658fe6fdfbedd378f02e65928d2b83a3f05357b8a9aafd6ad22e402448dfcf96b72faaf5755774b83ed1656ae7cb81554c72 SHA512 c4f66941d608a3f1c2a441b81ec5b64d9ac4e53b70bf4bda08fd8fc68b1c34022abdddfa47e3812cdce063e5b3c440aa4b9ad39ea95bfad2f285b5ffa89d711b
 DIST howdoi-1.1.9.tar.gz 7549 BLAKE2B 3fa434652971ad9addc01d9232fde67b4d86a7b1bdf14849f75029703495a70eeef3e232d6062ac3598e921b0bb86f39618125cc81424bba646bb08134875dc9 SHA512 6f236c1e7685c10682e38d1f679ebe75a12b29b78bd2496141099d875b483b0c749d12873f69d163e40eb66756b6512146471131758fda84e6ad9fc7b76806b3
-EBUILD howdoi-1.1.12.ebuild 583 BLAKE2B cbf9439e8305d8aa30d356333ea7c226e20cb494918066b21fb65c647b3504c91151e8322152021b7ea9dc98c2f7af7940023cb0ce43ffe9b4a251d8c5810157 SHA512 8bfb4e52b7766c5a7966df25671c11f3909add694dc6d62128c9ddb3b6a7348a31f07cefe65e361cf2cb09b3934fbe53495315dacc090a8b8d5d522bc94f7f92
+EBUILD howdoi-1.1.12.ebuild 587 BLAKE2B 5198d8b1b30ed4665ffdb51f3a987d810a8acc94b0ab3f24cdf8dc86ded9d9f9bbe61c5e431232a4e24af04a1212f44802838359defbac83ac885c7110233ad3 SHA512 6f0a08b90e3bdfbe63e67e66ccbf65a1127dde2e09689a0b63f4b992fd4f6b4f3eac364791363ed0704c68812c20584276e26ec0d4c1809cb0b5a8cc70a9536d
 EBUILD howdoi-1.1.9.ebuild 581 BLAKE2B eabc0f6b41035df78b16c0cf6c450010d55f88cdbe371c336febbdc1e27cd27fa1428c02f2a9320e43755fd3689c5c0c9fb535c3fd885a2053f6187876a1cd18 SHA512 be163880689afc744bbef6e878b1bcc49d2a27c1e52eeef91a3449cdfc0c4decce538557e3e7ce969898fd1f433b13e7839ef602ac2ac75845ddfb2e244bd339
 MISC metadata.xml 290 BLAKE2B 49911a26acd9402378242b6d656e33951b594e09cd64ea6115460fb13f1c2a4026644cdaab5fd343790be4122df5426949ca0b2945240216f497542278ab427b SHA512 ede22af6bd7ec77ad0b831c42c0169dc8e43719d4f7c5d7df37e6abb79136d1699a923a587a056210c0cccc33aa887856a46f73baf476ff2c074351880299471
diff --git a/dev-util/howdoi/howdoi-1.1.12.ebuild b/dev-util/howdoi/howdoi-1.1.12.ebuild
index e072ecb0cb11..63a872892bf8 100644
--- a/dev-util/howdoi/howdoi-1.1.12.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit distutils-r1
 
 DESCRIPTION="A code search tool"
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 453f3209a9c8..b17abe1da051 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,3 +1,4 @@
+AUX 1.1.2-python-3.patch 3102 BLAKE2B cae5f4633e43cd6c9ee94422070d556bc1419eabf702033017d3366c618cbd88d8afcde2d68fb19dc9328170b226fe509331f6cca595c2d8d1657c6dd05c3a75 SHA512 847998b733587ff3714c9a2b482a461a29de99d836c0ad4ba5e27fdf4f53deb534369146b6ccf454ec362903058d74e8af0b3c4d660ddf59d2d769e93b6de6dd
 DIST imediff2_1.1.2.orig.tar.gz 17974 BLAKE2B f83b6ab652b1dd044587e75e4e7551a8132e1860b14f0d85d37f35383bd161a672860162e93554cf4db844d6a4700fa1876a30874c50fcb8442b4190a9b19185 SHA512 54d196d67107283bc3339eba30acb1c60972f256a268e86da397e0bdafa05220facc7979638a6a917b0c2dc7171edc3aa6b188295c9f40e9debf87a63731e748
-EBUILD imediff2-1.1.2-r3.ebuild 748 BLAKE2B 12c38a333b954d6d46719b315d5a9ae441e99fe52f275dc56130d266885ddbc8b0441ce4b7888c86c45278aa3d229c393f3ddcb7a7a5e36f0b66559c4e211c8a SHA512 37d293a96506ee1d5184287ce5222ae1cace1da406ae82a67e429ab3b524ac4db37e991918cffed5e0ecf17eb74c68be26256239af33ddcfdd90509d55fe73bc
-MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
+EBUILD imediff2-1.1.2-r4.ebuild 814 BLAKE2B 95c325c3a197088b415fa739553a7e0be0fd60389f4f0e2b3af82caa097adfdd3b4e751b5393282cdf2422353463d546a6d6623fe165175c9f39ab73a952afa3 SHA512 6cd0c1a6014f058ed575f5492c593b97b2472294b71e558a210601f293172a1d5a323b6b9917d93a7504d668c57a568d02454f9dee6e01cdff465026c5b7b819
+MISC metadata.xml 357 BLAKE2B fd7b99a53b06a9ed310039486dd9c631d70ae5af05b47b42009e92b6134e52ee13e520066b8170f70b000a8eca1ca6c3c670478e393a4e36f3fe6c21187f090e SHA512 2c36e9355ac79bb027b25c63e0487299cfdf226217ea891349c4665107f6e7fb2931e56386ff1d88f16ad9e573041fc94658f61e8658d234b04bfa49c5fe902b
diff --git a/dev-util/imediff2/files/1.1.2-python-3.patch b/dev-util/imediff2/files/1.1.2-python-3.patch
new file mode 100644
index 000000000000..a7b4fadf4d66
--- /dev/null
+++ b/dev-util/imediff2/files/1.1.2-python-3.patch
@@ -0,0 +1,113 @@
+--- a/imediff2	2017-11-14 09:28:57.007929569 -0500
++++ b/imediff2	2017-11-14 10:11:12.618496692 -0500
+@@ -18,10 +18,12 @@
+ # License along with the program; if not, write to the Free Software
+ # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ 
+-VERSION = '1.1.1'
++VERSION = '1.1.2'
+ PACKAGE = 'imediff2'
+ 
+-import curses.wrapper
++import sys
++if sys.version_info<(3,0,0):
++  import curses.wrapper
+ import curses
+ import tempfile
+ import gettext
+@@ -31,7 +33,6 @@
+ import types
+ import time
+ import pty
+-import sys
+ import os
+ import errno
+ 
+@@ -121,19 +122,19 @@
+ def read_lines( filename ):
+   global assume_empty
+   try:
+-    fp = file( filename )
++    fp = open( filename )
+     l = fp.readlines()
+     fp.close()
+     return l
+-  except IOError, (error, message):
+-    if error == errno.ENOENT and assume_empty:
++  except IOError as e:
++    if e.error == errno.ENOENT and assume_empty:
+       return ""
+     else:
+-      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, message))
++      sys.stderr.write(_("Could not read '%s': %s\n") % (filename, e.message))
+       sys.exit(3)
+ 
+ def strip_end_lines( txt ):
+-  return string.replace(string.replace(txt,"%c"%10,""),"%c"%13,"")
++  return txt.replace("%c"%10,"").replace("%c"%13,"")
+ 
+ def main(stdscr, lines_a, lines_b, start_mode):
+   global sel, active_chunks, x,y, lines, textpad, contw,conth
+@@ -237,7 +238,7 @@
+         active_chunks.append( [j, j+len(line_list), i] )
+ 
+       for l in line_list:
+-        lines.append( [string.expandtabs(strip_end_lines(l)),
++        lines.append( [strip_end_lines(l).expandtabs(),
+           decor, color_pair] )
+         j+=1
+ 
+@@ -512,21 +513,21 @@
+ try:
+   opts, args = getopt.getopt(sys.argv[1:], "hmuo:abcNV",
+     ["help","mono","unresolved","output=", "version", "new-file"])
+-except getopt.GetoptError, e:
+-  print _("Error: ") + str(e)
+-  print usagetext()
++except getopt.GetoptError as e:
++  print(_("Error: ") + str(e))
++  print(usagetext())
+   sys.exit(2)
+ 
+ for o, a in opts:
+   if o in ("-h", "--help"):
+-    print usagetext()
++    print(usagetext())
+     sys.exit()
+   elif o in ("-V", "--version"):
+-    print "%s %s" % (PACKAGE, VERSION)
++    print("%s %s" % (PACKAGE, VERSION))
+     sys.exit()
+ 
+ if len(args)<2:
+-  print usagetext()
++  print(usagetext())
+   sys.exit(2)
+ 
+ for o, a in opts:
+@@ -607,8 +608,8 @@
+         else:
+           chunks = 'old'
+       os.unlink(of_name)
+-    except IOError, (error, message):
+-      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, message));
++    except IOError as e:
++      sys.stderr.write(_("Could not write to '%s': %s\n") % (of_name, e.message));
+ 
+   if not launch_editor:
+     break
+@@ -619,11 +620,11 @@
+ else:
+   try:
+     if ofile is not None:
+-      of = file(ofile, 'wb')
++      of = open(ofile, 'w')
+       of.write( output )
+       of.close()
+     sys.exit(0)
+-  except IOError, (error, message):
+-    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, message));
++  except IOError as e:
++    sys.stderr.write(_("Could not write to '%s': %s\n") % (ofile, e.message));
+ 
+ sys.exit(3)
diff --git a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild b/dev-util/imediff2/imediff2-1.1.2-r4.ebuild
index 9c30e2e03597..22d3fb364d12 100644
--- a/dev-util/imediff2/imediff2-1.1.2-r3.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1 versionator
@@ -25,6 +25,8 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 S=${WORKDIR}/${PN}
 
+PATCHES=( "${FILESDIR}/${PV}-python-3.patch" )
+
 src_compile() {
 	# Otherwise the docs get regenerated :)
 	:
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 5c23291b5215..b01015a7e56c 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,4 +5,8 @@
 		<email>dev-zero@gentoo.org</email>
 		<name>Tiziano Müller</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>grknight@gentoo.org</email>
+		<name>Brian Evans</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 6dcae8d6fb36..73c3ec904b39 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,12 +1,15 @@
 DIST lldb-5.0.1.src.tar.xz 19225084 BLAKE2B 82a0f5d40e6278147e4e2d9c7bbf0c19e512ce92c39e4ea0d9a830bf53a343c233aa528ffc3512072017ea2ffc7e6e57d1f13f9bac84a9446e41fb29f35a9da3 SHA512 ebb3c3251098cfce28ccb6a5bbc50491a16b88d1adf3c71fd38efc95482d702e1bd9e7fb11c29597304d97cc0fd88241c70ec11276426aad901e5d23f05ca53a
 DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
 DIST lldb-6.0.0.src.tar.xz 19317956 BLAKE2B e9ebdd61c5116d3e6be3542674b1e3eebba19b4a2107da153565fd95ed24a97248fb80ce5220b4dce2b6e3ac5b61fcdb594e34d6af25e7737575c3f31cd45fbe SHA512 9679d1dda0c71681b1f8c5a22e775c0262de26dc5b091e1db189968b97ed3aed45991381d529b3fd4b3ab28112453f519045485708f97f765d3e3131b2a918b7
+DIST lldb-6.0.1.src.tar.xz 19292420 BLAKE2B 9ec3304aa370781dcbc7c30e47f7becbd99b50f32d9eea36fefbf0e3608bdfe10796ecc14807ee17795de430409315a5dfad02db0fd3ec1a0ad51e9e240e4b40 SHA512 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
 DIST llvm-5.0.1.src.tar.xz 23428720 BLAKE2B 3db4d33df21018d17eef0042c0d8d82a8412bd5daa99cfb5405a6ec83c5774178fa76b220e8731c2a9a64dabf898aa90fe29c685327bd63a4f078e8e94a9a77e SHA512 bee1d45fca15ce725b1f2b1339b13eb6f750a3a321cfd099075477ec25835a8ca55b5366172c4aad46592dfd8afe372349ecf264f581463d017f9cee2d63c1cb
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.0.src.tar.xz 25296048 BLAKE2B 7ea90bb63d6f26cfbc1c1ed2f243b0fcd8ad2ceb7963cf768d262cd55e9a0c71a9cfdea0333fb220faacf4540d924d2512532774dcfb52b52490ad74e38c09e0 SHA512 a71fdd5ddc46f01327ad891cfcc198febdbe10769c57f14d8a4fb7d514621ee4080e1a641200d3353c16a16731d390270499ec6cd3dc98fadc570f3eb6b52b8c
+DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
 EBUILD lldb-5.0.1.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-6.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
+EBUILD lldb-6.0.1.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
 EBUILD lldb-6.0.9999.ebuild 2963 BLAKE2B 54d7cbb6d273667023d8beb7e5aeb55b2c332729e49c05ec6a2b79170b06e4287f16542878abbd6b27b13a6981629d264c269f27e3107eb9198e7f9ba7db4935 SHA512 5fb250ab99d6bdac31790f7035148f3da7115bb93d65359da3b757a75c90cb2f840b37ccd72a8374434081d2c677fe523862d19ada6a693eff7b6dac5f404f2f
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-6.0.1.ebuild b/dev-util/lldb/lldb-6.0.1.ebuild
new file mode 100644
index 000000000000..466d0ecf42e1
--- /dev/null
+++ b/dev-util/lldb/lldb-6.0.1.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://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.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/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index a0e9da601754..79b32a72b8c3 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,5 +1,5 @@
 DIST lxqt-build-tools-0.2.0.tar.xz 15552 BLAKE2B 558e1c9f43e09e51a720460592309f3f52fb7832a121ae40c8d9945ed135d6220190182a6d2311bfb9e9971f68a60f0ab7d5dcf2055301fa683dfc483170b3c6 SHA512 40349710a20d3f06761c57b5d40aa05cb194fa4b50d1e41e4bd7e6adf1beb5c7209f3d4965869a301369df17ec1d75f55aede7ab0fe88a55d692cd56d72121de
-DIST lxqt-build-tools-0.4.0.tar.xz 19988 BLAKE2B 119f2907062c08996b26170b519b9c4ce0308d6bc65dc1363fd81e064084ebe7305de7e66225e2ea3bcea899c2eaac49dcf7651b72a4f3a9d565ce4fd1d5a756 SHA512 d84cfce5db9520725e24855f99fb3125f19ff5dbac12ec6d283e9c4483497c675b32061cdea2eda533e57857be4a6eb6020049ae4f593ea61a321b2708604638
+DIST lxqt-build-tools-0.5.0.tar.xz 23392 BLAKE2B 1f28ae093af772ed2b6f75a7933b76a2c608171bf15e0c8483477d7f3b702dec79f41af70bb38863c3b17ff9d52a8f2acabd4ed2347bb7f421d2074b8767e96c SHA512 6802f3d5e3d622b136cf312ad929353aac1f42355c00ac9e3fb7a9d46c63dba1f87a0a4fd11185289c4e7222d5b0d30b8829dacd38c88de45901ff0559639e90
 EBUILD lxqt-build-tools-0.2.0.ebuild 503 BLAKE2B ce32303742984b29eca6a481df6f1a04e459c73661a6f7432404b5dff43fa83619dd2042ad690b03b333a2731e27e909e3d21c6668983e380d75f0ba4ae7ab30 SHA512 3d19db5002e4c194d0802226b617aee5901580286b298075fd563d9d38c76e83e9364900d8c82e6112939b1f8ea81efb2e050a2758f0b5935a862664311cd3d3
-EBUILD lxqt-build-tools-0.4.0.ebuild 510 BLAKE2B c46c3b7d42d55b478e2f804dbf6c47a8d33a515daff1f419791ae685903c4f9d30ea2246c26127a7a3ae687bd3453f8ab159dc15e179864426bbead9865fca41 SHA512 528ec992a84a694ca7c77078699f9745c8d2ba54398ab2d4ee0ec46d8de29d7bc8b1ae0d04f2d32ac524f858a40c1f802c66c60d0d8abf85413945ac17786d56
+EBUILD lxqt-build-tools-0.5.0.ebuild 508 BLAKE2B a1dda5bf87ffdeec4218646bc379483205aa5d471bf4c493079ee292297b38253cbdbf0bfae2703cc508a037c62e84e73edcc8d51083901c413887ffb450fb57 SHA512 3149c16f1b24e610e8223c5bc25480dd82ab222ba3ff06d856fbf0feb7b40eae95c55e0e9e27962e2e28477f2ca5eef8f3e0a6c717b8757bb7f1f923881677ee
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
index 68901413faee..97c50c2b4af0 100644
--- a/dev-util/lxqt-build-tools/lxqt-build-tools-0.4.0.ebuild
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.5.0.ebuild
@@ -19,7 +19,7 @@ LICENSE="BSD"
 SLOT="0"
 
 RDEPEND="
-	>=dev-libs/glib-2.50.0:=
+	>=dev-libs/glib-2.50.0
 	dev-qt/qtcore:5
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index ea0cd84e80a1..03689a4daf9f 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,6 +5,6 @@ DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236b
 EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
 EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.46.0.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
-EBUILD meson-0.46.1.ebuild 922 BLAKE2B f523f208c53d469214ab173611df0fd3a8cb38172da7284908500f53c6247da923829edc2581654c967d7ac7fca6378ac68b69ce6c8f12312d15f89f1fd1545e SHA512 e701708fb030b4c66bb327931f02efb603c2bec48629e914fb8c7fbd581397a5f4c7105d28f2a1eb2736dbc7b3dbd4a90e17030de46f14d766e06fece5d64745
+EBUILD meson-0.46.1.ebuild 920 BLAKE2B 58818211bdc423fa863a5868bed4702d82fd6f064b8ae80b38b974e185d219bdda82886ba0dee07b19acb821e2e1539547377aec517a0deef7465b027867728e SHA512 aa44cb0334f9e3ddc17abdc21c5598fd6f5be8fe1547d8d8e6c389e3977d5f36d0dc07909c127ccc9c7ee254cf1b9c6d6960c4a1c6b3724d7227ff1879b7716a
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
index 7f4ab42481e4..57e4f43d9453 100644
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ b/dev-util/meson/meson-0.46.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 94a120b3b5ab..d65af4e9b20a 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -2,8 +2,8 @@ DIST rebar-2.6.1.tar.gz 191063 BLAKE2B bf3407007957c2cb67f47c0c2a049d9b9f9e51e6b
 DIST rebar-2.6.2.tar.gz 210775 BLAKE2B e06a6fb0c29397dfcfe83de60cdcfb8e89f4a8e4287a41e0102ff972a93c8632d760c7bb6cfe669d98d324bf3afa007198eec773fde9991daa9964a452b5613c SHA512 410129defbf98af00f5040f9d3956299a70a0a1a21d28c42db32350b922e207f8af5830d8c322e9d3cfed8697ddcb228d5a98b983995414ed32662659a5c4c96
 DIST rebar-2.6.3.tar.gz 213146 BLAKE2B 1e74281de629b7f007a718af3d9f5afe7bbef72562f07e7df8f4ee996593b428d84030c8ef50e0a8f6b694b104fac01783175b5f3c6a0c113e263d3de3d8852f SHA512 451f18cec02f9b23ab1e522d4e9bc2a43cf5ace5fea6a7543874a76615cdb55e3d705ad2be94e7c28e6e1acfbc519eb3452588880f0846b928f8a28369623dde
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.1.ebuild 625 BLAKE2B 5bddb2b81ac9adffe34e4ef00b7b1f6b7484633043419c7947878fb53b50bf2cd06ed34521aaa28dd1bddd25ede8bb30c68ee7482df91a2d44a668f6498213eb SHA512 27bc9e2d1d844f66c26ee1cb649c18860c77a8ff28d42058bbb76bc08f3f16a87e39d3606ae049e57e2d6ce1d2f28c13f1b87dabdb7f1de9bb5910997d608916
+EBUILD rebar-2.6.1.ebuild 631 BLAKE2B 767d3538242b6c7165543ab2030fa1af1d16779dcabf35d745e5702fc9a9ba58517e116fc623b287d128a4e1dd983b3d926112081895839e4f46a6d0e2e21b08 SHA512 f6e545bd98f66499f9fe846c19bff96dc121748fb99d6e6b9c5b74adec066e1d5b035ed4df9da3577d93c68c0b72713070fab19ae48ec4c8298d5005d3366da9
 EBUILD rebar-2.6.2.ebuild 630 BLAKE2B d87812a6f7ecc61dac7dd67614adbaab35949b5daf4ceeabdf22a1ebcc27a5ac1adf02646017e069e21e3be054231cf61d42a1c0177d56332804d374707f6743 SHA512 ecb5f24a95aa823ceb1d0bce71306238ec07a0d7285bb7941102a1b21b3f9855c0429730455e2783c84d0f7d662aeab863cc9bf07c2c670f027647dd3dc78512
 EBUILD rebar-2.6.3.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
-EBUILD rebar-2.6.4.ebuild 628 BLAKE2B 2c2b910d62cb1723fadb51995f5dd65fbd1949b2e4cf4e021a414875ee4e03dd8060e772dbfecccdc476d6289cb1954db8fd97ba243fa1a6e04780b802409077 SHA512 c7e7e67bb27f2668207ecede86ca78162a54021397e96ab3649d4778dd56d0a861958977be90e2ca09a37da0648920eaa4da425d4e8db77c32201983f6757849
+EBUILD rebar-2.6.4.ebuild 627 BLAKE2B a852cb28105e1ffe1e48f99fdac2ff4fe2eb425d64474a775cd91f913c24197bea6aa7340982779c792fc35e60eafa0ea509af4f8d79ccc4cf83b8fe012cc369 SHA512 078f490dc9d359495d3d26eb4c4b93a70782cc7f6fb2eacde5072de1fe10bdaa23bbd53047a56d1b1eab159894bf543cf5c759caf5d18a7e5c6c26773fdbec43
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.1.ebuild b/dev-util/rebar/rebar-2.6.1.ebuild
index aeaa19a8f9c3..ee7f7421d880 100644
--- a/dev-util/rebar/rebar-2.6.1.ebuild
+++ b/dev-util/rebar/rebar-2.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang"
diff --git a/dev-util/rebar/rebar-2.6.4.ebuild b/dev-util/rebar/rebar-2.6.4.ebuild
index 90ce6d8dc3cd..ed807feeb1ab 100644
--- a/dev-util/rebar/rebar-2.6.4.ebuild
+++ b/dev-util/rebar/rebar-2.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang"
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index 9551dc9281cf..75ac5cc5c9f1 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1538 BLAKE2B c01122d357112eba8b050a301450826bad650084067da58d380eb17814c5f7d94645f57c99d1ae1f52afe7862fd4ce952edf10239840eec76f84e1d6903dcec5 SHA512 7b80df325b9886f529c41fd03f0ee470c10d0559c9ae922c1a326b2e4683b62610a849b755d2d5b1c3ed6871d64851998837538b39fb79b00030ae10db311721
-EBUILD rosinstall-9999.ebuild 1538 BLAKE2B c01122d357112eba8b050a301450826bad650084067da58d380eb17814c5f7d94645f57c99d1ae1f52afe7862fd4ce952edf10239840eec76f84e1d6903dcec5 SHA512 7b80df325b9886f529c41fd03f0ee470c10d0559c9ae922c1a326b2e4683b62610a849b755d2d5b1c3ed6871d64851998837538b39fb79b00030ae10db311721
+EBUILD rosinstall-0.7.8.ebuild 1542 BLAKE2B 0956b9e0e7cbb58c7e7759bbfd64126ffdbafb682f9a1c14eee7a4461aae3fd619a4026554df070fbbfa73dcfc1e51b2c5564b35232fe5a90fc02e8ef89b4aef SHA512 c79f3206b128bcf405cd5ccf5f563887a848605f329810cbe588302d44c837569595eaa6399e8f39ada3e56a9c60fb8d3e7ab5e337fb6b0c190c44ca8d7609b4
+EBUILD rosinstall-9999.ebuild 1542 BLAKE2B 0956b9e0e7cbb58c7e7759bbfd64126ffdbafb682f9a1c14eee7a4461aae3fd619a4026554df070fbbfa73dcfc1e51b2c5564b35232fe5a90fc02e8ef89b4aef SHA512 c79f3206b128bcf405cd5ccf5f563887a848605f329810cbe588302d44c837569595eaa6399e8f39ada3e56a9c60fb8d3e7ab5e337fb6b0c190c44ca8d7609b4
 MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 421784382161..34fc06b21e2a 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 421784382161..34fc06b21e2a 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/scala-ide/Manifest b/dev-util/scala-ide/Manifest
index 119efa5a4f8f..532b07211a15 100644
--- a/dev-util/scala-ide/Manifest
+++ b/dev-util/scala-ide/Manifest
@@ -1,6 +1,3 @@
-DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86.tar.gz 237898838 BLAKE2B 0d5044340945d6a5d1630c3e48790fb4f8af17b2fb9a54e14138b18891ccd9409cb6f95bf07d9061813b14a9b7449322903f4e12d0bb12211f6f4bb9383a9065 SHA512 b8fcac4e0eeace0d146028e2f1551cdd3f58d38830430080e7aa5ccd581ae6a31992a5d1f39b6e8fcb30979953f0b9777166d2de73d7310621c9e7fa2e620f3d
-DIST scala-SDK-4.3.0-vfinal-2.11-linux.gtk.x86_64.tar.gz 238040666 BLAKE2B 8b425a726eaf62ce71b25f77ab376d04e00900ad640dddbd08f434cd0c78e6c18f41b9c7a8495711600765a3e864cbdfc2757c984290ccb76b3bc59a1ff28caa SHA512 70f3a481065f79532a4a0463e2549e4ecb0590e6d6e1ca7704629eced4393a7e4f7b22cd7c368a852c1d8f63cff949db02a7dd7f1be71cd30f52219c5cfbefd5
 DIST scala-SDK-4.7.0-vfinal-2.12-linux.gtk.x86_64.tar.gz 281266580 BLAKE2B dd7e38385228e5bcb5d9997324e5f9abeba8b9c1a09bb503eb0b10368df89ee48357900123e230341880356f24eb1e3138326970e4dc6bd85204a48422a464b4 SHA512 622f930b665b1187baaa416f3172dc6b48551148c6267fa251e1ab17cdc5c78cccce07371ce909e59af0202d7e9a0126aa9e1d22798e0498f217e7e541e0e1a8
-EBUILD scala-ide-4.3.0.ebuild 1171 BLAKE2B 8d9575f448760a492eb488c9594be70ca87faeb3226593fe2029cce119eab2ceaad65c3ef7362888e66b21189d833af467e9cbae883e5bded2c8a87ec6221830 SHA512 6dc5f301005ffa914ee5856fb8c4cfa4a37a0ec2ebaa053f5570a15a5caeea3ead88bc7bae163658bc278c6b8e8478c730dc57252d685b2c92a8e95020d448b0
-EBUILD scala-ide-4.7.0.ebuild 1177 BLAKE2B 1174e007a21c222012924cc8422ed3328338978c7b07aeb2d37d2e9fd2a15b060527882a4f698394347b21adb5162b184305e360b64cee1a75b49bbb76df8205 SHA512 e10e0ae0b9829c7fc9852e20e922152cb4f7ec73539edd2bbcb58fb0eeb03756e84c6a045f5b17b333592cf085471b68f1b309e542f078276a51c77f26e91d12
+EBUILD scala-ide-4.7.0.ebuild 1174 BLAKE2B 2334d098ca53d551ba7d2895d0094c92c55fa59377c9be72d63aee6e29748e9895b5059275f10dfb29d70444b215311cba56737b56e229c07e4eb02375fb72dc SHA512 a844721fe8fb090d445b44fa31b291310bd03ce75b4d5ea36f6b4a3a57eb436cefcdb6d2253dc00c7f391188017ceec6f59d54d4bc3914954a6f3e9ed98fae60
 MISC metadata.xml 317 BLAKE2B 47b0d918ff9d4f2287fc0c43a022b978a816aa0d96362cf449210cd6b13810ed1352dbe69c5bea8281cdd3f3d03f4dcf714589e414b27abd5cd8c648e3d64994 SHA512 506fab7ebaa9e1caf96f239d6d85978171b98282ebe22a4948f61df62ce05a4c22772d81159cec9a99dd9a127b602e7593615204142e295d88835f9385a64bc8
diff --git a/dev-util/scala-ide/scala-ide-4.3.0.ebuild b/dev-util/scala-ide/scala-ide-4.3.0.ebuild
deleted file mode 100644
index f562273c4257..000000000000
--- a/dev-util/scala-ide/scala-ide-4.3.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit java-pkg-opt-2
-
-# scala-ide -> scalaide
-S_PACK="${PN/-/}-pack"
-
-# scala-ide -> scala-SDK-${PV}
-S_SDK="${PN%-*}-SDK-${PV}"
-
-SRC_URI_AMD64="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86_64.tar.gz"
-SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-luna-211-20151201/${S_SDK}-vfinal-2.11-linux.gtk.x86.tar.gz"
-
-DESCRIPTION="The Scala IDE"
-HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="amd64 x86"
-SRC_URI="
-	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
-
-SLOT="0"
-LICENSE="BSD"
-
-RDEPEND=">=virtual/jdk-1.6
-	|| (
-		dev-lang/scala
-		dev-lang/scala-bin
-	)"
-
-MY_D="/opt"
-
-src_unpack() {
-	default
-	unpack ${A}
-	mv "${WORKDIR}"/eclipse "${WORKDIR}"/"${P}" || die
-}
-
-src_prepare() {
-	mv "${WORKDIR}"/"${P}"/eclipse "${WORKDIR}"/"${P}"/"${PN}" || die
-}
-
-src_install() {
-	cd "${D}" || die
-	dodir "${MY_D}"
-	insinto "${MY_D}"
-	doins -r "${WORKDIR}"/"${P}"
-	insopts -m 0755
-	insinto "${MY_D}"/"${P}"
-	doins "${WORKDIR}"/"${P}"/"${PN}"
-	dosym ${MY_D}/${P}/${PN} /usr/bin/${PN}
-}
diff --git a/dev-util/scala-ide/scala-ide-4.7.0.ebuild b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
index 352b17b81120..e7e17c02f4c6 100644
--- a/dev-util/scala-ide/scala-ide-4.7.0.ebuild
+++ b/dev-util/scala-ide/scala-ide-4.7.0.ebuild
@@ -16,11 +16,10 @@ SRC_URI_X86="http://downloads.typesafe.com/${S_PACK}/${PV}-vfinal-oxygen-212-201
 
 DESCRIPTION="The Scala IDE"
 HOMEPAGE="http://www.scala-ide.org"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SRC_URI="
 	amd64? ( ${SRC_URI_AMD64} )
-	x86? ( ${SRC_URI_X86} )
-"
+	x86? ( ${SRC_URI_X86} )"
 
 SLOT="0"
 LICENSE="BSD"
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index 3d78152c7172..5fa0911e2942 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -2,6 +2,6 @@ AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452
 DIST spec-cleaner-1.0.6.tar.gz 450602 BLAKE2B acd298421f2c119e24dc52cf63e149194d5baa1282f9aef902e2ccaf51de040f5817641b4077f209656f715ea6ceb19bf55b8661c32cd24f461c58f9126d9e19 SHA512 a27b5dc7fdb02ca5c632faa5b6a2b71d6db3e9f97950f20c15b14584fa240ff7b69dc981ca67f4fcb6af207dff28a8267447ad0eb918e06ce2294436892e0eef
 DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
 EBUILD spec-cleaner-1.0.6.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42
-EBUILD spec-cleaner-1.0.7.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42
-EBUILD spec-cleaner-9999.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42
+EBUILD spec-cleaner-1.0.7.ebuild 981 BLAKE2B f8e296a0b85cc8254a28d4cdeb141eef1afe54d23d0d006a46e7cac9d932699e949bea16dd0b00d74b136cbf22e7ec63b702e1e8d6f71763d71cbfa140a3d72a SHA512 fa24a7f5873195647c23bea3065aa5e02904b2b331b11765a4780bc07f44eb3c4326bdc2c21e68e7b39d8f3edc487f8111ded07ccf5facacc0e350c351610d38
+EBUILD spec-cleaner-9999.ebuild 981 BLAKE2B f8e296a0b85cc8254a28d4cdeb141eef1afe54d23d0d006a46e7cac9d932699e949bea16dd0b00d74b136cbf22e7ec63b702e1e8d6f71763d71cbfa140a3d72a SHA512 fa24a7f5873195647c23bea3065aa5e02904b2b331b11765a4780bc07f44eb3c4326bdc2c21e68e7b39d8f3edc487f8111ded07ccf5facacc0e350c351610d38
 MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
index 297d0528ae6b..f6af4811af24 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index 297d0528ae6b..f6af4811af24 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 42390ee9687a..61241f12f6f6 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,4 +1,4 @@
-DIST vulkan-headers-0_pre20180601.tar.gz 454023 BLAKE2B ac1eafcf4ef84023f5f9445028b03c6e2638652d3a5b9e999b527a636fd1cd8fb6a2d23b47af71ddf3ef29210ab1d4f3bd4c13a86bec6f72174aff98c7e4828d SHA512 427f5ebb248aa0cb2e79ac2ddb5c1977d3b9bb92a4198bd562d4e89e773a8219e4c7923ca3544e4303af7f53c746fe5d754e508c9e83854f02dca7bee3c2e935
-EBUILD vulkan-headers-0_pre20180601.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
-EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B c795ceec07246e8cee6ef9dec125a7d1ce4cbf72d72a7b95751ce95ce014262a77648e9865816972158bd31fb486df07bce09ca16966d9ccc91922457b6deccd SHA512 3a2425eda721e3091d1f2f8a37a45d757c7c41291e61967d36789827c8296bf249519f99570492dd855e1acfbaca851945cf4b19c7ae5604657fe416a31be297
+DIST vulkan-headers-1.1.77.0.tar.gz 459383 BLAKE2B 4c08cb5264d2cae036e7a5c9260915186ba237067a003f69300ef550f1d944123223dce3c1084cf2e2a44f571b957928771e4d907e5714415841cda60dd5387d SHA512 097d6d532215751715c9ce0d97f4e7793318c5e37633754cda2f451201ef34121e14e99ecbf8d3281a417d1ece11f1065852ac5409d7b16a1370e27f065c3a78
+EBUILD vulkan-headers-1.1.77.0.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
+EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-0_pre20180601.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.ebuild
index d6e2cd6c4876..0e2db9636138 100644
--- a/dev-util/vulkan-headers/vulkan-headers-0_pre20180601.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
+	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index d6e2cd6c4876..0e2db9636138 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="afd12b7bdcd63bf4d8d669d6e06a368a0954b6e3"
+	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 257a3cb27944..e15448b7f3a3 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,5 +1,4 @@
-AUX vulkan-tools-Use-usr-for-vulkan-headers.patch 1240 BLAKE2B 2206e0777c2c7fea95a1e0b43e09de372b6a898275b3dbfa3bc1cac84125be42ade8834ffb8b2fd872f8d8ffa64aa70b456ad5c2e63c98c9aa4abd1995777043 SHA512 c96da656fe2d32af3ea5fbf348e6297be88b1581bda55e65a97d8d96229363b26285495929d5fa749b8e8fc9c20aa16ee529bcdf020191d46eac9bf97bab4511
-DIST vulkan-tools-0_pre20180601.tar.gz 421373 BLAKE2B d7c6870cf27397800a2af512b0bf05919b01dc30d84961d8a8dceacf005be461a8b250ef65cbfee8b070ef7f6fe8544deb855c06aee99f6b5175f4073b5a051c SHA512 f41517c22fb06aee07d40b947c756d97453810998ccb6e8cf8c48a439de1826361fcd84f0e96eaf3898e373e732d3b938c807da6fc2a736d3b986c2d30778ba2
-EBUILD vulkan-tools-0_pre20180601.ebuild 1493 BLAKE2B 89a9c0db5aaaaf7877c7c2323f88dec89cfbab5b1e15163691fbb242a41fe60b1fd4db4fb5f930bbc0f7083377f7859f90e8923a3eda943bf7615211a9a3fe7a SHA512 4ffbd5f371a42c3c9a4241cc776fb30e530e599a6da800e4ce4c076bb37312c782d8ace93d445f2c25c43355a1772a435dbad5c69ea1fe2ca78ae6ca47f3316f
-EBUILD vulkan-tools-9999.ebuild 1465 BLAKE2B 4100099eb8fedd15c99eb4ee6ef33137421bd6f996dd19bca8f3e575240dbbe02b8ce27ded58dfff1a8faffbf0b17902269bf0bd5c5275d08dc43e41ff5b7150 SHA512 cc72acc0b479694f8742c9cd8d05aa66c470734d9bcedde58d7d8a68c762e0bbe47520c089e33f8a5493047ff4392ba5f447bb2510441c9f954e0639b657e9db
+DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725
+EBUILD vulkan-tools-1.1.77.0.ebuild 1465 BLAKE2B bd973e88e2bc8ad9a843f6e732233a74977acee79183f7ffbc57ebfccacb80caf6967025f6f7fc59683ffcd289b84b8d517a1221c18c979322099df6d605b404 SHA512 e9f0af61f4f1e1c686e7e9b0d4bf6864114db3dc781a6e60392e66a912d88cf55d18c14e309b7c35ebf2a835ddcb6feb51c503b574b411078b184126af1760ad
+EBUILD vulkan-tools-9999.ebuild 1465 BLAKE2B bd973e88e2bc8ad9a843f6e732233a74977acee79183f7ffbc57ebfccacb80caf6967025f6f7fc59683ffcd289b84b8d517a1221c18c979322099df6d605b404 SHA512 e9f0af61f4f1e1c686e7e9b0d4bf6864114db3dc781a6e60392e66a912d88cf55d18c14e309b7c35ebf2a835ddcb6feb51c503b574b411078b184126af1760ad
 MISC metadata.xml 430 BLAKE2B dd9ef031ce380e8c4f37ab9d1c6bde97ce580b860ddcb6d41ba6b367e1c049528dc1562f228e9e8fd9d8109ed60a32d82faaec5b60e204bda4fc62d054feebc5 SHA512 8a2d53130be6108388981f63b4c2102ad901135254bb14a0568910fc0dc599374962cd39f1d7920cc5d1cab6700f67440f5b637e2850449a9ae16b666c153668
diff --git a/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch b/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch
deleted file mode 100644
index b9797e19ad2f..000000000000
--- a/dev-util/vulkan-tools/files/vulkan-tools-Use-usr-for-vulkan-headers.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 9498942c820525dc531f643696b7938d3f5fa482 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Tue, 22 May 2018 19:55:59 -0400
-Subject: [PATCH] Use usr for vulkan headers
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- CMakeLists.txt | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index fa9a3d3b..2998edfa 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,13 +29,15 @@ endif()
- set_property(GLOBAL PROPERTY USE_FOLDERS ON)
- set(TOOLS_TARGET_FOLDER lvl_cmake_targets)
- 
-+set(HEADERS_DIR "/usr")
-+
- # Output warning if vulkan headers submodule contents are not present
--if (NOT EXISTS "${PROJECT_SOURCE_DIR}/Vulkan-Headers/include/vulkan/vulkan_core.h")
-+if (NOT EXISTS "${HEADERS_DIR}/include/vulkan/vulkan_core.h")
-     message(FATAL_ERROR "Please run 'git submodule update --init' before running cmake")
- endif()
- 
- # Header file for CMake settings
--include_directories("${PROJECT_SOURCE_DIR}/Vulkan-Headers/include")
-+include_directories("${HEADERS_DIR}/include")
- 
- if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
-     set(COMMON_COMPILE_FLAGS "-Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers")
--- 
-2.17.0
-
diff --git a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild
index 42876e8f5904..3ffd734f550b 100644
--- a/dev-util/vulkan-tools/vulkan-tools-0_pre20180601.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.77.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad"
+	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -36,8 +36,6 @@ DEPEND="${PYTHON_DEPS}
 		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
 	   )"
 
-PATCHES=( "${FILESDIR}/${PN}-Use-usr-for-vulkan-headers.patch" )
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
@@ -46,6 +44,7 @@ multilib_src_configure() {
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
 		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 86e63d7def66..3ffd734f550b 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="b7940409945face40657080b6074fc5588a0c0ad"
+	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index adaa9e2cf272..32fa552af5e0 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -2,6 +2,6 @@ AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f7
 DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
 DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
 EBUILD wstool-0.1.13.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
-EBUILD wstool-0.1.17.ebuild 1455 BLAKE2B 074eb1dcbe01cab0a3ae86279207642ba5051603c19077ed0ea52ae0cfa9003623dcd8562458bba60ce1a16be996eaf0433840856a2011c7c66602a790e444e0 SHA512 f59f23d2669288f3234f5e69421c4d496258d5e8264a9731741698791c3fadfd6e3f44280fcbb4d1bf1f48d3b4ba209f2b679cf2fabe82cafc5115bbd5ad7815
-EBUILD wstool-9999.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
+EBUILD wstool-0.1.17.ebuild 1459 BLAKE2B 9598cc74373117ea94f5eb862a7f2bbe11932f1d43d750651354280da580ed01d6b1ba0b905b411916821d365aa6eb7829c1dc64ecb801c112212e8c548cf138 SHA512 83e34adf6f66c2fd00eae5a327f29e5dccf8798c139eba5a49aa65791d8186a4d1bce56bc0e246576e500c2b2c1643a0445c8f93f2d94e2d9f507db768f2d9bb
+EBUILD wstool-9999.ebuild 1459 BLAKE2B 9598cc74373117ea94f5eb862a7f2bbe11932f1d43d750651354280da580ed01d6b1ba0b905b411916821d365aa6eb7829c1dc64ecb801c112212e8c548cf138 SHA512 83e34adf6f66c2fd00eae5a327f29e5dccf8798c139eba5a49aa65791d8186a4d1bce56bc0e246576e500c2b2c1643a0445c8f93f2d94e2d9f507db768f2d9bb
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
index 5615dbd2b241..0c19d47c0322 100644
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ b/dev-util/wstool/wstool-0.1.17.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 68bf771bb166..0c19d47c0322 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/wxglade/Manifest b/dev-util/wxglade/Manifest
index 3b0e0037d952..3d86f30646c7 100644
--- a/dev-util/wxglade/Manifest
+++ b/dev-util/wxglade/Manifest
@@ -2,5 +2,5 @@ AUX wxglade-0.6.3-wxversion.patch 357 BLAKE2B bd9f6ca3ad8b33d8f152aa067617cdee4b
 DIST wxGlade-0.6.3.tar.gz 595243 BLAKE2B 748369ab08cb114c9fabf046a981dd955532b7752b176c616e9660fc74eade1db3b6bf08669f5373586880fe7798ff96a7ce588878ea129a7c9d7c76a8bc2e3e SHA512 7cb8cb99f2a3d97c2aa43a6ad5cbb8c1b6aafff0e5d120fca1760acbb44d2c8fb3bf8a4d5b42055e1b4bef061bfdbe8eee884f4e087b9d6572874b5b818a61f9
 DIST wxGlade-0.8.2.zip 4682765 BLAKE2B b9c6a0fe5ca89dce4ba8236c1db079df76777ecff34c00b9251088f39e5c853c8b775a2d941fa7f45a4f607354b85ab6cb26b387bd7e81f4db9cf458944fecc0 SHA512 d74f0b88509232b5f573af70f643af840c96e810060fdffc413f71ad03acca0fdb0324fefe43ab2a36473d8b053259099883d4aae51afff0c1c0b0ece492f9d7
 EBUILD wxglade-0.6.3-r3.ebuild 1127 BLAKE2B abd1d19ce4d1668354f3e1c4607efa6b446d5af0703ab60cdb583d0807596327a2bf68fcf15726a424b620148aa8032c2b8025f7a6abd42be6da1d9e32ffc743 SHA512 60d54c5d1d36570b65a0319f99bb0921ef1f35c5e742d0cf060871ed36a58a178e37858d087c4be14540a48564bbc1dd6f774cd6a5a0523928a8711057171c6c
-EBUILD wxglade-0.8.2.ebuild 1079 BLAKE2B 5868b07efb9b33d2b179f7f93e910a16a494798d0bf1c56953844891b61f1cf4df8b22bf7e1ef5c4b4d73a5b5ac7bfd4a68f04e9314ecb1a6e2a3135d6cf3e67 SHA512 414e702ccd014be4a96523db15ad553004cca055f6ad8a8e3cf244f168d412d050c9781261d6a3f8e9d15c4fe68a85a723013f7d3b2f4948680b3c39dc903a8c
+EBUILD wxglade-0.8.2.ebuild 1104 BLAKE2B 294edc0b3c0735860c0c57df19aead07163737ea8930213fef535bb6daf3a9f633df7dbb0b590e1c0ec659fb908aee2bd6404fd811e1569871b9e1abb65fe519 SHA512 a11a38483da913a5353a26cd0e59ccc03459f3f6f595ff572a480fe4bb332f08e9da0e6261a294c0e75e79e593b20708bfc8f348313ebea747603680278f4549
 MISC metadata.xml 338 BLAKE2B 646f91107076526a1d1e8c838869a20f69f0a13ed96a209ede0fedc8b10151ee18becd720646193994281de671a7d51ae7dc99c8652acda63bc73e72c6e57d33 SHA512 a5c2365b0607137be3ea999914329a9ffb3390065163f1f4bc818247ee9d8bfb7b4494c533f739870a31bd5ee484b9ff4199f279a9202708c1742513b0a48b97
diff --git a/dev-util/wxglade/wxglade-0.8.2.ebuild b/dev-util/wxglade/wxglade-0.8.2.ebuild
index 399a943d73c1..1d0f48649e1e 100644
--- a/dev-util/wxglade/wxglade-0.8.2.ebuild
+++ b/dev-util/wxglade/wxglade-0.8.2.ebuild
@@ -24,6 +24,8 @@ RDEPEND="${PYTHON_DEPS}
 "
 DEPEND="${RDEPEND}"
 
+RESTRICT="test" #656934
+
 S="${WORKDIR}/${MY_P}"
 
 src_compile() {
author	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-06-30 08:49:38 +0100
commit	b2be182d49eea46686b5cf2680d457df61e89dc4 (patch)
tree	c66442ced2011c5ca81c3114cc51041e314c6d33 /dev-util
parent	e23cdda4dbb0c83b9e682ab5e916085a35203da5 (diff)