gentoo resync : 04.08.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-08-04 08:53:53 +0100
commit: e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree: 9cb29a544215119b5c5538e37211b994ce1c87ae /dev-util
parent: 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)
89 files changed, 1216 insertions, 1820 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0eeeccee0240..9290b65452a3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index f2f64bd9ab8a..eab0d171ad46 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,3 +1,5 @@
 DIST anjuta-3.22.0.tar.xz 6363016 BLAKE2B 8b02f3dc0f97d0e195039cfd462bb6db64199c92d689fbf751e8a88141f65a4dc604bbf848342d73e398ba755e89b3d934df375aad50c9cee12c38df8a8c2d9e SHA512 64689392bfe6102698ef8a1ce62aac37bffd793b917ef6ffc53cb5b8aa9eb5b8961a999c32db559e9e348bcf46a7ec0ca9448100910b52885ddff898a62f3295
+DIST anjuta-3.28.0.tar.xz 6382736 BLAKE2B 8872736d80d0a09d35706ef69c0de56c84b9abf025f9552ae4b21b0b51c3ab8ad93f07dd1564601422890e92155cc7be80bae8de77106035621a54316608832b SHA512 c8de0b0debf0a511d6c50fe2582077a33c04290a045cce637c05c15df984cc3e8ee942c0c3a75bfd01c48e6c302d5424565c4e54fe6eb118c87a3590563505ef
 EBUILD anjuta-3.22.0.ebuild 3520 BLAKE2B a537f055c2f8fc5f5411512ad248abcc3f5af309617d09f3d0191481ddea3802a60ab27b06a3e2ff1c6e93879692d3ea2f43ffcfe132d6b2d1cc1dd3f4fbc1ba SHA512 5e19000cbe233a2688ebc24afd74f761b6395576b5ed3bf83f3870cfa7a855d10650e447853250a93ee2c9c1b366291a1240998401b7c7f613ab5816befa7530
+EBUILD anjuta-3.28.0.ebuild 3572 BLAKE2B d69d7ee46afa8a95980c795824090afa96f4d5b3778fe7a9d597be41001b8c8ea8e68dfd63d8aade4ca8c5b467d93a22f32e495fc5979d6e5cd29a86e5626f5e SHA512 d1668c8f3b3b5f9bf2b1fa056a470cef0c68e74fa3287a40348e1b84705c52f6718f02e2db9e3058832939f306e2e1d3efe38b8b81fc254cdb7990242fc7171d
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.28.0.ebuild b/dev-util/anjuta/anjuta-3.28.0.ebuild
new file mode 100644
index 000000000000..998c1d399632
--- /dev/null
+++ b/dev-util/anjuta/anjuta-3.28.0.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+# libanjuta-language-vala.so links to a specific slot of libvala; we want to
+# avoid automagic behavior.
+VALA_MIN_API_VERSION="0.36"
+VALA_MAX_API_VERSION="${VALA_MIN_API_VERSION}"
+
+inherit gnome2 flag-o-matic readme.gentoo-r1 python-single-r1 vala
+
+DESCRIPTION="A versatile IDE for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Anjuta"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+
+IUSE="debug devhelp glade +introspection packagekit subversion terminal test vala"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: automagically uses libgda:6 if available
+# FIXME: make python dependency non-automagic
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2[dbus]
+	x11-libs/gdk-pixbuf:2
+	>=x11-libs/gtk+-3.10:3
+	>=dev-libs/libxml2-2.4.23
+	>=dev-libs/gdl-3.5.5:3=
+	>=x11-libs/gtksourceview-3:3.0
+
+	sys-devel/autogen
+
+	>=gnome-extra/libgda-5:5=
+	dev-util/ctags
+
+	x11-libs/libXext
+	x11-libs/libXrender
+
+	${PYTHON_DEPS}
+
+	devhelp? ( >=dev-util/devhelp-3.7.4:= )
+	glade? ( >=dev-util/glade-3.12:3.10= )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+	subversion? (
+		>=dev-vcs/subversion-1.8:=
+		>=net-libs/serf-1.2:1=
+		>=dev-libs/apr-1:=
+		>=dev-libs/apr-util-1:= )
+	terminal? ( >=x11-libs/vte-0.27.6:2.91 )
+	vala? ( $(vala_depend) )
+"
+RDEPEND="${COMMON_DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	packagekit? ( app-admin/packagekit-base )
+"
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5
+	>=dev-util/gtk-doc-am-1.4
+	>=dev-util/intltool-0.40.1
+	sys-devel/bison
+	sys-devel/flex
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	!!dev-libs/gnome-build
+	test? (
+		app-text/docbook-xml-dtd:4.1.2
+		app-text/docbook-xml-dtd:4.5 )
+	app-text/yelp-tools
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# yelp-tools, gi-common and gnome-common are required by eautoreconf
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use vala; then
+		DISABLE_AUTOFORMATTING="yes"
+		DOC_CONTENTS="To create a generic vala project you will need to specify
+desired valac versioned binary to be used, to do that you
+will need to:
+1. Go to 'Build' -> 'Configure project'
+2. Add 'VALAC=/usr/bin/valac-X.XX' (respecting quotes) to
+'Configure options'."
+	fi
+
+	# COPYING is used in Anjuta's help/about entry
+	DOCS="AUTHORS ChangeLog COPYING FUTURE MAINTAINERS NEWS README ROADMAP THANKS TODO"
+
+	# Conflicts with -pg in a plugin, bug #266777
+	filter-flags -fomit-frame-pointer
+
+	# Do not build benchmarks, they are not installed and for dev purpose only
+	sed -e '/SUBDIRS =/ s/benchmark//' \
+		-i plugins/symbol-db/Makefile.{am,in} || die
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-neon \
+		--disable-static \
+		$(use_enable debug) \
+		$(use_enable devhelp plugin-devhelp) \
+		$(use_enable glade plugin-glade) \
+		$(use_enable glade glade-catalog) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable subversion plugin-subversion) \
+		$(use_enable subversion serf) \
+		$(use_enable terminal plugin-terminal) \
+		$(use_enable vala)
+}
+
+src_install() {
+	# COPYING is used in Anjuta's help/about entry
+	docompress -x "/usr/share/doc/${PF}/COPYING"
+
+	# Anjuta uses a custom rule to install DOCS, get rid of it
+	gnome2_src_install
+	rm -rf "${ED}"/usr/share/doc/${PN} || die "rm failed"
+
+	use vala && readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	use vala && readme.gentoo_print_elog
+}
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 37dfa6b90af3..127feab0d484 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,10 +1,7 @@
-DIST bazel-0.10.1-dist.zip 92973197 BLAKE2B a1d681407e2c72a57b3dcbb5e2afc49e59670be65da3d7d038dc3b8593bc0ab5b4a06c8dd8fc8a617a92eef2fc26a049b6de9a1eab0d05f31efb2fbeeb9ce711 SHA512 1894c951fd39a084011f89dd0d458e182525c2bfd6c80da071865e981e21a8c2b8363530ab53af18e6deae4a488744d6d2b7a5a4acf04715c2e26560a01df707
-DIST bazel-0.13.0-dist.zip 90105262 BLAKE2B cb065025524123babef187bac2e1f54f43645d08cb1282a5fe8f8c8b090e595570646072e2380836e2c43403f7953f97321becc24b743d7b9ab43ad208cf2c2d SHA512 3c128e551cff1b685250a68892ca3e1ad6be8b152ee2b8eb527c94adbb8fd50c70e703a363bb938916275030ddb14d756c14e4dc238e7a7b40289c700c5d53c7
 DIST bazel-0.14.1-dist.zip 89415405 BLAKE2B 7be5d4630d024d235a66f6bdf495c282b04a4034dde156c50d37a7e2eb3bf98df0caead7887f421b664fe92486e6baa5cd90e61b1e82b07b1691dc509ab93a68 SHA512 02c7125438f060d8e5e25b91ce3ca76fac6681b4f12033d807955a4ca5a5c22a3508a7229581b7349f35f343911f8408f43f8d78d54601277576dd32539e4681
-DIST bazel-0.7.0-dist.zip 84669893 BLAKE2B 2f8bbe3a48224a797bdebdaad8f7c403c8b0232ada5eee8c8619f241e9670dda311b9280f48b5e2013079f959891d94f55aee2af0dfae9fc4f6a486663fa245d SHA512 039ab6a04fd4422bd14503187e6cc0d07301723b3ecae906606fa12ccea72190d82237899c103c1adfdf05dc8672887790780ddfb4cce87cd590adbde3d3f6d4
+DIST bazel-0.16.0-dist.zip 89720984 BLAKE2B be8ad9c94b13dd8d1d1de76ed67a3a695a2541327b8cb8a4d27b9279c065cb351d6b2d5785024d11a163bfd4697fb1375b350c8220387ab79db7e95537def5c3 SHA512 89cefed69df1cae7076673900546199427fab3508aad1f0347b9da38153b6b1566b19a4c205055f41ca431fd9444ec772c86bc32fbff0da0485a5e5f11728932
 DIST google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip 1056996 BLAKE2B bf168c41a9958bcdc679a40d1e88911c6af0e47207362204326b712e0129b37348360a855f44af8b76acc46108ac89a707d0c0f793500c513a919070248939b9 SHA512 40cb9ffcaa3c57c69bcbec7b070fad5865e7317817049b7588dd42899054eb97cd17cb0019df99ad2324ed8e2efd8334cd83ace758a4c2d3f453503ccf54a91e
-EBUILD bazel-0.10.1.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
-EBUILD bazel-0.13.0.ebuild 2099 BLAKE2B 33d61adacde597d2ce03a8d6ec40d56d774a48f542cc7eb72b5cc407389870b17773468b7164608294239c91d8cc9b346e4720da6770faff8d05884cb45c4672 SHA512 5d6d77837f203d2b4ed377a776935d21519605d06281b9abb906db4844f31beb40caa5d283537c94fe147b8d3d1f3b0de6142b28310f929da609927822c9c14d
+DIST zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz 53360827 BLAKE2B 2cf000a50950d839fec4a0ff871632a18a67e93ff31a430d8af92fb0bf40f11d0d45a4427ec546618620aa1c1fc1078a9e918c540315ef8e5fb3928c9b36019d SHA512 63c3989b97845d9a019be5f20e667d9c96550738502c148b0dbf6cd9c1553df077217cb6fa0a9517d555c53a7a6eadeb7403d94aebca01f67aee3d97517df4fd
 EBUILD bazel-0.14.1.ebuild 3603 BLAKE2B 3cc3d61b45ea0595ad543d240c13b7f61ff6f76ae5cd34f7f2ba60823fcbb3ad31653fbc09b5a7030df7f0750ae33d3c0c454d162e72911e0cb2944036fd71f2 SHA512 9369b64769351b94d119323f1d506ffe9816b3ab3a2a33f4f1977b2aeede49b85833aa3454a4ce1b0b4a8026fffe731302b60aaab42c326c1ec733cb20aec332
-EBUILD bazel-0.7.0.ebuild 2070 BLAKE2B c9e36a90c5d0233f282608f645db158d5449a2d2305209ff5b2268fb64d8208295316641123fe749446b2775098b7da38ce0fe753af959599995ebb24508cc39 SHA512 25e3293a33aae17cfbe2b4f7c3106bac1ff4362e72bf6becc4cd040088d9dab2cf64b3dca61d5de80631f00925f89a2a3aa24f49ac7520af50dec00181aae0f1
+EBUILD bazel-0.16.0.ebuild 3718 BLAKE2B 95348099ab995f8f93b7d040aa6f032ac84fddfb1f0c0f12881ad15bd238a8fb08d912e6f1f3cb4eff124b43e3c04db25d3b400991ebe5c2eee50734a00f63e8 SHA512 bdd0d7a445b08bc9df7babb2fd04b607d366bdc69ac75623f523f0f6d4921ae094b3fcc328d4ec36d9f6352fddc1121e403f8114105c2d370acf0d62578007db
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.13.0.ebuild b/dev-util/bazel/bazel-0.13.0.ebuild
deleted file mode 100644
index bb11e0536acc..000000000000
--- a/dev-util/bazel/bazel-0.13.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
-	bashcomp_alias ${PN} ibazel
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh_completion/_bazel
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/bazel/bazel-0.10.1.ebuild b/dev-util/bazel/bazel-0.16.0.ebuild
index bb11e0536acc..1a6480e936e3 100644
--- a/dev-util/bazel/bazel-0.10.1.ebuild
+++ b/dev-util/bazel/bazel-0.16.0.ebuild
@@ -7,7 +7,11 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing
 
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="http://bazel.io/"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+bazel_external_uris="https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip
+	https://mirror.bazel.build/openjdk/azul-zulu-9.0.7.1-jdk9.0.7/zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
+	${bazel_external_uris}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -22,13 +26,58 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}"
 
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+load_distfiles() {
+	# Populate the bazel distdir to fetch from since it cannot use the network
+	local s d uri rename
+	mkdir -p "${T}/bazel-distdir" || die "failed to create distdir"
+
+	while read uri rename d; do
+		[[ -z "$uri" ]] && continue
+		if [[ "$rename" == "->" ]]; then
+			s="${uri##*/}"
+			einfo "Copying $d to bazel distdir $s ..."
+		else
+			s="${uri##*/}"
+			d="${s}"
+			einfo "Copying $d to bazel distdir ..."
+		fi
+		ln -s "${DISTDIR}/${d}" "${T}/bazel-distdir/${s}" || die
+	done <<< "${bazel_external_uris}"
+}
+
 pkg_setup() {
 	echo ${PATH} | grep -q ccache && \
 		ewarn "${PN} usually fails to compile with ccache, you have been warned"
 	java-pkg-2_pkg_setup
 }
 
-src_compile() {
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	load_distfiles
+	default
+
 	# F: fopen_wr
 	# S: deny
 	# P: /proc/self/setgroups
@@ -36,12 +85,26 @@ src_compile() {
 	# R: /proc/24939/setgroups
 	# C: /usr/lib/systemd/systemd
 	addpredict /proc
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
+
 	# Use standalone strategy to deactivate the bazel sandbox, since it
 	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
+	cat > "${T}/bazelrc" <<-EOF
+	build --verbose_failures
+	build --spawn_strategy=standalone --genrule_strategy=standalone
+
+	build --experimental_distdir=${T}/bazel-distdir
+	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+
+	test --verbose_failures --verbose_test_summary
+	test --spawn_strategy=standalone --genrule_strategy=standalone
+	EOF
+
+	echo "import ${T}/bazelrc" >> "${S}/.bazelrc"
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
+	VERBOSE=yes ./compile.sh || die
 	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
 	mv bazel-bin/scripts/bazel-complete.bash output/ || die
 }
diff --git a/dev-util/bazel/bazel-0.7.0.ebuild b/dev-util/bazel/bazel-0.7.0.ebuild
deleted file mode 100644
index 0a5efcceeb51..000000000000
--- a/dev-util/bazel/bazel-0.7.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 java-pkg-2 multiprocessing
-
-DESCRIPTION="Fast and correct automated build system"
-HOMEPAGE="http://bazel.io/"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="examples tools zsh-completion"
-# strip corrupts the bazel binary
-RESTRICT="strip"
-RDEPEND="virtual/jdk:1.8"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	app-arch/zip"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	echo ${PATH} | grep -q ccache && \
-		ewarn "${PN} usually fails to compile with ccache, you have been warned"
-	java-pkg-2_pkg_setup
-}
-
-src_compile() {
-	# F: fopen_wr
-	# S: deny
-	# P: /proc/self/setgroups
-	# A: /proc/self/setgroups
-	# R: /proc/24939/setgroups
-	# C: /usr/lib/systemd/systemd
-	addpredict /proc
-	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
-	VERBOSE=yes ./compile.sh || die
-	# Use standalone strategy to deactivate the bazel sandbox, since it
-	# conflicts with FEATURES=sandbox.
-	echo "build --verbose_failures --spawn_strategy=standalone --genrule_strategy=standalone" \
-		"--jobs=$(makeopts_jobs)" > "${T}/bazelrc" || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
-}
-
-src_test() {
-	output/bazel test \
-		--verbose_failures \
-		--spawn_strategy=standalone \
-		--genrule_strategy=standalone \
-		--verbose_test_summary \
-		examples/cpp:hello-success_test || die
-}
-
-src_install() {
-	output/bazel shutdown
-	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
-	if use zsh-completion ; then
-		insinto /usr/share/zsh/site-functions
-		doins scripts/zsh_completion/_bazel
-	fi
-	if use examples; then
-		docinto examples
-		dodoc -r examples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-	# could really build tools but I don't know which ones
-	# are actually used
-	if use tools; then
-		docinto tools
-		dodoc -r tools/*
-		docompress -x /usr/share/doc/${PF}/tools
-	fi
-}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index 4840eac1e6a9..a3c168707c92 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -11,8 +11,10 @@ DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bd
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
+DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
 EBUILD boost-build-1.62.0-r1.ebuild 3917 BLAKE2B c54fa707afefaf95f734f0af209c5394fbd1840be1b17d08f85e19c490754a640742a418c1cba77ce7e30b7e8bc0ef3eb6bcd49f09997348deed50e471380c6f SHA512 c6d588a903e3b717665b93ffdf0d815ebc769e527d6e14df9a6d0726885b26e1e932862928dc246e661c32765315932c5e5b956aa3c32cc32bd39ebdf5c8bf17
 EBUILD boost-build-1.63.0.ebuild 3841 BLAKE2B 8a1bec9cd61ae7ebd6692c30372ff5f21bb766b6a91cb5cfd95879c1faa18f02b7c1b44a42d6be7ed806a5c0a6920732cd366e08fb7a8a54427415579221b54c SHA512 fd427ff4dcfcb7bb8dbf2bd3fe795dc163c55167245febcd57220fab383088b44e646d715edf44462f5db3a8ebdafb8f0396f25ebe18038d560ce6b90dd428ab
 EBUILD boost-build-1.65.0.ebuild 3841 BLAKE2B 56c4453ea28c2c183f39564a9585abb3b1096105045e22e0e14cfeece72796b7ac49f93038bd1069cf96ae90fba6a1e4f1879fcf3efc0c9cc88e19d4b6c1c3ae SHA512 51bb46c6ecf0ee0447dc1cbaf15088f077159def1db09a5ba92ecffce7a53ced2992977b8f6105461fd1e86b43fbb44f0ca37e205c928fd31dd7e8bfbc8bbcb7
 EBUILD boost-build-1.66.0.ebuild 3910 BLAKE2B b39850bbc32ec01db2976436f6e8aecbf7d72dad9c4f0dac7172864f3fbd1b67eab9f4ef181c3a6afa577dc9480b72ca8e88233a967fc9cb7c629f2cc303bac6 SHA512 47806a8831a7335fdf60da7bbb87a703ee5173b1fe04b3725ce60362c16305e787848092cbbfcde4f0333e50c3eef84078ae3c9341463877195f4bc0b4290c63
+EBUILD boost-build-1.67.0.ebuild 3877 BLAKE2B e4b673623836afcdef5a07ddd53c1fdd0a4f3500b766f6a51cbf1d6d467a68c77c9abd610f3a70d2130149f58208c3ef18bf54702ae854e3c45a5079d540fc0e SHA512 1392b87927e890688acccbac89adcf7cd0a7167cf96aff4b4ac03b8a1f9eb495deb22126b8f83f83fb7d564f0dccf0925bf5823f177757f7c7084fb573fe9698
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.67.0.ebuild b/dev-util/boost-build/boost-build-1.67.0.ebuild
new file mode 100644
index 000000000000..aa42085c97ea
--- /dev/null
+++ b/dev-util/boost-build/boost-build-1.67.0.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+inherit eutils flag-o-matic python-single-r1 toolchain-funcs
+
+MY_PV="$(ver_rs 1- _)"
+
+DESCRIPTION="A system for large project software construction, simple to use and powerful"
+HOMEPAGE="http://www.boost.org/doc/tools/build/index.html"
+SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
+
+LICENSE="Boost-1.0"
+SLOT="0"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples python test"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!<dev-libs/boost-1.35.0
+	!<=dev-util/boost-build-1.35.0-r1"
+DEPEND="${RDEPEND}
+	test? ( sys-apps/diffutils
+		${PYTHON_DEPS} )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+	test? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
+	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
+	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
+	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
+	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
+	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+	"${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch"
+)
+
+pkg_setup() {
+	if use python || use test; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
+}
+
+src_prepare() {
+	default
+
+	pushd ../ >/dev/null || die
+	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
+	popd >/dev/null || die
+
+	# Remove stripping option
+	# Fix python components build on multilib systems, bug #496446
+	cd "${S}/engine" || die
+	sed -i \
+		-e 's|-s\b||' \
+		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
+		build.jam || die "sed failed"
+
+	# Force regeneration
+	rm jambase.c || die
+
+	# This patch allows us to fully control optimization
+	# and stripping flags when bjam is used as build-system
+	# We simply extend the optimization and debug-symbols feature
+	# with empty dummies called 'none'
+	cd "${S}" || die
+	sed -i \
+		-e 's/\(off speed space\)/\1 none/' \
+		-e 's/\(debug-symbols      : on off\)/\1 none/' \
+		tools/builtin.jam || die "sed failed"
+}
+
+src_configure() {
+	if use python; then
+		# replace versions by user-selected one (TODO: fix this when slot-op
+		# deps are available to always match the best version available)
+		sed -i \
+			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
+			engine/build.jam || die "sed failed"
+	fi
+}
+
+src_compile() {
+	cd engine || die
+
+	local toolset
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		toolset=darwin
+	else
+		# Using boost's generic toolset here, which respects CC and CFLAGS
+		toolset=cc
+	fi
+
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
+}
+
+src_install() {
+	dobin engine/bin.*/{bjam,b2}
+
+	insinto /usr/share/boost-build
+	doins -r "${FILESDIR}/site-config.jam" \
+		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
+		build kernel options tools util
+
+	if ! use python; then
+		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+	fi
+
+	dodoc ../notes/{changes,release_procedure,build_dir_option,relative_source_paths}.txt
+
+	if use examples; then
+		docinto examples
+		dodoc -r ../example/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
+
+src_test() {
+	cd ../test || die
+
+	export TMP="${T}"
+
+	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
+}
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index e6c07db2f004..f059536f13c5 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,11 +1,7 @@
 DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e73260d826633553ed10ede6d66d112dfa8bcdc4f1bd376695ee0ee4a715f1fa3705329033044d9358731c0b807c54b40b4e32a04f565 SHA512 4a73994c29fe1f78c4432bdb42fe14106b8d7887bb35f2835b203f4818844d3e8d2ea308fc4fb2bd562de302bd7cf6612fe047476512feac068eca3891a49522
-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
+DIST buildbot-console-view-1.3.0.tar.gz 640506 BLAKE2B bf68136edbe734514b662a580b9025626b6e0acd48f49ccee979c38d1a2eac13e8fd13bf4c9f62948694ed003de3ee6c44a9d734561a1b5ed4e1d9d330b39f3f SHA512 5b4fa27c8cca57df083c3044729bc6086086dabe819e215b02fe4fda0863b62658925433bbc90d9b38f4309af50b2312b3c9aaefff96a1f62b18d160ca66f205
 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
+EBUILD buildbot-console-view-1.3.0.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
deleted file mode 100644
index ea6c131f8ace..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 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-console-view/buildbot-console-view-1.1.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
deleted file mode 100644
index 23b0c0ae9c77..000000000000
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-console-view/buildbot-console-view-0.9.15_p1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
index 23b0c0ae9c77..23b0c0ae9c77 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 127274072eb7..010ccec4540f 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,11 +1,7 @@
 DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23abaddc414713c46e5544915d5564641a0534dfa9862f71d689c5df27a5f2a6ecbaa33c29ece5bc85e1c2d1f0a10b0f19273364699748f SHA512 3bc90dcee10781afa90a44d0ff57629f2fe8620fb1133a489282b3a69b884d33a7ad3cbf6e38f688755fcc2153c9ae1c0d48cd2797e33070f66a9093887179c6
-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
+DIST buildbot-grid-view-1.3.0.tar.gz 638845 BLAKE2B fb52b8fccbce298cbaf715feb1d785856e879f9e9fe63add83c3b0b51df93417ef8b355b33569956e055771bc75a4b6ea318bd7bbcd157bce01f972730468b62 SHA512 f82316743c10c4fd2a509a754808535606bdfd114b86e5796887d47845b4ef83677c7af830b9e4c531a9857249a8b2de8411b30f2f5b2a617a54244658e4a528
 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
+EBUILD buildbot-grid-view-1.3.0.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
deleted file mode 100644
index cc4c6a14d1b3..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 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-grid-view/buildbot-grid-view-1.1.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
deleted file mode 100644
index e30008fccea8..000000000000
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-grid-view/buildbot-grid-view-0.9.15_p1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
index e30008fccea8..e30008fccea8 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 04829ad8d76b..54aadf90676a 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,12 +1,8 @@
 AUX buildbot-pkg-0.9.15_p1-Removedevelopmentvirtualenvironmenthack.patch 959 BLAKE2B c3b72b0a2c1a5afeb69d76b14d91292a45e827d28c82a7975d4a4e73fdcab66a87445aaa621593f98bdd34eb99dd564b9fdf015655906cf53b8f581a00377f97 SHA512 3d2d0e0d4049f623deca4ba050d873761f63fa4cb24cf4c83c52dd7c0f3eec483b6e76353a72b1ee3b0e3a64c54d8174620a3ff93ccdd1474d746d6309b5ae6a
 DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985acbff592dbccfeb59543a507f263133268dde57efcacfabb90ea61c3184d34dced21f8e269f619d505166e68c76d43e SHA512 5b9847747924b7e04ae7584f549fa498715e293c6dbdbfef1fe5896c8c96cd65471a908b48c46a32eddbcf8f7b3642402974b4ed3319cf42e90028e772b5e34b
-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
+DIST buildbot-pkg-1.3.0.tar.gz 4835 BLAKE2B d035060ebf1e5823979adea8b7d31a13cc7bf3382eab571090d68db23b476e2fb959deaf249e6d4f2f3b44cf453c407dd0fd39e54a4e5a3d41462b125c573505 SHA512 b8e53de24cd41e31417a4259396fa080c7dad48b5ad2b15d5c9de9eb3fb35196a84f48ba589e8a077382e8a14d760f6148056bbe30972f0542512404e8efbefb
 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
+EBUILD buildbot-pkg-1.3.0.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
deleted file mode 100644
index 31b0738d915f..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.13.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 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}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
deleted file mode 100644
index 82c5f2ba229b..000000000000
--- a/dev-util/buildbot-pkg/buildbot-pkg-0.9.15_p1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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}/${P}-Removedevelopmentvirtualenvironmenthack.patch"
-)
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
index 46595012d5d7..46595012d5d7 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 56a844a28f08..65a2c860e2c3 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,11 +1,7 @@
 DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149fe7f4a1f03f2c2593b89908fb0a8d748c32779b01b8d87327ec9a54e02561a40d273f03f46a8581cf224c333f1bbb3e14ba22a56ef SHA512 76abc01783c02980bc2d6e878536416aa046dce3259c65fa5c2f15d3f66d1b9b5e0bed2d4f6b9d6c338300637c6b91e9bdee3fca3e47022d2ea9b75ffa69eb99
-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
+DIST buildbot-waterfall-view-1.3.0.tar.gz 713879 BLAKE2B 42e838bfb5925850cfa679727a8f53a5a71c4b6ce9ad26b010480ba16e421f5eda0228d94f7efabb74f3493f868ef61274338f31e0ba6afa1fba4a3b533ac5d5 SHA512 4b8403f9f68ddc6fc980649cf26625834c6a271705e0b8396ab7c2fd739929c2878557df945a1d9c5411985b79f8b43d3fca2c7f74769e9e832b1a7c166f8a3f
 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
+EBUILD buildbot-waterfall-view-1.3.0.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
deleted file mode 100644
index ec80689f3460..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.13.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 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-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
deleted file mode 100644
index 85e04699e657..000000000000
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
index 85e04699e657..85e04699e657 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 300cf04881fc..105836d8376c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -2,14 +2,10 @@ AUX buildbot.tac.sample 1809 BLAKE2B 57b907edf44579b9f380d528d47fbf3616248d10619
 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
+DIST buildbot-worker-1.3.0.tar.gz 103765 BLAKE2B a5f06ad6b87442292f9fe0c7935f791d2fdb450db09c9614324f8230d0bec408380a7b1637dc32806259c4de7699b164f20f76d959232a82253f7134749531d7 SHA512 5e59aab6cecf8dd932df0e8063c69fda5613b76a46df63479ff554085275d4a19fb1b5142034bd4245423e99f3e46d45e765b10c3c74a9f28b92b70119fab9e2
 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-1.3.0.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 EBUILD buildbot-worker-9999.ebuild 4815 BLAKE2B b2c7ed54635f056e08dbf6f88a61d3e08e5a6ecd0a85b2ef1a8f20630c2310325d5a794da6ed8b0a83a75fe2f0df833bd88353cf5505389f5e276b8bcd3a4718 SHA512 ffea0666c8da47bce1d410c8de890ef8f37b77a6739199cc9a3a895ac4c79f7cef82b1ffba30a453039e577f4f75e43a5b441690735757f7b899093449203258
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild b/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
deleted file mode 100644
index f1331b427b7a..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.13.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2017 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/p}"
-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/buildbot-worker-1.1.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
deleted file mode 100644
index dea70dbdd5e7..000000000000
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.0.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# 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/buildbot-worker-0.9.15_p1.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
index dea70dbdd5e7..dea70dbdd5e7 100644
--- a/dev-util/buildbot-worker/buildbot-worker-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index f97f86a7f6d2..1aa404955510 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,11 +1,7 @@
 DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13c07958c203440ef875bc4a79be6b894d0cf4dc457423528b7ea34c830511a5ef5d7f645fde2f71ac08578e1de32687c8b1ae2864491 SHA512 113c1616b08feb64fd3d94c1186e3d7dd7ea93e563a96ddb802e6ff8135e194014464ef09a23004518451626584bc531fc17419188ebbdd388e9363541b80c3d
-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
+DIST buildbot-wsgi-dashboards-1.3.0.tar.gz 626828 BLAKE2B 9c44bca995a1849246c71cdf8ecca1a72ffdca9fb8e99db4e05dc529e0b188b85f45078c0f961c03eeb688fae08975dc438ba7c85bfcd3bebcc14a0d56a69f67 SHA512 97885bb26eb03c40b8424063333a9bbc80b5111ce82c79e0ca466f2f820622df43c6913b6b6f4f9ead2a47e09496ff9442df4a6a9a34041f6b9a127544413330
 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
+EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1152 BLAKE2B 8db351efce478167c868cefb3694c0027ee300daabea790f5d53ff37dc489707349ace7e1241f071b82608642831d5e7f426b9b758d883eab13fdb95f133141b SHA512 2930a358436bb9002505008ec1763aa5242a0e367ef5736c6e37d8cb026980a28c719265ba475160071e1eca70df914b58246d154e068f7bcee561e269ecb86c
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
deleted file mode 100644
index 79aac997ef77..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.13.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
deleted file mode 100644
index 33206843b81a..000000000000
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-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-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
index 33206843b81a..d40978a5739f 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 PYTHON_REQ_USE="sqlite"
 PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index fbd042988d20..571e9b969523 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,11 +1,7 @@
 DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1e295898c432da5c8915e36156f2f934fd065c8075dd55f68da7bc29a567c1ef276bc415df38911aff7c33de46fa7942 SHA512 6c525d32407be24aa728a0bd9c9a09c64bb4bef092ef9e5285475527f7fcbd89d516ea376d90b22aa24af384d73125bc886360cf992dfe3d01471838193f351a
-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
+DIST buildbot-www-1.3.0.tar.gz 717517 BLAKE2B 57b0ed7ef46fecb242562a0f93e234985c9cc0ea55d273c1c5de74753f6ea83d25d5017515afb6ad4b7bff4f80cdfb9a6daf937c5cd133c017c9bd6fa9d6d7ee SHA512 e01d1d3528ab1f29ff136321b25f45b01733a4f23cd9d637c9e3290b5301a8ac3dc545decb178c1332e58dc3e11065ef73df49fbb46fca6068acabdd40a8bff1
 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
+EBUILD buildbot-www-1.3.0.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild b/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
deleted file mode 100644
index 56bc0409643f..000000000000
--- a/dev-util/buildbot-www/buildbot-www-0.9.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 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-www/buildbot-www-1.1.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
deleted file mode 100644
index 8ee469d1634d..000000000000
--- a/dev-util/buildbot-www/buildbot-www-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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-www/buildbot-www-0.9.15_p1.ebuild b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
index 8ee469d1634d..8ee469d1634d 100644
--- a/dev-util/buildbot-www/buildbot-www-0.9.15_p1.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 7e0b9d59b850..be1af02e5643 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,23 +1,18 @@
 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 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
-AUX buildmaster.initd 1576 BLAKE2B badfd427f40acced775fbf1e115ddf72792e9df80ff46dbb2b99cf01187885be360ada13b05ceec0ea181337f0ba07966f659a9f539f47cc3611555f051bbdf5 SHA512 0ad8173fcd732420c104ee3467d9df4c629165d82e75ddc8154249e69af3a8492a645e57e2da8e06372ba062aecbff82bfd0b24ff7d58515f87f0d255c8cab0f
+AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
 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
 AUX disable-test_userpass_wait.patch 891 BLAKE2B e88d77dc41a6b5e6e7dd925433a1fdcd459cd4baa457207f0922ff640cd12533f435ba4abc9f5ccdeee5402a28bd7171212e227f1d70250f077c37d1c3e91608 SHA512 33701567ee7cba18e05ccf55400fccfdd64e54ed1f79c8d7ebe3781999f709b47246bf01b49ea0056f4a33996c6e9818ca84f222c611a9e386291e802d4d2488
 DIST buildbot-0.8.12.tar.gz 4834352 BLAKE2B 16d06d6ccbbb90581471cf1727cc9cdd556ab1c0fa1433bbe76475513a7482619b05c28038e956e8724b99a806aec371961302914567fd36caccfe342daa6aaa SHA512 18c5144132fb033f3581d3c494d5e8ff35d3e8b1548764452ce9ae543d710e58a2c6e3e8e46a0ef237804f9a6a45485890ae4616ab655fb00d4ccf328d6f6645
 DIST buildbot-0.9.12.tar.gz 3057832 BLAKE2B 8e1748739bacc3c884f353b2a1c798575e3ce5f451a1711ecf88a7c7e517da86d2e791748d31468a2bb07369022e96cb568518b7a8ce1d9e1cece0b6ab77eec8 SHA512 62459918267297b31b2a6416f72794c7a4ebdcb60de04ece1681f6b8be9debf161716cc70ad843fd468b23e02c521c0a0783a5a1e119d75648e107691d6b908d
-DIST buildbot-0.9.13.tar.gz 3061713 BLAKE2B fac74d610bf0ff1cfeea1c59c46e95339d6b080725f6b01258921175b8036daeef23dfd3bf2a71fe838d43b9d7777e3a3141ff9cec0e1c7e609f21c53f51b91d SHA512 b1cf176d01e04bc219be8ffa787a857aec7bcfb930c3e9cabe0410fca60d826c35e74d277cd5764fcd3c6183ea5f19bae195c09ad401cdd948bda500789f2ade
-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
+DIST buildbot-1.3.0.tar.gz 3119185 BLAKE2B d366b83baad7e865481535a2462ceb222aadce6c90a6229e82a72bf86518b8ebb0624d8ac8b64867783d58b6e9033b942a1ccd31fd6664a2b527eac9f11ab852 SHA512 e5ecf3eafe428a188c2410d270ee9bd5afc39122e62d35747288cf85347368ab4a94190b4ff6fe687269dc19cc7b91d33be8d3e3b637741e421a2cbd83572830
 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-0.9.12-r1.ebuild 6434 BLAKE2B c5d990555a23357803c9e6dfdaf569467113034c0791f30f6cb8f93b4974bae3298123b281527a360bc7a20b96150ae3d2ba00aea3c23cb3e76457ec374b54e4 SHA512 86f1296ac15f80822606e7f7ef23853fe46b10440c774353dec387bfa56fa34da624811b7b4c7979b10ce05f230f98dbca77d6bcde4ae3a64cd8aa95089ed302
 EBUILD buildbot-1.1.2.ebuild 6550 BLAKE2B 88e1fb4d2acc8f6876629ad933c54e0574ba179788f33416ca00c40ada8f0d355d49f5675d19ba47003090ad5f8f556568b3b65354925df95a9be39655148328 SHA512 1db8c11e0622f7ccf0c7237e7404736c40d55233d2b56778a2b85b30dd9e26843d9ab2e3c9fe2c63467dfe54f28141323688eed1ee43e3a0f7e483fda71a3254
+EBUILD buildbot-1.3.0.ebuild 7179 BLAKE2B 8bf2ee184ffb4faebcf281f8884f8732dc51ec3e9a0293a6441f1eee85a118360750c4101b3e957616a7e1eda0858fef90db4cdaa0ff79d36ae66ecfa43b3a64 SHA512 c58491324b048e3d36c019ff9eeb226f1f1cadec45b58d6337fe2af3ded585426a1b4563069ca8e6c7528d74f1a2e520604ba8c7286fdcb8fe6e11282ad57c12
 EBUILD buildbot-9999.ebuild 7179 BLAKE2B 8bf2ee184ffb4faebcf281f8884f8732dc51ec3e9a0293a6441f1eee85a118360750c4101b3e957616a7e1eda0858fef90db4cdaa0ff79d36ae66ecfa43b3a64 SHA512 c58491324b048e3d36c019ff9eeb226f1f1cadec45b58d6337fe2af3ded585426a1b4563069ca8e6c7528d74f1a2e520604ba8c7286fdcb8fe6e11282ad57c12
 MISC metadata.xml 1505 BLAKE2B d07e69e8ef573b7cf2a5575a19f3bd875058903e1fc59c4100a4300e72825c1fb137eb4b804a505a7ec1877b7fae91621e35e611964abea4062fad37a9c6cc29 SHA512 795f29b373d7fa6190fa61f2ffe986e1e1857b11cf68a787a09c7d5ea485c1e55cc7f745d2bf84de3c431e8e29f6176d094df92f760432e808ba2abe12c065bf
diff --git a/dev-util/buildbot/buildbot-0.9.12.ebuild b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
index c37dc87e1474..5164daeadabb 100644
--- a/dev-util/buildbot/buildbot-0.9.12.ebuild
+++ b/dev-util/buildbot/buildbot-0.9.12-r1.ebuild
@@ -25,7 +25,7 @@ else
 	KEYWORDS="~amd64"
 fi
 
-IUSE="crypt doc examples irc test"
+IUSE="crypt examples irc test"
 
 RDEPEND="
 	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
@@ -51,16 +51,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${PYTHON_USEDEP}]
-	)
 	test? (
 		>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
 		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
@@ -92,28 +82,11 @@ pkg_setup() {
 		The scripts can	run as a different user if desired."
 }
 
-src_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
 src_install() {
 	distutils-r1_src_install
 
 	doman docs/buildbot.1
 
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
 	if use examples; then
 		insinto /usr/share/doc/${PF}
 		doins -r docs/examples
diff --git a/dev-util/buildbot/buildbot-0.9.13.ebuild b/dev-util/buildbot/buildbot-0.9.13.ebuild
deleted file mode 100644
index 632833de2f4a..000000000000
--- a/dev-util/buildbot/buildbot-0.9.13.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2017 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/p}"
-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 doc 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}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-python/setuptools-21.2.1[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${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/ramlfications[${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}]
-	)"
-
-S=${WORKDIR}/${MY_P}
-[[ ${PV} == *9999 ]] && S=${S}/master
-
-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_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	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/buildbot-1.1.0.ebuild b/dev-util/buildbot/buildbot-1.1.0.ebuild
deleted file mode 100644
index 4cdc4a28db20..000000000000
--- a/dev-util/buildbot/buildbot-1.1.0.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# 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/"
-SRC_URI="
-	mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz
-	https://dev.gentoo.org/~dolsen/distfiles/buildbot-1.1.0.docs.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-if [[ ${PV} == *9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~amd64"
-fi
-
-IUSE="crypt doc 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}]
-	doc? (
-		>=dev-python/sphinx-1.4.3[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-blockdiag[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/pyenchant[${PYTHON_USEDEP}]
-		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
-		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
-		dev-python/sphinx-jinja[${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
-
-PATCHES=(
-	"${FILESDIR}/Remove-distro-version-test.patch"
-	"${FILESDIR}/disable-test_userpass_wait.patch"
-)
-
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-	cd ${MY_P}
-	unpack buildbot-1.1.0.docs.tar.xz
-}
-
-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_compile() {
-	distutils-r1_src_compile
-
-	if use doc; then
-		einfo "Generation of documentation"
-		pushd docs > /dev/null
-		#'man' target is currently broken
-		emake html
-		popd > /dev/null
-	fi
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman docs/buildbot.1
-
-	if use doc; then
-		dohtml -r docs/_build/html/
-		# TODO: install man pages
-	fi
-
-	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
-	export DISABLE_TEST=true
-	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/buildbot-0.9.15_p1.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index 31c121b11d7e..f52f1c9e2ed2 100644
--- a/dev-util/buildbot/buildbot-0.9.15_p1.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -62,14 +62,12 @@ DEPEND="${RDEPEND}
 		>=dev-python/docutils-0.8[${PYTHON_USEDEP}]
 		<dev-python/docutils-0.13.0[${PYTHON_USEDEP}]
 		dev-python/sphinx-jinja[${PYTHON_USEDEP}]
-		dev-python/ramlfications[${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/ramlfications[${PYTHON_USEDEP}]
 		dev-python/pyjade[${PYTHON_USEDEP}]
 		dev-python/txgithub[${PYTHON_USEDEP}]
 		dev-python/txrequests[${PYTHON_USEDEP}]
@@ -83,9 +81,11 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 [[ ${PV} == *9999 ]] && S=${S}/master
 
-#PATCHES=(
-#	"${FILESDIR}/${P}-buildbotworkerdocker.py.patch"
-#)
+if [[ ${PV} != *9999 ]]; then
+	PATCHES=(
+		"${FILESDIR}/Remove-distro-version-test.patch"
+	)
+fi
 
 pkg_setup() {
 	enewuser buildbot
diff --git a/dev-util/buildbot/files/buildmaster.initd b/dev-util/buildbot/files/buildmaster.initd
index 933c6e2b4e51..b75ae34830d4 100644
--- a/dev-util/buildbot/files/buildmaster.initd
+++ b/dev-util/buildbot/files/buildmaster.initd
@@ -32,6 +32,9 @@ checkconfig() {
 		eerror "${BUILDMASTER_PATH} does not contain buildbot.tac"
 		return 1
 	fi
+	if [ ! -e "${RUNTIME_PYTHON}" ]; then
+		RUNTIME_PYTHON="/usr/bin/python"
+	fi
 }
 
 start() {
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index cc4deb0c7c6f..572555870bd0 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -3,12 +3,11 @@ AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9
 AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
 AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
 DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
-DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
+DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
 EBUILD catalyst-2.0.18-r1.ebuild 3100 BLAKE2B 18f15c937c4f3fe3790ad0dd4f665b4c2a5c100ccc8e9669ded1e45bc24bbe8391fcc3a3b0d2f17b3a9494d2fdef529b387037ec7518796e045d59faf516fa18 SHA512 111606cceb268f3f4b8c51ed8d980ef440215d622a7994c773da7b3fe7ead0ad3fb32bd4eac1835bda1fad5389aa4c995dc597fe7ccc6f8b4d7871997df3541d
 EBUILD catalyst-2.0.18-r4.ebuild 3261 BLAKE2B 07fba7e944a03f7bd99c4504aac4014e515c667a6c4b05791ec059e7fa805cc648a228389045b13d71c39b1910fe8016bdde218cdc7b070a9bd7ac8beb8341a9 SHA512 19be49f4b0508aa4f091e5769463d52280693e5540b8ebda4d9745f24d16ba5a8e938081f1b345dfb25d3d7675f90d721c8fff928d3a4f7f40886e2b4cb14ade
-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-3.0.2.ebuild 1993 BLAKE2B 76da50315f207c8c29dfee5598bde54749c681ed7de0726ae040c6f3e36420ac5ebd19af8d00061b35aeff0bc730b7aeebae96480b96a0e2ce8d1f3e4e448f7d SHA512 444c5e6d30bbaf61b4a6f12c404532b7be5cf5b5322c37fcfc670494b5e6dbbd726134df3d40d0915426587d05cbd1b9493b753d6ab186a7e57e8e5f917e017c
 EBUILD catalyst-9999.ebuild 1993 BLAKE2B 055a409cbb3ac2c82f776c5613b0d9e09aee320fc6a9ad445f0738f10fb5334b2f49f975606203b6005370c568d5e1648aa9b286663439c34247c4eebce32081 SHA512 3e526426383b71b906be666f5cba15f8a9dbddf0836313acbd3ccadc08dad5bae445db81560a7e47bd23b1f2f6e7b885f6c677ce124a2782af4928a5263578bc
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-2.0.9999.ebuild b/dev-util/catalyst/catalyst-2.0.9999.ebuild
deleted file mode 100644
index 3d4ac9380dca..000000000000
--- a/dev-util/catalyst/catalyst-2.0.9999.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	EGIT_BRANCH="2.X"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-3.0.0.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
index 2128e9957405..b253f77f24a9 100644
--- a/dev-util/catalyst/catalyst-3.0.0.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2.ebuild
@@ -1,31 +1,30 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
+	SRC_ECLASS="git-r3"
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
 	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
 else
 	SRC_URI="mirror://gentoo/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
 		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
 
-inherit distutils-r1 multilib ${SRC_ECLASS}
+inherit distutils-r1 ${SRC_ECLASS}
 
 DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
 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
@@ -36,18 +35,26 @@ RDEPEND="
 	app-arch/lbzip2
 	app-crypt/shash
 	sys-fs/dosfstools
-	!x86-fbsd? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	x86-fbsd? ( app-arch/libarchive[xattr] )
+	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
+	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
 	virtual/cdrtools
 	amd64? ( >=sys-boot/syslinux-3.72 )
 	x86? ( >=sys-boot/syslinux-3.72 )
 	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
+				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
+				x86? ( sys-boot/grub[grub_platforms_efi-32] )
+				sys-boot/syslinux
+				sys-boot/shim )"
 
 python_prepare_all() {
+	python_setup
 	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version
+	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
+	distutils-r1_python_prepare_all
 }
 
 python_compile_all() {
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 1eecbbd0bc7b..0b7d236c303d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -18,7 +18,7 @@ DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f68592
 DIST cmake-3.12.0.tar.gz 8089372 BLAKE2B 73c36b65ce3a3e7377d4c7dc7ec6c9050adefab75a0c0f245d7b1f774951779a213de13fb8589f209bd9b74b912b3f6533fff7b16990a85ec0159ed6a1460a2b SHA512 e1d5764023d6c8dd4e8d087614e0329a097f1bc587c08c7d22ce7600867bcd7f6750d513458c7c4042570a9526060b89778243e6ea6137efb1727e409ca031ab
 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.4.ebuild 5974 BLAKE2B 833e3a47fcdad582c6d46eea9c3bea63ef4542f7ec7e5a75eb9ad62f340ce17a80e00e4375541da2a014746aeeef238999e9073dbe21edfa5915bafc91997073 SHA512 e1b1feb91dc95811783600e3a571b028ece865ee0f91f6b82b3e6fd190d350bff646292bb7b1082a65e769a8faa03d430271806102dd6d0731369cdfc8fcfd2c
+EBUILD cmake-3.11.4-r1.ebuild 6238 BLAKE2B 2d2c117f9cb6725922d22ee5c8945a6f0d2b4a64128f6f9f25433cc18e3b2544588f9a138ed3004fab5ceb0340b0ca242e90917eba81eb258d1802fb15c4e489 SHA512 dfaf2287e51e53c6ffc60aab40d6e4bbae036bb4f494cb3379de76ec4cd9b671a8ddf724d4e31a59ea98900354639c74883050ef319ce08e6217f9600ca13925
 EBUILD cmake-3.12.0.ebuild 5989 BLAKE2B 03f23bb64dad0671acd2c783417ace7c0606bfabbef079b69986d5ee2bf9401918f60c39250807d9f291b1aea9a0c93b74a6192b6d291fb12cd97ce07b2e8274 SHA512 e774802f962d6eb9717e1f99af8e5b23c9ed6ca46bd619d1305da0f745bb2b0ab231f0c90ba1155346bef3088bc3ff36391865abac32418f4ec9abcdd8f34dd2
 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-r1.ebuild
index b9e25d107095..6e13be1ef965 100644
--- a/dev-util/cmake/cmake-3.11.4.ebuild
+++ b/dev-util/cmake/cmake-3.11.4-r1.ebuild
@@ -59,7 +59,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
-	# upstream fixes (can usually be removed with a version bump)
+	# boost (#660980)                                                                                                                                                                                          
+	"${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch
+
+    	# upstream fixes (can usually be removed with a version bump)
 	"${FILESDIR}"/${P}-libuv-1.21.patch
 )
 
diff --git a/dev-util/dejagnu/Manifest b/dev-util/dejagnu/Manifest
index 2904c5c28e5d..765d9b11b55d 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 737 BLAKE2B 5bba994236b2cce0e03ce5e2144c955fd0a2f3b22f174279ed958088399bccb1805175383935d70cfbb51ed86c7ea960be6e3d898fa04a1fd9c92086fc58dc07 SHA512 caf18bc683b57ba5f35d332f93300b324cd3fff5a167fde260e11c9df0a0f3d03fc40f486f848b78a9854d143e36fe2bf244e8ee34337f0fd49dcd53d8f41a02
+EBUILD dejagnu-1.6.ebuild 734 BLAKE2B 6834f39785466c47d043eaabb501ff4cc25655e6a6dc5e50aac2ead48b57cdf1cb6c7f72cc8ffde1802f783810e9ec1197ed1c16d84a6e2bf96f0b4677e760ff SHA512 d32faf58b09e9b60d4907619e06f92a41a14459f248e666e2d42ed13f7e35dd70c5fb7bed85910d74e5a9bbdc4eac8ebc56cacb20f775c531fd5185d651a217d
 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 331d31f60aee..dc21495731c1 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/drone/Manifest b/dev-util/drone/Manifest
index f7b58a54ccb0..b4422d1b113d 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -6,10 +6,15 @@ AUX drone.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd893
 AUX drone.initd 472 BLAKE2B ad8966d5703fe092d3fb3b7e34344c092bf3a221945405f34329d936052c435d4f68537c1f6ec889e35d1b989dc5b395dc77bcdcf224d8159eabdb12d327782f SHA512 54b4ef6943a018c0d194658c267bda50c51b2594aaab1d25350d512e50ec5136eb5bc6249f22d1b3e055574848bd50025a6158b1e02bd89da8213611ac41a16d
 DIST drone-0.7.3.tar.gz 4133041 BLAKE2B 819976f11e37c4f2484b00648191f64818ab254a326f31c594917c5ba02122a4e061168344148c113a32e0d14791e59e95a71bb224cd04bef7d1586703fd77fd SHA512 4c85e964f43ce3076996cd1cbcfc3675d74b254278d046d1e7d4b7f04ee5fcc55a6de04947c3f8102be474e0ef3fbd5d0006ac2b39aae04fe2bc6b466b513c66
 DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
+DIST drone-0.8.6.tar.gz 4767466 BLAKE2B 708fbe2fb4e6a647e8fc370c39c71fdbdbd67abd28a18348985831c3bc8dee2880c64a2be01ce50c3dbe56d27ee89605ee2fef00e643a66c641a57f664867cf8 SHA512 2227bad9a0067e9c235c3a30677032b4b54488727e44c9caa6bd7dcd804338ed62d8f76879310499e7063d7e84d2b23a6b389f6a60a43f138ed2c83d8df07435
 DIST github.com-drone-drone-ui-2910d0ee662816a2463d31f0988b1ecccd0410b5.tar.gz 167172 BLAKE2B 26d5aadcaee776c073bc5b4514f5c7b2925a7dab25a22162c10464f16a18e14cb564012b2b13ca929d7c5156dc5790d0d0659ccef8d8424ee82be2410ce0d211 SHA512 d4c6fbeba9ae5c55533a76fdcf6c251516aa4f8c650f49add7e9392d22a131438bd829670df801495d361417ec12cce07e9d9c28aacd1ce1adc0024408cf3cca
 DIST github.com-drone-drone-ui-4d60e46e3938c277e90de404cc6236530beaab3d.tar.gz 229886 BLAKE2B 3681f8fc5f380da3c7ab6dd5f34903f44fbe1ee5b309f5d1db25cd72347690249943814bd9e1ea3f4eaf04b14247bbf53e9a817dcfa5ad0e0bbc7d5d1585d2ea SHA512 4bd9909b82b31ed0b872d39da79fea161fdd1408d9da262b8a92c8cb884caf3dceb953ab522daaf8c96747cf4b22724e8e1d6234d80f2859a9ddd436fb513345
+DIST github.com-drone-drone-ui-e7597b5234814a2c2f2a7f489b631a76649c335a.tar.gz 230464 BLAKE2B 23641867938e85a716a8628209892861578d519e49b9e3aa70e08d9099b4628a744e5bb8bb3f622640ef1438eac50df21b5c32064328165c4aafc2496ca54361 SHA512 6f997ec14fa59859436ed995d52cce2105abab5aceca21c6740869c651078f1ffdcaff8b5a117d624d624cf47382f89824f7868dd8e8df3598d6e632db341212
+DIST github.com-golang-net-3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd.tar.gz 964447 BLAKE2B 8d912b7c34494e9f05fb1ee1ba11699c028ceaa138015b2139fbeec1cfc5784d48e4369ff32cba2f13ba0d1b987111633c0805dc5af45e918bf7c240360d22d4 SHA512 0605a3d42233cbb228e432520c2ef6c96cf6b4a0a59795bf0eca0f8251eb84120c9e3c4831a24308d2bb648984d2152b11e03e51bfb7e9adde7a3e8e34830054
 DIST github.com-golang-net-6078986fec03a1dcc236c34816c71b0e05018fda.tar.gz 940111 BLAKE2B f1b2a50d9aa73a7aa8f20cff17247c0b555fc14d64bd75dd320d8df8166d7ed0b29bfa15021f5f8251e6c3a1909217bc6e4ba3208f2bb010789a9449ef3a2296 SHA512 24d4d72a1a502c1f4f9523d85dde6070a1a47ea72860a00eb64812acf27cadd22ca4422575b1a58b1b55e1997e8fe959b645d8810e2c128ab09c73f9e81c5f72
+DIST github.com-golang-protobuf-93b26e6a70e37abb14f2f88194949312b0592a84.tar.gz 331818 BLAKE2B d00007a32b48ce04652edf7f7379f11dd381640ac2a22373a3b29bed54be050bb54dc35e0a76e095e0240a2e3b063aa35667d051c3933afc664dabbc94ee950e SHA512 2befd6db79c07c8f2c10a18364da51e4f292b26fdd7e42a7d533972c1289c91d1186c626177fda0fdea1982e9af06bf449d73d1be1a7239eb4dd926f8a2df920
 DIST github.com-golang-protobuf-e09c5db296004fbe3f74490e84dcd62c3c5ddb1b.tar.gz 269725 BLAKE2B a62a3f96c49d77776103a9bece69b615e00d4140c9de8b42fb7edac979c8a8d172bd21062d3d6e24ae01dba10b320ff208ff8c6916da2d84118da448afc8caf7 SHA512 f64fa42e7ed9701860e16b1cdedc9f6b029630b6f534ee403ede1223c0c7542c731735995ea9763f093b56146776902b6633e5b1691b1f1dd4ab84dea0092099
 EBUILD drone-0.7.3.ebuild 1406 BLAKE2B 857aef910f1354aed8dfec202e7c404da7eea3f9048df6086853a062436a5a6463b24664ab556a9d3f3bb3297a0ae9c76d21895475e3c29e9257ce3543a17c70 SHA512 26edd24f0e66e13a3f397cac24b14c0ee0237ead70fa8204f7b2a76aa0495670a9783b7dddc7d363c778f2d973fb5bc6c75dcb61c8fc9359ee168a2d3356b0df
 EBUILD drone-0.8.5.ebuild 1812 BLAKE2B d6eae0a8fd1522bcca6c7ad08e4305d6812f86bfe89d4ccf438bb1e2cef2eeb4e8a70b308ce5be7300ff2ab67df48f490dd5e995eee148d373ffa41c0dc479ce SHA512 077808dda006067faecd74149b1c7c01d08b32ce9cf96209e6d375c170b758309dcc6cf46e50a0a9ad94bef025c7ce1efcb348d5c04696114db5f06d48df1ec9
+EBUILD drone-0.8.6.ebuild 1812 BLAKE2B ea120485a659e5df726968281662c78acf84f104648244ee42d4919221e650b3a695dde6a8e5d8fdb82a10c14317b6bcae018d0c72c7c23bdaa7e7718875e35f SHA512 1e9ef7bfa863aa0b445fc5494ff43a097a81d52fa77cbdabf89e15495af8fd1016c57eaea7e83beaf5826b0bd6e3f4335205e0754f12aceb24cda94f8067c0dc
 MISC metadata.xml 321 BLAKE2B 7e3819d8553451b8b4938040d4e25afd6a1b456c16ad7366b648274cb84a5a694f9a8d88f125023298d5e7e8f098de3c233d397cad44682813fca82329f55e5a SHA512 01b1dd14592873025099119b28c840eefa31d098e77de1e8e26ecc6894dad73778e4eb8d4df6232a2a444bc906057e8d7f853ecdc1f3091cdd27a43c19d8b950
diff --git a/dev-util/drone/drone-0.8.6.ebuild b/dev-util/drone/drone-0.8.6.ebuild
new file mode 100644
index 000000000000..4c2c80d9fb69
--- /dev/null
+++ b/dev-util/drone/drone-0.8.6.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone"
+EGIT_COMMIT="c48150767c2700d35dcc29b110a81c8b5969175e"
+EGO_VENDOR=( "github.com/drone/drone-ui e7597b5234814a2c2f2a7f489b631a76649c335a"
+	"github.com/golang/protobuf 93b26e6a70e37abb14f2f88194949312b0592a84"
+	"golang.org/x/net 3673e40ba22529d22c3fd7c93e97b0ce50fa7bdd github.com/golang/net"
+	)
+
+inherit golang-build golang-vcs-snapshot user
+
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="A Continuous Delivery platform built on Docker, written in Go"
+HOMEPAGE="https://github.com/drone/drone"
+SRC_URI="${ARCHIVE_URI}
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-go/go-bindata
+	dev-go/go-bindata-assetfs:="
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/drone ${PN}
+}
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)" go build -v -ldflags "-extldflags '-static' -X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-server ${EGO_PN}/cmd/drone-server || die
+	GOPATH="${WORKDIR}/${P}" go build -v -ldflags "-X github.com/drone/drone/version.VersionDev=build.${PV}.${EGIT_COMMIT:0:7}" -o release/drone-agent ${EGO_PN}/cmd/drone-agent || die
+	popd || die
+}
+
+src_install() {
+	dobin src/release/drone-{agent,server}
+	dodoc src/github.com/drone/drone/README.md
+	keepdir /var/log/drone /var/lib/drone
+	fowners -R ${PN}:${PN} /var/log/drone /var/lib/drone
+	newinitd "${FILESDIR}"/drone-server.initd drone-server
+	newconfd "${FILESDIR}"/drone-server.confd drone-server
+	newinitd "${FILESDIR}"/drone-agent.initd drone-agent
+	newconfd "${FILESDIR}"/drone-agent.confd drone-agent
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 9aa370a0e728..3310563e7c55 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,6 +3,6 @@ AUX gdbus-codegen-2.54.3-sitedir.patch 885 BLAKE2B e63cdb128735fa8fbdf2ae1e324f9
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
 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.52.3.ebuild 1312 BLAKE2B 4c90235e3f02cac0c35fd40ea9e217afe0a80792d96f1eff8274fdbf3485c22c8c5b9dfc286bbdf04471653e3e44dde5b86e7e54adf87f3b6d59930d9f459186 SHA512 3171fb9b84f1be1ffef7e745558eba77804f9630e2b1314b2fa10066fe001030aac47b250748d7ec8350dc5c724d33893471e0fc004aa8456b6be1b0224bd641
+EBUILD gdbus-codegen-2.52.3.ebuild 1311 BLAKE2B bf17da01f79eb6b14738251e89bfef6cc4d7b3fec8fbe09faa0cb7e72dce085f232d558ab42c55a7683399a9f1ff91f30fc0c6265c9016b8e6c0cc7249e04253 SHA512 610cd17bac301bdba9e7fefc019da8aaf1157fedfa0d1e6b05310794fa8e7e757aee22d12520725612cb2b12c7c8e56e63b76fdd1c300d1d4a6f302555ee6bb2
 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.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index 54907fc09e81..1b9457f3208b 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/gn/Manifest b/dev-util/gn/Manifest
new file mode 100644
index 000000000000..9dd5dd64ee2a
--- /dev/null
+++ b/dev-util/gn/Manifest
@@ -0,0 +1,4 @@
+AUX gn-gen-r0.patch 2025 BLAKE2B ee95f445ebbf8ba58724aea497d98a2be257708e59c5c5f237f318b3075d5f75135b935defa794cd37ec81aea9ef3c39648e4b92056e9f0746a31ca75e085a4d SHA512 0e281be477d235a15ffc483fa6af03db560bc421392d7c82322c7735c0498ca3e6ea69843ed46bfe7bc562539488c5b6d945e508e66b530d97584e08e154d6d7
+DIST gn-0.1445.tar.gz 958901 BLAKE2B f50dfa07c621e37d8a9face19ca91f28ca24e14717052218690e85911e25c91b109e6cede8d2be6c8493c0b7b8a305d530db4393123956c42da51cd4812d0300 SHA512 2ca21303aa8709fc4f23f15e01f2eaa8e77e394c27970a21361a22445d5cb29da150b1d05d77b471702ab2da2be04cea2a0d927eb0eb3a1baf3358c6eae15d06
+EBUILD gn-0.1445.ebuild 1035 BLAKE2B 4379c5852e60d16e4eb7036abd922bfd80d5116d727725ffc887a3c04f951adfed32826d9e5e4780110e61a7b4e547b9b58e912f8d5712b23f88937ebcbfebe3 SHA512 359cae269e45cfb01ebf43205ac0f1c61639d9c9cf62580394245581e55d7812ec356726135a783c75715f998b9b0402230532b890a155d6864c6901318e0006
+MISC metadata.xml 220 BLAKE2B da4da8d60764ec3b2181bd9ea602d6e3cf830e73e05b09fe8984f147215a2082b030e402c21098ad33de4b3621d1cbc1328bd52f4f9c32d6b0485773251b1d77 SHA512 a1e65cd8b02b8ffb12754e5d12dfd44ad9973de7c61ec867f1454e79563519182baae7d10cee3488622bbba8636fc7a6dca5806208f204a9b66df8436e3cd696
diff --git a/dev-util/gn/files/gn-gen-r0.patch b/dev-util/gn/files/gn-gen-r0.patch
new file mode 100644
index 000000000000..d30af3ab4ac6
--- /dev/null
+++ b/dev-util/gn/files/gn-gen-r0.patch
@@ -0,0 +1,51 @@
+diff --git a/build/gen.py b/build/gen.py
+index fce8fb18..2927da5f 100755
+--- a/build/gen.py
++++ b/build/gen.py
+@@ -260,17 +260,12 @@ def WriteGNNinja(path, options, linux_sysroot):
+     if options.debug:
+       cflags.extend(['-O0', '-g'])
+     else:
+-      cflags.append('-DNDEBUG')
+-      cflags.append('-O3')
+-      ldflags.append('-O3')
+       # Use -fdata-sections and -ffunction-sections to place each function
+       # or data item into its own section so --gc-sections can eliminate any
+       # unused functions and data items.
+       cflags.extend(['-fdata-sections', '-ffunction-sections'])
+       ldflags.extend(['-fdata-sections', '-ffunction-sections'])
+       ldflags.append('-Wl,-dead_strip' if is_mac else '-Wl,--gc-sections')
+-      # Omit all symbol information from the output file.
+-      ldflags.append('-Wl,-S' if is_mac else '-Wl,-strip-all')
+       # Enable identical code-folding.
+       if options.use_icf:
+         ldflags.append('-Wl,--icf=all')
+@@ -279,11 +274,11 @@ def WriteGNNinja(path, options, linux_sysroot):
+         '-D_FILE_OFFSET_BITS=64',
+         '-D__STDC_CONSTANT_MACROS', '-D__STDC_FORMAT_MACROS',
+         '-pthread',
+-        '-pipe',
+         '-fno-exceptions',
+         '-fno-rtti',
+     ])
+     cflags_cc.extend(['-std=c++14', '-Wno-c++11-narrowing'])
++    ldflags.append('-pthread')
+ 
+     if is_linux:
+       if linux_sysroot:
+@@ -293,15 +288,6 @@ def WriteGNNinja(path, options, linux_sysroot):
+         # probably resolve this and (re-)add a way to build against libc++.
+         cflags.append('--sysroot=' + linux_sysroot)
+         ldflags.append('--sysroot=' + linux_sysroot)
+-      cflags.append('-stdlib=libstdc++')
+-      ldflags.extend(['-static-libstdc++',
+-                      '-stdlib=libstdc++',
+-                      '-Wl,--as-needed',
+-                     ])
+-      libs.extend([
+-          '-lgcc_s',
+-          '-lpthread',
+-      ])
+     elif is_mac:
+       min_mac_version_flag = '-mmacosx-version-min=10.9'
+       cflags.append(min_mac_version_flag)
diff --git a/dev-util/gn/gn-0.1445.ebuild b/dev-util/gn/gn-0.1445.ebuild
new file mode 100644
index 000000000000..8f8649a10435
--- /dev/null
+++ b/dev-util/gn/gn-0.1445.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+
+inherit ninja-utils python-any-r1 toolchain-funcs
+
+DESCRIPTION="GN is a meta-build system that generates build files for Ninja"
+HOMEPAGE="https://gn.googlesource.com/"
+SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-util/ninja
+"
+
+PATCHES=(
+	"${FILESDIR}"/gn-gen-r0.patch
+)
+
+pkg_setup() {
+	:
+}
+
+src_configure() {
+	python_setup
+	tc-export AR CC CXX
+	set -- ${EPYTHON} build/gen.py --no-sysroot --no-last-commit-position
+	echo "$@"
+	"$@" || die
+	cat >out/last_commit_position.h <<-EOF || die
+	#ifndef OUT_LAST_COMMIT_POSITION_H_
+	#define OUT_LAST_COMMIT_POSITION_H_
+	#define LAST_COMMIT_POSITION "${PV}"
+	#endif  // OUT_LAST_COMMIT_POSITION_H_
+	EOF
+}
+
+src_compile() {
+	eninja -C out gn
+}
+
+src_test() {
+	eninja -C out gn_unittests
+	out/gn_unittests || die
+}
+
+src_install() {
+	dobin out/gn
+	einstalldocs
+}
diff --git a/dev-util/gn/metadata.xml b/dev-util/gn/metadata.xml
new file mode 100644
index 000000000000..02041b24510a
--- /dev/null
+++ b/dev-util/gn/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>chromium@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index fdb38183e6c2..0c7af8ea54eb 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,7 +1,9 @@
 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
+DIST goland-2018.2.tar.gz 236750402 BLAKE2B 54df8b09f4ae59323c4b8aa06d41a23753399d36fbdf34a0ecbb159d00fb5a6cf29fd4aeeaee9d853b54d2ceaa8f99ad5560128b4e50b4ad2720a2db81df7dc3 SHA512 f1c7ddb94bb918b9668d444e285f4ff82b45c9aa1e24e848f32bc219b2dd48a939d52f6c5c749fc76bfdd3f58e2f2a72ca2275a9291a7a5a5a3c6a30c4780420
 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
+EBUILD goland-2018.2.ebuild 1040 BLAKE2B c39b58baf35a98553877f364e228f16615f448ab2b937072297a1a36a22775e6ccd11444e64eab66f86b700c3613ee003f24b688bc2ad3beab860050198394be SHA512 cb34fd2a41c7ecc8a07d0c5fa5a997229f478aa1bfbe78b29bb1d12330a0339454a0f3c7c81bb6e697b2516089f198ce46297ef82b785fd9da972a33c7797d86
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/goland/goland-2018.2.ebuild b/dev-util/goland/goland-2018.2.ebuild
new file mode 100644
index 000000000000..d46b730ae466
--- /dev/null
+++ b/dev-util/goland/goland-2018.2.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/gperf/Manifest b/dev-util/gperf/Manifest
index 9ad30eb909b4..c03e4e69dd29 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 737 BLAKE2B b3d13d77ee4c9bb01daa3e9596b1cd5bcddbf4435b043b838c250f742130915e19d7c5983599d07cce646bc3462656baaab129b90263c380e2a088d961359e18 SHA512 a6c0443f8f2e8b31fe767ecd634429ee57a57eb92aa7b1c3d93189ed6d3e4bbfabb10398ed1077e7d57f8d55500f398c4cdca34a7547c66f96a4febf3d047a43
+EBUILD gperf-3.1.ebuild 735 BLAKE2B 07f60246d0036ce533c2be9c93760ae3ddb02dc57c0024bd187094102b04ee35249fa5be009271c580332feaae26c5cb5d78477ab1b37be4c2fcfd4c7692e696 SHA512 6564a4551b4244733839ddb117d2be2ba3a2cfe64279763ad2312d3c1009da0be3a7be1ce46a5b32f9798be39f34fefd8bd0503776474f884f2934e62f5e4ba6
 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 028df12b3669..9e400c03fb58 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -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/gtk-builder-convert/Manifest b/dev-util/gtk-builder-convert/Manifest
index 6d4f547661ea..06d30f1db9f8 100644
--- a/dev-util/gtk-builder-convert/Manifest
+++ b/dev-util/gtk-builder-convert/Manifest
@@ -1,5 +1,5 @@
 DIST gtk+-2.24.31.tar.xz 12805344 BLAKE2B f516f9970a95afa21ae5dbe9f0cafd3c57c5cd27af0c6740a0f7f4367eb8032719e39e533bf89db72dddba7485ee499da9c2370707f51bbc4a7af2d4fb7c1309 SHA512 75b846661308d94b5236e7e1c367deabf57753792ca87e92f9769822dd5ec90e00cd8d5574adcc12162e3702e1ae6dc152278a1d218f9bd9e4d1c8dc1dd520c1
 DIST gtk+-2.24.32.tar.xz 12620860 BLAKE2B 03f4c0a8be98473f62bc8c86859937969c4169960a5f93d37ff6dcde00413215fa6c7125b15781bf50d67b40aa0056cb71b83fb50acb2c3467b5deb3c8d938f0 SHA512 8e8fd9ae32f1d6fb544da260f00599f0f05090d910d767b06ef086ab4f1f8373a29bb0da9767761c9b5f4cfd51b5c45d0fa5d39b0428c839ddf0a579df806696
 EBUILD gtk-builder-convert-2.24.31-r1.ebuild 1154 BLAKE2B 6f23d8b14d7b86023a5db01e36951d7fa222b690bf3d225f042254fd68e039995f0243a6edf085a2f83420be2204b35888e7eca81243f127b3bf8f167f230a61 SHA512 1b2d8ee90718a47e79b1063efe19e2ba35a4595a3f253a7d6061379b6fcecfdbbd1dd98cca2d08b5eddb1a52abc7a6002edb19398ce9e925aeb41775f828aa76
-EBUILD gtk-builder-convert-2.24.32.ebuild 1156 BLAKE2B a16b6081216cfda17384802712b730639d882bee26f17f02023d99e2c89783367228e4e6a90be15b73d5ec4b7f5834909c02147365319746c09bd2740428e750 SHA512 1fe2f3dde5545da71fb33942e2d0b3658ae7d0df408217b4d62dd40df5aa2839960734d8c39ea36cda003c4711170d32958697d7f96393420bd49cfe4a615f32
+EBUILD gtk-builder-convert-2.24.32.ebuild 1155 BLAKE2B 334bb76485d6f2e8c99da8998589de8e7af051ab5f1b9ef943d0586f893177178819b288e4f429b563606c6ca4c6acf57504c2d09e598990d3a16ef5b2f253bf SHA512 33f90c14014d062b6768beaad4f7eb8b068fd9eb60ffe3dcee2fe1f556f8c516b141896e30269638df318452dd1d642126713a56687583b1a1b4f4df5e9756e0
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
index 1325db12a354..48d1c1e234db 100644
--- a/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
+++ b/dev-util/gtk-builder-convert/gtk-builder-convert-2.24.32.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 9b2e2e3d6f9d..2ddad267c5fd 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,5 +1,7 @@
 DIST hadolint-1.10.2.tar.gz 39009 BLAKE2B 84552ce978d6f53b6e2e769da402585777ce7ef5bd7b66cc538b4f22d73a54b0d07246c1d68b9628f9e2d17d9db2bb472e1902cf017f13344b9277b27658b652 SHA512 2104cb588bdb9620d6a5831ab0f38e6fbd45ab19ba6dbd38e6ced43995f2dd6509d7f9d0180d59a828bbe8de46738f7ff2f3ba9859d9ac4a04b1ba9015071fd9
+DIST hadolint-1.10.4.tar.gz 39126 BLAKE2B afec4a6308ac19d31207ad9cc89f3d75c24ae1bc7d09e89c9437863e117ffaf0041df7a110cb0264a4b76a67ff6c2901fdfb372a5ca7660a806f059db95cf572 SHA512 ca0dad6f64247a514b562cacd5744ba9b5ab87353144b8075bbcfbfbe8893228f08bd45b6c9885c2be1f3a3a12c4afbe4d8f6afa0031405b5958836a8b415021
 DIST hadolint-1.7.4.tar.gz 35187 BLAKE2B e40892f739d7714f62b322d1d3bb6d5cb285e9e6f3bc9c35d21a8d0eef837f32966b6292ce3e20ff461e2775777b2bf6192676ab76d32a558a8242dfe12c697d SHA512 ad92d1f6a1efee2b853613ec078396847e7ee2c525d6069d3cf1708d1af229133eff35e0dee6f0680433a2c6781839beeda02f8cebb52e360c622e6b05ac5925
 EBUILD hadolint-1.10.2.ebuild 1137 BLAKE2B 3bdb1e21534531126433c77f9e14644d714e9803e6a11b39c0553c1354a523e3f18316e8a21b610fe18604471557f779825ca4b0b27cd3e4d46f9747c4680305 SHA512 9aae19d11f1b502599a8c4279729da7d63b50dbf7877e95eb2dccb32640edeae7c78d484bbfd4605dacbbbc24d0c4ceff7a485c898d570a64efb0da17806e148
+EBUILD hadolint-1.10.4.ebuild 1137 BLAKE2B b5fb51af0ca3137c7666aab77ed9fb911f1d3aca892c0dfed7cb9039685566c90a5abf1855034e5ffa841a59320d3b570303c9d0fc80093ad0a8a702c4443cca SHA512 bf97efd4f7d4316e958a8904f372919e1e6dfb3d404074869a94d5ee22ad203705c4ef13280540639d0c078bb7aebd67b5149ce0e87e0dd9977181c82ba8bda5
 EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.10.4.ebuild b/dev-util/hadolint/hadolint-1.10.4.ebuild
new file mode 100644
index 000000000000..4c740b4d0998
--- /dev/null
+++ b/dev-util/hadolint/hadolint-1.10.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# ebuild generated by hackport 0.5.5
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Dockerfile Linter JavaScript API"
+HOMEPAGE="https://github.com/hadolint/hadolint"
+SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-haskell/aeson:=[profile?]
+	>=dev-haskell/gitrev-1.3.1:=[profile?]
+	>=dev-haskell/language-docker-6.0.4:=[profile?] <dev-haskell/language-docker-7:=[profile?]
+	>=dev-haskell/megaparsec-6.4:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?]
+	dev-haskell/text:=[profile?]
+	dev-haskell/void:=[profile?]
+	dev-haskell/yaml:=[profile?]
+	>=dev-lang/ghc-8.0.2:=
+	>=dev-util/shellcheck-0.5.0:=[profile?]
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.24.2.0
+	test? ( dev-haskell/hspec
+		>=dev-haskell/hunit-1.2 )
+"
+
+src_prepare() {
+	default
+	sed -i -e "s/-static//" ${PN}.cabal || die
+}
diff --git a/dev-util/herdtools7/Manifest b/dev-util/herdtools7/Manifest
index 49dbef2dd5d3..d8002ca6dcf5 100644
--- a/dev-util/herdtools7/Manifest
+++ b/dev-util/herdtools7/Manifest
@@ -1,4 +1,6 @@
 AUX herdtools7-7.47-mkdir.patch 318 BLAKE2B ae22c24b4d9c4ea6ecb7b862ca73df1f5ed09a53bff1bb1e2e520131dad92e0f98c1fbbfef159ffe23670d019f90b7af7482a9f594eff86b64dc8ef237fc3350 SHA512 de4556ef77eec10e4b9800289d27e27fb306a8801754dd210801c1113bf005bb29a0dc1d9ce9a8bcd2db32fbe589c8b77c4a57cb8ac41bab6932894a35726dcc
 DIST herdtools7-7.47.tar.gz 763045 BLAKE2B 983411c9c383fabba70598a5b6891f8c1cbc6ff803c2c5b855834cc17f560085e4db03adc193e8f132568f2468164ba84563b8cfae539c27e6877582a0e374b5 SHA512 85295815fb725b78e7015f597cdad10c3a52db2e40b179efb314f6750c7e5ec09393fac4038dafe0b7eb3f5db74d10a032384a384adf3c97bf846cb016f5180c
+DIST herdtools7-7.51.tar.gz 803546 BLAKE2B 17a6c4cbb8fc1034ddb0ec3eb4438181142943634157d0f20c752ee5e04f4dc30d2512b9a7a2df22517b9182986795e4e1a6992a9aa44e35a4cdd877ee1d91c3 SHA512 35edc4360ec97a7c26fbd6c0e5e02e9032a54cdaf20d7cdab32ea28d69b08991404fb601ee73fe8bff79126335dc83b6d7a4204964eedf39a6a6776bc2a9bc6d
 EBUILD herdtools7-7.47.ebuild 620 BLAKE2B 7a90ac83d7aa7eb9f2d944807751d73af6e9ab23282202c6e85a6df91d2e84be26d2797f8f91714393ce769876739331d29f65b233035a63818311996e71ed5e SHA512 1241971eb805151c01893df0d385a1a07113039659f014663e6e0e4f6c2af2330ba6b88e1a19b016ef227492ac8e0d2815bc2f96f4afc10bfde7349658e0d8e4
+EBUILD herdtools7-7.51.ebuild 575 BLAKE2B b234695daeb1dd16dd4fa87969f232f078a4c6813e88e37d3c695de59ac719796088125dae7e0c98ca046d1c9078fcead5e88d16f2ca4f3f3200de6465ba0746 SHA512 3cf644c29f29d17d743049f968b8315255d42520ce9b3a77dc3ec84ce80752a58a47137119d18105317cbf91a35dda5592e12f4dadef36372e54ff4e51085ee5
 MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/dev-util/herdtools7/herdtools7-7.51.ebuild b/dev-util/herdtools7/herdtools7-7.51.ebuild
new file mode 100644
index 000000000000..80e9b8f64f1b
--- /dev/null
+++ b/dev-util/herdtools7/herdtools7-7.51.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit opam
+
+DESCRIPTION="The Herd toolsuite to deal with .cat memory models"
+HOMEPAGE="http://diy.inria.fr/sources/index.html"
+SRC_URI="https://github.com/herd/herdtools7/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-B"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-ml/ocamlbuild"
+RDEPEND=">=dev-lang/ocaml-4.02.0"
+
+src_compile() {
+	./build.sh /usr || die "Build failed"
+}
+
+src_install() {
+	./install.sh "${ED}/usr" || die "Install failed"
+}
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index e0bd11c7766e..5c3b08b149b0 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -10,7 +10,7 @@ DIST kBuild-0.1.9998-pre20131130-src.tar.xz 1707632 BLAKE2B 51d68203d38a6cc86a32
 DIST kbuild-0.1.9998.3127-src.tar.xz 2221336 BLAKE2B 12eb542553c2abe4419440d124ed9c6b3c485fc77ca20bc8b8d5265cf2d91003e3bee21ad7e247f1da43c88bd29fdc5d317e42bfca213cde1ac0c900cce03fcf SHA512 b4cfca917efdb19b015a70efc15fdb0f2f08a4b6e493c7ac121dada97866b2f57cb9be9db9dd9b337eda4d5772ab850bf0586e5bfdc370e1332659363374f78d
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
 DIST kbuild-0.1.9998_pre20131130-tools_and_units_updates.patch.xz 7344 BLAKE2B 75d24ba49ee69a11b8e1d798ebee4470fa50ec4970299faaa67b0537d21729053fa24142d02e428cb56c429c6c17d581d147d659c3a3ad11693e2fa6ab4e6d72 SHA512 91aac638e9f4cc321f7d06c89be1a4ce4e57aa88165c71a4f68a73ad51f049f631b2d7427178014408b551fac5678f0c0bf806a61f9d749daf5019f1b6a61bb0
-EBUILD kbuild-0.1.9998.3127.ebuild 1723 BLAKE2B e4ca9b4b61807247d39cb7216f8eb2fbb17c45c18e241791403393474ec0e58774c7c8e03a50f03fc9dbf51beed9639b37a8646f356b1d34176dd7c05e599c16 SHA512 e0943bb0d315e6673332639031c4ed0e45e8ba3b94bb5de62918bf2de96bdb14c21b6f75012f18b2cab5d90ac10b3be5a38e40457e2012a08cc068f9a2d8bf7b
+EBUILD kbuild-0.1.9998.3127.ebuild 1721 BLAKE2B dd168c90c4e722c36347e6ac5d40bd063fd338b7f5c179c83409bb7004c5ea8e39c1137b68b24c10243a29706ab6e5304b939bb07c28032a70f4035443f15dae SHA512 1ba75710985246a11c34ca3c3b1d1e4ae6732852c173c86b1493768b94cf65dadbdd6dec14b5518173f30667ca78bdaeede66b264a87bd2a97db54c84bb7a37f
 EBUILD kbuild-0.1.9998.3149.ebuild 1797 BLAKE2B 77af90d7312b90240f3ff3f03a7c16bf181b6aabb0a19c87f7618f495c7b11cc0f9d10a308da81563e58e5f46176756c8dd6510319afba5826cb5ea354ac1074 SHA512 11add83b15c24aafb276617a596a6e329eab3aed0c35b32c6da9540cada1e89e2e64d3da2f042573a2058ba680c4d3bea99ad18da65f25d46710f5760b8a93f9
 EBUILD kbuild-0.1.9998_pre20131130-r1.ebuild 1802 BLAKE2B ce3518b0ab413a1a4aa3150d6fa3f13050cf49cae8fab1603da6912beba290135574570acb25fd2d7dffcfe65e54d8c9122ec1071cd589e7d5c46ec0de369805 SHA512 39d21f6ac472c67c3f0aa9e1d160444f89bfdab05bef260eac07aeef9bd464a98f1fa8ce978a47ecd47af350c0484dffbc9c0b057f4d92a9bfdbbe95627fa92b
 EBUILD kbuild-9999.ebuild 866 BLAKE2B c14fc7ecf01de63d6812800b52cd61607826a5c52efd11387b818af1c88c2d88c72992fe49490c4cd549b06d75b3487167669bdcba382d32ef3cfda756b61965 SHA512 eed52912df838735e25196dc2b836b7af459dcdd68338c8501c16dd534050c6650f9d973a41d694862d189d0a30ce12ebedf9793f3a5ddde3d9304d7bc78c999
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild
index 6a36842f7560..8644ad96da38 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3127.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/${MY_P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 73c3ec904b39..07f3bbd17106 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,15 +1,10 @@
-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-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-5.0.1.ebuild b/dev-util/lldb/lldb-5.0.1.ebuild
deleted file mode 100644
index e3be91f0a816..000000000000
--- a/dev-util/lldb/lldb-5.0.1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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 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"
-
-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)
-
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-		# compiler for ole' python tests
-		-DLLDB_TEST_COMPILER="$(type -P clang)"
-
-		# 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_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLIT_COMMAND="${EPREFIX}/usr/bin/lit"
-	)
-
-	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/lldb/lldb-6.0.0.ebuild b/dev-util/lldb/lldb-7.0.9999.ebuild
index 466d0ecf42e1..55be1c6e3754 100644
--- a/dev-util/lldb/lldb-6.0.0.ebuild
+++ b/dev-util/lldb/lldb-7.0.9999.ebuild
@@ -8,20 +8,19 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils llvm multiprocessing python-single-r1 \
+inherit cmake-utils git-r3 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 )"
+SRC_URI=""
+EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
+	https://github.com/llvm-mirror/lldb.git"
+EGIT_BRANCH="release_70"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS=""
 IUSE="libedit ncurses python test"
 RESTRICT="!test? ( test )"
 
@@ -40,8 +39,6 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
-S=${WORKDIR}/${MY_P}
-
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -51,15 +48,18 @@ pkg_setup() {
 }
 
 src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+	if use test; then
+		# needed for patched gtest
+		git-r3_fetch "https://git.llvm.org/git/llvm.git
+			https://github.com/llvm-mirror/llvm.git"
+	fi
+	git-r3_fetch
 
 	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
+		git-r3_checkout https://llvm.org/git/llvm.git \
+			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
 	fi
+	git-r3_checkout
 }
 
 src_configure() {
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 64ac6f541e4a..9886e91aec21 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -6,7 +6,7 @@ DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d
 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 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
-EBUILD meson-0.46.1.ebuild 930 BLAKE2B 0a4fc99548ffbd679fff1f0f73ec2dafdc064193121530c35e4920a02028bce02bba87b98ae99dc00e80a22a9a42fba58921de504cb2e6492c32307fa2c89748 SHA512 7dac6a904163939d90b62f9c7f3664796612f20f078159b5c00900ada7c82db730f3cfeb01e31ef0f66d74eb96c0cf6c892cb408632116c4eab5a12fa5f1023f
+EBUILD meson-0.46.1.ebuild 929 BLAKE2B c1c6574991faf4f8361ca3a50218888b411015b13d9a5d2117adec2761e5ab8c665583f0872c2cae2c68127bf264fb5b4aeced6b5a8cf094e24f6763432fbd83 SHA512 030552157b1bc5b3865839d9b57a4fe223211e4e0d3f6f410ac8df9ba09384290c0db3c4312a7ec8b46e330cacef37e611c3af9822d117258d8de0a5f659ffef
 EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-9999.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 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 6f8702115d6c..6c28bef689f0 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-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index b21efa52806b..db2802aa5965 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2017.3.4.tar.gz 279847033 BLAKE2B 451540aae6434f39a94a664d4aa8747071c9c045793a7d445bf1acf4c0412309448b9e05b01c7e86d5b6915d144cb5175956981597d24064b2a7f934bd043bf3 SHA512 0478ca55a0dbd45b54c3d1af45a6cfdc562f0a863e3fe09922421ed121e22f5182c71fbc05b0e9fe7a8e92b197f6ad473da34b30b867297690d7bd9df5fda730
 DIST pycharm-community-2018.1.4.tar.gz 271284732 BLAKE2B 806fb3774f08cd94ea525a3e3a6de3b1a17f1340e093e897ab185b7e08a4f389b627b5f3b5233421ef6c1468f36ec205bfaac73f3b8f151f57c23f0ce44ad3ea SHA512 00040aa0f6d6cc60837277c1413b155b82ec580c6619d425aeb8c50521c11c17654549901a3c324d335d8818120e1e9e730ec03a03722058aa1064685e17cbce
+DIST pycharm-community-2018.2.tar.gz 260724936 BLAKE2B 0c8882d8f2a115a172140e8312ef331cdaaeb41fd5ea6adf3091593d8635f63a616ad5dc710447b7e148c9d83d5ece98ccfd71f4af6663ff89296259b729c0aa SHA512 d2b46e7463010186fb633a17c2833cca397ffd001679495fd3aca034e4feeebbf7e19c4803f6588d23e15afbf3e6850b2880b7867e7f9cfeeab338e7c7322669
 EBUILD pycharm-community-2017.3.4.ebuild 1046 BLAKE2B 91c20e6afe384e069c14f4650d2c8082a9994c55db770fb21b1ff5490da06a6c342ab4ab537c090689e76ba0e4d697a0cbf349e6fe6b2105fb5d197ccd5bd566 SHA512 44adaaf25bbde27c7170dc818bc7a8b93c597fa0d84b7edc48f53209771467afe1b3c73be60f3b118a2a10e434b790502cd837633efa3c4c5fef466094d2c06c
 EBUILD pycharm-community-2018.1.4.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
+EBUILD pycharm-community-2018.2.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.ebuild
new file mode 100644
index 000000000000..c37c85ebc8eb
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2018.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm"
+
+MY_PN=${PN/-community/}
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 1aa33e02d632..e2fcc7a11ba0 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,6 +1,8 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2017.3.4.tar.gz 356283723 BLAKE2B 3d2abed57f0459e49034a6b081c69008628ec8a16322ce90e15e0a42c670554ea4eca66b73279ea0f9aeac116dc86e8d52590861d712ccdf93d2be31c2d1211e SHA512 8adc3c46b50c4ed895d0d40b0c235a047fcac7e4ab5262aa88ba69deffa9402b652bc69ec1ee3d7682900698d14bb2ecb7f82a89f998979c009fcadb98ef4517
 DIST pycharm-professional-2018.1.4.tar.gz 348483306 BLAKE2B d03950a8d91c726f175c51fe512fdedef32a26fc39881ff4651ff09f277e9b7b3c053754e391c760856507b64b0a57128092a9fef5b7d2ab5fbfaac47f3216d2 SHA512 e45623fc0127a5f919015937853a4364344b01f586d5a63cf3605f0eac773228f02326c0714e2c25eb490431716f2b794e191aa01149a07ab87c067f1ff3ce3b
+DIST pycharm-professional-2018.2.tar.gz 337502172 BLAKE2B 9b4c4f2f69ea4fce29ca498a633d6a7bac749920580c8e670844effce030000c491ef041e545a90559b7ce589c5f0a28c8e40d3dc5708f7166a3f6bbe88a5f43 SHA512 51b30d73526ada82274d043c40724b7f7f7189eb25393a079fda04fff88cfd1158878c5d87810918d06a5e5c656cde03497de70f67ca4d73d6f0c1b159be27ba
 EBUILD pycharm-professional-2017.3.4.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
 EBUILD pycharm-professional-2018.1.4.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+EBUILD pycharm-professional-2018.2.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.2.ebuild
new file mode 100644
index 000000000000..5dc7e67e051f
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2-utils readme.gentoo-r1 xdg
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND=">=virtual/jre-1.8
+	 dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="opt/${PN}/bin/fsnotifier
+	opt/${PN}/bin/fsnotifier64
+	opt/${PN}/bin/fsnotifier-arm
+	opt/${PN}/bin/libyjpagent-linux.so
+	opt/${PN}/bin/libyjpagent-linux64.so"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_prepare() {
+	default
+
+	rm -rf jre || die
+}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_icon_cache_update
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 27487728d6af..e8a49aa7a91a 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -12,7 +12,7 @@ DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e9497
 DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
 DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.1.ebuild 1603 BLAKE2B 2469be4adae61636d044e2beec6bba28cb62bc81c6381d8eb1228a8907ae05c248ca042490cb4af0ef94bd1e081b950dfff064d07e194cba347e01c5ad647624 SHA512 1609e0aa9c7ac60e38aa92cae29d15bebec7583656d9f18cd545745f8fd29677fbd00643e617408866df88b42949c47de3405e2c57ddfde1e608a88a8ea83611
+EBUILD scons-2.5.1.ebuild 1602 BLAKE2B 4bdc43e095e80121469c7576b9261449c3da77d4fd03e8cec6a876313411d772a395077c0c313a6915b298c4c8bd78f50577ef652608a5abde18fff43c36d3ed SHA512 73e837984bbe9238e7cb88d48ba313c0227df7f69335d4238be0e223103dd324bdd44c6d8895a6f923cea2a4bfde86561a8c15c47b96a2372731df66b7304358
 EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
 EBUILD scons-3.0.1-r100.ebuild 2078 BLAKE2B 44634da960c7a30c9a0b8923cf163ea0be4ce31308d9b57d6705dc9baacd8661d62b317ad622f058cdfaae29728d781708df22021038281b83e9e9f0dda1db71 SHA512 f34c403ac05b2f42f3e1de1dd4ab3a3e22c3377f68ac0781da2a04280123cd218c912f5ff784876139b78cd93fe9b0dabd8d3304a4f3341f01645459a154f766
 EBUILD scons-3.0.1-r3.ebuild 2066 BLAKE2B 177a52afb4171023de660f6afdc0d895f5cc499b619c2d427354f8c99282eece6567c6b08c66b8dc9f644ca2b7d1ae216471c289c1030dbd0becd875c972108e SHA512 b88dd6016af45be90e31c761b276cb354bca00e28b3939bbe7f2b0a704620f46e71fc5b58dcc5553e10565413501c22d5c6e19d9a67cc99d267bd474493206e0
diff --git a/dev-util/scons/scons-2.5.1.ebuild b/dev-util/scons/scons-2.5.1.ebuild
index 22476258b7e4..4b85748576e4 100644
--- a/dev-util/scons/scons-2.5.1.ebuild
+++ b/dev-util/scons/scons-2.5.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc"
 
 #PATCHES=(  )
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index 8c2e606e0d4f..34d20e611deb 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,7 @@
 DIST sysdig-0.21.0.tar.gz 756010 BLAKE2B 0dfcc3e7f5c830e8b250e4edd9d470764ea6be25804fefbc59b020f208edc313a51b3fb783e538d2acb520c56ad7c8555f224fb90999c87b89125394a90d54a1 SHA512 73c516c9fccb504d4ccd37384aee37ece542d29f82d696acf7c90df18b3a1538faf8d2b29065eae1f3dca7c04c6c2dbe93ed9369bc1340216482c4af2f61d23a
 DIST sysdig-0.22.0.tar.gz 824519 BLAKE2B 7d46376f4f3c346fb6e9ce55552a0377aea6dc258ce3487b1e5a970a25721fca95d731d7313d1dc4b72dbefd9ac37e4050d7a934b8b9bdce027b5b6774ea1351 SHA512 599195bce77f4c2d3f62b11c00361420ab15da5fda4553486a7f812a1a464927cfa4ead36bf046fb1cecd3cf03e5d80a261d4571405d6bc309383bd2b4ad0204
+DIST sysdig-0.22.1.tar.gz 825171 BLAKE2B aa4836ed0be30fb3d8318b151c3f60586daaea15974558e7d81ba2da6d9c511bedc67fe8bc518697b6a268ea93bd112f64ae5772ef75c10d8b57d06e1468ff13 SHA512 e9f5ca594dc31832b4ea365a624208f5319add1480cfe9fb3d0e960757229fbe6ce46b906a390a667147ae1a7c0a31fd7ffeb9a1a0b376376530d4f60f397453
 EBUILD sysdig-0.21.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 EBUILD sysdig-0.22.0.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
+EBUILD sysdig-0.22.1.ebuild 1881 BLAKE2B 13b91e07489dc8dd42a88fdccffe3f122f59a8b6256bca5b1559f95d9b3bbd34e1a6248dc1b98e241bd146103798bdfa2967230a88326ae1cdae4117892d492a SHA512 db667f8017f3f11ff462d79725c092c68e63adc87e970346831d93945ac2e5fdcaa8e97b7ac8d59a159e52d1a290b74554fee27b5e46569f57326c6c40c6a39f
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/sysdig-0.22.1.ebuild b/dev-util/sysdig/sysdig-0.22.1.ebuild
new file mode 100644
index 000000000000..e366e6626308
--- /dev/null
+++ b/dev-util/sysdig/sysdig-0.22.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+MODULES_OPTIONAL_USE=modules
+inherit linux-mod bash-completion-r1 cmake-utils
+
+DESCRIPTION="A system exploration and troubleshooting tool"
+HOMEPAGE="https://www.sysdig.org/"
+SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="libressl +modules"
+
+RDEPEND="
+	app-misc/jq:0=
+	dev-lang/luajit:2=
+	>=dev-libs/jsoncpp-0.6_pre:0=
+	dev-libs/libb64:0=
+	sys-libs/ncurses:0=
+	sys-libs/zlib:0=
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	net-misc/curl:0="
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/os-headers"
+
+# needed for the kernel module
+CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
+
+pkg_pretend() {
+	linux-mod_pkg_setup
+}
+
+pkg_setup() {
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	sed -i -e 's:-ggdb::' CMakeLists.txt || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# we will use linux-mod for that
+		-DBUILD_DRIVER=OFF
+		# libscap examples are not installed or really useful
+		-DBUILD_LIBSCAP_EXAMPLES=OFF
+
+		# unbundle the deps
+		-DUSE_BUNDLED_DEPS=OFF
+	)
+
+	cmake-utils_src_configure
+
+	# setup linux-mod ugliness
+	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
+	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
+	BUILD_TARGETS="all"
+
+	if use modules; then
+		cmake-utils_src_make configure_driver
+
+		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
+	fi
+}
+
+src_compile() {
+	cmake-utils_src_compile
+
+	linux-mod_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	linux-mod_src_install
+
+	# remove sources
+	rm -r "${ED%/}"/usr/src || die
+
+	# move bashcomp to the proper location
+	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
+	rm -r "${ED%/}"/usr/etc || die
+}
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index bde6831c1a15..db18987678ba 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,3 +1,5 @@
 DIST sysprof-3.24.1.tar.xz 595920 BLAKE2B 90582eab3fc12a0169c151ce0fad20b839841f77a31e5858f8d660f9b0f2630396bec3b239dd88baa3f6e3dd936bdd6d63a652e491a1d32f966a755f9099f160 SHA512 5d323bcb9923c511065132711963dc8856c4d837b4d7ccfae5cc5794be5ac8ad1dc42504025469199f4bfd6a6fad4d8f49b7b21cab6f0c9a954820182e75c7d0
+DIST sysprof-3.26.1.tar.xz 609076 BLAKE2B fd10ce27b224100558ff5bb9c75cfffcb76b2331d2c4056bd73a9ace1ea155e61d705240acf6fefa805fba2333f6d439369d5b1cc16e0c537ab9fed408bf6d85 SHA512 ee03360e4971cd91129bac3cc9d2cf292d29aafe1cdacd078e404ee15c3ff02bcd0c0159502605c00eb2abd3a46917cf70458ad05e48b594eeb2835ead55c34c
 EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f1215320444c23559e6e553125700e31df955ec542b9ee04ec9a12a0bd4a669eb23cd4fbf96de6fb8d3562cb2c258c2b SHA512 24b82366648690bd9a4a03e04dc14e88d23c177c75dcca745a816213cf018ea4a959bb733da54ae0b1cbe85706df63cfc79140744716300a457c348eeb57982b
+EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
 MISC metadata.xml 842 BLAKE2B a36dfd049b5a5307006e5189a46fff5b6de8f16fbb8fcaffa8d737895e9864974478c00007b452c350b673fdc735e809ace65fb31d9a7e21c4d4905d9e1d3574 SHA512 cf90f7e7b64c02bb8ca0ec210959c39e004b0c4f6707b2c489ef2a566fd8d62961b902c00deec95f2f762c55d142f5d706a944553cd8e37bcce3d62c9eff8a9d
diff --git a/dev-util/sysprof/sysprof-3.26.1.ebuild b/dev-util/sysprof/sysprof-3.26.1.ebuild
new file mode 100644
index 000000000000..144b2c9fcadc
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.26.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome2 linux-info systemd
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug gtk systemd"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	gtk? (
+		sys-auth/polkit
+		>=x11-libs/gtk+-3.22.0:3 )
+	systemd? (
+		sys-auth/polkit
+		>=sys-apps/systemd-222 )
+"
+DEPEND="${RDEPEND}
+	app-text/yelp-tools
+	>=sys-devel/gettext-0.19.6
+	>=sys-kernel/linux-headers-2.6.32
+	dev-libs/appstream-glib
+	virtual/pkgconfig
+"
+
+pkg_pretend() {
+	kernel_is -ge 2 6 31 && return
+	die "Sysprof will not work with a kernel version less than 2.6.31"
+}
+
+src_configure() {
+	# introspection & vala not use in build system
+	# --with-sysprofd=host currently unavailable from ebuild
+	gnome2_src_configure \
+		$(use_enable debug) \
+		$(use_enable gtk) \
+		--disable-introspection \
+		--disable-static \
+		--disable-vala \
+		--with-sysprofd=$(usex systemd bundled no) \
+		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+}
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
new file mode 100644
index 000000000000..0bd6534c1172
--- /dev/null
+++ b/dev-util/tup/Manifest
@@ -0,0 +1,4 @@
+DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad
+EBUILD tup-0.7.7.ebuild 2183 BLAKE2B 5a87498b280616342885129ce6c395667e378c9e5f54fa6583512e2b6a662a1e15555bc7003586702125d8300b1e71b0709b42bf5117b2f5eb765fb2be50f76d SHA512 6e78d896108cb77d45f97f25ec5dfe18a6be7272c0ab6383feaef92ab41f1a58add61bfec0a87598bfec586642fe11c3d16eec40e6f37514814a9aa0b842138e
+EBUILD tup-9999.ebuild 2183 BLAKE2B 5a87498b280616342885129ce6c395667e378c9e5f54fa6583512e2b6a662a1e15555bc7003586702125d8300b1e71b0709b42bf5117b2f5eb765fb2be50f76d SHA512 6e78d896108cb77d45f97f25ec5dfe18a6be7272c0ab6383feaef92ab41f1a58add61bfec0a87598bfec586642fe11c3d16eec40e6f37514814a9aa0b842138e
+MISC metadata.xml 326 BLAKE2B edaa58be0e147ba52e73b1e4ad70250ee2ebf7c31beda95bc4f639dc4759b4a2515a3f927b4c5c3e644a66a58180df7ef6874893908d6ffc55181c8a554f3a70 SHA512 cd0c6ad8e43779608355cc4bd23a03a88d2920ff15269f2b130395f955fe58d63029d6f8567b021c4f546d0c41e8af3d866c0de4b72d042be1ec6eff72cc0154
diff --git a/dev-util/tup/metadata.xml b/dev-util/tup/metadata.xml
new file mode 100644
index 000000000000..390ab1cc5015
--- /dev/null
+++ b/dev-util/tup/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrey_utkin@gentoo.org</email>
+		<name>Andrey Utkin</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">gittup/tup</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild
new file mode 100644
index 000000000000..104dd83a9dbd
--- /dev/null
+++ b/dev-util/tup/tup-0.7.7.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A file-based build system"
+HOMEPAGE="http://gittup.org/tup"
+# Tup itself is GPLv2, but it bundles differently licensed software:
+# - lua: MIT
+# - sqlite (unused in this ebuild): public domain
+# - inih: 3-clause BSD
+# - red-black tree implementation: 2-clause BSD
+# - queue implementation: 3-clause BSD
+LICENSE="GPL-2 MIT public-domain BSD BSD-2"
+SLOT="0"
+
+if [[ "${PV}" == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gittup/tup.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	dev-db/sqlite:=
+	sys-fs/fuse:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use our toolchain
+	sed -i Tuprules.tup \
+		-e "s:CC = gcc:CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}:" \
+		-e "s:ar crs:$(tc-getAR) crs:"
+
+	if [[ ${PV} != 9999 ]]; then
+		# Avoid invoking `git` to find version, use ours
+		sed -i src/tup/link.sh \
+			-e 's;`git describe`;v'"${PV};"
+	fi
+
+	default
+}
+
+src_configure () {
+	echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
+}
+
+src_compile() {
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+	./bootstrap-nofuse.sh || die
+	unset TUP_NO_NAMESPACING
+}
+
+src_install() {
+	dobin tup
+	dolib.a libtup_client.a
+	doheader tup_client.h
+	doman tup.1
+}
+
+src_test() {
+	# tup uses fuse when tracking dependencies.
+	addwrite /dev/fuse
+
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+
+	# Skip tests which require namespacing or root privileges.
+	SKIPPED_TESTS=(
+	t4062-full-deps.sh
+	t4063-full-deps2.sh
+	t4064-full-deps3.sh
+	t4065-full-deps-proc.sh
+	t4067-full-deps5.sh
+	t4069-gcc-coverage.sh
+	t4072-proc-self.sh
+	t4074-getpwd.sh
+	t4131-proc-self-exe.sh
+	t4132-proc-meminfo.sh
+	t4171-dev-null.sh
+	t5083-symlink-fullpath.sh
+	t5084-symlink-fullpath2.sh
+	t7048-full-deps.sh
+	)
+	pushd test || die
+	rm ${SKIPPED_TESTS[@]} || die
+	./test.sh || die
+	popd || die
+
+	unset TUP_NO_NAMESPACING
+}
diff --git a/dev-util/tup/tup-9999.ebuild b/dev-util/tup/tup-9999.ebuild
new file mode 100644
index 000000000000..104dd83a9dbd
--- /dev/null
+++ b/dev-util/tup/tup-9999.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A file-based build system"
+HOMEPAGE="http://gittup.org/tup"
+# Tup itself is GPLv2, but it bundles differently licensed software:
+# - lua: MIT
+# - sqlite (unused in this ebuild): public domain
+# - inih: 3-clause BSD
+# - red-black tree implementation: 2-clause BSD
+# - queue implementation: 3-clause BSD
+LICENSE="GPL-2 MIT public-domain BSD BSD-2"
+SLOT="0"
+
+if [[ "${PV}" == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/gittup/tup.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+DEPEND="
+	dev-db/sqlite:=
+	sys-fs/fuse:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Use our toolchain
+	sed -i Tuprules.tup \
+		-e "s:CC = gcc:CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}:" \
+		-e "s:ar crs:$(tc-getAR) crs:"
+
+	if [[ ${PV} != 9999 ]]; then
+		# Avoid invoking `git` to find version, use ours
+		sed -i src/tup/link.sh \
+			-e 's;`git describe`;v'"${PV};"
+	fi
+
+	default
+}
+
+src_configure () {
+	echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
+}
+
+src_compile() {
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+	./bootstrap-nofuse.sh || die
+	unset TUP_NO_NAMESPACING
+}
+
+src_install() {
+	dobin tup
+	dolib.a libtup_client.a
+	doheader tup_client.h
+	doman tup.1
+}
+
+src_test() {
+	# tup uses fuse when tracking dependencies.
+	addwrite /dev/fuse
+
+	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
+	# which violates sandboxing.
+	export TUP_NO_NAMESPACING=1
+
+	# Skip tests which require namespacing or root privileges.
+	SKIPPED_TESTS=(
+	t4062-full-deps.sh
+	t4063-full-deps2.sh
+	t4064-full-deps3.sh
+	t4065-full-deps-proc.sh
+	t4067-full-deps5.sh
+	t4069-gcc-coverage.sh
+	t4072-proc-self.sh
+	t4074-getpwd.sh
+	t4131-proc-self-exe.sh
+	t4132-proc-meminfo.sh
+	t4171-dev-null.sh
+	t5083-symlink-fullpath.sh
+	t5084-symlink-fullpath2.sh
+	t7048-full-deps.sh
+	)
+	pushd test || die
+	rm ${SKIPPED_TESTS[@]} || die
+	./test.sh || die
+	popd || die
+
+	unset TUP_NO_NAMESPACING
+}
author	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-08-04 08:53:53 +0100
commit	e3872864be25f7421015bef2732fa57c0c9fb726 (patch)
tree	9cb29a544215119b5c5538e37211b994ce1c87ae /dev-util
parent	480486b52ea64765faf696c88b2c6a26a5a454d4 (diff)