gentoo resync : 28.04.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-04-28 09:54:45 +0100
commit: b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree: e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-util
parent: dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)
384 files changed, 2554 insertions, 3139 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 9ac452c4c3f6..c68fa60114e0 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/Orange/Manifest b/dev-util/Orange/Manifest
index 4a381b57c20d..163b596ad417 100644
--- a/dev-util/Orange/Manifest
+++ b/dev-util/Orange/Manifest
@@ -1,5 +1,5 @@
 DIST Orange-3.14.0.tar.gz 22537651 BLAKE2B 253a9bf69856f9167fdc9cf001310982441450a93f3caaa74ed91ae2afbefb421734fda1561aff9e4aa1e3dd786c82c324ced07fcbd97a507197cad28778e27e SHA512 eed1e50826ea0ca7c96ad302eb8fe65f997810786f8c9ad3b3c90e085dd77f61ca75535294b3f0244a237d6ff7fe7d0b4cd9bdbd5bb5f489e45d7b1549ead55f
 DIST Orange-3.4.5.tar.gz 32999331 BLAKE2B a334da0d55096a8b3a6092cab4b79891c085e6faed8ddc738aa720ff97bf4bc70e215814a0770f284f5d34fe6ce58081b916477262ec62cb28dd246a923b589e SHA512 327c99f17b5c6a83c48c1826cf34624aaf620d84a2f566f22e394cfd0f1b9c7863cecde0ea7344f16b706efb6a4581adad90b59872db9f0be355495971aedd58
-EBUILD Orange-3.14.0.ebuild 1787 BLAKE2B 12c9af136dcc3ec042809252d47bcd380c3417c8641f7a04ce923e9938763251750548b2f5672a34b752f179dbe6458727e274d7e474cbc27ebc40419d1692c4 SHA512 87263aeae57d2b9eec81ec735043c689ba33e9f0f8f92c37a5a6a696427dd627897e3f9e330b86fcd0c6b54d6d6b7832ebbd5e18f66012e33a1d8930d68499a8
-EBUILD Orange-3.4.5-r3.ebuild 1467 BLAKE2B 19091f97648b4b6d1e29e8ba34c9a5e9ced4178ae723f8d7fbf526a4d05ce7f969fffc7253f1576cac39838ab7c4ae02b9e1f6e1a1cea25a838ca506284a377c SHA512 63bcde7e30ce41ccbcef6c3793da3ce8d2f7fb42f7d0f2f23ba9e15c4edab4f00b6d59bcc3a5149f40f95ed267b169f76fafc6305685082aee08e26e848f3e9c
+EBUILD Orange-3.14.0.ebuild 1782 BLAKE2B 0919dbc0c854b66b6682e8413f82a6e39e68f3df9d65589a5a8c0939b041b0dad3a360253a892c5299e21440444bad892ad2e075a627869f6e6dcddac44c25f8 SHA512 18a1b28c7e5e8494387537ba1fc2be5bc1a9d8455b77a0c76333858256e4bb5f8e950b6f178e5fbfd59e72b5669467f5a2b7ac94c3f736f3dcb93ef339da5680
+EBUILD Orange-3.4.5-r3.ebuild 1462 BLAKE2B 9cb0dbd4ec25c74e9110a2820b889f121642dd2bd4c6cd37906816e51820746c07f2db17539944793872671fb237345598257b1211ffe71d83098405dddeb9b7 SHA512 031fdf235f01332d1766f87ef620577a9c869b1c3a2496103e4542270519ba0c9aac344c9b1393626c50595425969851ab7395ae68357476dcbf16c53abd4312
 MISC metadata.xml 214 BLAKE2B ee4a28a5b07deecdb0f59f382551a5f75712aac4c44a3f1b6086bdc520a5dc1cfaf67982ddeada2044128fcd551b40aba54d463d91142a3c35236cb09e119416 SHA512 e38be8dc636f8d2db14dbf8a5d673224ed83adc030db673cc59ef4c2db90884de5f4e61c3247524d12015486769ee984d1c188acb7488826e659fb36de1b46e6
diff --git a/dev-util/Orange/Orange-3.14.0.ebuild b/dev-util/Orange/Orange-3.14.0.ebuild
index f4f9db0c5c86..8669a0e2acec 100644
--- a/dev-util/Orange/Orange-3.14.0.ebuild
+++ b/dev-util/Orange/Orange-3.14.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/Orange/Orange-3.4.5-r3.ebuild b/dev-util/Orange/Orange-3.4.5-r3.ebuild
index 43ad03b58d54..5c6193eb71ee 100644
--- a/dev-util/Orange/Orange-3.4.5-r3.ebuild
+++ b/dev-util/Orange/Orange-3.4.5-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/android-tools/Manifest b/dev-util/android-tools/Manifest
index 60be34afe686..937fde6425b9 100644
--- a/dev-util/android-tools/Manifest
+++ b/dev-util/android-tools/Manifest
@@ -27,6 +27,6 @@ DIST boringssl-14308731e5446a73ac2258688a9688b524483cb6.tar.gz 13030361 BLAKE2B
 DIST boringssl-45210dd4e21ace9d28cb76b3f83303fcdd2efcce.tar.gz 13581532 BLAKE2B ca2f6757807adc265314a7444605c6199a19847fb426384bafa201bf63f4e3c7c567fb8094b740b8a00caf0d106bb1efea2893b00d45c9772740a81dc0a186f3 SHA512 c6695d078ee7b3694898dfdc0ee3382d01f9bb592ea46eb64026c73565735fd7251bbb0fd3e8c8552394bcdad5717de7ee5106cf1ed91aacec05d779ad693f6a
 EBUILD android-tools-5.1.1_p13.ebuild 2077 BLAKE2B edb2e3a9f69c2c8a4f86170b39aedb1f44b173df943b2edcb96f7d90384658c6689925e06873c3d5331c20f360732860f70e0bfecdb0d5518dfbb9d90816b671 SHA512 3659aca002096aa11dc94631de73f1081cda5a5728f2842aa767844b6b3e12e0bdcdd0abbc2903efbb1d9f11666e7bd392be694910ffae58fce1e8b52a8cd090
 EBUILD android-tools-6.0.1_p79.ebuild 2820 BLAKE2B a87ef5bc6d814ef772c3fe4292563c73beabd59cacebae706721d4019059be8b2cf31e27594c473abe202ed1f4afb78993ae3e947ef7c21b5016245797f90b45 SHA512 ccdd6e4fbc6a98ca0e9cfd89618c6a13e11e174abd6c6b3dd1d1b8f7a592a4574cf83e0f4770750918ee481b129d01425ae56fd55ddc323b3409add6ddf10279
-EBUILD android-tools-8.1.0_p1.ebuild 3967 BLAKE2B 8422202a62ce921579811894675bc77d5992cfa42d39808954279ad12795a6099bba2a16f4e97b796f3ea07c224bffe3255c38ce53f4bf3e7ee867eaa1faa914 SHA512 b9660d621cb71dd1df58728fab9f71c92a802ad68bd1105d899f26c1d44891b9ddabc7dd7317d04e8d2005981cc8132160deb4ee8cca0e56247de2bc34032232
-EBUILD android-tools-9.0.0_p3.ebuild 4513 BLAKE2B 54bf658dde5521394d9c41d62368055e2648202d3ff63af5f99adff3a0545cad7ff55920cfe304c2b124b02a47fd5c61956c058f3ee6c5ffa0c03dfb5fcfc775 SHA512 c321e3cf94a12148ece9a7f8143d404fb65010ad0df9dfe8bd0b6372525f3e80e563b2434e254fdf03cf317c80747d56207e75b22e445c19d3db668774050993
+EBUILD android-tools-8.1.0_p1.ebuild 3962 BLAKE2B c90050118d3a0fab1032c59479b604eb390ec12ab347412dca37837fa8c7b421b00a43800b89510d32377b8d7e015d2c0a8f97a6ca25035a5d166ab9ad728db9 SHA512 7174b75f654eb92951aea67a5b5e915c87b7f6d047b57062938ce16486be30c0c464a1b9c3ea96f43959423b77a25c52055fc8c0bd3ae804795847aaa529c862
+EBUILD android-tools-9.0.0_p3.ebuild 4511 BLAKE2B 910f057922f0171c32c6c775d102c8308eca894260d5dd1cfe96ccff60c64f8d99c6d5daba66481844cd93cbf109a0e5713d57da9184f30b41bfa004fcae385f SHA512 fee26749b8015d8c4b64e0ff8aaed139c5de055bddfb6bba1dbbe4bfc64cdccabb0d224f01ccd6a16e468cb3e6bd0bcd0b2695452b5dcafbf44d4d2b75117a2c
 MISC metadata.xml 643 BLAKE2B 99ac01fb57cc1d2908955720cd2fee6e97f98a19d9fe9bbbb07e0f9f915b7efca184a75c5f5eb5372b9c21d3ba7db542d061de47ac6f89e6c58fa3dc886d4f21 SHA512 51ee41cf77548eb1ce543b2c1f5f37e9634250c2fa42b36a8128b4a80a73a270b90b9e9e1c2c58d7aeb6dee85238ec73345f1a3a4ac398a4f7b2cd8e8c6e84ee
diff --git a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
index e895b2f9e305..9e63f95cdd3e 100644
--- a/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
+++ b/dev-util/android-tools/android-tools-8.1.0_p1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
diff --git a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
index 6a157340caa9..7ba1bd762351 100644
--- a/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
+++ b/dev-util/android-tools/android-tools-9.0.0_p3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 CMAKE_MAKEFILE_GENERATOR="ninja"
 
 inherit flag-o-matic bash-completion-r1 ninja-utils toolchain-funcs cmake-utils python-r1 python-utils-r1
diff --git a/dev-util/anjuta/Manifest b/dev-util/anjuta/Manifest
index 5519e968b833..e03ecbe1b8c4 100644
--- a/dev-util/anjuta/Manifest
+++ b/dev-util/anjuta/Manifest
@@ -1,5 +1,3 @@
-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-r1.ebuild 3919 BLAKE2B 9e3f6006eac5564ba10993aefb4e819657d3cb367dc732dfbe2cfab64d590b0471ebed6b0d56aea4061aa0dc5f58a10740fae1e808231609b5985ed019aa9d26 SHA512 ee471b71e40d15487106e515a5fd43d2330728a033d8cce29f6bd269b212abf15c5792205c325a0db45f36bea428209d6e201d45e66544f510b4272b3eaa0276
 MISC metadata.xml 562 BLAKE2B 928b16bacff2417a1b50749486d2dcd656184b6cd7bce6f17e534d253ab2e1af854e18bf40f3188714e973b9c49f1b2691d031bdaef0ec73d9a4844c05b99218 SHA512 c452f34b8489e3faeb8c272282233341e22c958f04d750d54e07c487895aab8b03f4df096e1f07fdb7686a0295c770cb1fcf38fdca01f71730e991148013d82f
diff --git a/dev-util/anjuta/anjuta-3.22.0.ebuild b/dev-util/anjuta/anjuta-3.22.0.ebuild
deleted file mode 100644
index d68d2eee168f..000000000000
--- a/dev-util/anjuta/anjuta-3.22.0.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 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.32"
-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: 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/appdata-tools/Manifest b/dev-util/appdata-tools/Manifest
index 1d999381ff56..b9e712b16742 100644
--- a/dev-util/appdata-tools/Manifest
+++ b/dev-util/appdata-tools/Manifest
@@ -1,4 +1,2 @@
-DIST appdata-tools-0.1.7.tar.gz 124580 BLAKE2B 1e57c06f79108f7e1f5eed9543fd5412393e498d8cde36d0a1a35fee5d2788f1164e2f6e1e70db20dcaea002bcf2476f7c2bfe1c56b534d203bfa8396459d5da SHA512 d0e32a2028f54482bd9715627bbc2050cfecfaea4be37fc3eeef273cdf989aa270a55112cbc81406dadedea87ae3521d26acf0011834d0055a473083147dcdc7
-EBUILD appdata-tools-0.1.7.ebuild 854 BLAKE2B 34c1125fde353afaff4df871166b01c3eda3969839feb73cd2bb0804e399d9443b328995b2f8e415bc86904a39a6a2f1bea49cafc1504d55a97a6b6d6c41204c SHA512 254f76a902e6c6b74b1154e11c07ab6b1050b63b0c39d210a4b0ef662f3402eb1e16427bd71acc05162628f1b8a1a2bf4ff843f53e651a81f01073b9487ff32a
 EBUILD appdata-tools-0.1.8-r1.ebuild 450 BLAKE2B 1c4843d123d008961b7da15a5204a5d673e925a434b6481c47ba745a8bfa7a136825f8daf6f21ae1960f9d49f02f949d9957cb3f92b0c143f54092aba510a4f2 SHA512 d7b024aa8e38aff70d9c9ca8f65daf62e69e81a25d8c9d958793db2657e5d57996c41bbbaf1158f1936df7b896f6032bad0f41e324b38a1c8490130c6ea407de
 MISC metadata.xml 451 BLAKE2B df7d5ccf4c6318efb44f840abaa9c42346b302739acee4f21e0ac85653ee44e3fde2050be164474c27c0cdd97b280f891a3ccff8ef738174dbbfe09a54d8d365 SHA512 35a3d284a2adfaa5eeafd5be63757734ef8602e1350a8c616c4e35fbef9a52dfa5fa5c9d08b9570ffe0e537e16054dceed6ba1d5f43277af40d4134a2606e2d9
diff --git a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild b/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
deleted file mode 100644
index cdb3f6c3c48f..000000000000
--- a/dev-util/appdata-tools/appdata-tools-0.1.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools
-
-MY_P="${PN/-/_}_${PV//./_}"
-
-DESCRIPTION="CLI designed to validate AppData descriptions for standards and style compliance"
-HOMEPAGE="https://github.com/hughsie/appdata-tools/"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="nls"
-
-RDEPEND=">=dev-libs/glib-2.14
-	>=net-libs/libsoup-2.4
-	>=x11-libs/gdk-pixbuf-2.0"
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	nls? ( >=dev-util/intltool-0.35.0
-		sys-devel/gettext )"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		--enable-man \
-		--disable-schemas
-}
diff --git a/dev-util/artifactory-bin/Manifest b/dev-util/artifactory-bin/Manifest
index 17855f0e2048..94f5a7bcca63 100644
--- a/dev-util/artifactory-bin/Manifest
+++ b/dev-util/artifactory-bin/Manifest
@@ -25,4 +25,4 @@ EBUILD artifactory-bin-5.5.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d
 EBUILD artifactory-bin-5.6.2.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-5.6.3.ebuild 3336 BLAKE2B 95c75f9bda210f5387f6c3ee9dbd30d65dc4bb891b6d8e401a8b602b604cbacb4289b4915e92880bd2f6a7cebd121393407a75ed26cfa5e2970d2899671a1980 SHA512 663fa63a3a27c9ef480677732f413a789c8db9fed1942a3dd129295666868293f1df01682ad6734fd530a7c8ea24fa29834d07fb0f1b15c40f9ce2be6adbc961
 EBUILD artifactory-bin-6.3.3.ebuild 3336 BLAKE2B 57b6a9153b744428ef8ea398ac04e8e114e7472033ae1ad7a57c91c329a2e1d7bb474692e67aa95bc35d84a339b5c1cb597b965e30b001c8544b6fe65e46abca SHA512 b5253c320d7b699b41fbd6b9387dad3d021f3e6e3eadc6e94bfb175009514dcc0d1313b624362d72a34fc5f9c0d4190411d2ebcc5d3c5c39089bcc5f8ab5e6e3
-MISC metadata.xml 368 BLAKE2B 1a5f91a194a1eb7b58ddc795cae9c3e52b33aca6b716b286069b8185c2393bd6b5281219f4a0e6446c9a8a930f18168b0f5923df9423ffd6b20d0d7ec08c48c8 SHA512 889ab0f86261be62dc4988fc99c8526212c7936b3fbb8a078d644046047f653108b3120cef9cc65bce00a1c267227e58dae0cb1eb7d86ac1f4966408fa783beb
+MISC metadata.xml 279 BLAKE2B 6e75b275009b71b76ac58588f1283d30718a910a3a6ca8d289ed313645a0a16683d8a308ed9129da37967f3a903b692290c0b03c3a7441098632a32fe9a74641 SHA512 2948e82a333d27863551e8e4d0f1943c53da2e5eb72ce8128b0b90b5a07a011d32fa0108eb9f91d7e2b14e108c11ba36df3efe3e196df9c0abd1fe862e087c97
diff --git a/dev-util/artifactory-bin/metadata.xml b/dev-util/artifactory-bin/metadata.xml
index b9b43a436113..fff2f58633f6 100644
--- a/dev-util/artifactory-bin/metadata.xml
+++ b/dev-util/artifactory-bin/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <longdescription>
   Respository manager for Maven (among other binary package formats).
   </longdescription>
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 7204966af066..016224cea19d 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -1,6 +1,6 @@
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.6.2-r1.ebuild 996 BLAKE2B 80620a5bd3bdbc01901142c5feaffba15e3c95e2c55f38316af6f990c035e49dddcc76e15f11532dad444acac2aeb57151f72c22bce29d619382522faef064e5 SHA512 fea9848ac20fca8837763665d6771af000ead36a4552a24a55f42912374131b1f44999a3db2cb32716f3bbec50dc31f9baebe647edba1e003ca17dc8b0193171
-EBUILD aruba-0.6.2-r2.ebuild 999 BLAKE2B c5f3f639b0c50b9d24d4d1b6f58cf742cf6f4feca6dce1b590d7a5ce8025b13eb1a5699798c17b6153d1af7ec8b2fa3c8bb7247fbcf6738eaead1ae9fd9299e2 SHA512 73a37757794d6707cc5fea0dd7f13818f59587c9bba4dd7fd223f6fd6e860c71ee0817b3f6fb78c5a87bc12bdc83abdee67bf2edca5dde11d114314fc3c80ef3
+EBUILD aruba-0.6.2-r2.ebuild 996 BLAKE2B 61b0126b4acec56da8a4f75ceb6924d3cbed17cba41bdb96ca4373c1b0815baaad8d4582702a6023f838d22a2299f9039d63bf78e8224848915ddb6430ce542c SHA512 4b31af5b3b278601cffc27d9d9c87cd046caea4b59673d519b22fde5e0d0a493f46cc27225e0e88766ecbe442fb77481bb79991ff0124e38601341265f1ae3d4
 EBUILD aruba-0.8.1.ebuild 1672 BLAKE2B a01b44c435d4594b8f58c5a272c2443c40ff04d20fd186a51421dc4d11dfcb7a1d68ea96191dcf3772c8247635e4ee296101cdbc26e441d67127509574dfc827 SHA512 411dfa207e15afc3bf6d32a0bfd02c0cf2c2f1a054cedb90c768e0435890d590e5723d810884405e69697df84394a7a545bc8bc4628ac4f8ec3046d0bc99433f
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r2.ebuild b/dev-util/aruba/aruba-0.6.2-r2.ebuild
index ac44f384dbcf..26d29b4803a7 100644
--- a/dev-util/aruba/aruba-0.6.2-r2.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index c680985eefd4..663bc180f49b 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,5 +1,7 @@
 DIST bazel-0.20.0-dist.zip 87602213 BLAKE2B 0d10fc89a8bc2bf91a67317d42302b894abbec8c4e9f39dd4fbeae71fcba847d5ae35102e3ef4a26d7dfe2da9e47cec5660dd28e1804c3ad562583e9566b78cb SHA512 1628a99a2c95334b7b190c5cf1b80ad3ce61c827103844f68401ffe5cfa994d5b7edd9e314a2775b6ed5b8da70ad79bee0ef47b9acf409919a613069356623a3
 DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3c1fd3af7147e13b1474353fdf4cba1f58deed6d1880ec85fe5a07940b8df14af2701361d86e638b5c0e6924300c1 SHA512 b93cd21f0f164c118b90efba761a9492eb9894e24f13ff468defd12b86c7e67f16e51060ac2fc4c2f8dbf51b1c833d41b255fdd8107988e5babf093cfc5b3254
+DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774
 EBUILD bazel-0.20.0.ebuild 3058 BLAKE2B 120fb7b7ccc4aa2b96b626d36c182bddc2ac8495478cc077dd04921d2d5f43f9065e47096a1b9443eabe07cbdd448359b80270678fc120ce8187ae786dd630df SHA512 5d6667cf6a87beacbafddd2dbbb67f37e4f7b36b2d1f0a100bb9508a6fde8601fcc9bed0362157ab4501b5f44ab1e4a89e09c0182ca8d4b76750dcd256e83ea6
 EBUILD bazel-0.22.0.ebuild 2868 BLAKE2B 36b2141dd525a26fb9d5ba9e866806110276f86bcca728c24171a9d00c124c69be88b484286c112f2da0eee46375a90f6c001ec8bd5da26c83a9c4a356bb3518 SHA512 b1b142af04cbd4666758ffa44f56b58e7c80c36b4a3e9f95687e8ef4e6f4c8bf371d03b1ec5cf8f191b9de269a0de0666663e1e28f0409d171262c06b46c7d01
+EBUILD bazel-0.24.1.ebuild 2868 BLAKE2B 36b2141dd525a26fb9d5ba9e866806110276f86bcca728c24171a9d00c124c69be88b484286c112f2da0eee46375a90f6c001ec8bd5da26c83a9c4a356bb3518 SHA512 b1b142af04cbd4666758ffa44f56b58e7c80c36b4a3e9f95687e8ef4e6f4c8bf371d03b1ec5cf8f191b9de269a0de0666663e1e28f0409d171262c06b46c7d01
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.24.1.ebuild b/dev-util/bazel/bazel-0.24.1.ebuild
new file mode 100644
index 000000000000..68be76691f9d
--- /dev/null
+++ b/dev-util/bazel/bazel-0.24.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+RESTRICT="strip"
+RDEPEND="virtual/jdk:1.8"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S="${WORKDIR}"
+QA_FLAGS_IGNORED="usr/bin/bazel"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+
+	# Use standalone strategy to deactivate the bazel sandbox, since it
+	# conflicts with FEATURES=sandbox.
+	cat > "${T}/bazelrc" <<-EOF || die
+		build --verbose_failures
+		build --spawn_strategy=standalone --genrule_strategy=standalone
+
+		build --distdir="${S}/derived/distdir/"
+		build --jobs=$(makeopts_jobs) $(bazel-get-flags)
+
+		test --verbose_failures --verbose_test_summary
+		test --spawn_strategy=standalone --genrule_strategy=standalone
+		EOF
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) --host_javabase=@local_jdk//:jdk"
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+	fi
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index f8c3beb246e1..1d9a5bfd8b2e 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -4,7 +4,7 @@ DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b
 DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e
 DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1
 DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091
-EBUILD bcc-0.6.0.ebuild 1137 BLAKE2B d9c11470ea2fc096cbeaba592d0181652376d8c4774c1e69c4b9a0cf38ae8835824a4090b75dc6def4dace3b26be263aa12c52f1283912c86580dc9334ff6f82 SHA512 bdbf5614a9ab1fb148594cdcf9c2c53069d2909bc88a244f47395bfc4b9b4851d965feec460ec08ea2289b6f0198cec2d41d3ad22de0c02626577df9d8528605
-EBUILD bcc-0.7.0.ebuild 1136 BLAKE2B 12bdef1faaaed5755813cef01a381e08b5bac2119c85f7bdcff4af1584d8cd46722c35daac1ecfdfd07288a568e3e514e0f0ba01aca6ba3c3ded5a1dbde0a0b8 SHA512 525502acf9faedca72bf34ab12e7ca85830e7e4ad474196b4968ed18d3a44d6865e51fc190ef83985ff766104d712d6cf23d857c8b8e7345ab2c98154ab58472
+EBUILD bcc-0.6.0.ebuild 1132 BLAKE2B 4f3fe126841b267c7ac676be765968163e350831a9dad18e9ecf923c6dc5fbbbcade831cce89c9d25d862174deaa512f5310a5a667ede2ee2cd356277ca38f2d SHA512 7359781a42c5470be2d67fed289c5aa45c1495a060e3e022d2e0b8a086b3b03bac422b85f8fd835e7dbe882d42829b24aee364e84c988ec744d2d45913873ca9
+EBUILD bcc-0.7.0.ebuild 1134 BLAKE2B a3a89ee433c77d182394f2cd4ab6200059430ef623d000f2e2f651a9c424bcd804414f19598fb1f192f0caf28aaffac3ed858973bb5c3f98e386b2167690fc20 SHA512 2f4ba8cb864ef80e5081d0f84092b0c2e1a2a31f522c3ee5ed8df134bd53023bfd8366e4e15e9c8ff5cd4f81897d28c08befa0ec7655f9d8696f574c9d9719e0
 EBUILD bcc-0.9.0-r1.ebuild 1670 BLAKE2B 947df6d21a52d197fa05c307f02cd40bd34a98bd015036016837f46a081a842cab0a02bfb9a433f5f0180753f5b3de7f3af7c95071eceafe496adbb62aeb4464 SHA512 8ecfb0764de2ee7e53e2d64e81d6d9b2fd7e0d5c94dc523f06564977da28e26769d388658197238f6a8acbe0c189923a0208923a3e77997b30453e9e8859de34
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.6.0.ebuild b/dev-util/bcc/bcc-0.6.0.ebuild
index 42ab57d08a2a..4e1d37a74c91 100644
--- a/dev-util/bcc/bcc-0.6.0.ebuild
+++ b/dev-util/bcc/bcc-0.6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit cmake-utils linux-info python-single-r1 python-utils-r1
 
diff --git a/dev-util/bcc/bcc-0.7.0.ebuild b/dev-util/bcc/bcc-0.7.0.ebuild
index 9d90ec40225c..9d6fc4908ebe 100644
--- a/dev-util/bcc/bcc-0.7.0.ebuild
+++ b/dev-util/bcc/bcc-0.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
 inherit cmake-utils linux-info python-single-r1 python-utils-r1
 
diff --git a/dev-util/bcpp/Manifest b/dev-util/bcpp/Manifest
index b17f2682f44e..a46dc1e0d61c 100644
--- a/dev-util/bcpp/Manifest
+++ b/dev-util/bcpp/Manifest
@@ -1,3 +1,3 @@
 DIST bcpp-20150811.tgz 145969 BLAKE2B c7cdb21b6c07599c93c6f3fdf6ca4f5e825d4ae5f955e1c969d744a9ff2594bf3c7dcded1582dff695201f6e7e8ed57d5796883b63c5c57476c6601da6a49717 SHA512 a11462574bd87cf66dc50ce23f188d335480aae5448b527694791d4b7ae5cde27c0e0c0850dc8899b2b66198c37a434985c833f95f7f2d2d88a3b7dfe4ff34a9
-EBUILD bcpp-20150811-r1.ebuild 912 BLAKE2B 83362edbe78e6587ff3df1ccd6e32a919aa39094170ee5670fbc3716d7825039d075b01547cd89a31af302f0e9550eedcf1aa4ac9a601c51581e713176fc0717 SHA512 b76858bb46a572a0fb64184496146b6b2c47a87330095b96562d62617f2179b9c3f442692296614e2f02cccf206a34163823cff0840a707b51b754057c6eea58
+EBUILD bcpp-20150811-r1.ebuild 910 BLAKE2B 11bfec1c872ab0cd15490d764eea6df214f9b92c8bbbbcf13fac97194f0f9bb81a57d08ba2edeec9eef121159db258424a48ff5a6beac1209494f4a902642683 SHA512 7e216cf70a48728c57e08f862b8798e4b943d44f209d05bc7569704d446d0b5a22b3ec79b6bdd4e11d86a57ee9d84e5dad0d3b1d3d82a030602374842a9d030c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/bcpp/bcpp-20150811-r1.ebuild b/dev-util/bcpp/bcpp-20150811-r1.ebuild
index 32f56aaee9d7..983e05a2945e 100644
--- a/dev-util/bcpp/bcpp-20150811-r1.ebuild
+++ b/dev-util/bcpp/bcpp-20150811-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Indents C/C++ source code"
-HOMEPAGE="http://invisible-island.net/bcpp/"
+HOMEPAGE="https://invisible-island.net/bcpp/"
 SRC_URI="ftp://invisible-island.net/bcpp/${P}.tgz"
 
 LICENSE="MIT"
diff --git a/dev-util/bitrise/Manifest b/dev-util/bitrise/Manifest
index c130a8024f37..577ce9348183 100644
--- a/dev-util/bitrise/Manifest
+++ b/dev-util/bitrise/Manifest
@@ -2,8 +2,10 @@ DIST bitrise-1.16.1.tar.gz 3986520 BLAKE2B 2a38eb72abc2aee69b9494abe03434014531a
 DIST bitrise-1.19.0.tar.gz 4223634 BLAKE2B cb0822af15c1214d785f002617cd5c184e50a85c289d7ef5fe4fb429009495db26935aea9b9fbdb43514221d233a10347b52d01c0f839bb981da8437d61f79a1 SHA512 ef0ca59a907bf85ceadd2bccb7859e6b40146fd4983d51c84f82ba3ac36b47eeef41cbd342cfcbe516ed2ee678e66a4e07ef451cc36a7b6977fa6def9ac2a1e4
 DIST bitrise-1.20.0.tar.gz 4226859 BLAKE2B f358caf503e02bfbeb895ebe759aeceb2c28f0055676cc897b16ffacfadf2b0f48e7c0c495716d58d1a65b8697889eb3c6895a145bd7fa6828bbbe32280c5d15 SHA512 edb3e78fe8714604f2e514d80efc879b8a28e18846be9f7a9abc641901355b31ce6659ed30ef9c81bcefbe9816d48a6a3f6c292f8948c09c6e9330fbef154eb7
 DIST bitrise-1.23.0.tar.gz 4294480 BLAKE2B 2bc18a78822280fbca6039270ef61403cebd364aabca23b0bfd6b2e62b865cedeb046fe57641125bbddbd48922a34d89f59ed3c0b3e13b17497f485ac39c0932 SHA512 a41ddb2757f5d13675425fe943ca5834600f81233992fc80505347d87472df6268b98b82da9ea0349786647b2d7360b0a9019b41d1016ae231db348a5a0cac32
+DIST bitrise-1.24.0.tar.gz 4319920 BLAKE2B bc3a318453e32b1889310b21ef5f08a501da7be2f7da95498cbfc003c31d16490242c4972b40b74735731b3cf937b3cc55da08cf846fa2fbdf7b1d4b94bf818d SHA512 63a9fd3db3686140ed41f4f1e31e3787ca17e2e031a06f8561bfc581b01568ae5ff88bb9f81f0365bf60f4db6ba426fa3ad76a7363e31fbf31b702e7a9fe8b57
 EBUILD bitrise-1.16.1.ebuild 1046 BLAKE2B 51bb9aaea5bda07f1505af7e2982b476d5b78e3e5850bb943c74716d022bb71cc74054b9bc9c6228d65dcb1c7549ff4b971a1c59bf2d4f85f59bff4d870c7a08 SHA512 61f650a5c6a37edfe5d3444c1db3200a1f8b8a770686de9332b07767a7e82fe794eda33cb163184fe6b61f3936c856b865e236cae66c2e83390a383155e2deee
 EBUILD bitrise-1.19.0.ebuild 1107 BLAKE2B f7310107af1e54c7c0bbdabed8a34bb395cb32fe7c0f33dbefea4f20bf2e1e1dc220f192f7c7ac2ad7a7b9e4119f81fe4d58a8e01760e8c2310fd68bd5f7820c SHA512 08be8f002c738976f4127fbcc55223949f439bfc2e56de01f442a545164640e88205f24af10a3d643b6947446f809ba5a3690a82e1433321b150248d73978ff1
 EBUILD bitrise-1.20.0.ebuild 1486 BLAKE2B 16bd7ae58234830fe8a85828cf857b8be6a96742531f94de2f8aca024fc88afc2cb2bc4a8802f4cd02a3c12f37b62dd05bc981a34679a7489357f5de0b3c67df SHA512 ab6d0c7e346618d8500dd0308166d2195e6d711f34b5778ba097d96f90529b9e2b01714da454be938706011add5101c3b5b08b37bd00550c7fee5340505f2de1
 EBUILD bitrise-1.23.0.ebuild 1494 BLAKE2B 4d48900a79908b97c4f34b81d2cd38476cd0f92c09aa13345edf967a1cd04af8799a81e1ea45ec95795d68729967ae289f5ebc5582b3a4f166cba9caa357e2f7 SHA512 dcf78dcf576cdacb11ece035c8d5692f7b5c086662f8c9ab6adce6b7faa6fcbbc9246e1090b4f1b8e97a9c38c12ad790c53ab551afbeac0b9b83a201a74088ca
+EBUILD bitrise-1.24.0.ebuild 1506 BLAKE2B 448ad61c9aa717c10241f0e34043e0ad3924f2873c879b18236899292c5cad3930d41f66eea1d20137776c761547ef8a26e4bf6973f045a11203505de1231554 SHA512 9927ba34aeb39e3b9d483f4cfd0fb235900020d612f9809117ed96c4fb9dfb49193a9da3749cd68e6fafeed93c6fbd5122db57d781dd647e6d59c0c92d838ed8
 MISC metadata.xml 1069 BLAKE2B 18a8c9d910ea0495f53dd0f979ee07f5b99394c9198e56739a54e03c9d5a158038de5b9d38fb57a71a191327b76e7902ffe78324c23889295e4f7c404ba0e130 SHA512 787df19e97b702d0b0ca57a2474a68957fb953c16f236aa235f2488598c051851cc174824aaf60bdd7666d8338dca78f109ac03510e1a374605e855605870cf8
diff --git a/dev-util/bitrise/bitrise-1.24.0.ebuild b/dev-util/bitrise/bitrise-1.24.0.ebuild
new file mode 100644
index 000000000000..2bfc659d0fc8
--- /dev/null
+++ b/dev-util/bitrise/bitrise-1.24.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Run your Bitrise.io automations on any Mac or Linux machine"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RDEPEND=">=dev-util/envman-2.1.1
+	>=dev-util/stepman-0.10.5"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/bitrise" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/bitrise || die "Couldn't compile bitrise"
+}
+
+src_test() {
+	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
+	rm envstore_test.go exit_code_test.go global_flag_test.go json_params_test.go log_filter_test.go output_alias_test.go \
+		step_template_test.go trigger_params_test.go update_test.go timeout_test.go || die "Couldn't remove network-dependent tests"
+	popd > /dev/null || die "Couldn't return to ${S} directory"
+	local -x PULL_REQUEST_ID=""
+	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/bitrise"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/bitrise
+	dodoc README.md
+	use doc && dodoc -r _docs
+}
diff --git a/dev-util/boost-build/Manifest b/dev-util/boost-build/Manifest
index f90994c2ce34..5fa03ee13b29 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -8,12 +8,8 @@ AUX boost-build-1.55.0-ppc-aix.patch 228 BLAKE2B 80e1c943ae11e7ec7730e83a0126ef8
 AUX boost-build-1.62.0-sparc-no-default-flags.patch 2646 BLAKE2B 65a3a5018fed0197fe2bd1f93e5de4e799a201274f7320f4417edd4978a338a800eef1aa911ec7729f4f3b02c9cf85106dc25d466eab0e0c87d7625c4b652936 SHA512 1767c0b72f18ddf7bf4dc9d51c911ce0fe3c775e60cc960f913b218850cae9361728fad192194589929808c6c89c63110810e668fc7f75c79a04cbab1e59834f
 AUX boost-build-1.66.0-add-none-feature-options.patch 724 BLAKE2B c757f0e2d9b096cad74f130ed8219f6d0ff81f7f020cfef7352a324f47167cc4c71f49c8d2781d06f624fec98e973add229ac731bf2f37f9dade907bb9c9fc3d SHA512 9d4149739139d268e54304d73d1ceb0073ca94265d8a84467c890c8f68aac3b0060e847b71e961a92f17813bad651d0515898dd4d0535f5cc6c1c4a024e9b39a
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
-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.63.0.ebuild 3884 BLAKE2B 5a60f760d3a0247b486436421da22073e64e979f817ae2f7205fce5ed3457cc3bbf444728405bc9c13ce9457917f3c1447e0580c3830a33fe34332977d1d167a SHA512 df1c108b743acc29791550e50556bac9a36db4762079906ef6f18610d5c5cb5d8c087744de899a80555740821f4ce9578d3cf32c5066e86c14165123df09548c
+DIST boost_1_70_0.tar.bz2 97887058 BLAKE2B dc7a974c6dc2662b767dbd87cb832cd1749c24fb745779d1059b73f19f7e52b33b645adfe72b0296c5e098e5cdb3b9f5eddd382374f33fbcd2ad5739287b2206 SHA512 7f2ea9636baf0210e8ed1d21ee798efb6ce23c0710ff8228b285e2214f82193bcd2d912fd435929c554289a59101c7be2e27ce798f93833f307976f0dd070b49
 EBUILD boost-build-1.65.0.ebuild 3882 BLAKE2B 6beb6f6bce5bf373bf797c2c589331aa21111253b15370254b4ddfec7398f8830d1d05608788de6d6a7ebbb488cac74e94c8e3d9143d46e8db8c3546fa6a72ad SHA512 8e5ddc74ce3d84bb16afb3e105eb3a86c286aef19a2ef62ec7ed02043fb53f5e225be0400c7b1b0f050f745e560e92e39c2c4d5ceff6b2be9ff93174357ed1c6
-EBUILD boost-build-1.66.0.ebuild 3953 BLAKE2B 5683a4fcb771aa3faec78e40aafaac2762fa3891bc299b26b20b226e64a5c8f170d1e6ea7c6db766ed13c26391a5493db966a5afd28cf48d854770f6434b3672 SHA512 317d8880c77aff0b627a5359fbe5d83ca0df856038f7a998d05e5a0769ee6913972d77c7778503f830537ed5897019adcb8a32dd44431a4c09b11e2d5c70370d
-EBUILD boost-build-1.67.0.ebuild 3920 BLAKE2B bf5aafbbf67380119653165caa1dae20be32df035a739cf13c076696adf1fb8a68fe320c3bc144971c208683b7a9786d54c17366a48ffa359234890f268b0886 SHA512 e3d284f7e3912b561f4c0a98067bdc91d0be770357fd72d2ed0b9bd40386e40f2f26e1f8ff36baa700dcaac4d5a493deebb908c424bc2cbb23ad8c0636e84e15
-MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
+EBUILD boost-build-1.70.0.ebuild 3853 BLAKE2B 1ad6ec4b5b1feb7dac12784322a5afbf929bf1cc4d1cbdafcf36c70b90b925e82e1a7a2c4877683f3f850506e8b0c0cba1d89bd4797db9a084521c50411e8844 SHA512 dc16571b58e53715f44027180b6acc1fc6a38db81de26fcafc745a5075c2c7f590f360f35f468227b0c4a09aac9f32d00544a94bcd7049253c7adb5fe9546205
+MISC metadata.xml 329 BLAKE2B f492b1ba64c3f7bce1d3fb304bcff93357cc069dfd06b69c25cf26f4423ebea51ac4614a8d865635568f0e9db424a6904fc1edd5fa729243838e16e9887f4202 SHA512 57baf2d8e0a4c240d99f68ce122086a147d42145687b712609fdcd73b77fe3fdfecc1b078edb6a9c922213482fcc17c2fccb6762ec69890fbc9a912c4cb34827
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
deleted file mode 100644
index 4dbc423b5357..000000000000
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-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.34.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.62.0-sparc-no-default-flags.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/boost-build/boost-build-1.66.0.ebuild b/dev-util/boost-build/boost-build-1.66.0.ebuild
deleted file mode 100644
index 2fdc1e473128..000000000000
--- a/dev-util/boost-build/boost-build-1.66.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-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.62.0-sparc-no-default-flags.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/boost-build/boost-build-1.67.0.ebuild b/dev-util/boost-build/boost-build-1.70.0.ebuild
index 4dda7f0a6aa9..98eb1a3631a7 100644
--- a/dev-util/boost-build/boost-build-1.67.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.70.0.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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
+inherit flag-o-matic python-single-r1 toolchain-funcs
 
 MY_PV="$(ver_rs 1- _)"
 
@@ -16,17 +14,21 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 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"
+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"
+RESTRICT="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} )"
+	test? (
+		sys-apps/diffutils
+		${PYTHON_DEPS}
+	)"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
+REQUIRED_USE="
+	python? ( ${PYTHON_REQUIRED_USE} )
 	test? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
@@ -36,7 +38,6 @@ PATCHES=(
 	"${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.62.0-sparc-no-default-flags.patch"
 	"${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch"
@@ -103,7 +104,20 @@ src_compile() {
 		toolset=cc
 	fi
 
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
+	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${ESYSROOT}"/usr) || die "building bjam failed"
+}
+
+src_test() {
+	cd ../test || die
+
+	local -x TMP="${T}"
+
+	DO_DIFF="${EPREFIX}/usr/bin/diff" "${EPYTHON}" test_all.py
+
+	if [[ -s test_results.txt ]]; then
+		eerror "At least one test failed: $(<test_results.txt)"
+		die "tests failed"
+	fi
 }
 
 src_install() {
@@ -115,7 +129,7 @@ src_install() {
 		build kernel options tools util
 
 	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
+		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
@@ -126,16 +140,3 @@ src_install() {
 		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/boost-build/metadata.xml b/dev-util/boost-build/metadata.xml
index ef3f9148d5aa..791cf4e1cfdb 100644
--- a/dev-util/boost-build/metadata.xml
+++ b/dev-util/boost-build/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>cpp@gentoo.org</email>
-    <name>Gentoo C++ Project</name>
+  <maintainer type="person">
+    <email>soap@gentoo.org</email>
+    <name>David Seifert</name>
   </maintainer>
   <upstream>
     <remote-id type="sourceforge">boost</remote-id>
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index 7630aab1bc2b..a0c6141aaf5f 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -2,6 +2,6 @@ AUX bpftrace-0.9-llvm-8.patch 1306 BLAKE2B ef6c7cfd58f6683d3a234fef6a5aae6a8136b
 AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
 AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
 DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
-EBUILD bpftrace-0.9-r1.ebuild 1250 BLAKE2B f3a2f791b7bfaf774e64361192edb2d0856d2ed5a31c36e517840fa873d8e244c9bc9836d4a2fa4d520e18ae2a1873ec6983f4d4f8e24b58dda36a5c44b11529 SHA512 5dca810b91e946c79ee251ff572f54bede05d56d0c5f593af0d3b7fb6b93d9fa634ad06704e96821ccf6d12cece76bc2abbdaaa8ff121b8afc99582e2f28acf6
-EBUILD bpftrace-9999.ebuild 1250 BLAKE2B f3a2f791b7bfaf774e64361192edb2d0856d2ed5a31c36e517840fa873d8e244c9bc9836d4a2fa4d520e18ae2a1873ec6983f4d4f8e24b58dda36a5c44b11529 SHA512 5dca810b91e946c79ee251ff572f54bede05d56d0c5f593af0d3b7fb6b93d9fa634ad06704e96821ccf6d12cece76bc2abbdaaa8ff121b8afc99582e2f28acf6
+EBUILD bpftrace-0.9-r1.ebuild 1362 BLAKE2B 1e6ef72dd185e27edf5439bde430030df97ff61520bea6d506491ff4748e136ef1e56cc165b6f208180a94a9ed946ee1d4269e6fbe6b107dea6d8184ec36b36d SHA512 bdc7078bd027069b72bcea3b0f85d8466a2b0378083c5c3077ad1871f15ade9171e7ecad2890c8e5d4020a4c1c1e1e31312e9a6817e27cae94a79500445eb549
+EBUILD bpftrace-9999.ebuild 1362 BLAKE2B 1e6ef72dd185e27edf5439bde430030df97ff61520bea6d506491ff4748e136ef1e56cc165b6f208180a94a9ed946ee1d4269e6fbe6b107dea6d8184ec36b36d SHA512 bdc7078bd027069b72bcea3b0f85d8466a2b0378083c5c3077ad1871f15ade9171e7ecad2890c8e5d4020a4c1c1e1e31312e9a6817e27cae94a79500445eb549
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
index 393a086df3b7..81d37ad3721c 100644
--- a/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs cmake-utils
+inherit toolchain-funcs linux-info cmake-utils
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
@@ -45,6 +45,12 @@ PATCHES=(
 # lots of fixing needed
 RESTRICT="test"
 
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+
+	check_extra_config
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 }
diff --git a/dev-util/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
index 393a086df3b7..81d37ad3721c 100644
--- a/dev-util/bpftrace/bpftrace-9999.ebuild
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit toolchain-funcs cmake-utils
+inherit toolchain-funcs linux-info cmake-utils
 
 DESCRIPTION="High-level tracing language for eBPF"
 HOMEPAGE="https://github.com/iovisor/bpftrace"
@@ -45,6 +45,12 @@ PATCHES=(
 # lots of fixing needed
 RESTRICT="test"
 
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~BPF_JIT ~BPF_EVENTS"
+
+	check_extra_config
+}
+
 src_prepare() {
 	cmake-utils_src_prepare
 }
diff --git a/dev-util/build/Manifest b/dev-util/build/Manifest
index 77a007871fc8..532c6373ed9e 100644
--- a/dev-util/build/Manifest
+++ b/dev-util/build/Manifest
@@ -1,3 +1,3 @@
 DIST build-0.3.10.tar.bz2 73647 BLAKE2B 90a6d2cac1d34cb5a11bd476011c352f4073fffcb55adb62890938bbbe36d9088c6900a9297f08af3aa564569d09a36662288a9a624e9cc44a9f1b2e5dd289fe SHA512 5836da9347714d602162e050471e27330caf398cf4daf008db174797013d8c353e23f41e393166181ff0fdb08359b434cb7ca2ae6bf789376f8340046abb195f
 EBUILD build-0.3.10.ebuild 756 BLAKE2B a7b06c46cc24186dc0c447bfe1dc23341f3447aaa9b946452dc8f21cd7b5b0920f5285fab7ea37cb13873c0a489d039a9750d49552bc5884bf5cbdd994f56c05 SHA512 a4ff71aba6a8bfa9b1e20cb0a597f98c019fe0f24aebeb6cba4f39f04e16d2809e051f1b5e6221c2db6598d97653ec178138f3962f54d2ab7908d12a22819120
-MISC metadata.xml 249 BLAKE2B 5791e38f31ac36bb4b94c03962980af247ea39c8af739a949749b1b3a7705ce4031ff53f620b1e4d30c44360e3d1d37ccb186ea109ecc1036977e4e0bb3a92e9 SHA512 0b2b2d015d6d3310efdedc20cd12cb2f587c105f1e84b243d3a7dc6337dde082c16683781eba9a0cb09341756f10f651579df35837ee232309a97017ec02cbee
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/build/metadata.xml b/dev-util/build/metadata.xml
index d4905c84fc34..7a38bb900964 100644
--- a/dev-util/build/metadata.xml
+++ b/dev-util/build/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>cpp@gentoo.org</email>
-		<name>Gentoo C++ Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index f059536f13c5..1fc178640749 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -2,6 +2,6 @@ DIST buildbot-console-view-0.9.12.tar.gz 640923 BLAKE2B cc0da84395aca571803e7326
 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-1.1.2.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
-EBUILD buildbot-console-view-1.3.0.ebuild 1143 BLAKE2B dc92edde038d757ca4bdd6ec924d72fdc8fa4adb5016e7be4f09c2d18d53c0ce711bcceaed557dc9a2f1fc626459be6e1803f7936fa0700a2c44c9c2a6ab09d8 SHA512 3886ec299c1f18eba3a4472f9e8da420b367414b583e9390a0f7f5368ea8d03b07242bcbad438c93f3a4d540594b06310b4300be36f7ea9d6a5c092a7ef75e3c
+EBUILD buildbot-console-view-1.1.2.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
+EBUILD buildbot-console-view-1.3.0.ebuild 1138 BLAKE2B 389ff1f782f7da3bc61b06167d94d561090a099ca4c85fa2af47da25b6e6e02cf66148b51be8be768e636782439f60a8b1154f5f8e259e5ab0fd4296ab9b48d7 SHA512 e1c866d38d17c580245f873f2e7b7b34c5781e2c1468e717bb6fba7326a9509d5b57b3809e7959eddd311d92e3d79e3a3c7f6059a424a57220635a969123e320
 MISC metadata.xml 660 BLAKE2B dd64f91ba93d64ffa1d1aec035eddab0863d2332664ae9292d54ddb394c3d406ca4f5c55cc4da7e0163563623d27602dbc51656e100e587797653b4fdd01f5b2 SHA512 975022375960d255342c24364513b4352e6eb6ec34ef8f16f8a7c08a978969202660516957eea8f61e4afe13622dec826ad8a5f69673d0cabffb9f52e91e0992
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
index 23b0c0ae9c77..a1e2e8c473c2 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
index 23b0c0ae9c77..a1e2e8c473c2 100644
--- a/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
+++ b/dev-util/buildbot-console-view/buildbot-console-view-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index 010ccec4540f..f5b064a66a82 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -2,6 +2,6 @@ DIST buildbot-grid-view-0.9.12.post1.tar.gz 638819 BLAKE2B 5e0bdc39ebe2b447b23ab
 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-1.1.2.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
-EBUILD buildbot-grid-view-1.3.0.ebuild 1108 BLAKE2B 89afe6690638fb6bcd9944e1567b3ab311d9d7d79794c7e815f3204516fbffde9c80aad33468df22a7e9582f3ba7a04424d3b0111d60006b6c38909ecc996840 SHA512 1e26c38c9295f4f896b434eff52cad43b9f3944e2596c7d46e172b27d738134cd740f51d6e8ed4e573c4e059affb3cf54e14d8c59f3e8e1ea972a68f03fe737d
+EBUILD buildbot-grid-view-1.1.2.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
+EBUILD buildbot-grid-view-1.3.0.ebuild 1103 BLAKE2B 2e4977f8fe7e7aa6d443929189b36a7f79d012705e2fd27938044ad01445921042542db8e1f339bac74df60bc9d6bcbff1d764682babf6f457b013fec481f785 SHA512 2244a4b235452b00c24471c6e56aaba659be7c94bd8f423b2e74e4abf5caf09c245b2499462490349cac2959c820ccae09273d7369d233cce2e097c4623cdb5a
 MISC metadata.xml 639 BLAKE2B 563a20f38d4d1476b8833f8e858110adfcf70f9abbe589e5538eac0289ce0d232d5359a111d710b371030342571bab3298e3a2425bc360cecc11d0c976653835 SHA512 5f1f6e27005ff78eb008f4e9a74cac6fb58dc0b73155fa52325b2771f8723691755e5123382a33beb427a4a33c1832f796b56fc94eaafc7eb91c7042546e964d
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
index e30008fccea8..cbf5ca68c8aa 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
index e30008fccea8..cbf5ca68c8aa 100644
--- a/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 54aadf90676a..c4dfc177c85d 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -3,6 +3,6 @@ DIST buildbot-pkg-0.9.12.tar.gz 4446 BLAKE2B e8077d3b212c968694d2d9e5018c9c985ac
 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-1.1.2.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
-EBUILD buildbot-pkg-1.3.0.ebuild 1160 BLAKE2B 253049ca7beda2184a86116e5f2b9215fe2e42f9fedc0a98218a3a2186b4de4e24e5fa6a9d1a4aa25a899eb14d3f86e887274221d99c4f530ada63cbfe2be43e SHA512 9bf84d91cdb3c6f81f69dafa42c3c0e00476204cbb9f28147a307b2948386df94e28caef9ca901561405850712514f129b579a125d96c771e10a20b562b87623
+EBUILD buildbot-pkg-1.1.2.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
+EBUILD buildbot-pkg-1.3.0.ebuild 1155 BLAKE2B 766c0e653890ae4318ffec25cf02a53aaf600817539753c6e8b82f4851f6ae8e31460b722bdcac825e709307be85bfc8a466c5aece34e634e7e0c16e724f3240 SHA512 3e61b1cf62e6a12e3cda6d62d418a0bae56fee07c332b2ca13dcbd80252d32d12866f329df5162a274f2be8b5827f5b606e1b055cc6a8c1fc394194d09c4c65a
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
index 46595012d5d7..8b1c11f90656 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
index 46595012d5d7..8b1c11f90656 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 65a2c860e2c3..a7fa1c732ef7 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -2,6 +2,6 @@ DIST buildbot-waterfall-view-0.9.12.tar.gz 714290 BLAKE2B 4867539275aa6c2b0ac149
 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-1.1.2.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
-EBUILD buildbot-waterfall-view-1.3.0.ebuild 1147 BLAKE2B 0893dcdde64bf34d8293645dd1f0275552522c1a8eed59373a3a164666b7b7ff68ab05bac6a9a5bdd8152639468abf97a32e7612c5a155e65611e86a4bf526d8 SHA512 349d3165dc59f1973c3ad70268a29999b119fff1ac9dd5bd507d78ff82c8ba9accab7c25e387040cc32e15bc4499005cafd84bfbc951e8c77bc01f238ad16935
+EBUILD buildbot-waterfall-view-1.1.2.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
+EBUILD buildbot-waterfall-view-1.3.0.ebuild 1142 BLAKE2B 1fe5002e9588fbedced771f8736e164194ab56fd93307bf4e2cc354b9c99eb912f792703bab9320c777a3c1fd291bd7a98458526bb06f3f347dc65fe45ca9bdd SHA512 0db5aa9024e4ac2634caac0da3a422ad34de6e7af10f5c210c7e97a65031e34cced4c6c947442fcc0a2d4f6950fa06fb4495926a998cfc75b30bc48469bc79c1
 MISC metadata.xml 680 BLAKE2B 47bfc9bb17933438a0c3ec478c1dad7da7f398cde2133ab96c472d0665e563f4d5c8d09ba04bcdccf820603cf3dcc18086b1e217aa86f7ae4d8067178922020b SHA512 266fd7fb76a1373c9342b438487d73a319209f320097981041bae9cf3892dc9d091fd253532457328a3f6f52ec37b0a0e6cd1119c6800de42bf19d7fc6054133
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
index 85e04699e657..381cb9f5560e 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
index 85e04699e657..381cb9f5560e 100644
--- a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index 105836d8376c..6f7804ed66fa 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -5,7 +5,7 @@ DIST buildbot-worker-0.9.12.tar.gz 101655 BLAKE2B a73f98ec56bd3ad6d19ad0b9dfa015
 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-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
+EBUILD buildbot-worker-1.1.2.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
+EBUILD buildbot-worker-1.3.0.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
+EBUILD buildbot-worker-9999.ebuild 4810 BLAKE2B ac2963d34b9afe8e000db472b2deff56fdf3c5f00a3ffeae31582db71dac30544b31dcbfb5922baf58b87a4de6c0d627ad0207cc8f0c0ba9eb948f77b0605b2b SHA512 44b10d2efbb2156c2444f92f1c5a37fc34c943f02aad96450d9ce3586156a6959f50ab2dbd9b7545aee71e5b15bfbbfbb60c48ed2812da8373e6f9597c8b2c82
 MISC metadata.xml 480 BLAKE2B 5ee99e9a87b5449742a0066a5c720137406a952a63f81574bb7d5cc94f235ee54c1fae5bd13e320e7b017d5005cc45a009360351c987609fe208089ed464cacb SHA512 95b7d71c74d693b93e2d0ff8943d97ffb2d9ea9fb2090bdb5fd8948444237ad20c571b97aa16f0ea5d20cf76e4d8e0392df276a0d1ba39b5263a72c57da3dea0
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
index dea70dbdd5e7..cbff1cfe433b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
index dea70dbdd5e7..cbff1cfe433b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-1.3.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index dea70dbdd5e7..cbff1cfe433b 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index 1aa404955510..d0f98cf387bf 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -2,6 +2,6 @@ DIST buildbot-wsgi-dashboards-0.9.12.tar.gz 627274 BLAKE2B 26632ddd1577e9c419d13
 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-1.1.2.ebuild 1152 BLAKE2B 8db351efce478167c868cefb3694c0027ee300daabea790f5d53ff37dc489707349ace7e1241f071b82608642831d5e7f426b9b758d883eab13fdb95f133141b SHA512 2930a358436bb9002505008ec1763aa5242a0e367ef5736c6e37d8cb026980a28c719265ba475160071e1eca70df914b58246d154e068f7bcee561e269ecb86c
-EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1152 BLAKE2B 8db351efce478167c868cefb3694c0027ee300daabea790f5d53ff37dc489707349ace7e1241f071b82608642831d5e7f426b9b758d883eab13fdb95f133141b SHA512 2930a358436bb9002505008ec1763aa5242a0e367ef5736c6e37d8cb026980a28c719265ba475160071e1eca70df914b58246d154e068f7bcee561e269ecb86c
+EBUILD buildbot-wsgi-dashboards-1.1.2.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
+EBUILD buildbot-wsgi-dashboards-1.3.0.ebuild 1147 BLAKE2B 21659d6708b7bc8f29954d6d46765c238573a8cc1e2d4179f7ca51b709baa457499158d872a4e35f6c2a062c46bd9657bccf51a29388e98c36e56a9ad68dcf34 SHA512 66d0e207a955f066b974b9ab0e372de15e251f4fa87cffb7273870b94d728bd49b0af650b530e0e5613e35f9b6cc588fccc284208fa3724a3af3e82fd848da70
 MISC metadata.xml 679 BLAKE2B 9ce30ea17fc3c2fa7f7c4fba8ad2f521bdf828662683893a8b6e8fc43f4c1ce8fcd8afdb1bc237153751eeb5d134df683b1abe9f0bf7a70f1b6c98517640d3b9 SHA512 47cebf0aa635cee9157445057c21b2d1272b222291874371791656823f75b20f59772ebae2eb1dd8230752808878f284879127650f7130e2b9820ce60fc6d92b
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
index d40978a5739f..3c6698a632b3 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
index d40978a5739f..3c6698a632b3 100644
--- a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 571e9b969523..df990b1c41a4 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -2,6 +2,6 @@ DIST buildbot-www-0.9.12.tar.gz 691551 BLAKE2B 9bef044fe9e48e34d3e314d9c9b7446a1
 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-1.1.2.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
-EBUILD buildbot-www-1.3.0.ebuild 1184 BLAKE2B f46018b1c07701d416867d7e19e56540991280896a2298828930ce9d018ab55d8d7c67022bd4af5b81b95339468f78dc9dc2b65c8cace5672cb02f4420c1b33a SHA512 4fadd990c1093fc0efc7cca133bebb734c58682feb3613e8bc38e44cfe3fe1b005ee1d6a3d0272484acfc3afaaacd8db267943892402e54860233664bc20231a
+EBUILD buildbot-www-1.1.2.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
+EBUILD buildbot-www-1.3.0.ebuild 1179 BLAKE2B 68e1cb0c1f5a70246eccc70c4b8f480cf6d36936492bc195ff502d3b02732453e2f65a7c09251ed963a73d93c1349f2a1d2265c0326b04435c0fc862f845b9a1 SHA512 7b133af1d0d2e56b84895ba6be5901a4e2ad9fd72dec9d27470f6aa68da816067c437045522c152020269b9ac82e3673635d857d78041a0babe682ff063e8a13
 MISC metadata.xml 666 BLAKE2B 2fc8d01c607e9f1fc0de5d151e0256fd7adbc1572d2497126012b0792967dbafe2522b269232a72c5208a5c0a6b9eddb9094afdde5d99d4b27995ad506c08f03 SHA512 1d00795d602f0df5e1dac771d38dc068e80edd098add25231bafb11d0f8d2ce783e884e41c3b0eba1a52fc2dac26a62f4c1c29603e20d6cb0af7c6977f437907
diff --git a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
index 8ee469d1634d..f0f9c7e69d11 100644
--- a/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
index 8ee469d1634d..f0f9c7e69d11 100644
--- a/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
+++ b/dev-util/buildbot-www/buildbot-www-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/buildbot.git"
 
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 3a1b66a73381..71ce5b3fa075 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -10,7 +10,7 @@ DIST buildbot-1.1.2.tar.gz 3101168 BLAKE2B 35ec56440014015850a69324d475c4ca9555a
 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-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
+EBUILD buildbot-1.1.2.ebuild 6545 BLAKE2B 4047c82720ee5495ed62a90a6059aece3b21605983cebdb654db29c3ab2121a8e384f8b4a249141f0ab2611108059ebf597191a6600fd16483b769d801fbb12b SHA512 1ef262f9231a59a30ac907e631c7fd415d0b5a0cbb387309feb0bec672e505ad714a1ee1f35b31b4c38e640d2cde0c3dfe44d98a62de9e3b48eb93e16513d6d8
+EBUILD buildbot-1.3.0.ebuild 7174 BLAKE2B 91f1741210f11aeb355cdee343964db5a187802b652e3d9e525a5b5346ef50b74ce883b0cc004da5417c2c1fc3cc608925129a61efbd38398ebe299a0ee7e449 SHA512 f8b5a2b023252cdc2d75678ed3a3a1284783aff086ca62e69db35bf3ab995e7218fcec1ceb8614a3136a5ada4203b886208098dd1a261b39c19ca28781f645d1
+EBUILD buildbot-9999.ebuild 7174 BLAKE2B 91f1741210f11aeb355cdee343964db5a187802b652e3d9e525a5b5346ef50b74ce883b0cc004da5417c2c1fc3cc608925129a61efbd38398ebe299a0ee7e449 SHA512 f8b5a2b023252cdc2d75678ed3a3a1284783aff086ca62e69db35bf3ab995e7218fcec1ceb8614a3136a5ada4203b886208098dd1a261b39c19ca28781f645d1
 MISC metadata.xml 1505 BLAKE2B d07e69e8ef573b7cf2a5575a19f3bd875058903e1fc59c4100a4300e72825c1fb137eb4b804a505a7ec1877b7fae91621e35e611964abea4062fad37a9c6cc29 SHA512 795f29b373d7fa6190fa61f2ffe986e1e1857b11cf68a787a09c7d5ea485c1e55cc7f745d2bf84de3c431e8e29f6176d094df92f760432e808ba2abe12c065bf
diff --git a/dev-util/buildbot/buildbot-1.1.2.ebuild b/dev-util/buildbot/buildbot-1.1.2.ebuild
index 0888e9cce412..a904b1708e96 100644
--- a/dev-util/buildbot/buildbot-1.1.2.ebuild
+++ b/dev-util/buildbot/buildbot-1.1.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-1.3.0.ebuild b/dev-util/buildbot/buildbot-1.3.0.ebuild
index f52f1c9e2ed2..8b9107a2b5c9 100644
--- a/dev-util/buildbot/buildbot-1.3.0.ebuild
+++ b/dev-util/buildbot/buildbot-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index f52f1c9e2ed2..8b9107a2b5c9 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # 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} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 EGIT_REPO_URI="https://github.com/buildbot/${PN}.git"
 
diff --git a/dev-util/bumpversion/Manifest b/dev-util/bumpversion/Manifest
index 957247fe8425..71c3df118a3a 100644
--- a/dev-util/bumpversion/Manifest
+++ b/dev-util/bumpversion/Manifest
@@ -1,3 +1,3 @@
 DIST bumpversion-0.5.3.tar.gz 16596 BLAKE2B ecd9e999241d0d77161529344d9f83859ab1083c323524f91f84802ff74aa8e9d4d95126b65c685e04183cf7907732f2ad734938db7aa03dfb9e334a1d24222c SHA512 2dc507be98838e4a389502cbdae08d23bad465b171923e15c40ae16da2cc9529c71dfc40213c47d23da363257b363fd5786a5661a4a6d6b568b5f8b2cf8af959
-EBUILD bumpversion-0.5.3.ebuild 813 BLAKE2B 4e747fba1fd159bafa533e1e5e5dd492c5d861d098487395e71e270ff94fea0e8d6d510e62e1542dccb21f26c661f5fcc9da79ca2d02b68135782aaf6fe7ba66 SHA512 6109d87c14376b49de5495cbf4f18dbc890037d2b62b9fb8bd789bf3a3091ba35df22234f7442b244025a5f36ef100558e2b0f86bd9b0e340232c5e65b7a01e7
+EBUILD bumpversion-0.5.3.ebuild 806 BLAKE2B 3615b98a753b5ee5af52fb5bda4f5cd46dc941576e2232bfeb0fc7412b3d4022082e2d181db001bd3ec84b72f57789b2cf7b3e5a941167bb5bc8dcbd56190527 SHA512 b31f6c17985dbb5e183c9ace2327a6ab87a741654209c242d499e5d7c1b9726373092306b3817dfa132f349c84222dcd2285723e893d2b2978914afe2170bbb5
 MISC metadata.xml 300 BLAKE2B c9f5c0e8c55aabd0ff79c4ffa4d04195f6e532ebce0c697dd75fe1568399c7dfc8575d27b20781d626a9aa075226688b67f14487db0db9d081da94352eaf1e8b SHA512 de2e356433d02bc7f9b8f24f178fa1124948f9bce7475cf4fea0efc002533755b854cfb5f591343ca73c6b798cbbe15a40c0450f23d994420a9a28f9bfdcb483
diff --git a/dev-util/bumpversion/bumpversion-0.5.3.ebuild b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
index 3109273e0b2d..63789cf1e8f4 100644
--- a/dev-util/bumpversion/bumpversion-0.5.3.ebuild
+++ b/dev-util/bumpversion/bumpversion-0.5.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-util/cargo-tree/Manifest b/dev-util/cargo-tree/Manifest
index 8fe215229f36..d430b9ebcd6d 100644
--- a/dev-util/cargo-tree/Manifest
+++ b/dev-util/cargo-tree/Manifest
@@ -1,6 +1,7 @@
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
 DIST aho-corasick-0.6.10.crate 26122 BLAKE2B 752eccb2fbf36fbc73b8694033d2f80f6ab6d2a8c2ae023329b90bb252b537adb1e80a604b4266bfb1ccc2963fcaa6579be48ef011c9728734c7cb77fa3eab99 SHA512 4a21b0e68c416e5dcfe99ded917577abdbe7c92e50227b7906a2b3bd25105f8e7d03103514d388171a41090cc7bcb63bb5b4dc3c6847a9b4e09bb3856a1bbd9d
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
+DIST aho-corasick-0.7.3.crate 55093 BLAKE2B 16dfd6505ac34c1b0351c736a913852a354da64177fbf8fabf35212a4deea087150ed7e558787061da1e71c995e3c876c155eb1c629865cc282ab8aee06c9539 SHA512 4250dc8fa38ad74e0c25375744f34eb06ff3bddbf16d6b4d757a9053ca16c3945d15c8f9deb11ea55d30b6d1c1744c4bccc388a4413b723a429445bf5ef3ffa9
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST arrayvec-0.4.8.crate 24260 BLAKE2B 0445e8cbbe7781fe7890dd98d46bb4451de8441fdb99b74b9f08a6a93016eb8c94978f2bda263c6f2ba6d4ea31176446c0bba43f5cb12ea644289fd4568007fc SHA512 a20753d9b9ff320162f9d02f72d2756ed9e85260238e43c0528889597016525c4bca5ebd57f9a5c63727cdf707a3e3631f83401ea565f64e55208349785c625e
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
@@ -8,34 +9,43 @@ DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6
 DIST backtrace-0.3.12.crate 33665 BLAKE2B 860f98231701f1e75a414297e663df48de739ac5b75f049831a77884ae11df499957c599ec66c8f92c41654c436117a11b92829b095c62eeb721962ddbf5f1b4 SHA512 40e5aa214691f9c3ea5a609b96ea364d72b7a1596c42f74777ac5906cddf0207f591922ffeb53ffcd62e47d3f296daea0c93b469ee3426cf34866397dc40f47a
 DIST backtrace-0.3.13.crate 34101 BLAKE2B 853f1527736d049559688f4ec49a800f0280c11ad24dcb88b7fab5a18c777f39e0307061c107d4b1d60d52183aede3db7b8f7145ad1df50d28dd13929dbb38ce SHA512 434037b8b9bae57bbc788d5db05d02464cab8aac92be1bee9636aec17b02f14110e7d6bcf0c529ce5ffbf632c2fc939fbcd96600bd90656ac489c1ccf1e8e439
 DIST backtrace-0.3.14.crate 33452 BLAKE2B a3177739d2d2877a5b0257636b6a14b1fdb7aee440fbbafb9602a199b09b73702132e99bd4826245371f9a9acf33739dcce9b15e7ab6be4c29e0c30ed2b6a9b5 SHA512 6ed74aaa996c30b7d97e2eee2aff72347ed3d26d6f5e9f5af4047dcf13170fcd9ea8edf7e44134faabfa34d41de0700f8c4b814f81e8f450729ef5db2d03a435
+DIST backtrace-0.3.15.crate 33807 BLAKE2B 4de08c8ae6ce4ac650a94fbbdc16ae5f4e4a4b8364d946dfbbd13c6349edaa4600f77e311d1dfc52582d6b72bcdb8c107557f39f33222f40c802faa7baf69a9e SHA512 d2850033ff2478e4f6547af922c5c2f43a8fa15f749e00f2763734f57040a017670c90a5fda62e35593748560a498f65c81f4a8c225393e7c67c1f612bb61daf
 DIST backtrace-sys-0.1.24.crate 522332 BLAKE2B aebfee4b257b44ce127f3bc13d7622dcb0d6cb4c1e73d504b8d77b6c0b1ed47e7ca310cb6b41798cd13e6589739c352d9e33072e20fae0547d292312604a27d9 SHA512 7e7b279bbe5f3d8bc2ff3234df11d7b08cb09209c861c24b3fa67dcd89699bd80a6fbf93d3b0b287544f73792983172bfb5e5c86caedee59f09ee66d259fd0c7
 DIST backtrace-sys-0.1.28.crate 522603 BLAKE2B 6150bee74264cf2383aa27cd33b28790b3c70da0c21c327dbc4af628b5f12afe941c1f3ecbb556f8dec5638b6be29f5db3867514417b267d7099202c5ea89f52 SHA512 4b16bc8500258d0e75db0c6cca3e2a68d9024106a0e8a4a46cf5865fe1e08304d9291a6723e4fd337b7d7f5bb14e9cec7b3aa2e40bbaa4642562764c803d345d
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST build_const-0.2.1.crate 4499 BLAKE2B da7f1040560862b76447426be8884bf0ac62d2f2faca0a572b8cf566fcbbaaf27dd1f260fb1333c3cf9410251433239616aaf0ca1a2be644fd4cbcc2b908eeb1 SHA512 4e210078ad781bd645381f469285f0e4d20cc8c416818c27d98c0033f070b708a6ab27933f9c3660c83e6cbfb3afcb7ec753f9c186b0c75b99db37dff1cde658
 DIST byteorder-1.3.1.crate 20959 BLAKE2B dcc5d3b97a0bd82272616599454673790d64d799b699b9e339feaf1d8a75b64b6f4cde19642d5359babf6c769b14325b89a51d29594f1e8ce48c2190348bd4cf SHA512 b8d8273293f776cf567dbb9357e73a65cfd352461963b2ba202959bb48338f5e14eaebb221f940c09dc0b3214924e40194f6952c32631f20a18030ad22258c25
+DIST bytes-0.4.12.crate 46361 BLAKE2B 991f1d9170e7d3438c7d74507e6274df551d483883b3be2d99f7bbc0611ee6bd3f8f45c0e086cfa5488e8fc00e36e9a549fc71a325ff62b9bb83bd8fd412b5df SHA512 5f603532ea2f04cbc53044422feed1667bf0486af398c9c8e2ce7b4601b37e1c47223201970fb0d17fed77fef7e89961e0ac05a30e6cc9bf13462d98bc587250
 DIST bytesize-1.0.0.crate 7522 BLAKE2B cd4f9687753ec1ea4e7435f34b64afdf6e5534d33515d00c413da37081dea57eb76b2f3b8e001e65ca40908efccddcfa458ce1e3b5974aa79232567d9df7faff SHA512 a8837bc05efbf6faf55ce76cffb0f8ef2f47baad2f65875da246f4a8f1052af0fcd8f156950deac0e57e015183d740e0d8ced1e6da1aaecf03244ad370d926b8
 DIST cargo-0.32.0.crate 825669 BLAKE2B b3d1ae376d5c4438e1f2912dcc242e61f52633dfba0f8ace9ee4646ff8a49c1ad02ed4feb6d20ed303fc6534b937b2f4095ded193c014c1b6e1035314ff9dc0c SHA512 fadcf5e8f830920de1fdc0a6dc061d22616d98e2ddb7816ddc219bac4d51fea70ea249f3779d86875e4e5ef2b4d5b84ee64ccef1e816ab6db0f9088539b4a80f
 DIST cargo-0.33.0.crate 836765 BLAKE2B 78a06124ffb1d34bde2bc465093cc045a7a3e3c271ac6098ed0f4c0c129d6055d125f837e1a9ea19830cf3949f9f78381a9964a8df0d17a5cab6abcc70638c33 SHA512 00170f3d89b10a9abe8a5aa17bcb2ece4dd3aba15e86c01aefeda3de12ec5fa26041a1fb5ae27ea5fb15d2db80d9aebfe268cc140019b0d500a1dd0a7a1e2b05
 DIST cargo-0.34.0.crate 919411 BLAKE2B 6862f5a35e50aa6d81059c0628aa8587b80f395f1a32d2dfdd9479c48be32ab0e5bbb062122e230c706402e49d6bc13f07cf3d28b38534c99d7f120b0c8d14b4 SHA512 9490748eb6ddaf120e67acd6642433b2626b114a2ef127cbb1e0feb49546983d91272ddff432e7d9ba5e271b56d8fe842d7be058f8edbcfcb5a82ed4030d8e2a
+DIST cargo-0.35.0.crate 933578 BLAKE2B ef8831460b3d10d33790525f6a4937367d39d32843cb5b0fa2790f3b86e1a36ffc243296f0bc8d39190515ee91a771c9e0a36a356a077e103784c38928eb25af SHA512 df653278d9fbc41e4932217e9283f01b9ed55f46333a10a5879cae50f188a9c49b04100e4a63b55c0ed89b90a47d58da3db451a0f30127757c3cab38b62d496b
 DIST cargo-tree-0.23.0.tar.gz 23212 BLAKE2B 464936a2ac923600dadb282077e0d7a792f03da796df56d9360ce5a6340a1397fa2f9f314d677c53c27bb43f39c2619d70b5bd17ffdae89ac67493eb526e05fa SHA512 aecb14738f97b75123412100c1e4a0e0bb073070b25c13d2a002776bad4710ccd0cb1e863283e3aaffac4124754be76aaabf4b5e88337fbb579202351b60391c
 DIST cargo-tree-0.24.0.tar.gz 22603 BLAKE2B c0cc265e9dfb02dd8c14fc7944d2d6096b7a48a39b79d04dc70fddc31a0c65dcf52f9a4e3052def20953bfb57ff229ab44f252b90cefdf9c3301fd6e47df3b17 SHA512 ba4f8d01ff3c47632c54f81731ec35fa9b5afb2df5c1866ae730c981164f18579a803c2917bc1f327dd21aab39310d99854d7c2376c604be1b252705853045cf
 DIST cargo-tree-0.25.0.tar.gz 22695 BLAKE2B 04ebb2a2175ab5b4c714bf81326509b2d256955165aaa89b08effbcd1c88e7a1a61e04538e335d15a5e4d654e030588ffb16054b59a44d756ea2f52ec0305b2b SHA512 7162eb1dd33e8e4b1d374b2d83a4a350999375c932dcd5d0ab88fa704d5e4f2cf8366de41e1a48ac9f7200c8e0972715ea5c36ab0f0df65447d7b98aa0f9b265
+DIST cargo-tree-0.26.0.tar.gz 23042 BLAKE2B bb3db7341fb8f45cbc5194e834f90b2b82a7049b013ac37ed952c0b0141f987d02c330cb5cbcd8a671d0fa99c5ed594809cfca1d26e7608a8488ead8a594b216 SHA512 ab5741f61dc6ac8ea5f9d45ff1b811edbd53e4639154a0e7d8648ff5b17f72e30bb505308ca1b3b9ad786daba7de3f2ba10f22027af792027118c0ae026e1dee
 DIST cc-1.0.26.crate 42350 BLAKE2B 3a31535c6168036179930c8f8a4aab0a52632d733c9e0b54fa8d1e8a5d6c426ffca4e7da55bf23ea9fddb7ca72e6894a1f6a8e9175fc4058a37b7a181afd7bc4 SHA512 f4ab851d2aefce6d9e6b08b2af99e7b6c63238c6ef931d3f7872d79edb139f62627911335b62e8ef0c62f54bec65693a97411487af449b1f750a5b6652c785f1
 DIST cc-1.0.28.crate 42422 BLAKE2B 632455257fdfe0be6efddc6aee1a32a8a450c49f3a49b7dd13f770cda69334acb0d11e69a4bd4b94c09133ab4319a529c29de993b960276f7506511e4c0fda9a SHA512 2d1e8e34dd8d60aafb0337a86516b152f7f5b04ed5313079fcce66460b5d9c753afbf5e5ba13ada56bbaa7f5ffa1678eb3c2e27b9d58cdcec9f1a5374e6a32ab
 DIST cc-1.0.30.crate 43009 BLAKE2B 1fed399a931869a1927caf1a572ec04fd30ad1bac18478c2e329ab67c0028182e6d3f9c42926042ba041ace8c855b41f7ae8b14cd11f10fbe22da08d7472c802 SHA512 3ca9759808cddecc011ba202c75ce65f338568d5254b10f5de091829aeadc5acb9d2fd1d0da8411ce9c93cab7e8a84de5bb3e8045cc1e3459382e8fb2f83e307
+DIST cc-1.0.35.crate 44369 BLAKE2B e74583fd826dcda590d7d6b853f751a3f18b10705f62a35a954bfba2a38768870b43046d98b6e8535143cb40950bfd8daa21c86b1a24d30c3cab485b7bebeaea SHA512 6d2c2708d696598e403027b3ee3e4cda4d7119185bdc2ab8c825e36bb2b9f48f40b84392b708100b812ed4a74626b7fef5b3698a9f5513de8f00ff6d922a3f04
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST cfg-if-0.1.7.crate 7360 BLAKE2B 0f9a457501441c9d3408a40efb199eeee196490bc22f4c14565703ee09dacac2a0b4e1704c05853bd4662977d487c7723521cb733881a9bafad3ff46d775acd0 SHA512 30a1510f0a217e588e9a2c1ef51e6188d7437c63641284782262fa9a2ec78f04d0bbdac7ce32c0e8282e2e518d4b6c9d6ed0c2658baac412133ad1cc1f8d43a4
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
+DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST commoncrypto-0.2.0.crate 3009 BLAKE2B 174f3099955d595040005ef201361bacc3084f5218efb0f20df8082b9bb683909a10ade64af7062edfafadb9674b27a06836f2333fdaa7d2926b207355f7a40c SHA512 61f567468221cc46b30b31ce96dba26e3dd3a9245a8d37f9f8a615b346d992c261db059bdc678882415c608a806bd45c7b38a5bfb562ad96a111cee8e1082e85
 DIST commoncrypto-sys-0.2.0.crate 4338 BLAKE2B 992a06d56adc97a9d02c547766c2be2f1973507fc0083e50c623dc4ac554681b802f3fb5ef61ef430e4a58bda000170636cf6e38430550e0c0506438901fae20 SHA512 06851fbe0b87224f6c8333964237badf57f32256acb7e647ac2da16561701b7572c12509e042d0d1032a54c94c1663bc2ff19ef5ba3a7daf84276f2544bfba8e
 DIST core-foundation-0.6.3.crate 24267 BLAKE2B 8e7ca9a19db4e51aed67df420ed50d4096d39be8485cdfc205185e3647791f27227773f466e50af3a734306880bb8f7f2236f6ef3281b5130c1fedd33f7069ed SHA512 7a21e003787738763c031934054d3105d8b573d0d52696a30c9c44e1d795b5c2e1ff0e3bd4607187004c176bd0e92461d9f037f062241b5ccbff151999179525
+DIST core-foundation-0.6.4.crate 25233 BLAKE2B 720cb670e0ce589fcb75e583c3f70b54669407481f61b67bb5df1a5056f07c88f568f2adeb65188004424b26b623ac42b03d830239571c15f241216e55fd8dfa SHA512 5dce50f15aa48f38e1bf287fdd3c5276d8e5f1d64bcf29da7d8a68008414f6ee560a940040361eb2f4e65657ca4329958dbec8105cc6d3606ecfe9e71ccb7632
 DIST core-foundation-sys-0.6.2.crate 16204 BLAKE2B 32766d4b23a2b108777c57b2115cc718a0cdb42fcd2e3973a0adf944d326e0796a6953756c42140eb4e6e96a2609bfb41f84a54c59b4b840d7213f3c5dd4234e SHA512 bfbe4e77a5e2644952c66a2afd21058a07583d3a1776c34dbfc316d159289073d92b8672eaab2f39fa46c48cd7f22d88f0354f02b3208482d700473a807ebf07
 DIST crates-io-0.20.0.crate 7996 BLAKE2B fd60658cf2822132815bca3b63e39b12220cdd3a82f519f4df65fb617a752d6aa885b378dc11d8a57ecb297f07f2ecd4825e75e1fe69ef84bcea76955f97b04b SHA512 2d9a9101ba9a1034a98a446c75f2b43a08de96d7acdc4fd64f37ab24090af044b5d6a9cb0350acf88b86a9251715d46587d41cd80cb77b0439902643460a9736
 DIST crates-io-0.21.0.crate 8009 BLAKE2B f640e0cef1cb1b06624d4b2fe1961341a2ea8245847b97501c8b252bb2b62ef3003688c15291c91ec1f07799c8125c48af06d6eddf4e2f6992c3cd3eb7def994 SHA512 977c874aab867255950096445c069823aedadf4de3b1433f186c059bf3d00a2626be2aafaa8a7b5b9399ef9f8636be23043716e6d0d1861a17c60b62a5222318
 DIST crates-io-0.22.0.crate 8098 BLAKE2B 7175d48a19fe4c68d08e3c4535ec4b4c09846d27d4d3fec8b2e1e7263d6cfda0e3b2985675c302886e5412da5fca634f82ea180eaf35a6abee519b75cfbe00d6 SHA512 c99e96cbfd0c7be19019fe92b66168aa1d2bd8e187d95bea6c4e5bf60b21c62fdfb70e2c01ee57c65c7c6e1d9fc43fb3422456485f7ef85bc080a46a40924449
+DIST crates-io-0.23.0.crate 8149 BLAKE2B 5ee479317e8dd966ad8de27cfb0e2d8940bb310b61229df82318ff7e54ff2e30d77b348e574134b76aeec8386e28f9cd34373ee9c945570e28b1645fa5acd19e SHA512 93530752c0e72b04ef3c98b48b75eac30ef7da35b62d4c2cfeca87597739f00139456b0783e2810da8d575a336419ed5c1005158f0726fe7dc83cc1156df8650
 DIST crc-1.8.1.crate 9114 BLAKE2B cd96400652888e700c326a2842005c8bee699ccf3c61b87320c01196b455a55da511749241af75e903a76847beb8172598dc8f770779aefe945db7934976afbb SHA512 db0b3d0ca197cb2a2049720b753061f1532d1ba2c86c7befce36a18cb4e8008b061e39e26960b4d9dcf1e7ea55348f55c441da5d17cd0a424402a8489d52ed1a
 DIST crc32fast-1.1.2.crate 38312 BLAKE2B 7448304242aba1798491da328eacc326132dd7c8bab21c9909bdd729b9b70eb321d00f992f6c7fc026ed2d0f6a562af1113e45baf61b907b8bdb4412357436e1 SHA512 f0ff5c889a89e0c235ff876d2e0bf50a5c97b85c6f19abbc3d12de26c97e678e784c04cc975be7d008b45fba7ac68c9a129680e37492d77f7a0f433fa895c659
+DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-channel-0.2.6.crate 64953 BLAKE2B 281d8ccc60ab2f4afe0e7b5d9fba5fab7cb2f3a36b8a04d4ac445bdd9f0838fea6b41dbe08be7f25e5154ffe2eb0fdb9304034080d881918a84ae3ef46bffd00 SHA512 6c124ebcecc70277b9957d3908acaa7c22c346f99b4e678eeda6a54406e1a6d703da6a95971dca248839cf831a830d172650dbc032de138c2d398f0f80a20c51
 DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
 DIST crossbeam-epoch-0.6.1.crate 34089 BLAKE2B e99a20c26bbf6cd94978d0aebba43b5e49e76a97ffd4113cd050c262140e257a3d3640f85b0ef7b217064dfd2f53ba016fd14f33906b9f50567eeddbb9ba00b4 SHA512 f2be7ffda167935b4a30ff0264762477690bd7e7916ad26e6bdfe8a7a0a6fe0bea5e8662b2a6e7fa7dba26baf4c2c2944307cf19b5565a957af1f9f3b336e7ed
@@ -45,10 +55,13 @@ DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d
 DIST crypto-hash-0.3.1.crate 7858 BLAKE2B adcd2b397a0226df7b326625a6ed179eafa2f550395782018b5daece122f0d02c68529dfe802aeb933e7ccbd4c969ad9fc0876673002b57ee23b881abcff6e72 SHA512 4c4002a08e68a03409096da5b3f3c8c4db9a23bb331c54c7f4a615ad0be64e3fdca3291f4a20b682dc4bc6d13b95950f02a306423c4cecb48664df05c46209c3
 DIST crypto-hash-0.3.3.crate 8139 BLAKE2B f42f7879369c90ded8dab271d5f207a327722dc3a5e386a31c60ca78e71198d3f44d2583bedf23530eda4970f6bbbcb2f4dab3855dd9c0095a5cdcc1a89f887e SHA512 a4c48e543f45c0752c4057ffcf0d6d50f7238a0b43cc509ad8451412a46df7f45f917cf3df26a6e3aa6fa66d73eb459c43c24d23d0f5107bbe585e412bd27954
 DIST curl-0.4.19.crate 73204 BLAKE2B 668d81467c9cdd215fcda75514d67ba286ba530f0122cb6406d8e8482c2146efb3ae472916822f47343ae809f5d031d20ee2beabd83c3dec4fe4a6b596c7e44a SHA512 dbcd94b7695db392ed2ad6b3335c0a9bd3db29319cf301489d5f902f250917c64fe6cf51476f0f1873275ab6984df73c39b6b3be3a7f43faddfb692333b68588
+DIST curl-0.4.20.crate 73228 BLAKE2B 79ef3f9b602baef5cbd94bc1c7d5892283b4b7d3c24e5bc5a5537db61421ff6056aa5b6fbe95c4423065e4fc722863c8193775a984bf7e5714c627516063f372 SHA512 0c6b00c184b6e5381740eee42f124b593beb3e35250794c4026779146b9560b71be9bdc7852c0ca35a4423f3e58e8cdbb9d2f1fcd0eb556424627a0bd9814c9e
 DIST curl-sys-0.4.15.crate 2860437 BLAKE2B 10a0d95b6e88a8e06494f5cdcd9c1a9f495d39edcf63efc63cdaf4678c48057f7b18f1130a8bafdeabdde8c719aa668ac88c1f9ce1249467ef2d7b8480cb1b57 SHA512 d56f3a13c833b24578f72f72989896e8d045798ed90fcc16e8f36860ed962ce47e50f9e03df387aca687dc08d8072be9883690169a0472f414cfd0b0f38482ce
 DIST curl-sys-0.4.16.crate 2860720 BLAKE2B f37aa78730778c3b44558df89d059baed7f79cbc131de6004cdd0d2427797cba16b73fd8e547690a67cd01fb43df118517f0f9d925a39dc8dd2651e56b077eae SHA512 22842a0c973ed6581b1cc80519772f83510b5be2d4982d761db7884fd20e8654b184894aab72b94cea4fa218fa05013026c02cb3e4e2f277d269527ca8d3d134
+DIST curl-sys-0.4.17.crate 2855342 BLAKE2B b5fc6db08feb85ac9360b94ec5bfa7901c6efdaf08222b5d0c3774ed937cec1bd8377f492fc0ef2b39dac93c381b92f8d5018cd3d8cbd93dcf66d164ea20b05e SHA512 e0b1db564ac22d7d2bb09122393fcdf3cfc196490ad344d4c8023636fe8dc553ed6fe94c7bba3027cca3d707ea511e95294c31bd3ea676f094126677e934e8c8
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
 DIST env_logger-0.6.0.crate 27887 BLAKE2B 09370d369b4516ad5ff02ab5dc155a329adb7431a966d45c2d2ca91d20ac0235680f5872c452d9e55e59220a625494f54b3709a3f3b97c5e2ed991e24c85f855 SHA512 b75d8a6cf2fc88c926f3df8096211a46c39da418657bab73e65df373e5c2c187397f75ff6b02b9a2f18626f0a661cc5bccb03b39c72bcfdaab6d478b43fad8df
+DIST env_logger-0.6.1.crate 28567 BLAKE2B a7302e44a807dcb1b523e1dde683a040837b1de2fbda5e8e7347478f77d4b7a39521aadd1d6d42dffbb6229e0dd6bd1b2b9fc47b860db45281a95612dd78faab SHA512 7e5142fa24e46aeb246515f42f9fc561364f266a693ec9f8c45dbe96d31174bf5663ef6233f41a5f96849dd19b61e2a97ab7ca1a7a55c51f741f4efa5af371c5
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
 DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
@@ -56,6 +69,7 @@ DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e
 DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
 DIST fixedbitset-0.1.9.crate 11974 BLAKE2B 22d60a9dbac0717c00f95ebd687eefecea597edc5216ba080224eedcf732d4bc901b9f9d6c9dcbd10c0876376de49a7efb4e6ccf90c6776dd9edb5a7f19b9c20 SHA512 07b45fb7e676c6a1b450d23ff53651e1ea1eafdbfc5bc304b13255e0c30f72718fb37fe0f17f2baff799015aa29405b8a677eac604e3219e5ed3f9abecda1964
 DIST flate2-1.0.6.crate 64769 BLAKE2B 54a11a27a6db606bed5f2940fd35bee95afe9b4c4f9a434d7a607b248208586760cb28fb5b4dc2d43721d0e912764615cf8e1ae6bd4b7267f0d1d1a5c9294832 SHA512 b51c31d41db4f9732156a1f5ac956f0482d988174f06675498647d21cc70a22e97c2c01d8a5d0657b5d649c933f51582553da0be32b096f94fcf92402983967c
+DIST flate2-1.0.7.crate 65912 BLAKE2B ace7d04662b4880ca817d7d021d6cd06c09108548880b2eeb5f53329ac1ac482c83e046188a76895ef36d4c62bfeafc831119100c172c2b696f28793e580f751 SHA512 f45bc04ab7b82a2783734c9012eff7a2ca22ba871583229b6267e2798a1dab8e14cf273592e7e67da1e9b193149447419b64b5c4dd0e1b329d79b279c35b41d2
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST foreign-types-0.3.2.crate 7504 BLAKE2B 520818b702d990d296ecd31a8646850202509ccfa18edd0e1b260289619a6c351e758f317ec0824bd76eccb209b6f087057c25f1bd01a47897715013dd834867 SHA512 bf27b8243ed482c202d120383374f19ff09422535e24b9c1aebccc66529bf300ca17b8bbc76d67f98ac092e614497afe3add9dc68aa69c93074df05762f91232
 DIST foreign-types-shared-0.1.1.crate 5672 BLAKE2B d2e42e04b6657e7a69fe0bd20c672176629c743e49a55fd007bb30e289710b70045d445ae9cae0eeaa747ee708c90e8abd9b5fc39bad8ec0666befe1b696d4f1 SHA512 bafdb2143e136fb0818e2ffd90b5c862b7181647d6568947d4e4531012bbf7a57b597221ec7056c1b562dfc0c3b5dead26d1a4111ebc15e7863737a873518a4a
@@ -76,14 +90,18 @@ DIST heck-0.3.1.crate 54666 BLAKE2B 99f7ceb44ea6af445749989730ce1e14156018ff046a
 DIST hex-0.3.2.crate 9053 BLAKE2B 3ac67d26ad367df7543967a8153a2ca7c082d5f56df16cf63a37f76157ce94c68f4cb11c14cc75621a9c45d19c38425acb92b552dd6f45b9052d90cde2ea6e5f SHA512 fbb5e86da5c7fd4b7ebc505d4c0da1258b06406d40a5c6c1626f559e1a91525fa747cbb6e35a687c63216158832ceb49dc61d68cd7d74f2df3630b36ac423852
 DIST home-0.3.3.crate 4043 BLAKE2B cd15b8d83b386fb9ce130edbf21307917050865242230af141805b8892d8a295cfb2be0db09296025d75a9c8ee24f6e83188e525ca0fd8753accf1dddc07c7ba SHA512 674f782528c7fc9087d80ff73c224fb5c43d7e14146026064e633841ac08feb342a6a7cc45f29e7da5585a2c920fac8eadd5f143bcaeaec4bdfadf6653ba7b5b
 DIST home-0.3.4.crate 4167 BLAKE2B 8e71387f6063446aa565dcfc6f08f72e2e406681d413bae835393d31ce1f80d451928e3b434bdf569ba3ccde23e55be320f0081f2c2570c3e4e4069915dfc0a9 SHA512 0e6fa44f4464229e833f8ffa893fd84dcd0bff181c718adcbe5f202b76bd2e16044aa44e1828d4eb332fc71637a3e9ac432a048ad2c6e8f87c719e9e88d4a9b1
+DIST http-0.1.17.crate 98437 BLAKE2B 67a3e69d3e14d52df47cb4351bd210bc8748d5a270a906488b5526c1b897540c607d0ff18f434813109412d44c1e3ad2a141dc49ba5a50c58c0bfee6c5d527bb SHA512 4ec143aec78ca3c0834eed20926ade333c282fedb81aa482b75f25daffb2584756ab337de5fa0e9e8d5d24f39d5f9976d51a9b08e94c50d162ab23564924cf23
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
 DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST ignore-0.4.4.crate 45482 BLAKE2B e810688495dd4e23747c0b9f650688029033f2e49c2acc2f12ee7d11db1888d425267c8e89a661e44c5a5bac1812120db95c87177fd9abf1366f260d0c55a2c4 SHA512 b7dd5de1c14b77483d22235c4738f39123011bc8c19b785fb528d30fbfe9e9c2f8e3b137ad2d3516ce8f59c2ae06bddbe80811423fcc5ef76cb851fa7ad866d9
 DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
 DIST im-rc-12.3.0.crate 98492 BLAKE2B 0edb749ff8b20581c856cfa5d441ade046de26962eb39daf43592f6c4573a3cbbefa4b44b479c41960f31e6b9d1738ccd16c25118aaba633d9bd8a6b604e879d SHA512 a3981ccdce43de938d614f5f0ea7ed43b3d6eb5b8542c55e178cac83fe1e4ea0ffa4334f5a3499dea4e01934cb5ed9cb5898a71832e6838abd98662e1f68894c
 DIST im-rc-12.3.1.crate 90614 BLAKE2B b25683ee3949e797ea89fe9740e2324e66a5af3d8815ce17478163b0fd7ce6b754f943bd657269b95491cc88d08bdbe66ac7d5993e3301b6f3419fbc1117564b SHA512 9d8637a5a1967b7cece7776a364e5c92e303db9d799aa49114fe0287d0e53c566bd86aa5c4de8b5079bb46165505673a904d10f2524fcfb66d6140d0f13509bc
+DIST im-rc-12.3.4.crate 124256 BLAKE2B 6ee5fe39142b8a6bb96c9a2f50206b67088377ecba753b92fde0211df409b82faeaa5a534016aa91a70aa5b93396af2247c2094d10a0dc136ad4319303e4a22c SHA512 bf85209dca389ec4681a53fec3d58a1f98f56a1821e916d95b152ed8a1eb7ca1fe704062c27a8af27c209da1bf84fda9f39f92202b4d810dac36ead4e225bce8
+DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST jobserver-0.1.12.crate 19791 BLAKE2B 450588820d26d51a6b669faa042b8d9efc131bf2a077127468738f36f373d557ae4bad7ada5cd457540436d00d9805e67f1c886c2e2f445d5a78663dafb87986 SHA512 228af0a4174698b33be5ca5d1e87aac917e8d222f06594c7c69fcc541d0aba773012b791729c3e0669335147b62ce72259baf3ac0c9ededa3ef7c76752fbebe1
+DIST jobserver-0.1.13.crate 19329 BLAKE2B 0c104f7807967ff738aa35a3876355bab8634cd474c9a7cf6d4586d8a22c20fa67a5d704a17b4206c138a5a0290ba0473014be115ebb6557d6848eeb3b349d3d SHA512 fd6c85c1fe3195305e3fa30f47a1971d2e9509161ad4c5e9b1c588e93dc093ac76e6d6830630fe6f182755715cbd1690c8beb5865df59c295d0496cc9f9047df
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
@@ -91,6 +109,7 @@ DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae92
 DIST libc-0.2.45.crate 349425 BLAKE2B ded7a699266fb8c8003181dbbb0a8ed9fb27613951b72d538e05bf1d262810dac7edb47560d06989d0d24a9cfac18f22744efed44d12452fa41ba68cb4b8e4cc SHA512 8188400f2f9fabd7c1e0dd1172032eb25bde2702019aec4e3e0c8b936209347baea347ff8d85fee3e93031df0741d32faed151c2b553151e95ae8321bb653381
 DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
 DIST libc-0.2.49.crate 375486 BLAKE2B 38c6f83279d9ab9460b95296c8f4640d671ffd8e425c11338b0fb8360947f9e57fc8d0e4a6101d4d4b24ded14f90995f6c756d6bd260b775743c5be1ab76b598 SHA512 2a337c4574a226c600593ae7c78b7aa8da34881e0002872a362f34fc10e8b667d9425bbce8a39486c605f35676e43dc02717e2da68300da98e4e3728fb7056a1
+DIST libc-0.2.51.crate 397323 BLAKE2B 51306c2ab8eed6de1fabd4d59b7618ee74d8d699eaec776d21fa5df20c63cdd743a50ace3a37334b282e3050dd718faa9f95d359abd2495a2bb8de0384738b15 SHA512 d05693e7106e1887d94b23ddff5692111c2164e7ce59d9c60995af2a49fcf03ea8723e837370867c1177315aecdf25be82bf723c5e798ada66f5cc7886c22857
 DIST libgit2-sys-0.7.11.crate 1176919 BLAKE2B 9793a5131c805f8474c17d336514c480203938f51fcdb3d4e09bfc609e6599027a05436660077a526ddedbcab3c587a411fd9ec8d7dd921fb352ebb61e52eb1d SHA512 361aa7d75a029209f59c799e2f091f6ab8c0ba6a4677932537eea8e0198a36a2382327e8c5db98a2980f47b6a4baf07708720f128734081ac58e30d8721c3435
 DIST libnghttp2-sys-0.1.1.crate 2225580 BLAKE2B 05e0d61759122a98270a0da5a4d1bfd4ba740d6287ab75fd3491fb88f0e995209fd8718230364fe79d19d2129443fc23120d1904b12d5db832d4619ef4ee1e06 SHA512 68cbcef54c9b274050b1ef50b57b7256cc7dab36a89cd2a6bf698ecd27f02e644dcc8d2b16c61cf111dd35e09ad62c07c7069873e5cfc85273a661da34ffc989
 DIST libssh2-sys-0.2.11.crate 458377 BLAKE2B b9fa613a518ec21e5b90ef75ce0a4171406feb3be64accdc83b3d5924010d4b94eb95d1698addb44ca6756afd5663461506e3831035b745637741a35719b464f SHA512 4fee372cf5d546e6471177127041313291c7f1aa21777b1e9f0c6027052938fe4c6193b6925815b64248faf9086ea04014b6cdc0420135ca99403016700c15da
@@ -115,10 +134,12 @@ DIST opener-0.3.2.crate 14077 BLAKE2B 975f837863d54cd6a6c41c49d72e1b8225df60a25f
 DIST openssl-0.10.15.crate 167961 BLAKE2B 64dac45c9274dcfb9610204593d9932e8b6261e2b0bde0d69a1ef7fb06111b8469b187e1e7f380a39176cb66766a2d7065201072eba793f748def707b93a1c94 SHA512 fc9a0d57848012d0937efc677cf2beda8182cdce2a01e22a00d6aeefe9ac98704608c22a152465ff2ca9f62668af4d25982fb67b90aff98a90be12192fb60b42
 DIST openssl-0.10.16.crate 168681 BLAKE2B 6622e4f76531369337e8380447780d5e6eaef7b16b1cf04a58fe0a6dab195f27e4213ed921c999f72df7139b02ab268e9726594cbd10a570d697439a5f683824 SHA512 dff4e72f3da5bdc2b82012ec942f2725adecf2b62c42f9101436ebc8c3a38a2fed92ff421dbf02654371fa70e3345ca950159187cfe2ca5fdcb6a858197443ab
 DIST openssl-0.10.19.crate 171279 BLAKE2B e6c637a2b04eb5c4bfa18aa8f866f8580296fbfa86327842ee712519230f6a3cc2f2fda2e5b01bc73125d288260f7635c825d61b0883236be5773f972b757911 SHA512 a904196d7e8a0925e4c2d2d0a1606f49c24831451095a939f674246afbfe046be2208d65acc75dd555d9cb8969054c65c1d7c7393b0f53a0b22de02768427883
+DIST openssl-0.10.20.crate 178977 BLAKE2B 6db17ff510662ef0a5e6d89b8b300b19f5b434bdeb1bc94260b926d8045345dd2019f3bbf7e29d0597e0c2de023b43a4b11498ff50408fb29a280bbccfcfd213 SHA512 958265ca7309cff11d67b08eb5400c3b0c296c9e6d96c4477b2b5bdcb7fe8f4fc8699594dfdb921952ee5c78e0bc25b64b4e218a27a03b3a63afb99bc8b1701c
 DIST openssl-probe-0.1.2.crate 6427 BLAKE2B 8df00c8ab6af7887a88dd1672bf2c40c6aed5867b0b8d07dacc94b80591814e2fee4ac5dc775ea0e98cc33641b9eeebb6d5979d34717ba400b907358ceb2a469 SHA512 4001eeea5c4f859559475b4b1df8248611bd44273116b31e7ef775e02918cc989825989868f331f0f0e387787680c1e4ba721ac0fd4695f7363005ccc0815d9a
 DIST openssl-sys-0.9.39.crate 43147 BLAKE2B 0e32347bbbc21c24d8b756f3a7b837d8c6b4cd5bb04e605c5633bedf07de8fc54e1de49bd020296289680c7179f5bf1180ec7d6a17e971779023f151c4feca81 SHA512 f22bffd75a95a60358bdc1296f4d5dbe5f193b27f0de3f391e9a72e663881678b71a7f11145b2a0a4649273cb383f21a1bf86ed26dd9781869403b4036d76426
 DIST openssl-sys-0.9.40.crate 43360 BLAKE2B facfff126f92ad9be7f72b1beb8d6f30b69481494a71553daa6186fd16b861ddfa2b8a67a99d2dadf52cbf9712220c94e447aec37308b97b16caef31d92536db SHA512 6bd4eceaaa84a759bb6c250dde05241235e426a84382471c56618d6890d869c7fa56ec70c22ecf0435f5d83d7fc8509b68e0f9ff041a5d42ea4472d8769ba166
 DIST openssl-sys-0.9.42.crate 43618 BLAKE2B ff3998ab80e9ed117f5facad2ea0250aaddf7c9a0048a551d2a32d20e851cefa706c4e04ccf7b35ec890557ecd3cdd422827d6c596ea1f3dd916a3eb92e017b9 SHA512 6201194e4a75eff661e419310fe021d7ff423cc8779ee5839d17ca272ba6ebc019b3b6b8e477c06f41560d5ac944313ad0ab9635b3612abb0b1a17b5ddf0d2cf
+DIST openssl-sys-0.9.43.crate 43849 BLAKE2B 51dd4664dbb174c5022df6f3ec811f6585a409c842a931f0d5713d0353dc19e82896798e590f50e7397ccf3847a48f6288d911907c9ae2807bf507d3006b7b12 SHA512 2b780a7b1078fc63a4ecfb8dbba117ee452da360ad472c171f2422018edd13eae12d18ba9a3f0c21dabec177b8ffff2abf7411f0d1848de478ca9ba497636100
 DIST ordermap-0.3.5.crate 35246 BLAKE2B a663aced769ea6bebedf21b95e98756796b9640d89e1cde828f7af32921cd7354dc7dc232fed40f4c65d54ab3e472200e07a057cfe634002d1371c9f93003e20 SHA512 4413319af191656c82c6f4b185840486d2021ab4a91e412e5472329af928a6519690734613f9616c285c6a4c967a4c718483583e0a5d4b16bd98b01f3d226ddd
 DIST owning_ref-0.4.0.crate 12233 BLAKE2B c50343d2bbc99c4c8035e1251c2ab31609e8209fe5b6bbdca8bdb0cc5fe7749ce29ef2aae77c90798e2f2f201e12ad81e6607c34c2797195890b5587178dd194 SHA512 51bb1cb259452f7395bce0ac4e7d2d6f3733dfe7a8a1a46d50179516ef921924f745a248e4816da5e434b589b5956a20ca554f9a93790b2ed1c55451b9b885ba
 DIST parking_lot-0.6.4.crate 31890 BLAKE2B 95024d434bc988a3612d231e83808efc96a4184d059b51a1c2a9c86e661fbd3d75ef284381f0fe168e73a1c811754a6386ff6410ea2e248434e524ff9de54de0 SHA512 e2d91dcddb872d09d1f4a9d7fff21ca53c0c8b15f49e46b68e4a59f2ccffe1e852214860bd99d9407a66e4b6ecf102fb96ad792bb3e9676ecde349d728f16028
@@ -132,6 +153,7 @@ DIST proc-macro2-0.4.27.crate 34098 BLAKE2B ecec94ab4c79dbdfc77731054e3c370c2ae3
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.11.crate 17283 BLAKE2B 04fa278094e505b806324d572154755d2696a6248ec6afb3aa5ea97ec2556e5b845cec3da1089ca321681591c0ca417caee1d51d7a2b57fc411c3f8270a0aea2 SHA512 5fd4936542eec530bbd33b1ee600746ed5c003eaf31c8aebf910fc1372d5ab91cfb10fbfe2a990a49e5eed88747f99d52cd430b34e0a5cce688094e55eeef4cd
+DIST quote-0.6.12.crate 17541 BLAKE2B 0d09f5075358c8c7cee6503c55ad489a2ed4efa31dd0bb47c77a01b7bcb3ab4319cdcedaf5799cd25738c8f6a9f6256f91e509b60eb18ba99664693efbe45afc SHA512 5d58945b0c9b41e368458a1661ae7b2ceed2e3285d377088afe5fde38e1db945ab42326d096cd6d13d82f5f80fe73d204c5fbe3c7abdea149eb6d7ca7c5e6798
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
 DIST rand-0.6.1.crate 126613 BLAKE2B e7779ba6b13aa58edc3632f250787d35ad486185d3307d17528b12bb6d2adf6eef8aa91c5f51f021fb8e037d4ab1fb64fa364ec093fae0a5bd79095d51e06791 SHA512 dab500d25d538d28bac5b9b60e3b262f64e9d0581c5c17f165890497f7cb459603b815e8a43451610e75d8f5390aa41aad57dcb532307c479ebb99f475f4d4a4
 DIST rand-0.6.5.crate 104814 BLAKE2B 8d94c6f135ff4b07a2236cd7b0c2ff2b80f3d391e330590bf0ece15b08a8c8a5175ea32d9d12832eeb485822446515e14408171d5f1476a27e2b9ed97aa7986f SHA512 2eb84bed29708b8ba109f4329bf6f1cac6caed9d91b2aaf185d68dd2eda73d3fb7be2897d0596fb28352e799ccf92c161ee44599d5cb426ba9c3b8c747831904
@@ -146,6 +168,7 @@ DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b370
 DIST rand_jitter-0.1.1.crate 18226 BLAKE2B 351d16c41d16b543dc8b4785cd6b8f5040f7c1e2370fb61537331373a0a4eaff6aaa34b3a68ba55f1d9ff408f7f4f0c6e614b6eab87b0e6ebef751585826706e SHA512 b1b72536883acfb97cc2797c1a3371a4ff466e454b61ea0a14ef1ecc81b423139d046a3bbac227d83cc71de4b398eef79e037d78a52d8b5c5a4eba1ae3b92c65
 DIST rand_jitter-0.1.3.crate 18341 BLAKE2B 6bc99b148765ca0ad7ce1d457eaf4c039e825a7178fea200eded79a7897aa407ba39d9c8ab1693f28511fbf6def1bc9594e29ffe108555d3e1a3f709abb802e6 SHA512 a70bb59677bc82b4f0b6549d8907b1cde2e1529435866b9161cbbef28ae79f7edaa4067fc6498800267f944d853940670bdd093d437ca8cc84eb2b0ea6dcd551
 DIST rand_os-0.1.2.crate 18359 BLAKE2B 699e5e8a542a92b631fb878bd5e8f5c925ea85d64cf00ab67191e16b428e583df9017ced7ec760477c4bb719bc5c718818e08c3a9ee6f504ea18b9e678c77ea5 SHA512 c4ffe4c8d0b5dcf40ca1b1804bd491345c411c9eb105be24c033aa7a76bd808af6d06ffcb168bad72e5adb5eb240827de39f483d80076a9f288316fd51e3d790
+DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d790351652a8e39323bf0dcb446d14e9229e13c14a84e93394a22e0a127f50ded11db1df8ffc0a6bd564af63a7 SHA512 01e81a692b78df3b2bd65bc285e5052ccaf208c7d0ace414f251db4fcff7f9ae1502ee60ca5745c95e778d3d5efe15fa84153c17c422b6b6bfee829376c14575
 DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
 DIST rand_pcg-0.1.2.crate 10844 BLAKE2B 14150260cb41d57c59aa7251000acb1af9225b015ef8596527e1c313cb5943bc3e6c995e31b9db5a5bac41e30f36a6f7fce5a24b21d6413e74d0b3f9732cdad4 SHA512 6bc684778ba60c2e48793d4759b40cb0d35b0bc20ca0fc39fdff7c3f8fe9082dd7b5d5f26a7f17bafc6f3568924eac1bbe45820b1c2b09c91731ea5487d76d9c
 DIST rand_xorshift-0.1.0.crate 9194 BLAKE2B e35999cedfb58b4c2192fcb0d4b606b1535a4ff32cf0f9a8d337f029704cff285af741b507c98afa27040e04f2be23d53a7c749fbd86242469a4a85d61939f64 SHA512 6bdec89da3e3c07c8fe42ba4ce5c24d76ea81b522fad533ae172c5d402f109fd9ce793bc13647dc1db188202bd78f48a9ad55f0caa43f1b88c711f3f2c18a0bb
@@ -153,17 +176,21 @@ DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf94
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.44.crate 15254 BLAKE2B bf2ed8addf2dccdc4c2dcad2e3079f01788db01a839a9a99ec73389a1fc6e8d8e3aab61e4b3aaeeeaf76b451f5847c963ec71ba3e48d93474c0a9423d331c541 SHA512 c3f7225837be18775c50535d18888ca7ced5c2e577891c67eee34409b583ad685389d806f7aa24cefe6fc1a2b6dc47fef2a8e482f6c77a32240de7889ee1fda2
 DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
+DIST redox_syscall-0.1.54.crate 15668 BLAKE2B 2da177fdb698073829b29023e6cd0a2f422ad1cf1ac359b37d3f5cf4c12f6334eb241bd313fde0236afced49714af92469919d62119ad4ddc49448ab5d9a2589 SHA512 38ee15c2fa470428329b3888fef1f1b5bc57ffae96b6ec505fc051f33a8da86512afddfeb6966cb2342382a5cbccb624a825767d3492b3d6d21d6f8e97e57e9e
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
 DIST regex-1.1.2.crate 241143 BLAKE2B de5e00f4c23dbb00ffdad4548c7ecba6de24fba996034e966122b2d79142f0cab35d9a8edd5a9f6a6fa223bce36b07160492c11d844aa4582277d0d1b24de9d0 SHA512 84d4bc302daf92c71354c53565f55bc931b1a1d9f6a3ca11d1959ba9d6fc9a8cdb6d47ecad2e9edab451574a5159bbb4fe82f344513c56f63f42510cb76b1d16
+DIST regex-1.1.5.crate 243275 BLAKE2B a410be7f109298749f3e660af6a71fdaa08ae57d9dac7e7c67830a1a126f5d8ee5dc1c33b65a7a2210ca8838a3a8e978fcbca430f1edbccfc1910009e9d55a00 SHA512 19bf5616b9ea4161e007e6c690dfd51fa930bba58e8b52256000cbbba637e1690ecbed6ce9d65803ee369c37a8cba498bd9001f3b5a08b3b76cd23ea1b50f9a8
 DIST regex-syntax-0.6.4.crate 272048 BLAKE2B 921cb35d306d796baeb9e3f2fd243bd6c90e92ff175cb9be23e12b1a0f19f51a40075aaf66a56e32fe9b1f08eb30b2a1f47469127061542c96b4f68733780b9a SHA512 7a199c43668f7d660a28a1324ce1951cd6ec299cd98edbfde3b6a6d172e9f1a52135457673b432a0318163a5c23e541abca58607623a310f15fbefeafb50ee3b
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
+DIST regex-syntax-0.6.6.crate 273068 BLAKE2B 283806a4fc1f0656d2984e8d970ef1db515a56ec08573e397fc342e6f61b6534941530a0ba7fbea69d3817a043dc110b11322ec14b50ce59c2976deb6a66e393 SHA512 5b21640438443394631d28ed1ee391e82bf8b2afc0b3cdbf67f33319064ef4771dc250dfc555d7ff0fb453da3b71e30caebb37ca5c0be446cc40726228c51b76
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
 DIST rustc-demangle-0.1.13.crate 11726 BLAKE2B cd97c38228174133532b0ddd31c0a57afc4a4061b5b40162a5ad222723862986a276a60a3917518420a125c7440c41b48a60f75497866c141e0c8787ae7a85a6 SHA512 3266d49f90301d814dde06ed9a2d0ed2a45e6f35cee0dcbb21aff213ba011f808d54ddd45c0f489ff3be06df1e6de0a0dec462a59ce2233edd1143d60b99314b
 DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
 DIST rustc-workspace-hack-1.0.0.crate 774 BLAKE2B 521f71467c95554c8a87ab3e10623ea3516932fe4bc9ca95c835c06b8e0bf526291dede3a5e08df8222f365f4d326c4054a99ef0d37aa6fb5210e2a35d7599be SHA512 48e4774a272e717ea571f4c22606ffca78245723ebc3f15ae5d0b28c5d767df9e772b7e2d6c5c3505bb09bf28097aa83a34b182856bb9d74b3a00b292da45315
 DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
 DIST rustfix-0.4.4.crate 12698 BLAKE2B 06128ef65155657cc127e19bd6aea8e5a652f510ad0a290e7ab4578371f333f2bf4d53f5061b0273afb396e443887e43d65c4771ff53a32dcf234fecbeb7c05c SHA512 f20866fbc1f98095abd9c2a78d1b8580640eb59396806426b30271d376c3c0f3ead3d01880370d34065b0c6e5c3fbbcf1007d60139d8e5a55c6e7c78cef865e0
+DIST rustfix-0.4.5.crate 12730 BLAKE2B d72a95e684835ce8e951c5e872bfcd347cfded637069a3c4f8662d28c65b6f5d7920a743fbb057a9c148079827f6ec96dc048d105980b4f2ffe6b7d638367beb SHA512 8ee5566dd5ddbf5f88543324a7caccb36f47e9c754a658d9e52b8ff966e8b1de9892dbcfb8d8c70c660758315cf21718e9b81b32b27faf4a978b3b144f19310b
 DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
@@ -174,34 +201,43 @@ DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96
 DIST serde-1.0.82.crate 71666 BLAKE2B 443f39840e8f88ad9a8d6c094ad6db759258a448ce2ee7c1036a4cdf446de522f960543f2a712d5d944dd8ede699b05eeb25a9f50cd128cbd3b7ec600185119a SHA512 287a11c84c8c2df98cdcb45916779f0ccca932f7901374dde7981ab16a8aa98a3cd79a698f9d126bac64269fe4def9b85b19bc2d200c2f302e916b87bf029ced
 DIST serde-1.0.85.crate 70965 BLAKE2B f6260c01d93f59542211ada91e38c77bdf0e493bf946bf33055e712aae55534c6343ed40d0d178b1f3de70172a80b482696398be4484f6d5a0c1d60099267e2e SHA512 695b6698b45f399dbba9ece3f79d3da973736260f9410cb9cdc149473d3f864cacdf5c851f1b73aae5cc33aae2949423520cfa4caf96cb3231d111238b7c7419
 DIST serde-1.0.89.crate 71395 BLAKE2B 6fc88c889a12ce4bee3dc96aefd80e18e21d52c11b840ec9f6562b300f386d3b6d83632006d5d70e52a3693c3ad4af5ee55f1b6869cb402305cd0c46ff565140 SHA512 e01f30208b7dce831890bfa37a38a6e2177c35f423fa02021d32c1209ae00a3e8f836deb12cc26c4343a4a10b87286d780ebb8eca83bd4191d1023318c15e745
+DIST serde-1.0.90.crate 71415 BLAKE2B 7793a7d5227ecfa4645c9ce6cd22e0d9c76b216012bc4028e4f940938e1e4921c337cdd27deaa3ccb54df9fe57bee7ffc35f2c2d69c98a6b8e0964d7831af60f SHA512 6ad37dc002a7b8db9e38590f70a9dc26a93a82a1f6d9414fc2a45dd2f57b974a947c1a4c350c970f69199de08d5a94cb6ba5b53c0cc7efa817e3442957638a5d
 DIST serde_derive-1.0.82.crate 47403 BLAKE2B 91634aff2026dcf90240a83b2955d02a286db6db9a91514645f5fb5d2e6ac860ed6f7f7b8b7526688ce3bbdc6feb46692a49b0388deadae014575418cb18cf82 SHA512 bb00e82c7768b59a01f8df31fc425476ac595186ba658c69f33ef5b7b9d419e891989e178daecb517d27a59639b8dc47a91be7d01f5a52c177aaa151c647ef5d
 DIST serde_derive-1.0.85.crate 48580 BLAKE2B 5d76f4397d7c04e69840a240270755e3ff4e1119f0ed46b68ba7b45789190330f1b79480e6955fe52bf3bb7e52eb71f711c8aaa6222e2788c3f191abe872e129 SHA512 719e8f7687c7ef3e8266eb2436e755c7fb013de6d8e6859676cce079f7044d9eb1d073ea00fec6c1be86998ab9ab8357aa70d866e3e3158176f031615be058e7
 DIST serde_derive-1.0.89.crate 48599 BLAKE2B 938134e97381bb4da5296a383a1bfb0fd9055c9e712a4121a39189849cf08f73b32eb5053c9f94b44ad4a62632d2b898d524013278c578ef569a862676daee0b SHA512 9c6e54b86eea33c8f4cfb27924f95e811b940ad0c9ba934c61691d728eaab3a31835a5c7ddf8b15d67786bd6b6d7f008079c453f89dc05b57f6412c9b1432d65
+DIST serde_derive-1.0.90.crate 48815 BLAKE2B f662383f4fe4cd5fd46f763bcd3228eb54ec681231e6749ffe9c3710e3ebc49687eb25435cf9b976322df2cc478d4c9febe1d1d770aa4f11c4102745f52162bf SHA512 50ecd5c54dda7708959a2163e365cff09489489893d421e5dda09bca8a6f824b42722af1eff76fcc93f8b9f507db33019f7eb743301025b3504e19ab3d64d015
 DIST serde_ignored-0.0.4.crate 9533 BLAKE2B 07d08459a3333fb30a9413a882169b5c5b49f26f58128dc8f0458c3e7e668948f3a84d3e5c4dff78905f51604f4f317d76f96c3a900da85d669c0c9065e6191d SHA512 29911d05145b33ddfdcd5c86d57af331262393cd445eb5c464df07f8853032a156b0b1be7b90b66666748e0383831272cb53252cad7778fdd3ea20f2a04e23b4
 DIST serde_json-1.0.33.crate 69738 BLAKE2B 72b396a31b156164c6f300d03a52f501dfc385e55f0abc7b2faf3c83ac361c595a1991e4342bf0e014970713ebf353d24a2233aa3941921e4546bd9779ada8e0 SHA512 5864c5922bed9f6c34db2163a14374fde73653f323ee69622f15510572cb88e8a645b4153ddb1e12e64bbf0e60f37895bb68982df68ac68a1a66c83df6cda2e0
 DIST serde_json-1.0.37.crate 68709 BLAKE2B e72f8fb0677430dca0037a7b067c36848a60cfdcbf7338e7e46cc10652b1e54ddc5764bd3b60f27f5cc99d8c6b1fd3661fbc75499f6ae46f9a4af9f60e61c961 SHA512 8808dd4ab1c4a85103956057dd7c1193376d81dc2a6bb98848b2c516f8c0b4267a401737281727ad903c9461d74a0e172ebcc57afa32f97124c17c26b6d00b48
 DIST serde_json-1.0.39.crate 69621 BLAKE2B 9eaa881f9a16d1895d2bc6f3aff3d6febd155d6ceff3c383968d0520d0f28dfa6fa57f2edd10c02eeb8448e2d87287d2cc04ee99f2c0bf96a60970c49aca14a9 SHA512 7180e5deb60e196f6b1ba3ac2a1bad6cea59d29f65fa7fb9258beb3d7012d6f3ea624e21fbb17868f5a21224f93b3f7b24875a94d50ba0d05e5b8d2aef632036
 DIST shell-escape-0.1.4.crate 6764 BLAKE2B cbfaabec7c6b81b802ced02a33e463c39b2f27f004e0e97087adf5712f1ccf4f4405ea9d010afb49153292741aa1d51d985caea5a3c48a601dc4f25b66012135 SHA512 19cd5e79b2b610dbb26098182c1ed3a8a2cb93a88fc623c0a9e3ff719998d6bb1de632f79519905441a4e38275178dd5aebca8b9994efc24e19bac4ebe5d6329
 DIST sized-chunks-0.1.1.crate 18703 BLAKE2B 3c1ccfbd8fee5a7119d50027be025f4f28a4c0f5d29b56e8e6a9f4ef6689e5db6673c8eab21c17df30c9d53265c1c5559df2e3db92edacdab6ef213548fb7365 SHA512 e8705c1e397ad4cf4e6d6ee9bd551a1169810ffccee77f80db92099f50fa5425effaf2eb3984ad5531536638f1136e2cd633fedd45ee9c6825a38e5a4873ca97
+DIST sized-chunks-0.1.2.crate 19577 BLAKE2B 5d34b536991f5d3508e6a1138e11bd060116d857e857f23450bc55daf3716e82f61b552e193878b0f2913fa6c7095d7a2177fa27a43bda6a324ee0d26a4fafcd SHA512 5cdba2c6966d3abb9d32da74f732f6ba9f86ca21b911a293cd293b1816efd3c3452e820224d8e056eb2152c864c396ad5fa08840f2969b1870a60ff0b7d7f773
 DIST smallvec-0.6.7.crate 21450 BLAKE2B 35201ac343c2029d9ced9de0361d1ae9046913abc3701c5f6a000008eb7aabfdcb6a05b63368989f4f182b7f0ab89956d7d211a0760432887f2be975be9ce0e9 SHA512 2f3e45b27d8a1e02ff856e9690d982a8c785eef797f0e33beb8a832b6de5038d5ca3d285f49d67bbcf9fb2cb4de278dc33f2e77c615ecd333da014f56c8aec1e
 DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
 DIST smallvec-0.6.9.crate 21548 BLAKE2B 465f70349baa54a3b0ec1b21e732fc6b79362c866e24cb15acd09c753c4e4469a9f085859b5cc33c5a24849d64554dd64d6c66410c221c4c4bb6f3fae4b55dd9 SHA512 2bfd96b6c07a740b77c9d3221604e108bb730770970e7428a2a38d29711dff16eea08251e826d2d511d13a887c3256ec3a689e3c481ddb9029f47452fb2877e2
 DIST socket2-0.3.8.crate 30379 BLAKE2B ab805dbd3bf53e6ee59e117129b064e31a2bd92f3baf472af1975dd67fc97149fafc480fba4f29c0b7e2fe8d8f101c09d2cc5bc7c5d635418277ff7c3a883a42 SHA512 b543633e3acf6e8fe661f0162375619841346d5f1e51eb622e045712153e2d331bf32c90bd9a8c0cd7e84034f5d2827433788b54b3342f3eaacb537013f86a87
 DIST stable_deref_trait-1.1.1.crate 8007 BLAKE2B 35bb1e1b24f36a0958aa3fd3972d0f30b3849f8bcd41f0221e2a893b1d17b0029369e21e8b735b7c29884a67ba6c9b2ff1558f544b500ed7c119d8bcdabe5602 SHA512 ca224226d612e1c4eb178271cee0d18b44fc036959e528d720e33f65c3ecd7a40c20d32f294c029d0d7b74dc6ce57d19aadfe3cf02c5f894e94ddb3bb06898e4
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
+DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST structopt-0.2.14.crate 25517 BLAKE2B 7d7321b9abdb5bdf322c8170ea5bf8b8c3a995d9d8f6c50e5831f7ffa6c187ea11f0c8c2ee582b1b294b8eba2b09f37df708be157fefdbcc1008fd8a8c56e1f7 SHA512 785eeda171c384be44ce7780f6205eec7d5544867ee75f375cd7e23c799fa3e837308d4b41431380ca9fa2b8842d87a17066a81b3f498ad3f4c66c51284e5853
+DIST structopt-0.2.15.crate 25564 BLAKE2B 12226dd3ce4a2510af47a3cbd07b0b44051403fe871e7678d56035c3efe4caa44a12135203bc50a991f410ef19e469debfa97aab53bf5cd2e3ad582549452e25 SHA512 b9428ab6cf47d4f768422e100ced57bf38c4e32adf4adbd00b03575e0dfa8130162f45a76ea45a3156d149ec908121acec3c5011526c43c693653313814e6cc2
 DIST structopt-derive-0.2.14.crate 12411 BLAKE2B b29493467688d812113c595a8d6d8999976a4099dd43fbe09714496ba4c0c1fed4df9e081165c68195a6b57c973b7b528fa38935a7a4b457e2aeac969324711c SHA512 224ee21f11b9dd07754c8e6464cb14d25e56866e2a0c65ece46affb6dc905fe6f8268814999438dbceebabb475d4966ec2d0b3beb8418c9bd48a9e7a9eeeea55
+DIST structopt-derive-0.2.15.crate 12486 BLAKE2B ff51fe828dff32c402b23c1e07014dc2e92159731f35d571fff972abd6648dea88321b94eab4bb0ee451b783c6701bedab245c711526bd6ff4dd1d9117cc4772 SHA512 1fdba3e9144b6c3fa82b5591760451e59d1a48c361fb5060947d87bce06e71c102163227841920b50295c3713b4a9944664ed5042db328756c145cda69f9150b
 DIST syn-0.15.22.crate 146349 BLAKE2B 161ac0586b2ecf50b635cbf881820b1a28cbf3d52bdd5872eca7517eea6fcd4af321c8dab7f05dfc8d449a2744708143d082ffeeced934a25886a812e0ceff2c SHA512 78721f2925edbd0b3b0e3377833e7621ba66251fb92631f0295bbeaf15110a6ade2ffb89f1dfad847ac1cbb608f8d281459450b95940205a0058ed41e8ceaf0a
 DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST syn-0.15.27.crate 145339 BLAKE2B 8e1c2be778ab47209ff3aac74ef9d61a386f1aec0d533c2e939b8472e1a3099aa9f8fb0e86d9a47249dbe59c328637488ae01ee9a27143bc1d0209c42f83d7f7 SHA512 eafd57f24e8250ca376fb39866ae19e9f871bf3ff33a866a7b6f66f60ddac24820ecb36c8459d0135f08a4f214a6f7bc379fbd494fd35cc803d6d92d73cb15c7
+DIST syn-0.15.30.crate 146358 BLAKE2B ba89a0e56259ba567e98a711478a3be4293417633e32939e62a6f2a14eb34247bf1540c210b11a470b0e7c34d2ff3c2d725e91609d052289955a3070863f792f SHA512 53924d112f7ed2e63b157b307ff7d8da2b4b6e39f70c789966e0f46180546dc92dfd0d511865567f660c295242c3888b51296b7bfaf397dca8933b07783904a9
 DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
 DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
 DIST tar-0.4.21.crate 45986 BLAKE2B 6b72db6a70c5c39ca36bcc6616b56d68fc4f0ce70e7e50c3d18fd9aad1d1863b51e4540b36ce74c5472217d38e34632e5f6fe0843acf7486731e07b4f9102d32 SHA512 602a6fdda02efa463a81d5a9e5d4dbb9dca399caf7bf8bf387f0b5d9d49e1f2df246449f246341cc741bbfded467ad8eb6266254d7141d14532dcfcf70b8e966
+DIST tar-0.4.22.crate 46179 BLAKE2B 6b981ea7860318e638629473ef16ac2672d1faa6110b9dc913d19d953a6e8634b564afec4e21522a039db97a54e4b3cf995ad5c4d584b312a2b08e33e2bf9465 SHA512 e7eb38be29d728990eef7e08bc912b4b11d19568e30f12b809201c0ce1b4d2a94d04be23ab1d8026515134ad526a638151a4e49c445c8de45fb86f03b8e5bc02
 DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
 DIST tempfile-3.0.7.crate 23922 BLAKE2B ea7207d7a5c893751fedca320dc0b08c01de041eed2baf39c1e63f744b55ba3a823890d60fff504c1018950ff9e564eb17cc086f7c519279293570ef2e470751 SHA512 b6fb6a1f4f0f5483255f9672114fa6adf13edd4bfe8f7fbe6c4225a36ccab5b58fc5f5510c50e70746e2697f2cf503b20682e5b44cef0b65b7ffac4ee39529e8
 DIST termcolor-1.0.4.crate 14416 BLAKE2B 373701dd2b8a3d584a44d1429e5fd3a697eb7b9138ca6c76eadbf642976e73a701d565a93d77ead3f5cc542c204b3bdce9cc5101b2778b3e32272db9c419edd7 SHA512 cc2f90f453834666b3dcf96c48695cc1fc48c6aacf71437bab635678f486cf02ba6e1c040ff011be078a17b50f9f6d2c09fec771e362d8d2d07526b0f040df6b
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
+DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
 DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
 DIST typenum-1.10.0.crate 30009 BLAKE2B ea68f463c2edd2cd7ace126571a88cead26ea37beb8a13ebc00eb033d9a6e9d7060bebcdb208830cea4944a2b2eae16e7ed7a60f0b9270868559292bf99df6c7 SHA512 9ff611df79e312b8ab32522007981220213f2beddd959118a855d08b94b7a7d35d38378694c8667c2d6aa324933307a47a4072a89cacf7e594537794385b9449
@@ -223,6 +259,7 @@ DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968d
 DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
+DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
@@ -232,4 +269,5 @@ DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbe
 EBUILD cargo-tree-0.23.0.ebuild 3215 BLAKE2B 053d6c2175b37f8dc3eb2fde333e0e687ac2772f2689a2e59900c5eca34c41d1a8d1798cf3e11a12bee7c74fd0c8bd75bfd52ca409e5bb636e7c9479c88fcc02 SHA512 4affbdcd74ac1ec015ce32ac87eef35c4c26903eac69682aa16804e1b7637cdeda7fa54f09256da22fc25a27bc5d7c0ed8c674cc4650ca14bd5eb8ebf89e870a
 EBUILD cargo-tree-0.24.0.ebuild 3041 BLAKE2B ba7383585015a44da1fbfa68ab9da4e7743478b053a4629e9bfda41889d21788f285fd3310a14404d29530c519469201820ef35cf794f395197c6b73dbd13657 SHA512 154a5711bd335553fb9a5afa9c21505291bec02fdebc4161d9a35affa472b0d2ca5705e514fc26ccb8489d41d6befe9292a6fa6616ef72cc02971d104c718dc8
 EBUILD cargo-tree-0.25.0.ebuild 3065 BLAKE2B 20e1f06efdab4996287df6e8d53ee87563b0e6d8787b5dcca0dce70fe91816df96a6970754de420857d0dd1d5b211c428db5b85abfb520fc4f8746e8075b875b SHA512 c36a1e5fe8fe33c83acb29e53c2b1f19aba66687cf964729e48eccc91c206be6e56f4917601dc60329a85bb143a404c89a20ecc4db4fd35e5e9e77886761dc35
+EBUILD cargo-tree-0.26.0.ebuild 3121 BLAKE2B 55f968ca7da4609b5d93c69d193b89e2ad928f63f2824d5b5bf420f48df9d824a673d507313602b67d9db51b4818df08da5d1f9053ff34eb13f79edeba6af544 SHA512 19fac437bdd1d2724e06536fd64e8628da93ee313f2c860c13660e5600961167e468b715d047ffa1c022d606755640b240273f78c9169f29795d70aba3fa7e77
 MISC metadata.xml 335 BLAKE2B 458848de5f95f88465b613bc3d2b692c4a8638ae42dda2b98ab6801ec695f92db223d1c115b6021f07822c62bcf98987ffe976f48bb8c3d9c74f35673d810962 SHA512 d7fee3ca27c5b91888e5dcf5d02e453cfa3dd7d8ca72fc2060d052e74990c2311a71bcf60b7ee3ee02cf21229611769e388925d7ef5acf8597dededd6b35f918
diff --git a/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild b/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild
new file mode 100644
index 000000000000..6e53a2e0be21
--- /dev/null
+++ b/dev-util/cargo-tree/cargo-tree-0.26.0.ebuild
@@ -0,0 +1,186 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.10
+aho-corasick-0.7.3
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.2
+backtrace-0.3.15
+backtrace-sys-0.1.28
+bitflags-1.0.4
+build_const-0.2.1
+byteorder-1.3.1
+bytes-0.4.12
+bytesize-1.0.0
+cargo-0.35.0
+cc-1.0.35
+cfg-if-0.1.7
+clap-2.33.0
+cloudabi-0.0.3
+commoncrypto-0.2.0
+commoncrypto-sys-0.2.0
+core-foundation-0.6.4
+core-foundation-sys-0.6.2
+crates-io-0.23.0
+crc-1.8.1
+crc32fast-1.2.0
+crossbeam-channel-0.3.8
+crossbeam-utils-0.6.5
+crypto-hash-0.3.3
+curl-0.4.20
+curl-sys-0.4.17
+env_logger-0.6.1
+failure-0.1.5
+failure_derive-0.1.5
+filetime-0.2.4
+fixedbitset-0.1.9
+flate2-1.0.7
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fs2-0.4.3
+fuchsia-cprng-0.1.1
+fwdansi-1.0.1
+git2-0.8.0
+git2-curl-0.9.0
+glob-0.2.11
+globset-0.4.2
+heck-0.3.1
+hex-0.3.2
+home-0.3.4
+http-0.1.17
+humantime-1.2.0
+idna-0.1.5
+ignore-0.4.6
+im-rc-12.3.4
+iovec-0.1.2
+itoa-0.4.3
+jobserver-0.1.13
+kernel32-sys-0.2.2
+lazy_static-1.3.0
+lazycell-1.2.1
+libc-0.2.51
+libgit2-sys-0.7.11
+libnghttp2-sys-0.1.1
+libssh2-sys-0.2.11
+libz-sys-1.0.25
+log-0.4.6
+matches-0.1.8
+memchr-2.2.0
+miniz-sys-0.1.11
+miniz_oxide-0.2.1
+miniz_oxide_c_api-0.2.1
+miow-0.3.3
+num_cpus-1.10.0
+opener-0.3.2
+openssl-0.10.20
+openssl-probe-0.1.2
+openssl-sys-0.9.43
+ordermap-0.3.5
+percent-encoding-1.0.1
+petgraph-0.4.13
+pkg-config-0.3.14
+proc-macro2-0.4.27
+quick-error-1.2.2
+quote-0.6.12
+rand-0.6.5
+rand_chacha-0.1.1
+rand_core-0.3.1
+rand_core-0.4.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_jitter-0.1.3
+rand_os-0.1.3
+rand_pcg-0.1.2
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.54
+redox_termios-0.1.1
+regex-1.1.5
+regex-syntax-0.6.6
+remove_dir_all-0.5.1
+rustc-demangle-0.1.13
+rustc-workspace-hack-1.0.0
+rustc_version-0.2.3
+rustfix-0.4.5
+ryu-0.2.7
+same-file-1.0.4
+schannel-0.1.15
+scopeguard-0.3.3
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.90
+serde_derive-1.0.90
+serde_ignored-0.0.4
+serde_json-1.0.39
+shell-escape-0.1.4
+sized-chunks-0.1.2
+smallvec-0.6.9
+socket2-0.3.8
+strsim-0.8.0
+structopt-0.2.15
+structopt-derive-0.2.15
+syn-0.15.30
+synstructure-0.10.1
+tar-0.4.22
+tempfile-3.0.7
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.11.0
+thread_local-0.3.6
+toml-0.4.10
+typenum-1.10.0
+ucd-util-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.8
+unicode-segmentation-1.2.1
+unicode-width-0.1.5
+unicode-xid-0.1.0
+url-1.7.2
+url_serde-0.2.0
+utf8-ranges-1.0.2
+vcpkg-0.2.6
+vec_map-0.8.1
+walkdir-2.2.7
+winapi-0.2.8
+winapi-0.3.7
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.2
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+"
+
+inherit cargo
+
+DESCRIPTION="Cargo subcommand that visualizes crate dependency graph in a tree-like format"
+HOMEPAGE="https://github.com/sfackler/cargo-tree"
+SRC_URI="https://github.com/sfackler/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="|| ( MIT Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND="
+	dev-util/cmake
+	>=virtual/rust-1.34
+"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	sys-libs/zlib
+"
+
+DEPEND="${RDEPEND}"
+
+src_install(){
+	cargo_src_install --path=.
+	einstalldocs
+}
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index a35b52f71f62..ba74972b39e3 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -9,10 +9,10 @@ DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd
 DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a
 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-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
-EBUILD catalyst-3.0.2-r1.ebuild 2034 BLAKE2B 5fff0e99ffae7b322117a045224a9305ed5059c01189a5a0244045099dae8defac9aa18d90dd377bbbba5ed31ba7cd2e8da8cd5af334301d1938b3bf3bbad77a SHA512 245ed691199421fac51c8a612b80f281872b79fb382bd2e4aed91227b6f3c03bd16ef2dabee21cda87454ac1403cadf15728b57bfba7c5283ea198b381765542
-EBUILD catalyst-3.0.2.ebuild 1991 BLAKE2B 320f68ea1cee53ff519006532321a8ecc695c1b547bf4f3d170a564eb336c430f7575effa03e112c086591c2f5fd18f817416e050a76e01769c4e282da1d1ad3 SHA512 a27092e4b8af69f20c08d3ed5f808e16b08a7fa7ebc09ed599e0dc0f3e0d969cdc8093995aeb245439a463a96fa44eeabdfb2031fec96ad442c3b0fb306b567e
-EBUILD catalyst-3.0.3.ebuild 2034 BLAKE2B 5fff0e99ffae7b322117a045224a9305ed5059c01189a5a0244045099dae8defac9aa18d90dd377bbbba5ed31ba7cd2e8da8cd5af334301d1938b3bf3bbad77a SHA512 245ed691199421fac51c8a612b80f281872b79fb382bd2e4aed91227b6f3c03bd16ef2dabee21cda87454ac1403cadf15728b57bfba7c5283ea198b381765542
-EBUILD catalyst-3.0.4.ebuild 1890 BLAKE2B 3e86a79dfa9a6d04684df98add2808510bbbd95b601d25d7d42efbb427d90a578ee681b13a52fe8583574841903ecef2adfefb3bdc09e91e51ec4d110a843efe SHA512 c1e2f06a4092ca066656ad0c749e2f38ef6bca983bb7eebaf2d4cbc5f7bf37043adba9d6ecc5a6f360068f362b1b906545bc52a745307e5852fabc6c1819cca4
-EBUILD catalyst-9999.ebuild 1890 BLAKE2B 3e86a79dfa9a6d04684df98add2808510bbbd95b601d25d7d42efbb427d90a578ee681b13a52fe8583574841903ecef2adfefb3bdc09e91e51ec4d110a843efe SHA512 c1e2f06a4092ca066656ad0c749e2f38ef6bca983bb7eebaf2d4cbc5f7bf37043adba9d6ecc5a6f360068f362b1b906545bc52a745307e5852fabc6c1819cca4
+EBUILD catalyst-3.0.1.ebuild 1749 BLAKE2B 4d6168aef3872cc6d52652efb9cfdd415c05f84f0583cb401c587cc0f5694c967efc23670222db15240190187cf1d3645735da425282df40f0cbf07d6bbc418e SHA512 05df5faadcc00465f9032aeceaf757a35798be6f74855cc79276c48b475c469c325f2e7a41a8c00fab761435c86d65b2eea3503e576a57edc871f8bcaa806ff7
+EBUILD catalyst-3.0.2-r1.ebuild 2030 BLAKE2B 3ceb7a97836503cbe5bda95cf6569ac181f5f5b5eca38a946a98507ca7e654002ee3a40415a39a307649e783ca7ce1067cfaf1d33561c9b9376bdb7a10819a91 SHA512 598c70956b2d52e2cda519fcc15f0ae345e82e0d3b83affae4e2d53aabcd194ac26077c9af86a6327c1a5ece20e74dbf7b99e2670cc6191152ec111237db9de4
+EBUILD catalyst-3.0.2.ebuild 1984 BLAKE2B 08620acbb663a18ccb41e8474e8df5e7ff3413a82d56e002cf25764111a7411ac789dffda6b2e44e4adbaab1e7e6ca2876e927c2f2d31f5e4bc8f20790e0c672 SHA512 21bc0f556d029b56427e591e1d3cf75d66e46db73b1fca2a6496a5c8183037b70f6b1343ba5a1bdce59e7e0533e1b8e3cfd69694f507475a7bb834196ef9eff3
+EBUILD catalyst-3.0.3.ebuild 2030 BLAKE2B 3ceb7a97836503cbe5bda95cf6569ac181f5f5b5eca38a946a98507ca7e654002ee3a40415a39a307649e783ca7ce1067cfaf1d33561c9b9376bdb7a10819a91 SHA512 598c70956b2d52e2cda519fcc15f0ae345e82e0d3b83affae4e2d53aabcd194ac26077c9af86a6327c1a5ece20e74dbf7b99e2670cc6191152ec111237db9de4
+EBUILD catalyst-3.0.4.ebuild 1886 BLAKE2B 957432f0fd43896f64f74140786c1845303f09d170f7b3addd5e762aada514efccb37ef163ba2997440317ffd8d82f0619e5466394a41072f97861a3354944aa SHA512 0932c7ce3405c3c271b05e61590cdc80f1c54a0829b709a691b0af8a0aba4a83f404932c87be772f6fdb7dc87bf3a027ca6d24c66e6858107dec8bd597a27953
+EBUILD catalyst-9999.ebuild 1886 BLAKE2B 957432f0fd43896f64f74140786c1845303f09d170f7b3addd5e762aada514efccb37ef163ba2997440317ffd8d82f0619e5466394a41072f97861a3354944aa SHA512 0932c7ce3405c3c271b05e61590cdc80f1c54a0829b709a691b0af8a0aba4a83f404932c87be772f6fdb7dc87bf3a027ca6d24c66e6858107dec8bd597a27953
 MISC metadata.xml 561 BLAKE2B 34d8ab6f5f0a82f20cba329a4f6ece18577bc5de7ea9828a49262cc218a36e2a2d89c9043684daf048f9c1192a6950f652c275deddee5a6d8bc99cb7f61930dc SHA512 2e8a0ea51c2ee0ea20d1ef7be45fc6606a2b0d0f3a9b841227281a5453e79352a12b9f44424aefa6fba1a61113ba6bffb4cea359cd9ce11cf1a8ee4bddf331b8
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
index 2e0198f3ece7..7792b7e20a3c 100644
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,7 +16,7 @@ else
 	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{2_7,3_5,3_6} )
 
 inherit distutils-r1 multilib ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
index 5e5de2a1b169..7aab281c337c 100644
--- a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
index cc286d0a2429..12d4b9dbf83d 100644
--- a/dev-util/catalyst/catalyst-3.0.2.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
index 5e5de2a1b169..7aab281c337c 100644
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ else
 	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
index e8b8bb017dfa..0a171813dc51 100644
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.4.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index e8b8bb017dfa..0a171813dc51 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -12,7 +12,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 fi
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit distutils-r1 ${SRC_ECLASS}
 
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index 96adf587f27a..a244ed42cc3b 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,7 +1,3 @@
-DIST catfish-1.2.2.tar.bz2 98956 BLAKE2B a04c7c62745eb5ac5bc8a169fa01e9a943e319cd0d96db44485b12367838f5ec587a7fdf2be4cba4c135f8d301fe2b72c26646f0f97cb69404b7e6b682f817cc SHA512 dad407f1e818b8d537b73e9f832c39ca4f9527b9d636da18493a685b03d2fab56982a11872382fd457b9a1a0ffb33d29ade4aa317561c3b2ee82c96728705e75
-DIST catfish-1.4.6.tar.bz2 150331 BLAKE2B fb59dfce5770ddfb7740f1f7b2deb22928f3bd49a1ac323827143fc6c41586adbe45521daae3b26bf748f14c859051bae43ea4f94a0be37c84b30f933f7a2bca SHA512 1c50375a9b36554123327a138c50de47abbbfd2fb334b91773312e9001e4bbc936550c2b23ad658b29fe9f1537d59997513b01bf4e2c31ce0286f5650776f8f7
 DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
-EBUILD catfish-1.2.2.ebuild 1505 BLAKE2B faa976f3a9b71d1e3c61e3ff34a6aa994572d0f5e948e0d8b12cd09a6bc078d9e4d69d3bebfca9acbb64fd7e9a85ec0f9389fa407b35966a63663f3240cc73d4 SHA512 ad5ae1955a0fd0607bc42c40d05dd0fe7442a57ccdee60e150016d9e6fea7c7b8dcebda300dbca14db701a0589feac2ff8a4a8917c054eafd4a76d113daddfe6
-EBUILD catfish-1.4.6.ebuild 951 BLAKE2B 604b7dbefd52af2d03b84c3470f3d87544132a7ac2381b88d56e8240eebc565d5b45f10076976ec011890fb160454336d7e754555536caa0fe5f1cb891c86d6a SHA512 fa0c10c2b546fa033463782e125b47de71765cfb0ea34dea8c0a6469793ba68bc411c5d50255c81cf089aff8080fb0db313dbfd4dc99c4cb834175cfa9d4dfff
-EBUILD catfish-1.4.7.ebuild 953 BLAKE2B 4f4435e59d8e4001617ce367643a8595f5c98449adc3ddd1891ecbbb4bcad12556533a09e5f8b4f0521b339d92e178d2412073a57c2ad7946093efbf0e865a12 SHA512 f2018305babd9b7c9e8cafd5d02436f852dd1bd9e3baa2c8e11926671575e85b9ffab063646233eff0324cb2345fb942e8d7a7b4dbd4aef4d2e0a9f31fc85949
+EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.2.2.ebuild b/dev-util/catfish/catfish-1.2.2.ebuild
deleted file mode 100644
index 42bde6bcd260..000000000000
--- a/dev-util/catfish/catfish-1.2.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils gnome2-utils python-single-r1
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://launchpad.net/catfish-search http://twotoasts.de/index.php/catfish/"
-SRC_URI="https://launchpad.net/${PN}-search/${PV%.*}/${PV}/+download/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-COMMON_DEPEND="
-	${PYTHON_DEPS}
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	${COMMON_DEPEND}
-	sys-devel/gettext
-"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	strip-linguas -i po/
-	if ! [[ -z "${LINGUAS}" ]]; then
-		local lang langs=$(find po/ -name '*.po' | sed -e 's|po/||g;s|.po||g')
-		for lang in $langs; do
-			if ! has ${lang} ${LINGUAS}; then
-				rm po/${lang}.po || die
-			fi
-		done
-	fi
-
-	python_fix_shebang .
-	sed -i -e "s:share/doc/\$(APPNAME):share/doc/${PF}:" Makefile.in.in || die
-}
-
-src_configure() {
-	# not autotools based
-	./configure --prefix=/usr --python="${EPYTHON}" || die
-}
-
-src_install() {
-	default
-	python_optimize "${ED}"/usr/share/${PN}
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { gnome2_icon_cache_update; }
-pkg_postrm() { gnome2_icon_cache_update; }
diff --git a/dev-util/catfish/catfish-1.4.6.ebuild b/dev-util/catfish/catfish-1.4.6.ebuild
deleted file mode 100644
index 8d005bda8b69..000000000000
--- a/dev-util/catfish/catfish-1.4.6.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 gnome2-utils xdg-utils
-
-DESCRIPTION="A frontend for find, (s)locate, doodle, tracker, beagle, strigi and pinot"
-HOMEPAGE="https://docs.xfce.org/apps/catfish/start"
-SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND="
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	x11-libs/gtk+:3[introspection]
-	virtual/freedesktop-icon-theme
-"
-DEPEND="
-	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
-	sys-devel/gettext
-"
-
-python_install() {
-	distutils-r1_python_install
-	rm -r "${ED%/}"/usr/share/doc/catfish || die
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/catfish/catfish-1.4.7.ebuild b/dev-util/catfish/catfish-1.4.7.ebuild
index cdd0e8511b7a..4f37b98187f3 100644
--- a/dev-util/catfish/catfish-1.4.7.ebuild
+++ b/dev-util/catfish/catfish-1.4.7.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 gnome2-utils xdg-utils
 
@@ -12,7 +12,7 @@ SRC_URI="https://archive.xfce.org/src/apps/catfish/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
 	dev-python/pexpect[${PYTHON_USEDEP}]
diff --git a/dev-util/catkin/Manifest b/dev-util/catkin/Manifest
index 73241e6eee07..766fe26cefbd 100644
--- a/dev-util/catkin/Manifest
+++ b/dev-util/catkin/Manifest
@@ -10,8 +10,8 @@ AUX tests.patch 1640 BLAKE2B cc0d89a779ad056806b1c721709c1318278cb836e539042071e
 DIST catkin-0.7.11.tar.gz 206933 BLAKE2B cda31e3d097516ce830060a2323956ec27c4113d161e95ab55564c00209e23d894e2acf3bf11b78e19538d4d8ff4c85814362a89bca58700da5fb609fb708fb8 SHA512 71810a80c1ac4334fdaed176285bee6bcb0443529debecf421723881e3d6316f41d4ed07c5eafa55515ba9d8143d5dc5fb683eda5ad54e52fda5c24085c44c96
 DIST catkin-0.7.12.tar.gz 211602 BLAKE2B ee5b9e57601847f79a2e7c49bb9b38974b0385a1c524c70cc549511d31b9fe8d03bf95e254b9c40a420fad990da40bf9c5d29f198ae42bd772c54a89cdc532b9 SHA512 ada496fae0959330b369c8a29daf9c575fcc94c3ee7e27e0180614fc49912450b23163622759975e588ffcdd49180e5f2fc8351e02bf1aef9b1f2db92811dbd6
 DIST catkin-0.7.14.tar.gz 203422 BLAKE2B 22f27066054db9d35aaee216603c778a70a1941ab067ba6bfb42d25c6c90dc3fe3efb19167328dcbb008d21b9f7987cce4d3af44fe8368a1fda369432b383401 SHA512 4d17d2fd9c69d04d90a2aff4d48ac6cbdec052856af18cd4b3fb72cb7b3159651b606cd36ef653b9097ee7c23e036709afc019a95bb0ab34c29f51aad4d17d21
-EBUILD catkin-0.7.11.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-0.7.12.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-0.7.14.ebuild 3139 BLAKE2B bc6d94dc8ecc6939cf87c49afefcb74f664c9283b38735303265ca392472d8457f7a7c58f30ccbbfd2adc8f3682effb716acf4772f920245da3bf9d545ec3b32 SHA512 8b7e0b4e54866abf40d87daa43a16ed396afec17674b6d09898bf794a326f44fcbf8cb5836184f35e245ae34e488bd99a8ae01137bec2e60fae56d65577f0f3c
-EBUILD catkin-9999.ebuild 3139 BLAKE2B 6a79b59b3737995740a010bd564765f4e8ee5ef527c6a65d7100335047e774c81a46e54cd2e142903c50ca6a8dc82c52fbe4522aad7e41c58ad419da0b256e26 SHA512 6376d7edca6f7fea19baf69d9e42f0a75692f9104e9881415e96cfcb8cb2f2a6652901ac01c485f6e7ca1951a454e05439c67b8b36bf92ba8147566e7e006b01
+EBUILD catkin-0.7.11.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
+EBUILD catkin-0.7.12.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
+EBUILD catkin-0.7.14.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
+EBUILD catkin-9999.ebuild 3132 BLAKE2B 7086d2b146eeae7b8ed6f288da896e998a4bdc205c0fd7034364ad498915cb8f467eaca620f4da0e788718fad0f3f50c4af0f989629430dbcf2d767c9297eda1 SHA512 829012be9c52ada3d2b5cfa0e9a4cee5207c594754495c74b9da0b0f9e6964b8375000b7ce4950e8438bc32ee8c1fbf56a9b68aaa06d1726f473658a91242ea4
 MISC metadata.xml 324 BLAKE2B 393e10af3d1bef82391a91bbf6382d9d1cafcdfe8a681b3a24844427cee1e3aa36f27ffd0a37a65b8a476ce0b3f2a860f546adc32c480164c69f66673bb0b5f4 SHA512 598dc8dd4427079a7eeca415c192ec39e99e53bc41c06796d2355b8858363b71ee8f038646c61ddd82d27451eb48c6f93b47489cdb04ae7c8663a6b46c4f9b94
diff --git a/dev-util/catkin/catkin-0.7.11.ebuild b/dev-util/catkin/catkin-0.7.11.ebuild
index 6f125a7d7fb0..cef4fa0eb0e8 100644
--- a/dev-util/catkin/catkin-0.7.11.ebuild
+++ b/dev-util/catkin/catkin-0.7.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/catkin-0.7.12.ebuild b/dev-util/catkin/catkin-0.7.12.ebuild
index 6f125a7d7fb0..cef4fa0eb0e8 100644
--- a/dev-util/catkin/catkin-0.7.12.ebuild
+++ b/dev-util/catkin/catkin-0.7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/catkin-0.7.14.ebuild b/dev-util/catkin/catkin-0.7.14.ebuild
index 6f125a7d7fb0..cef4fa0eb0e8 100644
--- a/dev-util/catkin/catkin-0.7.14.ebuild
+++ b/dev-util/catkin/catkin-0.7.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
diff --git a/dev-util/catkin/catkin-9999.ebuild b/dev-util/catkin/catkin-9999.ebuild
index eb49a4b8c816..cef4fa0eb0e8 100644
--- a/dev-util/catkin/catkin-9999.ebuild
+++ b/dev-util/catkin/catkin-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	EGIT_REPO_URI="https://github.com/ros/catkin"
 fi
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 inherit ${SCM} cmake-utils python-r1 python-utils-r1
 
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index d1e67b629437..6f6ca00eafff 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -9,9 +9,11 @@ DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d0904
 DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
 DIST ccache-3.5.tar.xz 334668 BLAKE2B e3e2b63e8c4c8074514fb3a5794325fa05a4d52f48fc436ab0ad21b643ca4d1a1502c989cb47ed68972b105d4f1642e4fadc5ecef1235fe2bd3be5d218094a79 SHA512 92181fb794f06dc231baa4193c37e8f1d844c9281fd64bcb8f4b35c87b4a88dfc9bf36b810b37151ee85699778fcd3783818949a7010e619aeca7e3b33b7a2e3
 DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
+DIST ccache-3.7.tar.xz 348764 BLAKE2B a80ac0d5d94ff5d1aaee45a186037a9c8346c5e44d00afd29a4ba40b4fca877cd30b82357f344bed77f5caeb333bacfde8aff46d8fb866b484a3a1d3e5f513f5 SHA512 b8a5944072fcf8280b63ddbd6e2fcbc04d4ee99c0b2d3bfb9b47f61e760ce1dc5e191cf3f6437431b6d08af6cfb2162d6a2021ad49fd6746e531eb03cc26fd2e
 EBUILD ccache-3.2.4.ebuild 2068 BLAKE2B 8fb9e15fe1787760e878ac9c13f9c97e9e9e87e3046ec700266ccd3a1d44240e7a5cf0e24deaef38bad30f66d823488e8979ebe79a9668ff55c6a417ec048229 SHA512 965dcf43bd7999352de8aa6097e90418160cf4f51e4016113c05dc37d023518e22d001a2415ad7948c07e55ab57ae044021e7e4f044df127b81a12ad2bd37653
 EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
 EBUILD ccache-3.5-r1.ebuild 2046 BLAKE2B f5bd4d9cf89b0896d51152614c47f329e29d084c371b4fdd0291d2d6d1b2d880af38358a6ffbd620b9a8d1f3ec6a95d263ce2f8fa202955c2cb32c77cf33d758 SHA512 a90b898e8e261afe126321d7222ce41d4c91e068ce5baa15927a630ea66d141cce95f87b826c85b33599f33b0584055d22af6dd358651daea29487800f0cf2ae
 EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
-EBUILD ccache-3.6.ebuild 2099 BLAKE2B c8f75918483df8772aa657dc837748053eebbafa8231d6ecf05cab5cd73dd2aeceb6e4394ab0ffe212a35c92d5482fb2f623551ceccb5d5cfd80654786ba6574 SHA512 3ce2913602971e9b6b2d91b8bfb24a839da3800b75e563d457e113db967bc037bdaf4649f6d6bd88d49657aa8533b2d81b944de6c8aa8181472d201e60fd726a
+EBUILD ccache-3.6.ebuild 2094 BLAKE2B c500a209421345174099d4603fc592972862cdde7d961639b81bcaa3c723a9339b4dcb8dfc20287a21b6e22125992245926f317c6c856c672f9cb8f7f601d0da SHA512 bc60aff39b32ddedbd052ce7c0b90f42780fbb40f6b8a76773349c2406ed86b3d630a40d4c7ab9c75bb7b566c18753e7840ff589878918338933e75531c6c8ec
+EBUILD ccache-3.7.ebuild 2126 BLAKE2B 11a1cdb3de7b56d6b97069c8646825ea10bf105d477b6fd16afc235d376b5bb888c53f9148b2ae0aa422d782b6b99e673a5aa821cfb09f0433388f6fa37a0c11 SHA512 b303a89fe8a501547394ba89ac44f9865320a737b8d9cb74acf1008b66803e2f62f46a38c22a1f4890891c97ffd0e249b0c3863ed3f3e2511f67a84f3164633f
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.6.ebuild b/dev-util/ccache/ccache-3.6.ebuild
index c5335c505f37..155ab8c7ce3b 100644
--- a/dev-util/ccache/ccache-3.6.ebuild
+++ b/dev-util/ccache/ccache-3.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.samba.org/ftp/ccache/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/ccache-3.7.ebuild b/dev-util/ccache/ccache-3.7.ebuild
new file mode 100644
index 000000000000..b8912ddeeee1
--- /dev/null
+++ b/dev-util/ccache/ccache-3.7.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit readme.gentoo-r1
+
+DESCRIPTION="fast compiler cache"
+HOMEPAGE="https://ccache.dev/"
+SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE=""
+
+DEPEND="app-arch/xz-utils
+	sys-libs/zlib"
+RDEPEND="${DEPEND}
+	dev-util/shadowman
+	sys-apps/gentoo-functions"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.4-size-on-disk.patch #456178
+	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
+	"${FILESDIR}"/${PN}-3.6-disable-sized-cleanup.patch #649440
+)
+
+src_prepare() {
+	default
+
+	# make sure we always use system zlib
+	rm -rf src/zlib || die
+	sed \
+		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
+		"${FILESDIR}"/ccache-config-3 > ccache-config || die
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_test() {
+	emake check V=1
+}
+
+src_install() {
+	DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
+	default
+
+	dobin ccache-config
+	insinto /usr/share/shadowman/tools
+	newins - ccache <<<'/usr/lib/ccache/bin'
+
+	DOC_CONTENTS="
+To use ccache with **non-Portage** C compiling, add
+'${EPREFIX}/usr/lib/ccache/bin' to the beginning of your path, before
+'${EPREFIX}/usr/bin'. Portage will automatically take advantage of ccache with
+no additional steps.  If this is your first install of ccache, type
+something like this to set a maximum cache size of 2GB:\\n
+# ccache -M 2G\\n
+If you are upgrading from an older version than 3.x you should clear all of your caches like so:\\n
+# CCACHE_DIR='${CCACHE_DIR:-${PORTAGE_TMPDIR}/ccache}' ccache -C\\n
+ccache now supports sys-devel/clang and dev-lang/icc, too!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_prerm() {
+	if [[ -z ${REPLACED_BY_VERSION} && ${ROOT:-/} == / ]] ; then
+		eselect compiler-shadow remove ccache
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${ROOT:-/} == / ]]; then
+		eselect compiler-shadow update ccache
+	fi
+
+	# nuke broken symlinks from previous versions that shouldn't exist
+	rm -rf "${EROOT}"/usr/lib/ccache.backup || die
+
+	readme.gentoo_print_elog
+}
diff --git a/dev-util/cdiff/Manifest b/dev-util/cdiff/Manifest
index c3c592ebc929..58f891787e7f 100644
--- a/dev-util/cdiff/Manifest
+++ b/dev-util/cdiff/Manifest
@@ -1,5 +1,5 @@
 AUX cdiff-0.9.2-disable-unimportant-failing-test.patch 383 BLAKE2B 4dfd4cdff8c71ba3cc160317d27a5bf26b2c5ed0d1278403dd7c5ad2a07e0b55759ec8c67c50b5d36aa1a8912f2b4f653fdb0b7ad1b36865367e28a433ebc4d7 SHA512 598cf3d4ccbffb6ac71c3e60c4402001d18172d1f7fb309290c94b0f5d2541c4fc1c6557cb1d5780e993e3fefb84314acb2515ab6e585affb7172327794fb4f9
 DIST cdiff-1.0.tar.gz 33599 BLAKE2B 98e6e8689329bfbdc718e7f6bf3cfb6c6ff92de0b27a44f62f24e35710cf0391c6127833b7f8302aa31d9420147791fdc2861aa95acf5719ce250f7af4d8893f SHA512 74a41bdf9c0ffef5baff775dd32027d401547bdc8f40eb633e11107c74d0e9b31746cedbeffc4a3732ff9abe03a101aa3a7a509d3a0e0e080589c6f18bcb8cfe
-EBUILD cdiff-1.0.ebuild 711 BLAKE2B 7877ede0ba03803d4527dde659f5312bea4c3126c82447d36e3527a46a8cf981d86da6b1dd7a0dac880a2236af1747fc76c918c692b7e7bc92c6c10edab64d47 SHA512 5444aad617de87c0bd6234db67705f6be50f984591b259fa4f6a3d01f54c3363a4cf5a0fba860d010a8da60625d0a7fd45b09d7610a31babd16792a35f02fb7a
-EBUILD cdiff-9999.ebuild 752 BLAKE2B dab28fae8a7d15a2b630ab794b3c388fbe6caf5fc011c8f3dea1451f5f388bd19ce5692e01699dee07df1c3c2c86e31ba392c4df2d3eca95ecf8b05a881c949c SHA512 68046d783fd8421ae93bb2094a6b46728b60955ac2d1e74c89657ef7e7740785db7eb8f5ded27fe99ca229545de49ecce09dbdc62e624a5f63f66d28545ae4b2
+EBUILD cdiff-1.0.ebuild 709 BLAKE2B 9e8d86ac7e5a8fb9dc162f1f63a76a159a1f88d0ef7458eeb2ade055215481d6710fef96ce552ea8e3f3425dd17dd80d5b4a807ca9a9b2e5d914bdac3faff945 SHA512 f711fb7b53f356d5f5a9d7a17cfe3145a3acf34eb70e035240d1cf3d5661f6af415e777565f0d53cf43534dbd127e5bdf396b2388d668216121f24f4a38bc508
+EBUILD cdiff-9999.ebuild 745 BLAKE2B 61f63f8673f91dc7b7b63e5028d6bbde27dac835fd82e17ee02e8bc12473d828c1a36d429a30c022e0edead0c8a4e1d5333dfcc0f2d78f579c9bf08e67a8dcee SHA512 bf47d0032eac6870eb4fd8a49bf17ddc71d8c6e8dfc99d2049440e6dc3b9b5dc5860afdebcdbd750d77a886837c97570e72cee97bc78e57d1c088afa36b8a51a
 MISC metadata.xml 383 BLAKE2B c2fba0c9ed05af593bf10ae733401d7de8a1396c22094ba912418a796783e069243506edfa72cfb1a706f63c0bcbc5cfb0321b21a5d699a726901ccae682a32f SHA512 c797a47d8258e3aff9bf93328566438192a37c166733e84fd6846ecccb77ea0398c82dd9abbbe90623d4a1fa33405c75ed1defeb832cb2e55b754d3a594bba5f
diff --git a/dev-util/cdiff/cdiff-1.0.ebuild b/dev-util/cdiff/cdiff-1.0.ebuild
index 44e8bc31bed3..98a045cb0db2 100644
--- a/dev-util/cdiff/cdiff-1.0.ebuild
+++ b/dev-util/cdiff/cdiff-1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy )
+PYTHON_COMPAT=( python2_7 python3_{5,6} pypy )
 
 inherit distutils-r1
 
diff --git a/dev-util/cdiff/cdiff-9999.ebuild b/dev-util/cdiff/cdiff-9999.ebuild
index 9d071be628c7..16e2456ba330 100644
--- a/dev-util/cdiff/cdiff-9999.ebuild
+++ b/dev-util/cdiff/cdiff-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 git-r3
 
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index dcfa6401c153..b5e8fb83d1d0 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -4,4 +4,4 @@ DIST clair-2.0.6.tar.gz 5195113 BLAKE2B 6044ba36d63d74eaecad5cc48173cd56867fb300
 DIST clair-2.0.8.tar.gz 5196242 BLAKE2B 9daa91599f9fe98f9a30a043fd261882b36abde5fe985097b47b48a9630db528d978f90f6bd68b32bae9d20a92f598199054cf188b1514a42876666703937b3e SHA512 000ba7c10ca540aaba34de91cf8060f6d28b704060457d320791d188871bf10ea1a8b5eb0526ae0aeebf6b6a307b096c2cc4038ddd5f955d200d20b96f1a725b
 EBUILD clair-2.0.6.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 EBUILD clair-2.0.8.ebuild 1048 BLAKE2B b5c1bcef67e5bcf097d7ce2c4f9a1718a67291934ce94b2ad7ae28b45cf79efe23be1b2be3bb8d6ff4cd89ed3b3ee4e1decf2d721e268995604f44e8e41695c0 SHA512 51105ad82d34ade4612ea52b0d71d0413d4742a17d50244f7040099275be8b2c46823ac6884282c09de0368d1ae975f6466e99d553686da1e047f74ccc5bff96
-MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
+MISC metadata.xml 244 BLAKE2B ce0da14c65df5bf7fc2cae4430ffd0987a290bca46fa277b567e19ea1ac70833236a8979926777633066649665f2c816fbc4b602bc61d26672265436ff67fbdc SHA512 7f3452112634a3eed755c069728dbd8e6f79c52195acb4fa4a6caf7d44764e24bc37fd59daa394823b436adec9a99c932d253fafef7384cc25f0f7b3fb66fe0b
diff --git a/dev-util/clair/metadata.xml b/dev-util/clair/metadata.xml
index 01abcbc89e22..7ffa01bcb56b 100644
--- a/dev-util/clair/metadata.xml
+++ b/dev-util/clair/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">coreos/clair</remote-id>
 	</upstream>
diff --git a/dev-util/cligh/Manifest b/dev-util/cligh/Manifest
index f37ceb07d48d..639f6bf19e6d 100644
--- a/dev-util/cligh/Manifest
+++ b/dev-util/cligh/Manifest
@@ -2,5 +2,5 @@ DIST cligh-0.1_p20120630.tar.gz 7848 BLAKE2B 4690330e4b353244bc1e7065759637fa9d1
 DIST cligh-0.2.tar.gz 7844 BLAKE2B 001e597ee60fd8b9e378c96f1ad4ab9dcf42de049bc2a914f8dece12048beebe0ec04b095cad64508af611b2fe52ca43fcf62b5bded74b3336359be85fef1235 SHA512 9b6e5e187324ccc1d9264aa259f648231f46aa443b75682206a17626f4f6f594a14538066f5e561c8a296d740506216db4cbd6ef7a9d25338a9d641cec7e3b9c
 EBUILD cligh-0.1_p20120630.ebuild 545 BLAKE2B 9480e10e97945bcdf10623417fc745ddd7f6a3751d3255d5b23e4ccd99cb5c3ce818268050a33090547df764cd90e839c4641fc45316ccb44b23022428a847e1 SHA512 fd32a8b47b20d93fc89888c1120f34bf2dde9698550e1b6eeea3bfd155cace25cf6109787dc0ce95f9829bc8e7d0efc3d6f5ad2c6fc317e240163f1c7d115217
 EBUILD cligh-0.2.ebuild 482 BLAKE2B fc1a2f481f693f513b3baacbe283408b26f4681a16f96be98435546bc66ab084ec9f10709bb7ea23d364ab980c1c06542bb78c1142479de868159dd7205abc2d SHA512 e26bd6b4af345ff67c145a55e27dfa37fdc12765a1437d17972c7ae9d7e418785c7649bcd127be9e72575a6de8a6ea032b0ac6fd9f3a545b235a07a203fe6746
-EBUILD cligh-9999.ebuild 477 BLAKE2B e5f728ee5049496241080019e31e2e9493cc4cb47a93f5d487345cd5e3b3265f7841da4d3f97010590e011625095d9172640e5cd341f707a028a8843605b459b SHA512 28b2b445ccd19c91141d26d4d71c0de3f013159c1c9ef0311c9bc9d637a02087bf9fc4c4cb4bfa53787d0cdfcbb45056f35992896cd1f62f49f6ddb40b3a3f64
+EBUILD cligh-9999.ebuild 472 BLAKE2B ffad639f1b1c2db9360bad1e37efe39ac836c657d8d50a84399ad9de8b698828ac5e0abf36261b7f7fd57950d068f180d2cef0fe62b9774c2fd6bf42c91385fd SHA512 a3dee067afde2e9e3a6f2f9bb0da84a024642c75d1da978ba8114935e224877de91baf3582c1b2c8ce827319b47b9b74d06e99ac110838b2b2dbc334a3d83267
 MISC metadata.xml 322 BLAKE2B 17e6d135ed46dac64053e30754ace41a45926ea930b32b4c41493eb67d03ff851301b07e4d42c37f6eef1150546eeec67994d9f3795af7197a376435acb68d2a SHA512 3d76d3e71460441beecd4bfdfd96f033d0701a2fa71918b9ffe222c4354ee5d716415ebb1aeff43818bc34a428ca60ef34894c44cee0256244f118e2b54d090d
diff --git a/dev-util/cligh/cligh-9999.ebuild b/dev-util/cligh/cligh-9999.ebuild
index 94342369cec8..524de0ae29d3 100644
--- a/dev-util/cligh/cligh-9999.ebuild
+++ b/dev-util/cligh/cligh-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit distutils-r1 git-2
 
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index 53e1d8b84dee..3793ae1c1b25 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2018.3.4.tar.gz 454682485 BLAKE2B 5e56fe7abf86b10c78b307c510ba22ef14fe73cd9504c3ab093e0677f9d7901fd446bccc1b464a88d40042c0b105ea0cc8a46e985e359407d75a73b875766a52 SHA512 ffe594b2df390cb41cd2c5629a1b8f9a80cf8463c05d22d43af2da3a8db73e9d52ebd70c15771b813c049299ce4b3a3765a4bd6f65fe59cbd904b3536f182d75
-EBUILD clion-2018.3.4.ebuild 1983 BLAKE2B 94169650024089fa4fd626a84a7c908aaa45fb71264785b7bfbed02333315f4c87481ce9e591af971973e2a0bda0d6b47a2b710644f3d04ff81cf91831d53c6c SHA512 c59f27d313fa33d595f3c06617361c17559c60f894ce2c0666654e6b256a414438355f0e9e363e08d4080488a5f799347fa2bac50d66d3062cccf4bc053789d9
+DIST clion-2019.1.tar.gz 429061573 BLAKE2B 14c2227509fd4c24d09ca139ff9f58ab2be71ad249d8f8a09d615cdc1aa07e9d2e0be9618e795859f564b63705a34e61dc90f3de5a012ad8fdf9a2f8ba512c33 SHA512 5c919ad2ea87744e0b3488958e58a9f67d8a8dcfa6affd86f975842c9e562663464d73373c72ef8085cede8f16828342dc17e182e761c199936bffee2f398509
+EBUILD clion-2019.1.ebuild 1903 BLAKE2B 20ce7ba85428dc74a5f682995352140d8faa30088e3aebf9eb1c69cd8d40f22f6102af2eccdf3baf530c9c175cbb6a6dcff51b0ec0531eac68f3c6e6e63efef7 SHA512 89922e0d2678b2410543014c84bfadc78a3d1c8d0a7d21fa0df11625e4495b1aad47fa0fd6c8f327b8c885d4f19621b32c96a64b2aac84303bd16187ae5bb727
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2018.3.4.ebuild b/dev-util/clion/clion-2019.1.ebuild
index 8ad83a903043..608e28eedd97 100644
--- a/dev-util/clion/clion-2018.3.4.ebuild
+++ b/dev-util/clion/clion-2019.1.ebuild
@@ -6,14 +6,14 @@ EAPI=7
 inherit desktop eutils
 
 DESCRIPTION="A complete toolset for C and C++ development"
-HOMEPAGE="http://www.jetbrains.com/clion"
-SRC_URI="http://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="https://www.jetbrains.com/clion"
+SRC_URI="https://download.jetbrains.com/cpp/CLion-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="IDEA
 	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-RESTRICT="splitdebug"
+RESTRICT="mirror splitdebug"
 IUSE="custom-jdk"
 
 # RDEPENDS may cause false positives in repoman.
@@ -33,14 +33,11 @@ src_prepare() {
 		bin/lldb/linux
 		bin/cmake
 		license/CMake*
-		plugins/tfsIntegration/lib/native/hpux
-		plugins/tfsIntegration/lib/native/solaris
 	)
 
-	use amd64 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86_64 )
-	use arm || remove_me+=( bin/fsnotifier-arm plugins/tfsIntegration/lib/native/linux/arm )
-	use ppc || remove_me+=( plugins/tfsIntegration/lib/native/linux/ppc )
-	use x86 || remove_me+=( plugins/tfsIntegration/lib/native/linux/x86 )
+	use amd64 || remove_me+=( bin/fsnotifier64 )
+	use arm || remove_me+=( bin/fsnotifier-arm )
+	use x86 || remove_me+=( bin/fsnotifier )
 
 	use custom-jdk || remove_me+=( jre64 )
 
@@ -52,7 +49,17 @@ src_install() {
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{clion.sh,fsnotifier{,64},clang/linux/clang{d,-tidy}}
+	fperms 755 "${dir}"/bin/{clion.sh,clang/linux/clang{d,-tidy}}
+
+	if use amd64; then
+		fperms 755 "${dir}"/bin/fsnotifier64
+	fi
+	if use arm; then
+		fperms 755 "${dir}"/bin/fsnotifier-arm
+	fi
+	if use x86; then
+		fperms 755 "${dir}"/bin/fsnotifier
+	fi
 
 	if use custom-jdk; then
 		if [[ -d jre64 ]]; then
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 8c9fcea903ec..207318ec5111 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -20,11 +20,13 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.1.tar.gz 8849712 BLAKE2B a4f917507a7ba354889606f17b9ce2c37e69d80a4ee86e75f23e214c9db11bd7947f8abc879a23c7fe76bdda32ab49360eb53f00eb1c4c4e74a8f80a7221d41d SHA512 2f0c0fb1559f71c5c2bf1a77f6fb2ecdaf078e47b5ab8ce997c6877f5d165619bc7a101b1566a8a40f8883ffef6ee690f93f2652855825019ec153aa4543ffb5
+DIST cmake-3.14.2.tar.gz 8850106 BLAKE2B c0e3a726d51caf8d0b3dd6fdc893c090d42094b49c8be9a6c8bc694457131eeb14c97dce71e11024afd419058f69db52a7c38e0e9a6eb0dab0374366baf198ea SHA512 b47dfa3c825cd520a5a92d8092f39595d2c89992c94b7fc5f7a5cc6d009dc6f9164c31f1801188862e58e943da3f84167571c2253697eace7a819a4ba43bcc42
+DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
 EBUILD cmake-3.13.4.ebuild 6207 BLAKE2B a2a7aaac70aa184f7da025954664f2a6a688a6f90bedbce965187953c3b8fedf984dcc7bf467171170857f1d1e6d350fb3a5dff2a53c90904ba262bb0c38ec6f SHA512 748e7e64d4a3dd96afe5ffe2981a79e5d4f380559fc9ef48a232360989a5cb01bde48aa014888a176042474c9d53c0eab9bd35adb03c04e28bfc990736de86b8
-EBUILD cmake-3.14.1.ebuild 6268 BLAKE2B 53bb585b3e89f1e1ca2d05cb1fd19799673a25b9bb8bafcbcd14869d0f9392f969d5fd4908bef5ba3d2fdb9054c40e17cc7d763d0fb64ef8d00cef375e9ea2d0 SHA512 b6c76a13362723a4155c2a46ac56492f0fe6f26fb3567dad4c71134423508b653e813fe683239ada1cf96bffe983fae62ba9d00a709d0c0af75e50d3dbb4ae67
+EBUILD cmake-3.14.2.ebuild 6283 BLAKE2B f00bc9edaa75031801d4bb097833089fa5dca7eeecdb360297792b4abb62b2f7872cf37860c9658ecb21fc8d138858f46b6496d675e797b3bf947a08d98c4ecf SHA512 039a0dae29ad6de201fadcd15208b657a182d0b7e13b56667131fcd7556765f0c332620fc9ea2453e2d743c08cab85688802ebb2ba07b718ce5ef572bfcfe5d0
+EBUILD cmake-3.14.3.ebuild 6108 BLAKE2B 8900d5f87f6e0a69b6fc6593e02e4665d4b40f600572b76897a3054322d16488f57107c0813a1b73ef5080e5d86220eae881daca28eac64e3a411b1be0d68294 SHA512 676d070b2cccb86116b9296dbed2287d4a3257d736dcb4d38b11d40e1b3f5b173118df703ad7955e4f2905c3c9cd33e4c33d9eb86af766d40348476f8424bc48
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.14.1.ebuild b/dev-util/cmake/cmake-3.14.2.ebuild
index ce96349c2144..af14db2da32a 100644
--- a/dev-util/cmake/cmake-3.14.1.ebuild
+++ b/dev-util/cmake/cmake-3.14.2.ebuild
@@ -126,7 +126,7 @@ cmake_src_test() {
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
diff --git a/dev-util/cmake/cmake-3.14.3.ebuild b/dev-util/cmake/cmake-3.14.3.ebuild
new file mode 100644
index 000000000000..0ec739545d3b
--- /dev/null
+++ b/dev-util/cmake/cmake-3.14.3.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5 test"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		dev-python/requests
+		dev-python/sphinx
+	)
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
+	# Next patch requires new work from prefix people
+	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null
+	if [[ $? -eq 0 ]] ; then
+		par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CMakeOnly.AllFindModules: pthread issues
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    RunCMake.CompilerLauncher: also requires fortran
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest \
+		-j "$(makeopts_jobs)" \
+		--test-load "$(makeopts_loadavg)" \
+		${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+		-DBUILD_TESTING=$(usex test)
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_preinst() {
+	use qt5 && xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postinst
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use qt5 && xdg_pkg_postrm
+}
diff --git a/dev-util/cmocka/Manifest b/dev-util/cmocka/Manifest
index e86bb1c92a3e..5f0e4f4a5297 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -3,5 +3,5 @@ AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a8407137
 DIST cmocka-1.1.3.tar.xz 78744 BLAKE2B 5043a496afab08837a73c2e0ff9c9b3c3880a2fd394a768b1f8b51d2fec517a5527e93b7e660f8dcc73af79aaf88e224f4e2869c7e31540f8e54c76481905ff6 SHA512 b1a2ce72234256d653eebf95f8744a34525b9027e1ecf6552e1620c83a4bdda8b5674b748cc5fd14abada1e374829e2e7f0bcab0b1c8d6c3b7d9b7ec474b6ed3
 DIST cmocka-1.1.5.tar.xz 81004 BLAKE2B 5625dc293ad481c654848f3de806ef88d1b651192c2461e52b54bf9d443b5e2ea5d2a685ab85b044685f57e5723ade6c4c17e38624f59c4eab240cb4feeaab1e SHA512 cad7f04757183d004f6eaad39036fc0e24c5e0e987f80e85bc43bc66dba22389cb02b08e25531cc28a541d0a24a86b29be134a2d6fc339128e87d66952f502bd
 EBUILD cmocka-1.1.3.ebuild 1215 BLAKE2B 0993757ee364fb894a6c505cd6d03138bafcda15ac74671879880eaec2207abf5aa181cdb2ab9170239529d98d9cc5bad48f1cabfe5dd8b9124d0c2d9422fee6 SHA512 7db546da812952a9adf0efc5f90de762a6fca4b594532062c6540efd31883b67b6123e8999c593c9701bd44501714d42cab15119dd4234bfe96089f190225469
-EBUILD cmocka-1.1.5.ebuild 1087 BLAKE2B b0e89d62ce18b7d9b889b382e40c9efb77cf84abf903271e6c0855bcb331a1c027d5d282761a2d3263ae4eee8e7388e7199eb08363f53bf88b0d8788a46ad60f SHA512 9ae111c95cf2af4e5a8972cdf9c21c263e67dbaf9317e58d7165ed4630aa89e6f8e8fb5f14f8ec68d332dfd86dc638a6fc0c5bd49955c46d8c39546dd1567cce
+EBUILD cmocka-1.1.5.ebuild 1086 BLAKE2B 86fe19e0863cc6eee1c4020ccf8412fe45f45b3e89b99ba01e55c969bf3df1459d7071be8ebfbe663497d8aafa0410c6cbfffc99f3a8489165a6c881bd332cee SHA512 ba585c023e48933b5fdba9a067fbf424af44bf5395d45290a81e688aba343f616f7c60ffe0ffa3581fc71dd453ddf0efaab77ee29b691d619f104c62644dd4bf
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index e0d5dc6a7262..48e189cfe8a7 100644
--- a/dev-util/cmocka/cmocka-1.1.5.ebuild
+++ b/dev-util/cmocka/cmocka-1.1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="doc examples static-libs test"
 
 BDEPEND="
diff --git a/dev-util/coccinelle/Manifest b/dev-util/coccinelle/Manifest
index f1efa8c333d7..ae7f177ff9e6 100644
--- a/dev-util/coccinelle/Manifest
+++ b/dev-util/coccinelle/Manifest
@@ -1,6 +1,6 @@
 AUX 50coccinelle-gentoo.el 154 BLAKE2B debbfe7a00bf6195db370b33430d18fb7121123da26f97c01703704918f977f886090abfa0b6f226f8d713bca566ff6e39fabefb07e098a2bfd7cbd64eaebe6a SHA512 dc99ec43c65fc3b6735b8d06f664c09dabe89bb6dec2a0c0390e97ea2bacb1d76ff33d94124c2a2d1f16795648480c33e0306020e151d67d530e35aa9f4f009d
 DIST coccinelle-1.0.5.tgz 5660596 BLAKE2B 9707e4773d165718b973e004e3359608428d8405d560d7013da66e2b1f0205f003ae0905c02a4f13c9725b39dc94710e5ccbc6b5b11ace66d7e87c3a303363c5 SHA512 0fee450554abc40feac9e745a252c1679f8016c82f04236e642e32e129618a950bb9657f1c447d62543289e95bbd4b1a8b0c6030373025c32a37068f82d30678
 DIST coccinelle-1.0.6.tgz 6684278 BLAKE2B b5b390488e818ce05c364f27782bd1c4dc63657a01c7564764d64faea8ff302c8409bb2ef172ce7ab7c2e00ae1a6f2c3bea76a1148eaf5a977f897d39a9fb23c SHA512 b667762ddf5ad30b126e93572cd8a8b3ffc21a790cd9d6df586e421c5db0a8d049af9587c6e5cb8f7a13f2c090ab2a9cca59ecba69069f9d3fe67b6f75dfe539
-EBUILD coccinelle-1.0.5.ebuild 2532 BLAKE2B 61181f5b7d0c9fc9412fc14ef043f65219318715f586105d75d7e5ea27e0bb95bcfa0870f41f98cebd6e6f30a0636fee8f0b0f46e806a3f743a00d86eba61d12 SHA512 4fc8095cc0c7ac610e5f73bb4bbc5fce144979773fff9047f54dfea8ffdc17c4d8576c9dd90059f778a8ec19f905a61f6ad29ef4a0a68629fedadb4c376751c5
-EBUILD coccinelle-1.0.6.ebuild 2540 BLAKE2B 250bbaff5f571d1ed9130840eebc1382813276ee32134664f9d8130a5d96050857cba62802eaa7f0e3929ff3bd9bc3d47bbc8c03b807f1628ce2b9617c92e576 SHA512 a81263ea8c9bd9323e96df6996bcb311bd6f7ab1a67444efe2c5ebba2f666395af4cdef9b9ddf0353d314ccb8053cb317b6f51f348c6c229cb45554e0d5fd93a
+EBUILD coccinelle-1.0.5.ebuild 2502 BLAKE2B 497c1c18a0e7a43185d2c9bc0ad261035e92b2fced0ca1219121aca1f8bbb188e041b9a0b1fe2d4f457268dcb664836ce347a92ea1a473f6922c43ad8399c50a SHA512 263c21c8829b259eda468cc94d1734cf0b9f24b259a70f0732226fd0fc5740e60534937e661810ca5c355be9d52a7a7c196908c3b3dab33cdf0e5d3e241857b9
+EBUILD coccinelle-1.0.6.ebuild 2510 BLAKE2B 0abd80374f80c8a963821c235d62d3f082ab8ed3873fe9ca3fb703f100db24bd3c852ca3c17326042e6e04fefa2c8228480d2830d600e5cfbb201b39d0ad9141 SHA512 bfefe6e28eeac5dd282c1a7ec65d6b9df8b14b4843ea4a85574f03e724cda8cd87e5ffda28a612486a841dc4387568d22e9506e2505374f63f5f6d13f8b32258
 MISC metadata.xml 350 BLAKE2B 0a338a957b414534b2bc01b9e916a93bc4b17d54b855b23d90f67af7f53a2dddded19eec734bd50edec0130b0b2210869c96c3f8cafe968446dad7d44b76740a SHA512 9c0be4d11897f712a537302f5f87d92cf8df5866e60d3293f5dbf7fe6dd1d88d5678e103319577b397546307604124db39ac47cde7dfb5e61141c43a0fbe5761
diff --git a/dev-util/coccinelle/coccinelle-1.0.5.ebuild b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
index e4f865f92b0e..598e875c240b 100644
--- a/dev-util/coccinelle/coccinelle-1.0.5.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -42,6 +42,7 @@ DEPEND="${CDEPEND}
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
 
+RESTRICT=strip
 S=${WORKDIR}/${MY_P}
 
 SITEFILE=50coccinelle-gentoo.el
@@ -109,8 +110,6 @@ src_install() {
 	fi
 
 	use python && python_optimize
-
-	export STRIP_MASK='*/coccinelle/spatch'
 }
 
 pkg_postinst() {
diff --git a/dev-util/coccinelle/coccinelle-1.0.6.ebuild b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
index 1e97b0576dc1..2ccd550333b9 100644
--- a/dev-util/coccinelle/coccinelle-1.0.6.ebuild
+++ b/dev-util/coccinelle/coccinelle-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -42,6 +42,7 @@ DEPEND="${CDEPEND}
 
 DOCS=( authors.txt bugs.txt changes.txt credits.txt readme.txt )
 
+RESTRICT=strip
 S=${WORKDIR}/${MY_P}
 
 SITEFILE=50coccinelle-gentoo.el
@@ -111,8 +112,6 @@ src_install() {
 	fi
 
 	use python && python_optimize
-
-	export STRIP_MASK='*/coccinelle/spatch'
 }
 
 pkg_postinst() {
diff --git a/dev-util/conan/Manifest b/dev-util/conan/Manifest
index bad83aee2d3f..1547db64dd53 100644
--- a/dev-util/conan/Manifest
+++ b/dev-util/conan/Manifest
@@ -1,3 +1,3 @@
 DIST conan-1.0.4.tar.gz 580404 BLAKE2B a3099e7f5bdb882591bab031da267f3df5582975d93a840cd7bf42d7b5b57850d42a28ea33440f6570149b7db8c2ae6a395460f375fee084a9336435d42e7df6 SHA512 47fe9632b0007cdc0456004e6c9122df387869c33b58694b4a2dca9956daf977532f79c204207b21d3a4e7d90337a25dba49cf84cba98c1f9bde3170f1a185a9
-EBUILD conan-1.0.4.ebuild 1615 BLAKE2B 1036a900af9fa14ca4760c2775d9bae1fdde999521bcfba449da3adf03bc5374600cb32ee9f6b7b99f9edad2afae39fefb6130ee2a6cd3d11bb71275e0eceb5d SHA512 d8d18d217d487f5c1ebdc02936bcee13d680d9167be8eba40cd12a195f215f14ccfee5028942eec233cae63e329dbbc4b514d44dfbd236cb6fa073c8ca114468
+EBUILD conan-1.0.4.ebuild 1610 BLAKE2B 1d53abfc05a4056bff26434097dda27f56ad2809ae62b7175a6d9b47bc13b71b217004670ccc009b353c163683557e2b8f6ef86fd6537405260b5c4fdbc57eed SHA512 eadc9fae7b90a2756c21ad94ba6eb66cd739e96514ffeead97ac991582f58ee63c6d230cf841ce8385a81d2308467aaef2892ab6c29e4427b87c726abd26fc64
 MISC metadata.xml 735 BLAKE2B 0897f7e1776d123435a6843abf5f61168f1d089ed0bc3e62497961e552ba6e5826c1e09a77dcf5760f8559417c5db850455caa12cf0c8f77684abdaaabc55d06 SHA512 410e22e6701f402d13447f034e0c72180ca739fac1c18efc0b52739c9d11aea90125db1f732d5811ac798d9d74a2d7616c18bd779321ec4d8bbaf67a8a1d93dc
diff --git a/dev-util/conan/conan-1.0.4.ebuild b/dev-util/conan/conan-1.0.4.ebuild
index 1c65c049844a..6a1147005c2c 100644
--- a/dev-util/conan/conan-1.0.4.ebuild
+++ b/dev-util/conan/conan-1.0.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="sqlite"
 
 inherit distutils-r1
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 29f70f91cc38..13a6d9dff99b 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,3 +1,3 @@
 DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B 68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba SHA512 0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4
-EBUILD cookiecutter-1.6.0.ebuild 1231 BLAKE2B dc83a9e3bb0d706ee630d0687f93f6eebc201179c8f0239d8c9ebd9da2e15e101cb76ec9c4a2dbf3124fc11053afb97823dfb7f27508b5c178f3d06019915a67 SHA512 d754bf28c797cda7e9ff753bcebbe7c4342f21a21cea0e390d9152b757af6e1c21c313bb514edb10d67a9d798fcb6d8c9595f8d9ed86543ba4f32fad95b55567
+EBUILD cookiecutter-1.6.0.ebuild 1227 BLAKE2B d095531ed247e25bcc50cd764cefded189b06fb65b6bf002743e6301e44ae0017a2c4d2cceb5934452d1c02d014d8c017b403474e3e20c3ad60c47249137cbc6 SHA512 4e0965c10ea7bb29553e06be3ba30ee5d752f8a7f6f06491dc2b38c36099f58427fddbff419d1f840e867b8db17626feedf6c1d5ce3e0522997d67cdbbcf40c3
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
index b4fcc8dfdb50..f1a0e34e7456 100644
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 1b5a77d6f04e..23146604487b 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,6 +1,6 @@
 AUX cppcheck-1.75-tinyxml2.patch 2232 BLAKE2B 389e8678fca9eee616640fc535b0c71d0476f6a2a3eb8700238d85bbc32823c92fe9b72e1a4a3b01143e23df60996a21a669625b418e579441d85ef460fd38b5 SHA512 575dfe090885cbd8157b089def7a47750519b8ea459404d3755ce23ea98e0fde2da5f0c7551a69ac195c2e3c5d03ce5a71c3d66b3fb119609eba6aaa31c39899
 AUX cppcheck-1.85-ldflags.patch 1503 BLAKE2B 0458ff66d61b9cd759839d31bc0fbe611e7d23e8d720a4b0a861d53b3fc54b30d67c481c22dfbb5254a6160eac04505f00dee01c4283214e15e21b26e0b7a76c SHA512 7cad7d456c8d3bfa5efab1c67bcd0f7e509e10e539ee9941055caad41ff3b4737d3ff82cfa172ad867651817bdd4a518a98d22732ce0df5227c149dd2122e9f7
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
-EBUILD cppcheck-1.86.ebuild 2318 BLAKE2B 9c9f9ed14addbdd9ec6def55d91a604ced068a3ba46d04782df12e2b7914bff3fe50fde4ac63814e48d8ee77d85435db77ffd759f21366a5e9ce354805d28fbe SHA512 77223a1ec8c185c2a22f6df91f538e5b44597bf96025f8061ed4fdcf5cf1eaddd7509ec7ee230aab163067dd43e47f86a3b0f5f216f99a6dfc928e8b4150453b
-EBUILD cppcheck-9999.ebuild 2199 BLAKE2B 5215fdc0d4a40b8f79984bec98eb540e320e884db7f5788a7cdb082ce13dbd2ef3a6524ece473c04ca87412b38d1141119ae95b72bd13bb45b1dd604d8a531f6 SHA512 77b3bec0b288bc9ef55e28e8f1c17e17f2dd04f037d7b9b32aaf8386b832434bec8cd1b03174d0ba7985a8647cb3c0a0dcd7a928d3f66a8d8bf6eda544068164
+EBUILD cppcheck-1.86.ebuild 2314 BLAKE2B de0698614f2f1790971fe198662fd235e5456a1f9a046f10d628889517bc5809fac6c76222ca7a5b0d7909c7842d77244c81c9606812450118e61c476492f08b SHA512 8d8502abb416704964aacb1267c2814e5cf50fe02c4a245bbb217a4cadbffa6efc1f288a94143b36f739d6f89e5f75133b1aa691565c76ac92a49cb0984d0c1e
+EBUILD cppcheck-9999.ebuild 2195 BLAKE2B db0b4d69263690358f782623a90813e57c0ae50b75045f919a5d6e2508dfda48c60076bcc4b47c554618bee509e69a8583958ecdb2acfa7f1c66dd567ba4959b SHA512 f9b6b82fab51429d1c46a499d490c5ef6c4bfd760644496b5f2316cbb7c3e6bce6dbbc20e2919309dd037f5e0d721dec87107a88bf269c8fccd3dd90d0a0de4e
 MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index c3cfb1dba837..cb394ed32bb2 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
diff --git a/dev-util/cppcheck/cppcheck-9999.ebuild b/dev-util/cppcheck/cppcheck-9999.ebuild
index c216c0f0a0eb..3e3669313a35 100644
--- a/dev-util/cppcheck/cppcheck-9999.ebuild
+++ b/dev-util/cppcheck/cppcheck-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit distutils-r1 git-r3 qmake-utils toolchain-funcs
 
 DESCRIPTION="Static analyzer of C/C++ code"
diff --git a/dev-util/cppunit/Manifest b/dev-util/cppunit/Manifest
index d459af47d683..a80bef95b58f 100644
--- a/dev-util/cppunit/Manifest
+++ b/dev-util/cppunit/Manifest
@@ -5,4 +5,4 @@ EBUILD cppunit-1.13.1.ebuild 1519 BLAKE2B b947d09d79ae72338dcd884cea61ebfd4540f2
 EBUILD cppunit-1.13.2-r2.ebuild 1723 BLAKE2B 669773bfcd5343b03f4b23f3a39299d405ae686cc7c077f82d73c6b9e2778628648614b206e0ff81260c0b05237053a84b0f20dfa5ed40b4599fd9434b8d2b0e SHA512 97e501aabb9c2ed2589b3f7566b0990955816ecf7d052d6765d1e219677c08a8c75eb2f4486ab7090d51ac1123cdd0a67363b2dad3cd3891fb002405405ab2d4
 EBUILD cppunit-1.14.0.ebuild 1722 BLAKE2B ea258759c776266c6db28b138f60b31c60c628be29ccbb23afbe6dea75c0137d8c43f12742f0df12516e0016d5c62979c7170d975337b6b27cb3d4e7871b139a SHA512 713f4a0b7ed0c565744af7512cc0772976b1dbba81b46cb2aebe230a6497f5e75ed59f5d518de6578150e6d54e62392f43bffa5c554ef84b1c0d815989313097
 EBUILD cppunit-9999.ebuild 1736 BLAKE2B 5bde8ba9a2298f612f2396f3f3de5893ebf5ae7868eb74e1ab78bfe9e8d739560d97f9d3d10c8abc4a216f768360ad307490ac008566161037a231e99089818a SHA512 38b35d01aa20d7e1c28832403a002b174ba44b656b5ba0f400972907b10bef5e94cc88292dd442aa2c59881e46fb0b8c98bad5d8cbaec93b29a3b7b38cfd6afb
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cppunit/metadata.xml b/dev-util/cppunit/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-util/cppunit/metadata.xml
+++ b/dev-util/cppunit/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/cproto/Manifest b/dev-util/cproto/Manifest
index 2dec160beac5..82f12b7bfd32 100644
--- a/dev-util/cproto/Manifest
+++ b/dev-util/cproto/Manifest
@@ -1,3 +1,5 @@
-DIST cproto-4_7e.tgz 145919 BLAKE2B 97e3b3bf3b282299d177bf2ea8548f91f8dc6432671b93187d91fc00ca02807f5d3a370cc563cbb46fa163f23fe5ff034d9e148e6621eaf87f7e9658e925c6fc SHA512 c9a1da8e19d85600109127e2de079cff5e66e51f0f3220f9a69e72e720ed6d745ef456b3a645bbb4755073c6ce59411d0137d9012da545736e92380f41c83985
-EBUILD cproto-4.7e.ebuild 574 BLAKE2B 2cca24598eb2536a18df9132a0dc010979f10803a5e263db5fe6bf1c75a45836ce122d2d76ac04646a49eb15fd27d713ac444bd022ff39b45224fe8378c5c34d SHA512 6a6d3cc55ab1e845916b82197114a9c108eb8aea24ad1284eb115f5d13a7f1db52b949aecbb87462428c40a7ec68c57bf6da37ed03e00ec25bb6afa5ed5473e3
+DIST cproto-4.7e.tgz 145919 BLAKE2B 97e3b3bf3b282299d177bf2ea8548f91f8dc6432671b93187d91fc00ca02807f5d3a370cc563cbb46fa163f23fe5ff034d9e148e6621eaf87f7e9658e925c6fc SHA512 c9a1da8e19d85600109127e2de079cff5e66e51f0f3220f9a69e72e720ed6d745ef456b3a645bbb4755073c6ce59411d0137d9012da545736e92380f41c83985
+DIST cproto-4.7o.tgz 168915 BLAKE2B a79d22014140531c263d0b389c50c263b13bf2e9bd2142da54ec712ec13f122539d92fbc3e40a52d52802e17e5b96a39c73e0ea3dd3c189e0e4563cf7b3feea3 SHA512 9a731be8bfa3f0da9c8a7c04a1c9bcf5ca52897325fa868306c35d818fc54348f83d93e2b2d792a2f682f935fb42d928d2828b1ff7fe3287a1806852e180a9f3
+EBUILD cproto-4.7e.ebuild 542 BLAKE2B 88bd34ba3005ba8ed8fd0104d122552596994018b3e20fefcc9eadab392bf5ecf5bc25c7265c1c04481f3d0f2000bc4b3ecad6e35030f44a597c990f90c19916 SHA512 701f6ab97500c8813e2b96f482c92560adebf0733b7e163f1a581d2cb2c9981e81c299da4a4b774004efdfc294fb7558f16b97e46581abebf16e407a5aeeabb0
+EBUILD cproto-4.7o.ebuild 426 BLAKE2B 669c88244f414fb4388a0a75406a36400fc0c24597a72cdc0cd3c93ba418b36bd561fa19db22cb0529b8bafcfb9f9c8a3b3a020e2ee94ec7b6edfc4452144e20 SHA512 efb9369b7f44f2f801e1a687f6b6a07dea5ddf5d7aa5feb6c7ec8424a8912cc7e924d3e5c3f9274a66a761455ff7ff3e0589e361bdfadaa3b6eb5f9c03697894
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/cproto/cproto-4.7e.ebuild b/dev-util/cproto/cproto-4.7e.ebuild
index 14609348833f..afd959a583b6 100644
--- a/dev-util/cproto/cproto-4.7e.ebuild
+++ b/dev-util/cproto/cproto-4.7e.ebuild
@@ -1,15 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
-MY_PV="4_7e"
-MY_P=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_P}
-
 DESCRIPTION="Generate C function prototypes from C source code"
-HOMEPAGE="http://invisible-island.net/cproto/"
-SRC_URI="ftp://invisible-island.net/cproto/${MY_P}.tgz"
+HOMEPAGE="https://invisible-island.net/cproto/"
+SRC_URI="ftp://ftp.invisible-island.net/cproto//${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
@@ -20,6 +16,8 @@ DEPEND="sys-devel/flex
 	virtual/yacc"
 RDEPEND=""
 
+S=${WORKDIR}/${P/./_}
+
 src_install() {
 	dobin cproto || die
 	doman cproto.1
diff --git a/dev-util/cproto/cproto-4.7o.ebuild b/dev-util/cproto/cproto-4.7o.ebuild
new file mode 100644
index 000000000000..891098774172
--- /dev/null
+++ b/dev-util/cproto/cproto-4.7o.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Generate C function prototypes from C source code"
+HOMEPAGE="https://invisible-island.net/cproto/"
+SRC_URI="ftp://ftp.invisible-island.net/cproto//${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="sys-devel/flex
+	virtual/yacc"
diff --git a/dev-util/cram/Manifest b/dev-util/cram/Manifest
index 2b3ef1b2d10d..ac1e5641df87 100644
--- a/dev-util/cram/Manifest
+++ b/dev-util/cram/Manifest
@@ -1,3 +1,3 @@
 DIST cram-0.7.tar.gz 33527 BLAKE2B 4c89f98a550bef0c7d92e4b15c466690c1be7d829257b6469340d5c40415466b755989ce1b4ad4ce479587c91d64467dfb42f468c5817e9a09163c111da11e58 SHA512 9fa57e504abac8fd15bf5ff4a74405cb7acd10fd4c797adee87052a4f1c4e975bbc0f4219afd9485358b2c2939b48b3ffe538ae2abc6eea71e0ba8b458d50103
-EBUILD cram-0.7.ebuild 485 BLAKE2B fb18332acaa5fffa849f15f790507f785c1be0e99aa1b82a748ff4c9c8386e7aa6843222f9bfa8207e53dfe5ddbd4815d8c082381caac5384c97fd890a402633 SHA512 d8b3e3c81533c39b847dd9032e5efb9f330a8e13b304d53bfbbf6d2c8f1a6e3cea1d33a24317bc32cc21b20bb96b1f0c5719ea4e3325e4cdd54a2d92c727ea75
+EBUILD cram-0.7.ebuild 480 BLAKE2B 615be2c72a86ca4803e3fe2dc978cd338b96574e87437eb7fca9238fb3aae5b9ee6d515ce022d184ea10b2269b44d99faa9968bb17ca126ccbbb26422a781efc SHA512 68ba8ff4d9634b37ed737289ade62b5377462928c0575ff06d7dca557f532e55c8507092d9f6f9d54a92dab1e74dbba420c65a4cb470c3eed67773e803e211b2
 MISC metadata.xml 613 BLAKE2B 4e970afed6540c9f375c79858c297326994950a3498b51fde64aff6bf4262e6d73f1c77ef5ca621be1ac4fab79b2e4bde73e914869726a6d8665d291f854aea2 SHA512 6dffd4dc26817f9ff558ab98deb4b0097fbdfd0394291969b817d2edf1caf108d46d0188919d77e54942a35689c564f2948d627e30e5fc6acb403e8d7f6998d9
diff --git a/dev-util/cram/cram-0.7.ebuild b/dev-util/cram/cram-0.7.ebuild
index df20e5706629..05dedeb0a0af 100644
--- a/dev-util/cram/cram-0.7.ebuild
+++ b/dev-util/cram/cram-0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit distutils-r1
 
diff --git a/dev-util/crash/Manifest b/dev-util/crash/Manifest
index c005ee9d36b0..a49ae243e2bb 100644
--- a/dev-util/crash/Manifest
+++ b/dev-util/crash/Manifest
@@ -7,7 +7,7 @@ DIST crash-7.0.7.tar.gz 32041666 BLAKE2B 80593221da82c978eec8edb7916cef0585d6218
 DIST crash-7.1.4.tar.gz 32137593 BLAKE2B 829335875e111bcf09d3dfc49ce17c893ad8c75b4f275a6e68d3e8698f0da209d769b6667b58569a373046d6553678e6168b50785e18c25c29c47713f8dc71a9 SHA512 6d536397418b99baaf8ae2bd76d72e60c5f92a7aaeef929f81301e58930ee9848e3e146a43ccac7350602c49c1cea4a31f0b74c267d6afd3b5a23f960a1c9cc6
 DIST crash-7.1.8.tar.gz 32154942 BLAKE2B e918e0e1be435edc0c0f6dfa0f2a73ed1e418c1c9f0291a4d6e5429bb51fd94f9530cdf13b812e6ba40a92537d79a8a1d36ea4c17b052b36ed8d56c0209f94db SHA512 21aa71b61077f7f361360f19214d8259a4e813ca5c3a5fb027f32376a7367e7eb16cf2f8a0a4b49b205c5e8550192c49fc64812afd1ccaceacf8d7649ba20bf1
 DIST crash-7.1.9.tar.gz 32160154 BLAKE2B efba2011dc583ee386107aa6808a25d74d0de175c92872ed22daa8d3a3cf756e569e514e1e703bf653de2744a94205b97cf3bec037c0f1d021d8041f52970681 SHA512 1200df0d2509ea864f568ee4861c3b6819b61c2594d61a5f993560b03f3f50a3388ba8fbde2e9d630c96ee9d390ba03eb687732352153b50866c65519591c4ab
-DIST crash-7.2.1.tar.gz 32178379 BLAKE2B 290841a2c430021993074cb870e4532f6eaafbe9c8b799fbc876fd2784504440e9eae9ce08c4e06acadd30a2e095ac5ddfe95880222867670ceac18d7a3a01ad SHA512 c20bc0e901bd91f642f73ef5bf624bf6d898f771e4fbb3f8c3ced4575baf3373e116dbd4c9ed72f0c1f232a4c38c6317072b5138fa3dbd39bbe6d6c032ee1b36
+DIST crash-7.2.5.tar.gz 32214678 BLAKE2B 1d19bdb0ead372b4df6f4715f9fc26218d7060ad2a3f774cdf6069d6fe7a85a24968766e6eab19042c1208716e871318bbc44be04012b7ef8527a7f536edd5d9 SHA512 6d07c4aa2bccafafe66567e2022250208ffdd5f0e64aad1aefb4c8d7c10df49464ad772e2ffe0d1067f324dd351e9186841d501680a181c79d7b9b58464d6987
 EBUILD crash-6.1.4.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
 EBUILD crash-7.0.0.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
 EBUILD crash-7.0.3.ebuild 503 BLAKE2B 9cc5ba1786ae4e7bb24a6e9194f71c156e77ce4e4854212e2e77cc80a5c22605f66fc8e25d06bebcce979ba3fcf3364853a70abcaa26ce0ec4ef2772502177f4 SHA512 43c334d628dc40e810e483fd842d019c7fd6ece9d675f3db013a912637d73c97fdf329d37e57e398c19faad602c5ca22ae21961953897516bc273d05a91b56b8
@@ -15,5 +15,5 @@ EBUILD crash-7.0.7.ebuild 503 BLAKE2B 1bf0e8a4d06849d11902f218efd276a55796507e5d
 EBUILD crash-7.1.4.ebuild 532 BLAKE2B 3829582253a432bcde5313c5e6fb9b5198215d1695dcab9fb9f80bdc84a38d587510481de1b6e8b83b3bbb85c6e2d6de48fd2d5e72149b26b65c4ba8c0d432f2 SHA512 5d9d6709a5a87ed15fb854dd1041dfd8b92edeb5f21ca08070e14be512b7941aaeb3f32f785b87d70663e198a842158dd3337074dbf21dd9a26c3b752f3d3800
 EBUILD crash-7.1.8.ebuild 474 BLAKE2B 0743da404cda8dab3c9da501623ef6260a318c186cf4098251e79d6a45a517334c2a334e01899e30036bd068d23665eee298ab729e7b583adf8e22858588f63d SHA512 e22d97d213ecf90cec49454285f4547718b2e7c5b7e0badc58fc77dcf8c804946cd7711d48690bd22dd70cb8ed0f5ad4855de3ccef4ddac20fee6bd876c45eda
 EBUILD crash-7.1.9.ebuild 474 BLAKE2B 0743da404cda8dab3c9da501623ef6260a318c186cf4098251e79d6a45a517334c2a334e01899e30036bd068d23665eee298ab729e7b583adf8e22858588f63d SHA512 e22d97d213ecf90cec49454285f4547718b2e7c5b7e0badc58fc77dcf8c804946cd7711d48690bd22dd70cb8ed0f5ad4855de3ccef4ddac20fee6bd876c45eda
-EBUILD crash-7.2.1.ebuild 529 BLAKE2B 9d986dab9878fd28f88c1b353b48c28efb37368353ff371c741b07327d79c20c42c151ba39c13e763a9f2b1db6e936793bd2cc9ff8f8015890f2c58168ca6f71 SHA512 774ab7f7c87dd8bbcc971e1791e01e6eb939a8e31882f26039d85e93089e6fe51f0abde34a8c3f4fa8bdaef7ffb89d905f02e88cb4808942801bc0d1e2e8c277
+EBUILD crash-7.2.5.ebuild 584 BLAKE2B 23361a8f51416c016d84ca434bf09750004b51f6da06d32cff7ada13c1cae930799c90da216e68090722f575028e6f9ef395a4d4647cd575db2bb41d862b7eaf SHA512 f36e973e2ec92795c85dd1ccc77b2afaa795fc58112d6336e8cb5861212b502ef119c26db6fee4d7abca706fd0dbcd1062aaf139a7082b24da6c7b3a1fa4838b
 MISC metadata.xml 647 BLAKE2B d88035e0778e0f8e6af171e7bfcd3eff14ee964f2521e00ec2d8b978ab560a4e321a60cce49775dc2f34187107309aea657f55bde348cfc4a830be4aff60463c SHA512 4e5b97c2f7306f4113f842e4683a2f4c3ed684c229c8e21483d08889e4a1d8656bfda699300cd71c70389510816f19d5eb93a37715c5861b669b285bff61ef78
diff --git a/dev-util/crash/crash-7.2.1.ebuild b/dev-util/crash/crash-7.2.5.ebuild
index f5ba2740d29c..1fc81e1cf58c 100644
--- a/dev-util/crash/crash-7.2.1.ebuild
+++ b/dev-util/crash/crash-7.2.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,3 +16,7 @@ IUSE=""
 # there is no "make test" target, but there is a test.c so the automatic
 # make rules catch it and tests fail
 RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.1-install-fix.patch"
+)
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index c3554d1e6501..651c24b2a9fa 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,10 +1,15 @@
 AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
+AUX creduce-2.8.0-link-libs.patch 1038 BLAKE2B d28b790141a898c72e2102d25cb14a48c1a4ed6e0902e413510932be66b224ec28caf23c7bb3741c07be0ee6e3efbcd4c7bb9cd774d4239eeaec84bcde652d9b SHA512 1ce357c17cebdc9f81692c545c020358d52bf542f5235c8a7c6ff3c1740b08089909204841eb1e93035c8f069d372656fba4026fa8ee848d837228a2b7f7e20e
 AUX creduce-llvm-7.patch 4046 BLAKE2B 013685de9ad7f364cfff647a6f6783615dcd2289af8ab602f4119401373b6422385e63e1c5aaeec65dd6e922fae945f44f29f18bfe02b581b0a12f129f83e0b9 SHA512 9a0cd0373fa8e0bd14907e5522b97c3c4cdb89a3350e38316edfa6a75dbc5bbe53756c4b605385b1feda5674bbf17d92b4d2e21c58b4a937bd2c61e76e322b0a
+DIST creduce-095c551a5f9ccaf2986edb836e7be9872d36c233.tar.gz 724597 BLAKE2B 9d7a57349b8e14599c795a27bdf2cb4536f5b41f02faf10263c3d883bf94efd83ce7483bbf72aee0c2fe00d8515490e5f5a9c8df575abe80e90231a4373c9318 SHA512 a317bae5e47ee85b4be401d8dae490bd0ba86640aff6e7b0e9d6fe14d1f87199b4e12edbfa3eddcb5341b926a753dae17131f5e571362849c01377eda00407fa
 DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
+DIST creduce-2.8.0.tar.gz 774668 BLAKE2B d799372d107c0cb45e9ed95f82c29634fd9de053c4eda1a2dfce8b2152ca84f7fff5e7b679e21e6dbe869d139e1cfd73963c02751ad30809a3470316ce10e077 SHA512 9d616dc421d0e932656ab0220ebfe1a4f20a08d46bf4ee004ef96a693ff37caeadf96c769262574a9789ac52c2bb4586e2b8602f7d44b627229b8eb45f5af0ea
 DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
-EBUILD creduce-2.7.0-r1.ebuild 831 BLAKE2B 90b54fbd845dbe404bbb18cde38882f2fdc7adff440d7da52ee23941f538bc8bc95608af410a0b9a7de333387750095b733cddd57829cf4381cdd17a4b7cbe62 SHA512 5526fc208eb9c6d1c3e30db997a0787a80868723443795230f178a3227d4aa5d964f4e3813a76915ab38ed56ef48573671ed976edead59ac199ab24696e3a513
-EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
-EBUILD creduce-2.8.0_pre20180411-r1.ebuild 982 BLAKE2B 004a4f77bd8b55f5db067fbf65a56b44a6eb2b171427f1109d88e4be6b3873a445596da80f909515499024d603c8a122d39d526004ab5fec33fa8e6064163f49 SHA512 9063ca1e50144d322d8828efedeacf816b4a77c9169b99097b8032d30010d0e9ba28949153f21b6227ddacb585eae460d42c7f230f785dde6497d84bbb892163
-EBUILD creduce-2.8.0_pre20180411.ebuild 933 BLAKE2B 6160be85dee851d4cc3322d21dbd3e228f65be6ac0b1e21d2911ed5fd3563a00ade8c30cbd95cee57ae20ec0d5d66f4a808c52ec9352f94cfbcb5f839d7fa465 SHA512 741a824defa8c9b2fe010c0471e69b26fb9fad73686d549596b80e7bc7ed2769627f166f513a326b5ae2694939877114db1c26c5330e9939bf9241aee78465fe
-EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
+EBUILD creduce-2.7.0-r1.ebuild 784 BLAKE2B 093f61657be92f1efd7dcb1abea1a79ba13def8c3ec013572c648357b1bdbeb4a39be827eafcac9763f8fd2a24ca90b8609924b27c45f32a8e95c7eaa3acbaf4 SHA512 a73b178134f28b22bcd070682f9d656fe8fb8dc05ba956c8ca5e25a18b1127ee85bf32614bb77350413afd884bd46d6bfd1b17536cfcfaddebc934a40b9067fa
+EBUILD creduce-2.7.0.ebuild 656 BLAKE2B acd91114279b3a71d0725dc1f862b47195e5281fad1d3b0a20557d461a9fa4f4bcaa08bbde130af9e34437394d541e338d896a811cbdc0dfacd3759e4b24735a SHA512 20afd62b290c267c1968f92fbec4b4eee27f39f2cb2b131f64ab4557b96a58eee10a33558d21ede3867cdcd3588bc081bf9a4dd1b6e8d1253487cb080365cee8
+EBUILD creduce-2.8.0.ebuild 814 BLAKE2B 2fa4ada35468979232ad1fe3fc6624d09df764454188933dea519ac1adac1cbec5c839ddcc71fbe569c80b74ef5cba199bc912c88ae090cbbaf68ee3983a4dee SHA512 0ade02bd6ba2c664940bb5971e71d973132ca6708cd887daad785b911b2b0e0523a7316c23bac612c75b5475b52df670a1a7714be6faf36a63ff8dda2d5acb2f
+EBUILD creduce-2.8.0_pre20180411-r1.ebuild 935 BLAKE2B 7aa0a8ca0800a216918a65bf00fa6926f2210d688b2e6385e4a6147f9b913d365971923dff7a2df8d1da442ebebc9c6befb4e243175ceaab29572d0ed57411e4 SHA512 403502450479f91306f97d3462a5f5b300a71d5d618e8bc735189031c0a630cfecdc86d568b712fc2e50e8feeb504be4ebd58bbe84698e363d174a9e900a5a7c
+EBUILD creduce-2.8.0_pre20180411.ebuild 886 BLAKE2B 0e7f8cfab414f998d5b8a3872c14d680b6848f17107a77cf00738f3b3a4961289862a44571888c125db3dc3bd9a7805a5a72ca4641abdc3f7e79cf353f8f6544 SHA512 500c0b3462147f872fab9a1b27266a848adb2cabc39a40c591bc057176a78c23b785da6e37acbbd5a6c3bf8efd30ec3e3faec39bee9c1c9b7044d16edeecdb34
+EBUILD creduce-2.9.0_pre20190414-r1.ebuild 924 BLAKE2B 03291f4301e3904c44f37da65ebe48feb79d563289b1c9ba272999aabb911c989d2e9e96c2b6b967b4fb23883519bb6f6f8c134a0a1e7393e16a4a0ffe531e13 SHA512 f0e0a51f61e51c64646a85ffd8dd0c043d00d65cf709cce33cc4cf70ffb959a1499a146b65edddb83c204c16f031786b2482db502d9bb83ce9bbb657e6e55f48
+EBUILD creduce-9999.ebuild 786 BLAKE2B df04cfbb91ecd736b40dc5ee770cfa7b30f954d4f485d5986b08a35989df66642a4b7f25ce2bb4d1e681a6663d55d19113f6cf29584f341006a55d0ec75bf88a SHA512 f7aeb50d2e68f25e5ff45fa008f2c29bb540b567d5ee00172563992b8d8b5895bfd29bb78b42a58eaa14e6f7a0dc0ec30007b648f2198eb362c0e3ca447e7461
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/creduce-2.7.0-r1.ebuild b/dev-util/creduce/creduce-2.7.0-r1.ebuild
index 85c8633fbf6e..617b8e64e48d 100644
--- a/dev-util/creduce/creduce-2.7.0-r1.ebuild
+++ b/dev-util/creduce/creduce-2.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -21,15 +21,13 @@ COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
 	sys-devel/clang:${LLVM_MAX_SLOT}"
 RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
 	dev-perl/File-Which
 	dev-perl/Getopt-Tabular
 	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
+	dev-perl/Sys-CPU"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-llvm-5.patch
diff --git a/dev-util/creduce/creduce-2.7.0.ebuild b/dev-util/creduce/creduce-2.7.0.ebuild
index 9fae9a665c8b..3d45da9f2c81 100644
--- a/dev-util/creduce/creduce-2.7.0.ebuild
+++ b/dev-util/creduce/creduce-2.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -19,14 +19,12 @@ COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
 	sys-devel/clang:4"
 RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
 	dev-perl/File-Which
 	dev-perl/Getopt-Tabular
 	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
+	dev-perl/Sys-CPU"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
 
 LLVM_MAX_SLOT=4
diff --git a/dev-util/creduce/creduce-2.8.0.ebuild b/dev-util/creduce/creduce-2.8.0.ebuild
new file mode 100644
index 000000000000..78b23f9fd6b8
--- /dev/null
+++ b/dev-util/creduce/creduce-2.8.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+inherit cmake-utils llvm
+
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="https://embed.cs.utah.edu/creduce/"
+SRC_URI="https://embed.cs.utah.edu/creduce/${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LLVM_MAX_SLOT=7
+
+COMMON_DEPEND="
+	>=dev-lang/perl-5.10.0
+	sys-devel/clang:${LLVM_MAX_SLOT}"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/Getopt-Tabular
+	dev-perl/Regexp-Common"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/creduce-llvm-7.patch
+	"${FILESDIR}"/creduce-2.8.0-link-libs.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild b/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild
index fec31d8e8913..0249ee3b93d2 100644
--- a/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild
+++ b/dev-util/creduce/creduce-2.8.0_pre20180411-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,15 +23,13 @@ COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
 	sys-devel/clang:${LLVM_MAX_SLOT}"
 RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
 	dev-perl/File-Which
 	dev-perl/Getopt-Tabular
 	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
+	dev-perl/Sys-CPU"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
index e7964cd3685d..b3bc269e1c6e 100644
--- a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
+++ b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -23,15 +23,13 @@ COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
 	sys-devel/clang:${LLVM_MAX_SLOT}"
 RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
 	dev-perl/File-Which
 	dev-perl/Getopt-Tabular
 	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
+	dev-perl/Sys-CPU"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
 
 S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
 
diff --git a/dev-util/creduce/creduce-2.9.0_pre20190414-r1.ebuild b/dev-util/creduce/creduce-2.9.0_pre20190414-r1.ebuild
new file mode 100644
index 000000000000..15624685b357
--- /dev/null
+++ b/dev-util/creduce/creduce-2.9.0_pre20190414-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+inherit cmake-utils llvm
+
+EGIT_COMMIT="095c551a5f9ccaf2986edb836e7be9872d36c233"
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="https://embed.cs.utah.edu/creduce/"
+SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+LLVM_MAX_SLOT=7
+
+COMMON_DEPEND="
+	>=dev-lang/perl-5.10.0
+	sys-devel/clang:${LLVM_MAX_SLOT}"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/Getopt-Tabular
+	dev-perl/Regexp-Common"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+PATCHES=(
+	"${FILESDIR}"/creduce-2.8.0-link-libs.patch
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
diff --git a/dev-util/creduce/creduce-9999.ebuild b/dev-util/creduce/creduce-9999.ebuild
index b7accd15defa..8b8470de887c 100644
--- a/dev-util/creduce/creduce-9999.ebuild
+++ b/dev-util/creduce/creduce-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,19 +17,22 @@ SLOT="0"
 KEYWORDS=""
 IUSE=""
 
+LLVM_MAX_SLOT=7
+
 COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
-	>=sys-devel/clang-4:="
+	sys-devel/clang:${LLVM_MAX_SLOT}"
 RDEPEND="${COMMON_DEPEND}
-	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
 	dev-perl/File-Which
 	dev-perl/Getopt-Tabular
-	dev-perl/Regexp-Common
-	dev-perl/Sys-CPU
-	dev-util/astyle
-	dev-util/indent"
-DEPEND="${COMMON_DEPEND}"
+	dev-perl/Regexp-Common"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex"
+
+PATCHES=(
+	"${FILESDIR}"/creduce-2.8.0-link-libs.patch
+)
 
 llvm_check_deps() {
 	has_version "sys-devel/clang:${LLVM_SLOT}"
diff --git a/dev-util/creduce/files/creduce-2.8.0-link-libs.patch b/dev-util/creduce/files/creduce-2.8.0-link-libs.patch
new file mode 100644
index 000000000000..25e9ef229165
--- /dev/null
+++ b/dev-util/creduce/files/creduce-2.8.0-link-libs.patch
@@ -0,0 +1,31 @@
+From 885a675474d93ae4ef929de7520d3ac38ba39156 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 21 Apr 2019 14:20:34 +0200
+Subject: [PATCH] Revert "Do not list `LLVM_LIBS` in the
+ `target_link_libraries`."
+
+This breaks linking against shared LLVM.
+---
+ clang_delta/CMakeLists.txt | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/clang_delta/CMakeLists.txt b/clang_delta/CMakeLists.txt
+index 6493abf..ab1dc42 100644
+--- a/clang_delta/CMakeLists.txt
++++ b/clang_delta/CMakeLists.txt
+@@ -242,11 +242,7 @@ add_executable(clang_delta
+   git_version.h
+ )
+ 
+-# ENE, LLVM 6.0: LLVM_LIBS end up in the link command line anyway.  I'm not
+-# quite sure why!  But if you list LLVM_LIBS here, the `clang_delta' binary
+-# can end up with dynamic link errors when it runs (multiply defined symbols).
+-#
+-target_link_libraries(clang_delta ${CLANG_LIBS})
++target_link_libraries(clang_delta ${CLANG_LIBS} ${LLVM_LIBS})
+ 
+ # Custom target for running clang_delta tests
+ #
+-- 
+2.21.0
+
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index a5cd95cafe56..691499b16054 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -2,7 +2,7 @@ AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cd
 DIST ctags-20161028.tar.xz 852108 BLAKE2B a4c954c560bb2d0165c12b4ec4f7b7c2c674acde98d438d9388f5d6102d325759faa3d4801eb0f63da70064fdeb32ef1c1cdd4124ade8d87cd9632b77c823e1a SHA512 2b991ca47fc77d26da43f55753624d1b21363dbeec4aff3daa57762ff81df97b18b067e8989f5d92d36dd8c02abc04ad42296dd5da3659ae0c8901001287c75e
 DIST ctags-20170704.tar.gz 1295281 BLAKE2B b58917a876d90df528f51bcd572301dcba8fa8ce8998bdb0a245d7d58033e37c2984af963a312c83b364dafd37633270f5f5d06fdb635a927066282e9382f6a2 SHA512 6ed134347a4be16a5dcff35186bd949e73bea645908a5ac43082b92fdfa6040b0b99ea04590948ae8308d4e9eb1042c83a4f0df006709f15cebfbf0741d73641
 DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
-EBUILD ctags-20161028.ebuild 1727 BLAKE2B b461614b554f4a489d230b6892878b96968f2483b3a6951f206c5e50b852df641aef7025f4d6b50df9951556dfbc165ffac8a2b88d63bda4270151b906167d75 SHA512 ddcd0d9a4d410de17e7d752711c481417d1e93cacf3c3f335da79a33ef37f48d63182d0f0cf12c147ed4a67f7747911789f342dd63adbe90bfd6d5cf6bba6b1d
-EBUILD ctags-20170704.ebuild 1864 BLAKE2B 648dd6499ed80bd2f00e51fbd2524f9ba735d27878bf37ed520135d8a15fd80f1f6351c02fe2bc97fbc49d3275dac201f064736bd666395027fa92a55e860062 SHA512 fb3a06df7d9fb5e0772cfa45c364af9c42ca0c6b3c57c4f00f415236c18ef2fa30f5a1a0055776ea805818faa154d4b6cf18e20b57362f27dc2dbd532894c929
-EBUILD ctags-20190331.ebuild 1855 BLAKE2B b57b5cb98f39fef6cbea9d10a6f0387de725855ef50f62742fe51e7718c23708e0a8778bccbef7b14d1d2121fb2cb38bf55abbbd2d0b70c922be3536eb481f21 SHA512 515fbb932d4cf379fddedcd1ff18000729312ed88ed96c321e55e67a76d67b721475e28432477c47805d32e8ac03081fc5380bed48ddedc97925a4d2408e943c
+EBUILD ctags-20161028.ebuild 1725 BLAKE2B f905914dba482790da1a5e5a940389e66b79eff95497440a507ee239830172f67221606639fa280edf6a3dd3f5a369cea627a4f04218e59bad82b3891bc7e80b SHA512 d982daeef17a03be793a29e09b37d52a309609820765bcc142e59904035669672b94c2c76d7725192c64fcf3de523fd239e22a288ae5d76ad09d4a35313eae71
+EBUILD ctags-20170704.ebuild 1862 BLAKE2B 84fae77b0b5267b68cc01e8b64c922a1b5d864662b34f139251911303d0cb8adf53831dc228a384eb29d0110485aacaef1ab42a4aa1f3d632a7985a7e4d9817a SHA512 05e556c94810b7a2681a0e4182ed2a752f441bbf692af6dec6106e56d5a270db98e5f382d5903b950c9067c481b28f78213a4f3ce026815d0ff45542ed7df648
+EBUILD ctags-20190331.ebuild 1851 BLAKE2B d7987cfe4e4923529535145df8c4b0635af9946cab8c207f190babd517871788d73f4b1aa81bf2b0a2f971c73ddd3408ea469ae23520ca6c5328c0272cdc697c SHA512 a1c8effec48853958f4c200ca0489eb72bb5aa17e97b4758ea31931c751335ecd0cd5fcdad644165476fc56fae8b32145b600fa8a71d790fbc7498d69a427481
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
index 9734f3d20018..64b0e6eb1489 100644
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ b/dev-util/ctags/ctags-20161028.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
 SRC_URI="https://dev.gentoo.org/~radhermit/vim/${P}.tar.xz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
diff --git a/dev-util/ctags/ctags-20170704.ebuild b/dev-util/ctags/ctags-20170704.ebuild
index 0fc5b8e6e8fb..2b2fbbbe1bb4 100644
--- a/dev-util/ctags/ctags-20170704.ebuild
+++ b/dev-util/ctags/ctags-20170704.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
 SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
diff --git a/dev-util/ctags/ctags-20190331.ebuild b/dev-util/ctags/ctags-20190331.ebuild
index 8baae1901d36..dcf4704fc33b 100644
--- a/dev-util/ctags/ctags-20190331.ebuild
+++ b/dev-util/ctags/ctags-20190331.ebuild
@@ -11,9 +11,9 @@ DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
 HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
 SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="json xml yaml"
 
 CDEPEND="
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 847c3518e7dc..86c41e8b0b08 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,11 +1,9 @@
 DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
 DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
-DIST cucumber-core-3.2.0.tar.gz 49868 BLAKE2B 511a1c12881ff6bbe9d1977e23c9ebb6bd6146e54de1f211f81f89fd8c4b71962ebb8c9784fb14910536ebec5b4e8d557c6dc69a356d92e034aaad7753ebfa5c SHA512 dcdbf8197b8945e165de3d32d440ca57c722a232b2c689778624e18e61f9be25d77f39d99b27b25645a37a4e72e1a774dec4cd9663f5e1e3eb1d0965c88dadec
 DIST cucumber-core-3.2.1.tar.gz 49868 BLAKE2B e5d18797fb6821fa9c300898bc8c14d57559b790d77a191d7147a987e27893ce89076716f82fa2048632e1b033ad607c748fe29f6b8fc600abd523290c4a9f50 SHA512 ba45e804d8454a6ef306eb90f32e6cdf3ee25fdd6613e9ba8308ecfce4044f27ee3dc012ad7f9ca481e94fe5e1d9deb9e0c46ca811a8e25bb27981a78c528ddb
 EBUILD cucumber-core-1.5.0.ebuild 733 BLAKE2B 217c3b09430a5fecbca7ed945fb3189113fca5e6bb3ee61f04681c0f7f6cb64377c07ef957dadc4c0dd1b88713aa08fe3309181a118644f0c677d59476424464 SHA512 2ba20e7e2f6b6d33c34cc88f0cf7e816d9d5ef3c060f067a1e2e10df0a61a60e482c20dffce7a7d896bdfbf91709a7f77d06a3a1e6401a099edb3c546ef45189
 EBUILD cucumber-core-3.0.0.ebuild 802 BLAKE2B d969e10078b0127a60683db02e4124458cd9ee666a0143e7c484efcf3ee8e0dac3dd0465f07f3fd78e1b0a6348497769ea8b4a6e738dd5b0d90f143631e4d960 SHA512 48c3ba8925b5b7b09fcd2cddadddccbfc2749ce2bad8724d23006e37a8f0280b0d7d7aa4d4e0f41f41b54e429f12e993262a6bf85518cd212f9784ab689ef6ca
 EBUILD cucumber-core-3.1.0-r1.ebuild 976 BLAKE2B 35f0b120baf995712a7e2c21d2b1fe0c69a067466ca91795a5da3deed20991c4323b8e71cadf25b00b3cf4e543036bd24f59ce289de4dc5c800fb5bb86fd32e0 SHA512 890710ba3a5a91f996c1da8c9e6e0a11a539891db63155c98a2de0f54a66a201a06fb71070667282876d11c1e6e6866553ef3e8dbcb458323505fd5ef6c691e5
-EBUILD cucumber-core-3.2.0.ebuild 997 BLAKE2B 7cb250895e6702adeabccfcf9d453d6051f263fbcc5ee6bf246ed5724cb9e32530bcdfd821600342b749f86aa719d74141cd8d5b28e7f8e0df191f77fe19e598 SHA512 a1dcb11e157ce8fb4e1e7388dfb977b3b6eeb0f432d68b37395e03aa22e1a2a2159a036c815ac3a9caed97d11d4ecdf8d2306a572d73b26f2e7118fe3febff26
-EBUILD cucumber-core-3.2.1.ebuild 1005 BLAKE2B 4f9d3805b56b0ad6b0220974849cba5350d5429b99985b98aa6d956ee8f6e5fb5c6b8f7e73dd5650fb6b00d5f963c31b26eea8569b5db991dcb7b97b7d894343 SHA512 e6b77183a7cf9fda4e060fab9cfbf41b9044c77dbee24cece20af766a392048c46f75546463c9c7535ae9fe8864ef069802bb4e9a12db8a176620aaa3d9a6eda
+EBUILD cucumber-core-3.2.1.ebuild 1002 BLAKE2B 69fee18824d9deea3b16091e9ce395813dc20c2a67421d0f10eeeb8b5a4fad8a37e0b86e4997e58844ab0904b1886fda5f622d5d6f0909806198da7e7ca0b20c SHA512 dad4373c7b06af54b9a1a9f76eaf0db20d52145794e2e1f2fe53c267c66959a100c115dad39117c541e0f9452b31d315f55ed6684446d41a0b427ac05ef8391f
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.0.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.0.ebuild
deleted file mode 100644
index 420d5a558337..000000000000
--- a/dev-util/cucumber-core/cucumber-core-3.2.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-core-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="$(ver_cut 1-2)"
-IUSE="test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/unindent-1.0
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/backports-3.8.0
-	>=dev-util/cucumber-tag_expressions-1.1.0
-	>=dev-ruby/gherkin-5.0.0
-"
-
-all_ruby_prepare() {
-	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
-	rm -f spec/readme_spec.rb || die
-}
diff --git a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
index 4a7fc81d9843..ed85104380f0 100644
--- a/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-3.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz ->
 RUBY_S="cucumber-ruby-core-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
 SLOT="$(ver_cut 1-2)"
 IUSE="test"
 
diff --git a/dev-util/cucumber-expressions/Manifest b/dev-util/cucumber-expressions/Manifest
index 82fb8cb63f2b..462be687a3a3 100644
--- a/dev-util/cucumber-expressions/Manifest
+++ b/dev-util/cucumber-expressions/Manifest
@@ -3,5 +3,5 @@ DIST cucumber-expressions-5.0.18.gem 18432 BLAKE2B d5728a766ac568a0a2588dc99d453
 DIST cucumber-expressions-6.0.1.gem 18944 BLAKE2B a30127598ff26ea60477bbdad9fc621d0cb1ebb09af3f38d329a15430a207616b6421a127c302ba8470089c8ee0daeccc8f38d4f951b6edb320cff1cc16760b9 SHA512 d9c6371d499ffbe9105038396cde0786cd889def866bf56284a66be77230aac03a74f565b2c3adb966a8d2c67e631ff83eaf426e4bc4b022cd7742bb3a030137
 EBUILD cucumber-expressions-4.0.4.ebuild 486 BLAKE2B 1e32843c530edd3b6c108c2a8d88b6cec0072c5043f32f68ba245be22c8464791a416f4f81f806f7bb6a25cfb510071bd1641d48b236b63885fc73fe31abfad4 SHA512 2ef549ece304bec61447cb885034cdd8b4c654ae418dbf0efa12a151dabe382eb57f99cd7546d4166808754206db30b2797e324c9e4fadd2461c7978b57fbfd7
 EBUILD cucumber-expressions-5.0.18.ebuild 486 BLAKE2B 5c9ef936e8f7695dc4a5f046bcf60de90c3c9fe9b6fa2d0dd6607084a4c0940c5162cdf9bbd14ca4dfd73681851874a33cf6adb36ecceec5c5adc18e4677e0e1 SHA512 8d5ea7734d0bb8a03b6b00c748a20af66075c84191280a0e9ba98236cb11eb900bc6c36977a5936b3ef698b32d34cb6e17db8c616265d10a87fc2b55ccdbd975
-EBUILD cucumber-expressions-6.0.1.ebuild 504 BLAKE2B 45d71f9a10bcdfccf0f7acdcbc7cc673dccf061a6bfbad59bd8473ff2086453ff10e26f9d8ffc6f4262c85f13d9e7285e4e7ecfba84b9a71b6e50116ef8361c2 SHA512 7a41b433cc8746f6b832f7174f05f1fbaa22195f32cbd949604e3e7a93d2ffe178a57223545f0fa1d667a44a008f8b7de6b8511148d52d142e458ba4786593db
+EBUILD cucumber-expressions-6.0.1.ebuild 504 BLAKE2B 8e5614fa91f07c563f67f8fa5f64037cc3f6d45bd6449edff56b742428c0b16fd4fb2047dfcd802ed65dcc9167d0928d8d7ddbfabb8d224c3e551d135b0618f5 SHA512 a75d20be3ace5e685369c9a8f9f6a2cb144ce42f6f13fccb9f05c0c7bb936bec444fb3728481292107feb99a82d4301c3950d63ff6860116d6efa6fb8f359181
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
index 35a304a5cd30..b7ec62310998 100644
--- a/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
+++ b/dev-util/cucumber-expressions/cucumber-expressions-6.0.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="a simpler alternative to Regular Expressions"
 HOMEPAGE="https://github.com/cucumber/cucumber-expressions-ruby#readme"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
 SLOT="6.0"
diff --git a/dev-util/cucumber-rails/Manifest b/dev-util/cucumber-rails/Manifest
index 11c8ad3ee642..3ea781acf20e 100644
--- a/dev-util/cucumber-rails/Manifest
+++ b/dev-util/cucumber-rails/Manifest
@@ -1,5 +1,5 @@
-DIST cucumber-rails-1.5.0.gem 406528 BLAKE2B a43f6bf93d10df49b57f1da914474f54eb5983b53afe54cb13fe1a1b95792c5c9031b26651d3ac8fe2f8788d86e6ec891aaa91853e95c603f746f02a719f7b6d SHA512 d5a416cea8055319b768243b2029fcc05412677ba8fdc523b246d69e12d820e429b80892d6cfc43600aa84257e2175058ddd5f0946d68c42efa7ebadbf1a536d
 DIST cucumber-rails-1.6.0.gem 409088 BLAKE2B 05263cd0183a6b6ae4a3091eba6e4d6f6bc1f21f434757e86b0f150c1c18c98773b210db31a4f58710c05d09324605048586aa8d62274ed1861dd7e2bba97b25 SHA512 dab37f8777e2bc06c07141baa84091cd5128fa90631f1ecf381e2a8fb22f024a1f5af96edd212148c4a9e30791efb9f2602a71058f3b7c6fc494dfd10bfefb00
-EBUILD cucumber-rails-1.5.0.ebuild 1215 BLAKE2B 3948f577a0a4229a2cdb34f1e97a034380127860894c5a62b918e021cebdec058d91c5cfa7ab938441b27d4172952413ea11aa50adc2104d19e6e64bf4b33ff2 SHA512 c93c1ac5595bfdf823e4c3e2c127eab035cb2c954f19c4c78baeb2f7dab21f4eabc396e3c359b36a5b9ec53324e02d30b974a475df23e0d81d55c33a729243d4
+DIST cucumber-rails-1.7.0.gem 411648 BLAKE2B 09f6e79384869e0d901cb7dda607f2db29b0a924cd57fac56f88e5a90ef5f79348246e91195ecb437ae88e2e5f3f2e17bbfc651b8ff6e01cfc92cc86c544b5be SHA512 05f91606ebfd5db6608120b7057c767efaccee1dfb2eb99113e9cc6f55e594bd4181f54c8a38780b451bf7dc53862180e80a3c62a81ee8b1ea6aaf54682599c2
 EBUILD cucumber-rails-1.6.0.ebuild 1213 BLAKE2B ba430abc294ee09c4d903f91aba1e6ff62cb5069df4d511bdd47184379b8269fe607b630d5dffcb6bbcc45db7fad514c5d74ca6a28f166379a6d681cc275e460 SHA512 25896ea0452c98e291cd03f0c05801fb15b01b98e143dd465eaf6fd5e55d37b2f5f7ae4c6028ba8fed04a2b0357b14de66727343b5572d25bf76257c7a9b130b
+EBUILD cucumber-rails-1.7.0.ebuild 1205 BLAKE2B c66c8dad299fbfcc8d1811138790f21d5e651cd7270ebb285a8862304a26a0bbcd326ee17a82c8da5cad62e3faa702646641f4ff639c6169119d643770e52e09 SHA512 3ada2192ba53a3fb6a3dbd870abc7f30c0cc884a6cc4eabbab64ffe012c745006dac76c9e499f048d32f79ce2c687d65d0c1c1c467d74cb971b9c178e72629ed
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild b/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild
index dac64878d7b4..876df59ea5de 100644
--- a/dev-util/cucumber-rails/cucumber-rails-1.5.0.ebuild
+++ b/dev-util/cucumber-rails/cucumber-rails-1.7.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby24 ruby25"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -10,7 +10,7 @@ RUBY_FAKEGEM_TASK_DOC=""
 # factory girl which we don't have packaged yet.
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="cucumber-rails.gemspec"
 
@@ -34,10 +34,10 @@ RESTRICT="test"
 #	)"
 
 ruby_add_rdepend "
-	>=dev-util/cucumber-1.3.8 <dev-util/cucumber-4
-	>=dev-ruby/nokogiri-1.5.0
-	>=dev-ruby/capybara-1.1.2:* <dev-ruby/capybara-3:*
-	>=dev-ruby/railties-4:* <dev-ruby/railties-5.2:*
+	>=dev-util/cucumber-3.0.2 <dev-util/cucumber-4
+	>=dev-ruby/nokogiri-1.8
+	>=dev-ruby/capybara-2.3.0:* <dev-ruby/capybara-4:*
+	>=dev-ruby/railties-4.2:* <dev-ruby/railties-7:*
 	>=dev-ruby/mime-types-1.17:* <dev-ruby/mime-types-4:*"
 
 all_ruby_prepare() {
diff --git a/dev-util/cucumber-tag_expressions/Manifest b/dev-util/cucumber-tag_expressions/Manifest
index 6d7a0a62cd72..9728d836e260 100644
--- a/dev-util/cucumber-tag_expressions/Manifest
+++ b/dev-util/cucumber-tag_expressions/Manifest
@@ -1,7 +1,3 @@
-DIST cucumber-tag_expressions-1.0.1.gem 8192 BLAKE2B a47f6d1c049e16df641deedd58ef5c7bb12fa1fb3d0a7e894cc04ac5fde05b1de71663af763ea5199b3d53a44f942abb650fb054a0baf3763f7e2f6dd59a76cb SHA512 be19d91c4b267d0f4c5f483e61a13d63cc023719874358bb63ac72fa3104e6068b8edc6231e70c4ee24c4f33e0b4f2254148edb666bec1f617c0d322275582b6
-DIST cucumber-tag_expressions-1.1.0.gem 7680 BLAKE2B c8aa789750c0e33acc0864d85bb7f90c87d9b0872cf027e84eda4be8ea73187e0171abbbc430d7f2fad4cffda3e218bff35c9016800f0eb80877c6acb84fe75f SHA512 471dd0e8cc63cc67e9cd99a446859047683b5e4f4b55461c986b25999240d4b466bf1d3eef4bf7debf56b7ea3ed10e6dac7f19b67496f81bbbe6d2d4c7168aeb
 DIST cucumber-tag_expressions-1.1.1.gem 7680 BLAKE2B 31e1f23c5fc008390c9221307473022107b109d409d8385a111f4fed1911fad15660faa824bee71cd87a2e183ec41a6ac9b5f7ecf5f1c417ed51d649c76712e8 SHA512 9b46d681be78b428c7cd29ca1cae21dbd410f7ca9844ec6f94368170c133f8de662a55e4f4440045704107e5428306ab81d2a90020c64102ef42f647cd8a66a6
-EBUILD cucumber-tag_expressions-1.0.1.ebuild 454 BLAKE2B d5416858d4e94dc2de51182c5a75159cdef7059dabecd74a86a3d2496b964e75dd885a7bded237ab6f1ca76d7b8d19c9706dfab05c8755e6981c5c9d19db468e SHA512 fdf8266a69df5bb423cdb292633952c511d2cd71f67780a29fcb2ed87d11449125fea9f42fd643f2cd3e9897e35b33af7b9bd561dc3230d72a7bf9b1b257fd77
-EBUILD cucumber-tag_expressions-1.1.0.ebuild 454 BLAKE2B d5416858d4e94dc2de51182c5a75159cdef7059dabecd74a86a3d2496b964e75dd885a7bded237ab6f1ca76d7b8d19c9706dfab05c8755e6981c5c9d19db468e SHA512 fdf8266a69df5bb423cdb292633952c511d2cd71f67780a29fcb2ed87d11449125fea9f42fd643f2cd3e9897e35b33af7b9bd561dc3230d72a7bf9b1b257fd77
-EBUILD cucumber-tag_expressions-1.1.1.ebuild 472 BLAKE2B 0522b0e68f6e894584ce7a3a0d2b81b6ed91d8c22dc6c797ef6d23d16a778b6e48e54bf70a4d2ea9aeec91fd1e366edc331189c465567bf721137f75c03ddcce SHA512 096e0c73e23134e2b07a7c1d990b49a4ae27f8792ca7ad4935e57409202ccd0b8e59cd55aabcf3a987d9955b9b9efa5ee726bab8438dc5c5216f36514bcd92e0
+EBUILD cucumber-tag_expressions-1.1.1.ebuild 472 BLAKE2B 43dcf720547773fa97e66f43e6e76a85d8f865570da1580e8c031c2656d855c4bf412ad1111907028596a18ae3f6f40ef8dfc3dd859790401719444afbb1d4d2 SHA512 c525b9e4315ee173f727ba53d93a0579b8e50de76ef8d38ccd938edb7e48ec1ad43bb4111669a9590e285a443f23827c18b1c8c4675716f100a8c05651d13982
 MISC metadata.xml 299 BLAKE2B 1f0765d5fb94004b9a72b4b9b4c50cb14b05e611c84016704210aa24909d554a6f817d475fb924573d2ec6ccbd389165d9689ee8ccb7212744292dfbc55a0749 SHA512 b655a45650726e475ccae46d7bc062ba32c527277160c9033382684f6a7aed520220c6a197f7abb9dfe18f8ebea051b5fdcbfd10c744031f123ac684ce3225c7
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
deleted file mode 100644
index 124d0a51dd93..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.0.1.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
deleted file mode 100644
index 124d0a51dd93..000000000000
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Cucumber tag expressions for ruby"
-HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~sparc ~x86"
-SLOT="1"
diff --git a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
index b02e7e9ff31a..dd7be131c07d 100644
--- a/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
+++ b/dev-util/cucumber-tag_expressions/cucumber-tag_expressions-1.1.1.ebuild
@@ -14,5 +14,5 @@ DESCRIPTION="Cucumber tag expressions for ruby"
 HOMEPAGE="https://docs.cucumber.io/tag-expressions/"
 LICENSE="MIT"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
 SLOT="1"
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 189423e3e425..c563c2007b2f 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,4 +1,4 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
-EBUILD cucumber-wire-0.0.1-r1.ebuild 530 BLAKE2B 85db7ba316f03ec88805501ba819250357d25b1f7a391c16f1cb9d7239c61af74bd365e2497e634b7d5b09556d44495564b7f621893e164b9a04c3b82e745335 SHA512 5c7ffcf28b8e35408ac5486446a6b623f992eca1db0dc52478d9a2a26b51e700e4d497e22e421dd140112b123c6e2608297b0d17197ab9eda5d3d68b117b53e4
+EBUILD cucumber-wire-0.0.1-r1.ebuild 527 BLAKE2B 3ca0734cbecd425d9289500ca1cf04dbb91ce9b83762a7a7b473acdbf9e7d15e3bb496377366f0ac5d61cd1cc0d2b224fe6cdbd706508e4c5f31e3fda9b29e97 SHA512 e5028f5be67915a392e1c53a2d8816bace3a3f0de5bb007080da83051a0af90cc6963941054e81e14e2c4d86d33a0cd1efd00931cdc7faaf2780f9c00b44ae57
 EBUILD cucumber-wire-0.0.1.ebuild 522 BLAKE2B 649204a8b9a48f5e4009cf10d18e0c67b538e718f1887f88aaabf9ba778fa210b77275f70673ff904f6f121b7071854b206231ee6f7771b95138cbf5d98a57e4 SHA512 272aa3faaf6f654acdd283927b6793fb7ba48613b1c6d4078ac860930a812bd79b7a9e5ac3154fd7514d56e00cd04a6d415683e1e12b2e9c41654216c6e4afae
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
index 67f2affad61d..db8e324de135 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index 82e72ebf84d4..bedc1bef015e 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -1,7 +1,5 @@
 DIST cucumber-2.4.0.gem 250880 BLAKE2B 2d0479695800639340332ab26b745a84cdbe7dfc575e652f6a94eca77b0c3397a48a2f3220a2a4eb164e9f0f747bf4866678b7927cd0ce47e5ce78ee057d273d SHA512 b7f9720e3f9e1f30aba9590ff92209073bdc028b880ac7a378f6dfe2a7f093c0521387cfc9319d7ed994c5e9de7106ccff23ba1f10c1cc5888785c69262c723e
-DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4cd6f85953023f5fa0e14dc7186a706c43b81cf77a55ad56f932e60146e7e0ca7d4107f85e9c6bd46cbc8b2d1f7a SHA512 1506427fb6d9233231497f0e1396143cfb1495673113fbb26344b171413c1bc9d35fd8a8ca86aa14ffc279d1d9db05712618c3a0e96f2288056d76f39bbf2cf6
 DIST cucumber-3.1.2.tar.gz 267995 BLAKE2B a55d15d2c5746efd2e9f3518025b3b6d69e7712920b5731e1174ff429a9d6161d9aad7c0065c5ddf8b97fd87c9e658ff86b961b175db2c930bba52d1904d6b62 SHA512 abf0b562476653c393bc5a3c1f9669d91a2e312bcceb98bd20ac3771a61eeb696721cba76299d12871f7c61fdca176310e3a334b53d10c31ef3e201948c762d0
 EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
-EBUILD cucumber-3.0.2-r1.ebuild 2673 BLAKE2B 718c85f7f4df14fca77c5667a0b25ba696255518a91c0fb5edb0140530f052ac9ebd419595ebb9505cb4389acb5ec872aad48e9496ba115c3a2887b8f0c49c15 SHA512 a4ec7c01e2f0ffd630763c2dafef49d9989644321fa8c4dfb30b4c906e48afe3191c4ae6babaecee4163a46f3b4fdbc474721350915077f0386982b68f3e72a0
-EBUILD cucumber-3.1.2.ebuild 2703 BLAKE2B 2c06ae7c702f4cc6d50f53c45d2d0844272c95b7bed0a026f0b8275771027d786bfd4e416abe3ebe5980b5f77e212b736a2c3838a93268d78aebe9bf34aab9d3 SHA512 dd508671e0d6c9a4fca9d551db85837c0f2ebbf7053273bb9c15fc43d768ab398193e2d1cb13c655cc061394fb7b608280378aa28b04d4940b7e97faf8650c8b
+EBUILD cucumber-3.1.2.ebuild 2697 BLAKE2B d6384978c77e32cb9790e1a70b12583d3724dec3cf9c2ca830a2ff9a9dfc896292ddd18d88df500c59b1054b210519d0bf030241d55a2b73c9bfe982e6b0f929 SHA512 a672baf15b125b17634a8d0a5c3ead6f1dee64e6e28bcc55704a3dcc4a6029875d4d6a0eea6990aeccc7eeb1863e03d459ce45e80191e6bec54bf3047faea20e
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild b/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
deleted file mode 100644
index ef62db8a64fb..000000000000
--- a/dev-util/cucumber/cucumber-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-# Documentation task depends on sdoc which we currently don't have.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST="none"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="cucumber.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Executable feature scenarios"
-HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
-SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="cucumber-ruby-${PV}"
-LICENSE="Ruby"
-
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~s390 ~sparc ~x86"
-SLOT="0"
-IUSE="examples test"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		dev-ruby/rspec:3
-		>=dev-ruby/nokogiri-1.5.2
-		>=dev-ruby/syntax-1.0.0
-		>=dev-util/aruba-0.6.1 =dev-util/aruba-0.6*
-		>=dev-ruby/json-1.8.6:0
-		>=dev-util/cucumber-3
-		>=dev-ruby/mime-types-2.99:2
-	)"
-
-ruby_add_rdepend "
-	>=dev-ruby/builder-2.1.2:*
-	dev-util/cucumber-core:3.0
-	dev-util/cucumber-expressions:4.0
-	>=dev-util/cucumber-wire-0.0.1:0
-	>=dev-ruby/diff-lcs-1.3:0
-	dev-ruby/gherkin:4
-	>=dev-ruby/multi_json-1.7.5
-	>=dev-ruby/multi_test-0.1.2
-"
-
-all_ruby_prepare() {
-	# Remove development dependencies from the gemspec that we don't
-	# need or can't satisfy.
-	sed -i -e '/\(coveralls\|spork\|simplecov\|bcat\|kramdown\|yard\|capybara\|octokit\|rack-test\|ramaze\|rubocop\|sinatra\|webrat\|mime-types\|rubyzip\)/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid dependency on unpackaged cucumber-pro
-	sed -i -e '/cucumber-pro/ s:^:#:' Gemfile || die
-
-	# Avoid harmless failing spec
-	sed -i -e '/converts the snapshot path to a relative path/,/end/ s:^:#:' \
-		spec/cucumber/formatter/html_spec.rb || die
-
-	# Avoid failing features on new delegate and forwardable behavior in ruby
-	rm -f features/docs/defining_steps/ambiguous_steps.feature features/docs/defining_steps/nested_steps.feature || die
-
-	# Avoid dependency on git
-	sed -i -e '/executables/ s/=.*/= ["cucumber"]/' \
-		-e '/git ls-files/d' cucumber.gemspec || die
-
-	sed -i -e '/pry/ s:^:#:' cucumber.gemspec spec/spec_helper.rb || die
-
-	rm -f Gemfile.lock || die
-}
-
-each_ruby_prepare() {
-	# Use the right interpreter
-	sed -i -e 's:ruby:'${RUBY}':' features/lib/step_definitions/ruby_steps.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	CUCUMBER_USE_RELEASED_CORE=true PATH="${S}"/bin:${PATH} RUBYLIB="${S}"/lib ${RUBY} -Ilib bin/cucumber features || die "Features failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	if use examples; then
-		cp -pPR examples "${D}/usr/share/doc/${PF}" || die "Failed installing example files."
-	fi
-}
diff --git a/dev-util/cucumber/cucumber-3.1.2.ebuild b/dev-util/cucumber/cucumber-3.1.2.ebuild
index f608147f4b66..d0087ecf4d21 100644
--- a/dev-util/cucumber/cucumber-3.1.2.ebuild
+++ b/dev-util/cucumber/cucumber-3.1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/cucumber/cucumber-ruby/archive/v${PV}.tar.gz -> ${P}
 RUBY_S="cucumber-ruby-${PV}"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc ~x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/d-feet/Manifest b/dev-util/d-feet/Manifest
index edbed48eb962..ec9c924ae45e 100644
--- a/dev-util/d-feet/Manifest
+++ b/dev-util/d-feet/Manifest
@@ -1,5 +1,5 @@
 DIST d-feet-0.3.13.tar.xz 174700 BLAKE2B 66d2a8735011c64985889edf1acbb37e1547d6af52fc6499124ffae09d8cfd876051e12f231c26a1af848939b9a3e9c36d1083e8afb240575d4f580ea92fde65 SHA512 b5a4eb995e883406a13e8a4137b1ed751cfbfd0fd80fa26eb81cf6f8b69bca63f3a4ad940b1aeaed0a57d48d81c582b62f6c3880e7038136f2b40a1eef25328f
 DIST d-feet-0.3.14.tar.xz 177064 BLAKE2B be1150cead543dab3daf1c8beae4047d3c32e60dbf9a73a50ef95fe62cbafbf6af9ab174c7f9128212b0d33aa111545b598c6aab6d359625c94f0029ca5f1a20 SHA512 1ea3bd2251693884592d375f1459681043b5185c341299dc28cbc8e4e05f3ff3a423c051b650806f6b930d8b89e0d751983ada7ad9a74b380f74f3205125b1b4
-EBUILD d-feet-0.3.13.ebuild 1368 BLAKE2B 43a9223eb66494160921db5862d447dbcb603db332fa8743ec0dd3d4675cb2e43e148983ea7b177ece40e38d40f74c69ab350e9c39f87db2e77442c259c45c06 SHA512 52eadfecd0e20f4b7870b6330226a694028270e7c860c98bbbfb33efad8c853a7ba5709ed2a8cff16b08091e1dfe45da0440f40f87d37bd8e3e93eeea7f3c955
-EBUILD d-feet-0.3.14.ebuild 1048 BLAKE2B 57a89fbbed48db602dfad03515929b3856c0faedfdb5758dfdca3f50e264ee4266f9861e04079deb0a50be15aeeefdc6eb38e4e538ddd1da6a6ef057004ddd98 SHA512 d706ddf3371439a2938ecd85310627df86ece0f169daa0448c7bba03d5899ea9fc68461c93e3c3e9a69f4a8f53cff4d20d8ccd274a21dd623b7fc41a704dd892
+EBUILD d-feet-0.3.13.ebuild 1364 BLAKE2B 3d6f96dee13ed64d6c63ecbcc49e454712a55e76aeef1209eef4dce4b6725bed457603021817ec0b6ffa8e64c343703949176af4b5c448b1eb86e13824b1095a SHA512 d3f0b0d82bd785bb740d39d2928d7c9f66d14f91a26e2ee3772b7aa879dc6627cd8efdf2adf53c08d9e5c0ab31a97a55127b2081e8bb34a10a9ed680f196153a
+EBUILD d-feet-0.3.14.ebuild 1044 BLAKE2B 27152b765732efde5437d6804773affbcc5e36aeb03487904967beecba84e1ac80f17b17a3a66c5eecefec74c3989b4412b1be799300eab36847fb1a9efe530d SHA512 77635c92aba6c67e11efdf50995e6b6cf6ea3d54ff4107a3a77b58632bcf1e7e33ab336e68f9fed79cc0a04e8910c2cdd0626a7ae16100fa50ca38c85ce0f209
 MISC metadata.xml 432 BLAKE2B bdc09ed75743fc3fa8155849638634790a2eedc0b58330991b7a6d0a05eb201cc64743033d35586ab6b91ec85c385b23f9ea744d826bf41ffc0cff3a493f8a77 SHA512 0cf318c10b2e7b85135560df21bde6857dcb101d101ae51f384dc613681afb29c15303de0ffd23b8478b2b81dbd5faa051e816df71155230e1eef1b6a99bc699
diff --git a/dev-util/d-feet/d-feet-0.3.13.ebuild b/dev-util/d-feet/d-feet-0.3.13.ebuild
index 7ca5c5d001f3..d0e6b9840c4e 100644
--- a/dev-util/d-feet/d-feet-0.3.13.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit gnome2 python-single-r1 virtualx
 
diff --git a/dev-util/d-feet/d-feet-0.3.14.ebuild b/dev-util/d-feet/d-feet-0.3.14.ebuild
index af1ae4c4c6d0..bb196e8f7420 100644
--- a/dev-util/d-feet/d-feet-0.3.14.ebuild
+++ b/dev-util/d-feet/d-feet-0.3.14.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit gnome2 python-single-r1 virtualx
 
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 86a885ec0b61..852d9e92164d 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,3 +1,3 @@
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
-EBUILD dbus-test-runner-15.04.0_p100.ebuild 1077 BLAKE2B 47b93fa42e8f8e99a1aef9bb380e2fd94cdae12e15924484bebc62bf17254b6f9e4904807e27eddefc16ae4ea15c0881d03446066c3d211a79797eba8d2ea426 SHA512 35dfe14f974d5abe94fd86d252a919b284f82c7b023ec8dcd617cd792baf288afebaf1a065f5c20132a611f0d3ec6d99804e636a7fecda0a90004b8efd2e3261
+EBUILD dbus-test-runner-15.04.0_p100.ebuild 1073 BLAKE2B a146962b47dce7e03c56aff5c4b1267ec9e613f3cc03ede486410fd18c9497eafe3ac7bb0bc9e1a926d0341e7b9a181d3b9d23782ae3abaf8d293153da2e0169 SHA512 88f33b879746a4849dd8abaab6ce3617287828fde4c66b5c4b3215e8a7a4a8fc16fef19569442a6a243924103a740ded523243da8055ecaa3d7378be3356b839
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
index f5ef58e3d858..b8397d945529 100644
--- a/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
+++ b/dev-util/dbus-test-runner/dbus-test-runner-15.04.0_p100.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 inherit flag-o-matic python-single-r1
 
 DESCRIPTION="Run executables under a new DBus session for testing"
diff --git a/dev-util/ddd/Manifest b/dev-util/ddd/Manifest
index e16a01527a61..fcfed827af3a 100644
--- a/dev-util/ddd/Manifest
+++ b/dev-util/ddd/Manifest
@@ -3,6 +3,5 @@ AUX ddd-3.3.12-gdb-disassembler-bug.patch 266 BLAKE2B a5658a1513adc116a81de7ec7b
 AUX ddd-3.3.12-man.patch 571 BLAKE2B 88f499833e47ae279beac8dbc4aadcfaa80e8c19f388b6dac3d724b284820472ca83ce81811df838e26d66d3bf1a558c9de8f51f22037b70cff3207f82104b40 SHA512 830115e517f754702892549d780003033e29fc0668824540cc63c3270e8445549896505a6584ccee104d94ffcf152bff679d946922f9d6fffc75d77abdbb8a59
 AUX ddd-3.3.12-tinfo.patch 330 BLAKE2B f0e29f408f1e5e7fa40e386ab2a1f6786a9a14dc6722aef3fc8132558b624c233102b4290c0ba0e5d55b27aa4b25e6bcdd6fcd1b4ae237540621f3961e92bffc SHA512 a3cd3d59bdcce6c106d4488ec9a6c32d8baea49963f61e8e493a01131fd604664dca2e9e548852ff4c538c7123f5c1572bc54d6143340167fcdfa754002eb224
 DIST ddd-3.3.12.tar.gz 5687115 BLAKE2B 52c448eda46bfdc4f5720abda569a0c70f3680c3fdd543f6101c9af8c4c448496414c1c2a7be91590d9f14d0c8c2bb053a234d179bf900ca52df0ea8c2642131 SHA512 1249e4f5f25335f8f2c3616470f7a8f36262c00b8ac12b79f2b2806228de2831ebeb780fe09490e5e8b5b1ca108fe936ae70856f6a6ec02876fc75c7b4a7dbf3
-EBUILD ddd-3.3.12-r3.ebuild 2112 BLAKE2B 499dd54516ba63d41f665b293f020712f5c6a2c1b0dbceff83da6e716614a77b6cd9b0b470e67ab332830edc95edb6087c1175354bb2d00f2c9e53b048caf027 SHA512 0660e012bfc359ecb50d79bd1e24e5b60f8aedeeb737534b7d5133fce140bbca9138f283d1f36ae9b6fcd3a87f55613d33f749d6f148687e42d4e59957d33950
 EBUILD ddd-3.3.12-r4.ebuild 2256 BLAKE2B 6fdae531b7aee21be37ca2c90c9e4042cbbb7388d42bedb5f198da4b7c4b2ec8793763eb4e24d50ea620dcf3e96be099cd50a550e0e49891bcae9f9c3eca1779 SHA512 a6614f1ad38fd3c479476f870b9c7ca09602d2592e5e2f9bff2005b441b0d88747ec5cad84268c0ef6670dc3ca5c1072f88d307a45dc3c807ddce629bf89981d
 MISC metadata.xml 658 BLAKE2B f2b35a9e08da89197aa56157e5d3c9adbc991d888cf798849bf7edf33fe6d9fd7dab16e0ea3068d20a836f85d133a570f3bbbcb9e57399c095292fa3390f59bb SHA512 8b304bbca5e836ff3032079f5dd2afea432b8f48e2c57575644adbefba0ddc4f64e3682f35f53c2804c27e950785ae8040f8704c05162acf302c6fb61b70c51d
diff --git a/dev-util/ddd/ddd-3.3.12-r3.ebuild b/dev-util/ddd/ddd-3.3.12-r3.ebuild
deleted file mode 100644
index 25d5352a90b8..000000000000
--- a/dev-util/ddd/ddd-3.3.12-r3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools-utils eutils
-
-DESCRIPTION="Graphical front-end for command-line debuggers"
-HOMEPAGE="https://www.gnu.org/software/ddd"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-3 FDL-1.1"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-SLOT="0"
-IUSE="+gnuplot readline"
-
-COMMON_DEPEND="
-	sys-devel/gdb
-	sys-libs/ncurses
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXmu
-	x11-libs/libXpm
-	x11-libs/libXt
-	>=x11-libs/motif-2.3:0
-	ppc? ( dev-libs/elfutils )
-	ppc64? ( dev-libs/elfutils )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xfontsel
-	gnuplot? ( sci-visualization/gnuplot )
-"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-gdb-disassembler-bug.patch"
-	"${FILESDIR}/${PN}-3.3.12-man.patch"
-)
-
-DOCS=(
-	AUTHORS CREDITS INSTALL NEWS PROBLEMS README TIPS TODO
-	doc/ddd{-paper.ps,.pdf,-themes.pdf}
-)
-
-AUTOTOOLS_AUTORECONF=1
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--with-termlib=ncurses
-		$(use_with readline)
-	)
-	autotools-utils_src_configure
-}
-
-src_install() {
-	# Remove app defaults
-	rm -f "${S}"/ddd/Ddd
-
-	# Install ddd distribution
-	autotools-utils_src_install
-
-	# Install application icon
-	doicon "${S}"/icons/ddd.xpm
-}
-
-pkg_postinst() {
-	if ! use gnuplot; then
-		echo
-		elog "To enable data visualization in DDD, install sci-visualization/gnuplot,"
-		elog "or re-emerge DDD with gnuplot USE flag (recommended)."
-		elog "For flat file package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' >> /etc/portage/package.use && emerge -va gnuplot"
-		elog "For directory package.use layout:"
-		elog "   echo '${CATEGORY}/${PN} gnuplot' > /etc/portage/package.use/ddd && emerge -va gnuplot"
-	fi
-	echo
-	elog "To be able to debug java, bash, perl or python scripts within DDD, install respectively:"
-	elog "    virtual/jdk"
-	elog "    app-shells/bashdb"
-	elog "    dev-lang/perl"
-	elog "    dev-python/pydb"
-	echo
-}
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index ba2d900535ef..f6e56038df09 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -3,6 +3,5 @@ AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94c
 DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
 EBUILD debugedit-0.5.3.5-r1.ebuild 937 BLAKE2B dc741f4fc4f880fffe5775067878d47e357a904acc79bdc69d9d5d7f2f95fcd41f5de34022cf73eb396e9a0d9813ddfe5245724830b069c1cc8d80ab6d462b83 SHA512 7553d4e2fa0ca9c2d65b52636af1ee775eba337bbd7313bb63f6392dd6db140fe81eb513d64b89a4bc07b04b7d80b2f3f24be13b76001f15dff057a7f62de407
-EBUILD debugedit-4.14.2-r1.ebuild 1870 BLAKE2B e38d970fd792a15663e3d0259cb7f9843bd469766a83ffd5da7497831e1189db1898556271fd6adf857481e1cd173a89c68562949625b7abfd6377c3e2615332 SHA512 791b4bcb8f0a4de331bb448489a80c090dbc3386c314903ed9b394be36ac7dab550232f81e3d1595dfeeac728d215d0577236a5c7bf1e2ae1fad9f2079911b85
-EBUILD debugedit-4.14.2.ebuild 1722 BLAKE2B fdbdd4ca1d9b85a1bc63de6eae867bddb873ef499190e7c3626af621cb1be6ddb333ac78f03c1745113f81b09cdd62461e4d313c121a81f6396aeb0a1f2f13ac SHA512 dc3854d27602108bb7db0fb25f3155b3bf52881a2a4991ac4ef24e680c871cc7bd7c56a161dbe9e419de0f5a0ad9379eb8ce66889df49ba14111a0769dfce7ea
+EBUILD debugedit-4.14.2-r1.ebuild 1863 BLAKE2B 0cd7d77c26565d3e5aebfaab3c7e1627571c85c6078dca375a6647e8b75f1bd866209cb5efe5e69d95f375c3a1ad03d8595ba084d24d0641823d78ec0c270236 SHA512 67fa93c458fbca94baefeb99e12f7fe1a614deeff865537d59abd062bb0afeff3594a07d9ec2033eb98e1ace59b00da56bdb5203c25ae0b7b526e0a1e5557468
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
index 0aabb6cf18db..3f8c2951f133 100644
--- a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
+++ b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/dev-util/debugedit/debugedit-4.14.2.ebuild b/dev-util/debugedit/debugedit-4.14.2.ebuild
deleted file mode 100644
index 754bbccb0cf1..000000000000
--- a/dev-util/debugedit/debugedit-4.14.2.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-MY_P=rpm-${PV}
-DESCRIPTION="Stand-alone debugedit from RPM"
-HOMEPAGE="http://www.rpm.org
-	https://github.com/rpm-software-management/rpm"
-SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	sys-libs/zlib:=
-	>=dev-libs/popt-1.7
-	dev-libs/elfutils
-	dev-libs/nss
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	eapply_user
-
-	# cheat it into believing we're bundling db
-	mkdir -p db/dist || die
-	touch db/dist/configure || die
-	chmod +x db/dist/configure || die
-	echo 'install:' > db3/Makefile || die
-
-	# TODO: why do we need to do this?
-	mkdir rpm || die
-	find -name '*.h' -exec cp {} rpm/ ';' || die
-}
-
-src_configure() {
-	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
-	local myconf=(
-		# force linking to static librpmio
-		--disable-shared
-
-		# disable linking compression libraries
-		ac_cv_header_bzlib_h=no
-		ac_cv_header_lzma_h=no
-		--disable-zstd
-
-		# fake some libraries we don't use
-		ac_cv_header_magic_h=yes
-		ac_cv_lib_magic_magic_open=yes
-
-		# use nss as crypto provider
-		--with-crypto=nss
-
-		# disable other stuff irrelevant to debugedit
-		--disable-nls
-		--disable-python
-		--without-acl
-		--without-archive
-		--without-cap
-		--without-external-db
-		--without-hackingdocs
-		--without-lua
-		--without-selinux
-	)
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake -C misc
-	emake -C rpmio
-	emake debugedit
-}
-
-src_test() {
-	:
-}
-
-src_install() {
-	dobin debugedit
-}
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 2f2ef1b0023e..4943d7281090 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -3,7 +3,7 @@ AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb
 DIST devhelp-3.24.0.tar.xz 615460 BLAKE2B b81ac9b1453c0edff45fa746a556343345a150c6436d68db4d51f716704eca70e7aa1af4f3deb5b5c2747db65de619be119f36af807490aa8f95fd070c68cc39 SHA512 56b1eeaf9d3c3357d3140002bed5c29bf7b21953d964405190a1c9cad69d08000efa0220bbc36c67db4151b15ee37c37e061e6fa63c8a79f626e1ec0ce386062
 DIST devhelp-3.28.1.tar.xz 642992 BLAKE2B d3b3a2768b33fb47f05d35d9e6fe970d2f42c564c37916123d7377515dfb5a8277c51f543d103d4b34b11d72e3fbf4d7efc63296e118b1b6a6ac5ba557376a02 SHA512 a42208cbb7ad677a9c130eb637bbe52ca9fbdacd6bb7714ea3cd71285ad4983d7131dfab003ffaf0be1faccd04f215ad68429d4dcb7b49dbb0eebc0e10350f0b
 DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
-EBUILD devhelp-3.24.0.ebuild 1652 BLAKE2B f371d3e2a9119eb5cb29c1b90c538a427fc81a1d00b1658b606a3076050b0b5f813af92dab684e191d156aa6309362ecca8daea03385c34146a3e9f32d376ee5 SHA512 596006b0a3e1c6d005f683be218b843a17593dbdd1f82ee2dfc43868609f318a74f3c48cbd8f4797310d214f885380aeb94c350242f2f81ecd0e6db8cbcad19d
-EBUILD devhelp-3.28.1.ebuild 1783 BLAKE2B 06084e4718a94e83d7a8a005f37a021ae7c7d918ef05d531e7f5b01f05d2dc5c3c7dc67262a4e2057ea22a46521c6323fc67d200f21756a5b910f52f3a155a7a SHA512 3e2489ccda475a4c95b0f4f95445036ff88693ca43d11e67b142ccd899064eecac45ef391ce892aeaa11909e94ba962abffa316e4536f41f06bf795680977466
-EBUILD devhelp-3.30.1.ebuild 1854 BLAKE2B dd7a2c7877853ca21744d9d8c5f1048c81b83b912feea173dbe3d1f4fdd0f1bb8556388dd46fc847054a8bbf50e5ec3c18516c3987a02c9bf00eb59dea249667 SHA512 2dc6cbec979f03abb684d974778c2d5d9ae3e5e1edb15a2d5315141f955254bda52a81eacb285876724d8113ad26d84ba59c2d4b2f103134f2985b34da9b2776
+EBUILD devhelp-3.24.0.ebuild 1645 BLAKE2B 9581b7a802fd98b0d1734f20a3fa5af84cc21c1e6866eaa876e85d3d50e3484493c21d709416a9182118616e16b5f2cdfb1c9eaeb70d38d8e38fd37223f0ff24 SHA512 a9f2ac9f19a1cfa202f29308727e3c11c9aac3f79395c67b989572f4c2ad582571e722bb77641819932f0047751d6ead3c6e89f7d196c9a70d3e117bd89141fb
+EBUILD devhelp-3.28.1.ebuild 1779 BLAKE2B e3cec87331d0cef4e55b9ce117baa29ee79f790a5a677cbfc4449acba2043322f9790bd72dd0c12fbe905656b54a4169a4ffffbe6bb3fbe670526b261f1bc5e5 SHA512 b05a76fdf0f3693f09298caf172cbd149fc23223b162d9d417f323f57e8bdcd0f80a0b2c231a5aa0ea9add7b2d17766933d9a3e1e6c7eb1635040d08d78cec92
+EBUILD devhelp-3.30.1.ebuild 1860 BLAKE2B cd407f4b908389931600fcab812a8c7336a523aec6cbf058a2a22edfb4fd4ee595fe44a6ff33e8fa2dd6f26346301f1451e34ed4e9469c4f6cbcbd3197523db0 SHA512 ecdfe80eb27cdd844696d42770cfb9f2347cdc28aef6e70fe104d39f7c8fe5ebd6a63efccbfef8179b510b6f1780bee34a9635fcbd9c05f1ee970dd6e1bc6a47
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.24.0.ebuild b/dev-util/devhelp/devhelp-3.24.0.ebuild
index b94f8d2e6f4a..4ce81bf23abf 100644
--- a/dev-util/devhelp/devhelp-3.24.0.ebuild
+++ b/dev-util/devhelp/devhelp-3.24.0.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 # gedit-3.8 is python3 only, this also per:
 # https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2 python-single-r1 toolchain-funcs
 
diff --git a/dev-util/devhelp/devhelp-3.28.1.ebuild b/dev-util/devhelp/devhelp-3.28.1.ebuild
index f613f8f1f72b..f4848a727cd9 100644
--- a/dev-util/devhelp/devhelp-3.28.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.28.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 # gedit-3.8 is python3 only, this also per:
 # https://bugzilla.redhat.com/show_bug.cgi?id=979450
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit gnome2 python-single-r1 toolchain-funcs
 
diff --git a/dev-util/devhelp/devhelp-3.30.1.ebuild b/dev-util/devhelp/devhelp-3.30.1.ebuild
index 478d603945ee..8814b22a2d2c 100644
--- a/dev-util/devhelp/devhelp-3.30.1.ebuild
+++ b/dev-util/devhelp/devhelp-3.30.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
 
 LICENSE="GPL-3+"
 SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc"
 IUSE="gedit gtk-doc +introspection"
 REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-util/diffball/Manifest b/dev-util/diffball/Manifest
index 168fc05530c4..cbbd64fbf2a0 100644
--- a/dev-util/diffball/Manifest
+++ b/dev-util/diffball/Manifest
@@ -1,3 +1,3 @@
 DIST diffball-1.0.1.tar.bz2 387787 BLAKE2B e46dbf32b2ec9bece106ca90a6ae46bdfde8b83a5fd41e67f15c4bd25d7015327b4738ce3bfba71c92fd2baa94a5d3bc507dd0fad2b3451447a39a7fe058002e SHA512 1e01fff8bf7d993c828f195d974b7df1cd4fb056e9a51f9533bc8e01666a55e0d9467c799a005f58d7b4369bbf88fc9b716d0fb68ead6171d349e3c874bddb8c
-EBUILD diffball-1.0.1.ebuild 806 BLAKE2B ad4d0357693531577a5c9f6d0f6ca5582af0849bfe0686162de8cb8320b2cc370ef4c325a997a1e804bf6c3b3041e87627bce63e0b4e700b1c42d17a8d564342 SHA512 3c5be0e9608123c1bc5f1bc30b458f59c387e9661cfd27ff5935b6841888e6c94ac779792c206f2b659a1b0dd46fd1c7e40727b9e697fcc1cf1b80a2ea12348e
-MISC metadata.xml 335 BLAKE2B a5e825f2df16ec0a8abe5be5a5e00c986c204b0d46da6a61370f4379b88a181ae473502cb33db6817a05e5c436979f7c2ab30963ff7d85b3d6a7cd01789a4ab2 SHA512 873a67d443a91385a6b7891ee5a09aa3f99cf96410b9165330af17d63333beb72c0e614142274a80ac433089c28a233110b9a142ed3ef2fa269b9a2d2a524e34
+EBUILD diffball-1.0.1.ebuild 863 BLAKE2B b793bbebdc8a2ab06b63f45790ef26afc13ed853cd21fd169996c7ddcb84824d4620fe46f02f3f7e620750c926608b10545fd47389d895b47e69c4d15aaae04d SHA512 dcb5093683bec099b2e82545f7860bbbca6d8dc8b4a8a19f79479a703d7a0003564512633eac02d6c7a90e8f944a20a68bcf2501b3f8700c184beb2469f17a12
+MISC metadata.xml 397 BLAKE2B 08a0d58404fdad1f2d187d5f6f51a061c5b1b24e83ffc3b59b54b223305c8da2f9082d8c961d6bb4ad13f2bb659cf265677d6d1fb7b70fd560add8e64d011f34 SHA512 4375382936f9f3f05349b4d648134251ed463ec7f74d3af2c48b1045999e1c69f9131853efb613d171b17e3ac8d7b17ec56a8088518bd6ef1aa442bd7f287bb8
diff --git a/dev-util/diffball/diffball-1.0.1.ebuild b/dev-util/diffball/diffball-1.0.1.ebuild
index 0902b00c14f9..52aa5e99dd09 100644
--- a/dev-util/diffball/diffball-1.0.1.ebuild
+++ b/dev-util/diffball/diffball-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
 inherit flag-o-matic
 
 DESCRIPTION="Delta compression suite for using/generating binary patches"
-HOMEPAGE="https://diffball.googlecode.com/"
-SRC_URI="https://diffball.googlecode.com/files/${P}.tar.bz2"
+HOMEPAGE="https://github.com/rafaelmartins/diffball"
+SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-util/diffball/metadata.xml b/dev-util/diffball/metadata.xml
index 70aa8c7d2862..eac20fbfab6a 100644
--- a/dev-util/diffball/metadata.xml
+++ b/dev-util/diffball/metadata.xml
@@ -6,6 +6,7 @@
 		<name>Rafael G. Martins</name>
 	</maintainer>
 	<upstream>
+		<remote-id type="github">rafaelmartins/diffball</remote-id>
 		<remote-id type="google-code">diffball</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/dev-util/distro-info/Manifest b/dev-util/distro-info/Manifest
index 755803e4909f..e2f58f1c2c55 100644
--- a/dev-util/distro-info/Manifest
+++ b/dev-util/distro-info/Manifest
@@ -1,3 +1,3 @@
 DIST distro-info_0.14.tar.xz 26460 BLAKE2B eb34e31514f7acfd283ae9405132884ccae31b77d6cf7af3a8a341ac349d589cbd5d7828e763911fc490d6504edae4c90551b3d3cc3518eec1f47ab1dcc6ac60 SHA512 aa0055f21523e30fc7e9c94c92f87cbd05fc5d082ddc109d092e94dabafac7533ced984197797252eb698232b3d8f512b3c345ed6abef0ae074bf2770224955e
-EBUILD distro-info-0.14.ebuild 1920 BLAKE2B adec92fe296311cfc572751e60c13df5cd32fdbf63b81a6e5c1acf474cc9e3777cb235155c80ce4ccb744e23cb8dc0fd9190a4dae76eddca29c37197394c2811 SHA512 4c75ee6a854e6c8afc78a27fdef03799ff5c0a1c66c0f92cc058a04e00c950eb49b94f320309417a8b56bbc2143171a5a2235e45457f5abaa71e73778495addb
+EBUILD distro-info-0.14.ebuild 1915 BLAKE2B c9e3756cc5fddefb9323b86d37bec849dfb9009469001d8993280096115d33499a166999ee5ff2fed1c6002e8483638eb53fa7bcc17a81ac3d7b8faba60f7a64 SHA512 826420545318624a6d296944a2f51742e9151a0c49b9e9b69a969b8d63cf610fb45a142cb28bc3030e0398d8c11de0fbd065440153b0fbbeecaaba93c4543420
 MISC metadata.xml 367 BLAKE2B 867a3664c5bbd444d69af80af19994e07e3810349258e85c2afd0c838cb140aa3f3342ee1aa5e6862d1fd5130e7e09c1f9f30443827fe7df705f4273694c0784 SHA512 3eb0be47e7eb6bfb6d8eecee66a25183da436c38272e226e7819c8748774f3aae620eab7227414cb862734d4baf8fa060290c1b2371233141abcffd7b489c7b8
diff --git a/dev-util/distro-info/distro-info-0.14.ebuild b/dev-util/distro-info/distro-info-0.14.ebuild
index 3f9afb1fe1d4..f8b1edfd3fd2 100644
--- a/dev-util/distro-info/distro-info-0.14.ebuild
+++ b/dev-util/distro-info/distro-info-0.14.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 DISTUTILS_OPTIONAL=true
 
 inherit distutils-r1
diff --git a/dev-util/dogtail/Manifest b/dev-util/dogtail/Manifest
index 6a5f6c67dfc1..b904e6c00b00 100644
--- a/dev-util/dogtail/Manifest
+++ b/dev-util/dogtail/Manifest
@@ -1,4 +1,4 @@
 AUX dogtail-0.9.10-gentoo-paths.patch 2705 BLAKE2B 6a3d9b7a7ced2388bea7216c4a6f95e531247b5d5f7316b64375215ea5a7e0e1a8deb974115bd613baf6d22c7af502efce01f00412cb8ff101042d08cfb9fe1d SHA512 ce792bf24713c8b2948874faa11ee53d341d4d1d25bba95cd11f9a31e2e76e813a20b0d9932268a2110c990de1fdf15382fa1867f02e31ea1d25349e48bb42c1
 DIST dogtail-0.9.10.tar.gz 125995 BLAKE2B e28e9a6330cefc8746b850501a5beba07e18f1e5d5f935ce182103a9ea4ffc95483b3530a705565cbfae1bff24da57839f7e7b6939f42821e31b287150e33b4d SHA512 08ce4ad6e5e492ab04be9964cc6583d96d2d8a707a49721c1bca9248e5c56702fe5d0d84dd992023f731fe87016c88e21929319baff561aa113c6e101343fc3e
-EBUILD dogtail-0.9.10.ebuild 1474 BLAKE2B 1b4b6f087b7cbaac0b14591414d153adc330f846f281f8cc27adf332b0cf1bceac8bba4adfd10cf8897a4c48f47523a70c2f7d9a913dd5cdd3bb03a3b787740c SHA512 63a411d3a2566fc8a8760c5fdce6f6fdcaf3b6df52bdb729ba9bf99c87d034af55f095b0afdae4842de7b9760174080c9fe55a1805feccc12dd8b6180ff20555
+EBUILD dogtail-0.9.10.ebuild 1467 BLAKE2B 84de0fc6e90e18b9e4511267fbb2e3cf2718dd01c2d38b3242ec143464c3369660f894b0095f0f316b88ad111fa7d2d50d037c9998062086cd553ebd81fa025c SHA512 2a807d2b10497cf325c7153a5c93f48490a0689c958eed6c6bbd8a03824a29430958e620ad9e5c2cc63ccc0de659825d0d4c25a13a836a8557f9ab22d4fe102f
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/dev-util/dogtail/dogtail-0.9.10.ebuild b/dev-util/dogtail/dogtail-0.9.10.ebuild
index 935b8334b61f..dee95fd89411 100644
--- a/dev-util/dogtail/dogtail-0.9.10.ebuild
+++ b/dev-util/dogtail/dogtail-0.9.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1 gnome2-utils xdg
 
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index b1446368376f..b183504e3e76 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -1,7 +1,7 @@
 DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a99d14adc141243900fb4cd3d28bc87665bc6f466b31cd1e5561df31edd378049f0e38e28006206c3cf02ac0d5c21 SHA512 51eb538d5571b2e48722e4e4de6f9d6fc67375e55284f6bdec5c4c495a67e0808f9d158ba925849353bdff7903df2ecae7a073d88185fc607d45383f4f2f5c0d
-DIST drone-cli-1.0.5.tar.gz 2627659 BLAKE2B 20d2db2faab26210659811bdd8f576775856dad618348a9b1f2a7cc3c37bf07176a7d4a72ca48f7cf32be4f9359c82e7521c9f6559f7637cd75bd0d671f16f6f SHA512 292e53079b15401364396fd61de481c6c47f426335713c5eb19a9231d11841636e26ae37fd32735f54e3143247489a8ea858ed8082874cef999aae334b9a98c7
-DIST drone-cli-1.0.7.tar.gz 2719694 BLAKE2B a5032a8bde86b196e1e0a2406e8c3f4789c22809e44eb47212eb41a8d2a31c5dac26a8fe264f09d503f1f3637434f6329dfb19d44448dc3ff01447a947a033ac SHA512 1d7145854eca418d977ac4507ddc52af2ca03efed2177bef5061f4d4e2a6ce8793e867b58ec9beedcaabec973e1b7a006a4490ecc0158db7206c6dff325be040
+DIST drone-cli-1.0.8.tar.gz 2724807 BLAKE2B f8bdbd90687e59cf104d3506957616c13ddfae5e31bde0569eaa36644da40310fb24396cc49527b454478de7ef1e3cdcfa6b0b07c6b0f1b80fac9210ddd336e7 SHA512 67f7ab7c8b4d215564421470bd3894670b0b28fe8ffdcc9ed15be9081fcce380ad1ab791d463f09f441a28c17285f507b64fcd43104a369e0f8dbc39300ba91a
+DIST drone-cli-1.1.0.tar.gz 2725959 BLAKE2B 684d03de78c07fd3a901132734c0e8f9fef129f4443b9af33a1b2205168289e3bfb357faf21e5d5e63f6fae21d864a475575cb3d1f60a499b846963cde7814e0 SHA512 ba059250cf73982b662e5fb9f4570381ca4ff2618a759dc497f793e7bba7d7094cc28fb90390c61b642caab0ee5d33ddc1c5a25cea13c6aaea8e50ac24868927
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
-EBUILD drone-cli-1.0.5.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
-EBUILD drone-cli-1.0.7.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-1.0.8.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-1.1.0.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-1.0.5.ebuild b/dev-util/drone-cli/drone-cli-1.0.8.ebuild
index ca7f0b0fdc7f..ca7f0b0fdc7f 100644
--- a/dev-util/drone-cli/drone-cli-1.0.5.ebuild
+++ b/dev-util/drone-cli/drone-cli-1.0.8.ebuild
diff --git a/dev-util/drone-cli/drone-cli-1.0.7.ebuild b/dev-util/drone-cli/drone-cli-1.1.0.ebuild
index ca7f0b0fdc7f..ca7f0b0fdc7f 100644
--- a/dev-util/drone-cli/drone-cli-1.0.7.ebuild
+++ b/dev-util/drone-cli/drone-cli-1.1.0.ebuild
diff --git a/dev-util/edb-debugger/Manifest b/dev-util/edb-debugger/Manifest
index 675799bf575c..8db22289dfcf 100644
--- a/dev-util/edb-debugger/Manifest
+++ b/dev-util/edb-debugger/Manifest
@@ -2,5 +2,5 @@ DIST edb-debugger-0.9.21.tgz 1042641 BLAKE2B 8f81e6629df3b74e7f670a35e7e92220f33
 DIST edb-debugger-1.0.0.tgz 1106351 BLAKE2B fbf888018afc069ef1be817bbcb45ee276c112a1cf5fae6ac32a66a5535f2d4f60c00673c290bf14e63cf24ba2927071ee80e58c68d213b11fc55530f428fa4b SHA512 d15a3d167b90b70227f273c416eae56f7ad174daae608081364284021c7da7aecb6cb42f9c5bcd85f9df70f07cba213d8345ef9d62e8d13c79e7edede38a04a9
 EBUILD edb-debugger-0.9.21.ebuild 2064 BLAKE2B 5e72e1670db4ef64d840a0d41f0b961fdd63003d40b06c92f129e0f63a1f5e0e7a051219bef9eb0b2826c020a943bda6a952e6c4a1ed5dd5392197e0d0216385 SHA512 3057033e815a93d42558904216f22ffae56d0a3a8afa99c0b000060cd185ae52059f87ce904f5fa9c1149f37536a1b1b6c61c0ad72e6ad0980d637fd80fc640f
 EBUILD edb-debugger-1.0.0-r2.ebuild 1090 BLAKE2B 5ff08750c0014efabd46d0531035f4c7761f5c2f3c111f317a938b942720e5b8f8c78eac555803ffd4af5db32991a48f1497c1029b6e847298651bb7c9fb1864 SHA512 cad7a47d3511372561eb62186b18272c4750f05f84fcffc01dff3f35ff3886f15d026add49dc785a1b03dcdf5594574610f3bbc967999ef5720e17d16a7cd55c
-EBUILD edb-debugger-9999.ebuild 802 BLAKE2B 0a5ba606ffab9f519c4d1c4095ee06c6768bc5e31b0272ccee75e9af2a4fc437e9c986d304d282d274f0175c879fa86167015597e19bc12f3a68323dda3c0357 SHA512 c26bd7c2a05b2efb588801b16ff021bfad1f4d4eba468c65e3ac0bab162fd05ea9f1f43e6908ed8b690c8e6fae7bc1f92aa7c16a4ae7d90c30f86123c52ea938
-MISC metadata.xml 601 BLAKE2B d91cda94777a8c5d1332e28b7cb643c59271d2442b3aef592b4ba097bd953693107e32803f23a5f2666a6cacf142ca87c0881cfc00a99f70b5a043755a14935b SHA512 76dd4c92c4a5463273ae8c8f9568e1ca330f709900a16247a7e8dc1035e3530c358c2573953d75845b442f63e965b3584ca7fa9f2fb75b55aa4985e13d3cbede
+EBUILD edb-debugger-9999.ebuild 922 BLAKE2B f2d5453d64c1608e64832bdcb30c1fb4c8f7af715f9b3b901c193c1149222b16e39361069b61599a47b5a184c884ccfae9575741b25da8d0fb6657fcfa9c88ec SHA512 48f54cc3d2c7b1a536cabfcbb279f846e5edee2fea578a9bc1e0f2eaf442428189c98ea3cc2b8ed184d2517bebc5bcb89d9b24aa4dd04c177a71b45d69b291ed
+MISC metadata.xml 692 BLAKE2B 495f0c9c21e56b476f6b18c8d0359215bf50c1be0e358c9ea96b6ab0a52aa885da2b3a4255da8e98cd61370160b007d02c84dc1e5d7ecda6997e418fe4936073 SHA512 979d1ca4dac0942b6f09d54df2be405c2fb65cc5a96ff417b078451d3f0a19d680b0a0eb50a6e44b159630cce6a9294166d63c742cf52471d573c8e6e2e555a8
diff --git a/dev-util/edb-debugger/edb-debugger-9999.ebuild b/dev-util/edb-debugger/edb-debugger-9999.ebuild
index ed907cfca5d3..5c9cd77c65a4 100644
--- a/dev-util/edb-debugger/edb-debugger-9999.ebuild
+++ b/dev-util/edb-debugger/edb-debugger-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit cmake-utils git-r3
 
@@ -12,7 +12,7 @@ EGIT_REPO_URI="https://github.com/eteran/edb-debugger.git"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS=""
-IUSE="graphviz"
+IUSE="graphviz jumbo-build"
 
 RDEPEND="
 	dev-libs/capstone:=
@@ -39,3 +39,10 @@ src_prepare() {
 	fi
 	cmake-utils_src_prepare
 }
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_JUMBO=$(usex jumbo-build)
+	)
+	cmake-utils_src_configure
+}
diff --git a/dev-util/edb-debugger/metadata.xml b/dev-util/edb-debugger/metadata.xml
index a940dc098dc5..cf47b0a1cf3b 100644
--- a/dev-util/edb-debugger/metadata.xml
+++ b/dev-util/edb-debugger/metadata.xml
@@ -12,6 +12,7 @@
 	<use>
 	<flag name="legacy-mem-write">Probe if writes to /proc/PID/mem are broken.</flag>
 	<flag name="graphviz">Add support for the Graphviz library</flag>
+	<flag name="jumbo-build">Experimental jumbo (also known as unity) build capability</flag>
 	<flag name="pax_kernel">Enable building under a PaX enabled kernel</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index b21aadec67b8..04673a6a47e3 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -34,5 +34,5 @@ DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752ad
 EBUILD electron-1.6.18.ebuild 28186 BLAKE2B 746db1980065510845990dc5c426982f6de9ddd9c74f42503c91b84a04835550243eaa21804408068b143d0295a5bddf23457d811f836ad072d74e792018201e SHA512 0ea10454ec86607f2413d77af97ee9f8152b7f66792a7766723a4453f2c5b629e4d19ee3c57fb900dec888560b458493c3904d25c8cab9c7c32fa65add7e159c
 EBUILD electron-1.7.16.ebuild 28059 BLAKE2B 027bd8197783c279780f947483a95188609f5a8f138406e64eda10e033ede8b58939fad212a2a2bc24e2bdd4444645ab76c63cd89f513ff66fce6d5f2d6f98e1 SHA512 e9856a634e9cdf320e64296830db12968cafd2f22186b1f2d5d0d18f05998ff5ce2c0dd0775d83ee1af76c2586dec2c79989b41e5c8028f5090581df3db99adb
 EBUILD electron-2.0.10.ebuild 28636 BLAKE2B 9a1b85fe418e8088ba605bdd223d1c812cd9b77061f9b0ef0dd39a589f68fb65126f407256e6221763408b6eff0017410a27f04a4bd30bba3f8b69e060f65541 SHA512 a92a1178b6200236cf5d68a020ef3a6e54eb839b9077260163e5459237e5f0b3d9aa465fb6e6ce027667d740c7a855d4ea7708d05b38f6575058d0910fe2d584
-EBUILD electron-2.0.17.ebuild 28659 BLAKE2B e7d407b061a4c04c463ed6e9ad3f7742eccdce4cacf79956b0fec9b15623caa3555a8a194da5b60a02bb0dd0113ce0c195db0cae6225c1b66fa1e132869597d6 SHA512 76d8c0c1f3bf65501a487124cd203e7f6a9f83f45915465ed5add5c4291f35ec4f0a7915c0b039f3ef8c517a6e233afa15735dcaa1e322464f4b5294e0a09748
-MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760
+EBUILD electron-2.0.17-r1.ebuild 28664 BLAKE2B d4bcca9e6b9653681bed01a701e9a0dce2a63e83a70dea868e93c7fb25a575faa8e0a73d31ec97883d588f2fdff5a6eacdb52ca8fe6850e2e68db695ddca8825 SHA512 4617ad52c1df75835dd66a5f0d1d89eaa193b2788cf136073739ccca1056ac8d274805ffc404b4147fec28e052147d3163545aa17e11f48ed022b0f259515b2d
+MISC metadata.xml 1361 BLAKE2B 58a37a5943813a7a526f98309ab79ba0c5148323a2b7a02aceee65282b1ab34d8451ed0e2e41110187014051bcbe33d2ecfc559490e51a66c047cd512c11295a SHA512 f2a2cb8e1093c5a5ac01a64f0213132213aa92307877c0b32e1946c513c7715b04d8a910f847c835533909dac9f52c11cb30e9793248dacc4965ea273bc8f732
diff --git a/dev-util/electron/electron-2.0.17.ebuild b/dev-util/electron/electron-2.0.17-r1.ebuild
index 1e3871596b70..1671cd90af50 100644
--- a/dev-util/electron/electron-2.0.17.ebuild
+++ b/dev-util/electron/electron-2.0.17-r1.ebuild
@@ -79,7 +79,7 @@ LICENSE="BSD"
 SLOT="$(ver_cut 1-2)"
 KEYWORDS="~amd64"
 IUSE="cups custom-cflags gconf gnome-keyring kerberos lto neon pic
-	  +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
+	+proprietary-codecs pulseaudio selinux +system-ffmpeg +system-ssl +tcmalloc"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
@@ -100,7 +100,7 @@ COMMON_DEPEND="
 	dev-libs/libxslt:=
 	dev-libs/nspr:=
 	>=dev-libs/nss-3.14.3:=
-	<dev-libs/openssl-1.1:0=
+	system-ssl? ( <dev-libs/openssl-1.1:0= )
 	>=dev-libs/re2-0.2016.05.01:=
 	gconf? ( >=gnome-base/gconf-2.24.0:= )
 	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
@@ -533,7 +533,6 @@ src_configure() {
 	# TODO: use_system_libsrtp (bug #459932).
 	# TODO: xml (bug #616818).
 	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
 	# TODO: use_system_sqlite (http://crbug.com/22208).
 
 	# libevent: https://bugs.gentoo.org/593458
@@ -688,7 +687,8 @@ src_configure() {
 	# --shared-libuv cannot be used as electron's node fork
 	# patches uv_loop structure.
 	./configure --shared --without-bundled-v8 \
-		--shared-openssl --shared-http-parser --shared-zlib \
+		$(usex system-ssl '--shared-openssl' '' ) \
+		--shared-http-parser --shared-zlib \
 		--shared-nghttp2 --shared-cares \
 		--without-npm --with-intl=system-icu --without-dtrace \
 		--dest-cpu=${target_arch} --prefix="" || die
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index b401858fffc6..c291dd2197e5 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -17,6 +17,7 @@
 		<flag name="pic">Disable optimized assembly code that is not PIC friendly</flag>
 		<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag>
 		<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
+		<flag name="system-ssl">Use system OpenSSL instead of the bundled one</flag>
 		<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag>
 	</use>
 	<upstream>
diff --git a/dev-util/envman/Manifest b/dev-util/envman/Manifest
index 83d7d9024919..4ef2004cb731 100644
--- a/dev-util/envman/Manifest
+++ b/dev-util/envman/Manifest
@@ -1,7 +1,9 @@
 DIST envman-1.2.0.tar.gz 2997860 BLAKE2B e49d3b421fb1ab226de4430e90d8c684bc3a2554205c6383a140c0832134eaba338797dca44668fc2473d248940b5499395ab3a6d3359382305fd8a719772257 SHA512 5245aea8c280a6d6022e8132216891f09abee707c0ed736bfe6b4882aa23880a771dce5371b8ba5fcdd41fa951606727e7582442d897058b25985cf9dd5a9d18
 DIST envman-1.2.1.tar.gz 3033981 BLAKE2B a48c46d35a122ad86274867c246f1af998a983a67e8d30214bc6f3a989ad6b435a61ebad7f128803ffb9dcfc05af261b99cf3316fed93412c6ee1da873cc988e SHA512 bbec25964d868077c88a01ab827744633b325eb955809d4ec48a5224f6f8530c31b297b592f0280dabd01007bf75fd6ac3609c4d19be0332ca114d36725c7fb6
 DIST envman-2.1.0.tar.gz 3133726 BLAKE2B 8c5c87d43bdc22838036fe25ea6b48e702163d474169181257cef6f0fe4fba01b18f870d9bfee5f56b30cce13f47f6af70f4e55fcff221af77f14550a13ebb46 SHA512 c0b7ab5355332fa24ecd4166e3fdb1f02e589ee11288768a382a9556d2c3061b1930061873525e19b71451a47c72c09f5b7c6191b8564b0dec2a9c29dfbcf222
+DIST envman-2.1.1.tar.gz 3162514 BLAKE2B 3aad5bc174bbbfc52ffe219fae7590e3ebcf7ef0a5390add53e27232500b777f562d3c4662219732048f1a700f6a11da6aba490b3495d57d4da3610a02d544c9 SHA512 5d30bd23a2aa828786663f184707d776ddc0e71ee09e007f8075b99ce0c415db28e612a785ab1acd8767cfd8623939a82a7c0fc71e0fd6ce8d8ce4e0b0048cf0
 EBUILD envman-1.2.0.ebuild 873 BLAKE2B ab827ea0ff610b6d2675f925dc65b32b47472eaca4f605341a71d332ea00527fb8f8357847a7f0bdbc3314d9182ea104dd13f9c179a8b210410190cb1472ade1 SHA512 862df91f0bed24dffec1e1c0d209aed338a2ab060c41ec147a82503a81f279b787ed2524ff0cca90be47717881b491ac7a4490736a8ac4a3011289bd7480ac11
 EBUILD envman-1.2.1.ebuild 869 BLAKE2B ed7a46805b4ee9acc2746795b09d812bf012c2975f7b75d501d94409c3a14312c9c4c985cb3191512203e9ce5fcedda346fed15c39bc79c4160f509a7041e49a SHA512 6dd367bd5ff737cb782192c35be6251a60a049f2a69a196171a2b2415b57d896a1c5db8702689ad926a6a445227cac50de83e00aaf2429cffb52133292357f15
 EBUILD envman-2.1.0.ebuild 865 BLAKE2B de902e8487a1978ca7de1283449ebeae631a01a10a54b26351ee3a3a7ab67327d28c308e4c56bf25cd22832906884f92f71c4faad7e616b181e875eb5793fd08 SHA512 b274313029889346172143f43ef85c234b55c683b0db93f37f1a52ba0222d3585d56e656045ac76d629578b8eef76a06c99ed3c9d12343a186b0d8d5b1308a61
+EBUILD envman-2.1.1.ebuild 865 BLAKE2B de902e8487a1978ca7de1283449ebeae631a01a10a54b26351ee3a3a7ab67327d28c308e4c56bf25cd22832906884f92f71c4faad7e616b181e875eb5793fd08 SHA512 b274313029889346172143f43ef85c234b55c683b0db93f37f1a52ba0222d3585d56e656045ac76d629578b8eef76a06c99ed3c9d12343a186b0d8d5b1308a61
 MISC metadata.xml 942 BLAKE2B 32b021b4b9f97464d5ff81c7541a389105d75d32ac8598474007f4f27013c0b1bff37968a4ebcf9b9e41264686aef44c43da6896426392adfaf91576ca2873fa SHA512 4fd1c54eec14f80bd804140299d2f987c404f0653c6b6adfc1715ac01cbaed0555ccb8cd87fbe6a2f34b7cb90f81cf20db817866f40ea2f6c607c7268705a089
diff --git a/dev-util/envman/envman-2.1.1.ebuild b/dev-util/envman/envman-2.1.1.ebuild
new file mode 100644
index 000000000000..20bf664c7e84
--- /dev/null
+++ b/dev-util/envman/envman-2.1.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Environment variable manager for Bitrise CLI"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/envman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/envman || die "Couldn't compile envman"
+}
+
+src_test() {
+	GOPATH="${WORKDIR}" go test ./... || die "Tests failed"
+}
+
+src_install() {
+	dobin bin/envman
+	einstalldocs
+}
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 35b36ad9d0fa..b80115170400 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,5 +1,5 @@
 DIST eric6-17.12.tar.gz 19035763 BLAKE2B e19195ef0b36ce216dc4f21ec221da4002a20ee3e3e300b80045d31d8793df299c2224f41f562fb59a0f8a65ead4f616df89a905905918dd1ae396d55d77fdc3 SHA512 7144c1fad76eb0f3ccdd2a29fb3fc369ad35d28dfbae1e6b75855b85218df34afa715f3a2df37bd6163e2f3a23a2a9a7f528cfe54f1bc21486ab81da6a69a697
 DIST eric6-18.03.tar.gz 16517664 BLAKE2B f7f5292df8bc694fc4715ec1a250d948123a2eb99a590e6824d985318446babff86aeb745f5b5dbd0707e771638eaa943673e5b546676bea97e266888b844989 SHA512 e488010791b44cc7da782620baec9b97259aaefeb90d491023ec1d4582fb68acbc06d9eedba7beef9ddc706302e06e36b9ebb4e46d6f035b6c74e9f4eb9ac400
-EBUILD eric-17.12-r1.ebuild 1899 BLAKE2B 4525652fc64fedf960f35222278545813a926edf2baca1eb61dc8c0ae562f47d72714286e5a1b0e87f1b78f6e02e2d529f258c918094fe37280614912f3183e8 SHA512 6f4e5b48dfb8a25e2aaa941fc64be371c41a097cdc1dc8259db9dbd82ff6e5e06fa42c78f6fd68996341b8fe08e903d7cc60c28f8c86b3d0706bc0168ebca17f
-EBUILD eric-18.03.ebuild 1899 BLAKE2B 4525652fc64fedf960f35222278545813a926edf2baca1eb61dc8c0ae562f47d72714286e5a1b0e87f1b78f6e02e2d529f258c918094fe37280614912f3183e8 SHA512 6f4e5b48dfb8a25e2aaa941fc64be371c41a097cdc1dc8259db9dbd82ff6e5e06fa42c78f6fd68996341b8fe08e903d7cc60c28f8c86b3d0706bc0168ebca17f
+EBUILD eric-17.12-r1.ebuild 1894 BLAKE2B 535be218a5702cb02b155039cf596f36e77dc3643a3696ecdd083d95bcde8341dc0ee4eeafeb7bb990de5c5dfd1e7292e8a96cc68e7f15c567d2a09112a3346f SHA512 b890f91befb946fb0ab92fffe5332ab2dd2f8caaf52de5780bb2012827ee5755389e7c6c37c8994f3ead414b3a4d002616f04829adc504649792728ceff3dce6
+EBUILD eric-18.03.ebuild 1894 BLAKE2B 535be218a5702cb02b155039cf596f36e77dc3643a3696ecdd083d95bcde8341dc0ee4eeafeb7bb990de5c5dfd1e7292e8a96cc68e7f15c567d2a09112a3346f SHA512 b890f91befb946fb0ab92fffe5332ab2dd2f8caaf52de5780bb2012827ee5755389e7c6c37c8994f3ead414b3a4d002616f04829adc504649792728ceff3dce6
 MISC metadata.xml 325 BLAKE2B 5c4bd806e4833d3f4c294ca46b24420c71f8ef234ea732460833f39f583e0e5156d773d6fbf7fb4d45edf409d21622a9b90e0989e9d93632d7dd94b7aa7e6c3f SHA512 e3da71c04a1a2af6b72ff068eba586c14b159034f759448c669032b30a82cc618e58467cc8cec8090d22d0e864338fc62b735f73dc31fd2a33d63cb677178f9e
diff --git a/dev-util/eric/eric-17.12-r1.ebuild b/dev-util/eric/eric-17.12-r1.ebuild
index 270355f4d0c8..e4789912cf9c 100644
--- a/dev-util/eric/eric-17.12-r1.ebuild
+++ b/dev-util/eric/eric-17.12-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="sqlite,xml"
 inherit python-single-r1 xdg-utils
 
diff --git a/dev-util/eric/eric-18.03.ebuild b/dev-util/eric/eric-18.03.ebuild
index 270355f4d0c8..e4789912cf9c 100644
--- a/dev-util/eric/eric-18.03.ebuild
+++ b/dev-util/eric/eric-18.03.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MY_P=${PN}6-${PV}
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 PYTHON_REQ_USE="sqlite,xml"
 inherit python-single-r1 xdg-utils
 
diff --git a/dev-util/fatrace/Manifest b/dev-util/fatrace/Manifest
index 83e15e8643a8..daff1ba81356 100644
--- a/dev-util/fatrace/Manifest
+++ b/dev-util/fatrace/Manifest
@@ -1,4 +1,4 @@
 AUX fatrace-0.11-sysmacros.patch 295 BLAKE2B a7f5350f0158e1f0c529b3a67a59b4a4255cd640287822b57e1f0952029b899fbdaab15e2d22394357e1210bcbafe8678866462a8213a030d5dfed2ec57f214b SHA512 0b3946043f74b957eb1b8caad39cc1b031e40bad564a1ffaa593dd77d5f96f06a1103d8d0b3689b4fe58f4bb4ff105d81855c9088ea5eec9d4ce6876d4a6f7f9
 DIST fatrace-0.12.tar.bz2 19377 BLAKE2B 5279af5497408fdc614f090060e56552e0f396501a0d4155752ab44bfa666878ab4b969979314051b9b3f529e3870ffdc8071f332dbc146f0d2a7798c8b2549a SHA512 76dfc9dfc5c6b8e13f5d0c5c01c5c1b91093a5d980ded1f8fd776c9e861a6679eea193bcdd92b1c8770c9af346820300f186b7167ff4313e670f27ea31f765ea
-EBUILD fatrace-0.12.ebuild 844 BLAKE2B d20c3845d873391b4a429b541cc45a8f55adc6cff1423e9dd757d34500b3948a1769d812a13494ab5e91fee403bf92e9dfed3f8794b7c92c70eb02baf5297c3d SHA512 befb801bc29cce8b63e896355c68e99b28f3adb4c5eb1b73244653e62e1b576b9485a562295391ba3d507dc62685a6515d3739b9a26888995a775ce80b42376f
+EBUILD fatrace-0.12.ebuild 837 BLAKE2B 60ab8ee834cc38fb28d0c4e8a792a60a4d8a7563101aea00d10ac71eba17d47d595f229b9e7449b132e7d52d62e15e6dfd2cc7d7d951ebceeb1af2a3a28b7e1e SHA512 f660b8bed86acd4f00a919a75ffc3b7aa81d72a7060b709ca6d4ce09cde794cc563e936601b6aa59d036b22233bc88aee8e526d403326a371fc5112c61b8167f
 MISC metadata.xml 312 BLAKE2B ddb40aa2eb3e880241bcfc0a99e4a344a13a761d31ae2fd38e5f7050fbdc3087498e195e0725821bea6b824d892a2bd72aaab698ca387cf74f5d6ab9bad76449 SHA512 013d5658ec11cb683dcd6c30d8059099662cf3b27e68ae1312496a54c317965efc73693705db27f96254d7293cf9ea8019237f2ee550cc91bfa2aa7b63c161b0
diff --git a/dev-util/fatrace/fatrace-0.12.ebuild b/dev-util/fatrace/fatrace-0.12.ebuild
index e6bad36cf676..392bf723af79 100644
--- a/dev-util/fatrace/fatrace-0.12.ebuild
+++ b/dev-util/fatrace/fatrace-0.12.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 
 inherit linux-info python-r1 toolchain-funcs
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 536762a29f54..7ba68d82ea24 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,7 +1,5 @@
 AUX gdbus-codegen-2.56.1-sitedir.patch 1898 BLAKE2B 2d3530f2c0e249254d170a7c0f1965cc9953af8b29a96bf7658a74595e740a4dc9b2dad804f16a855b2afa2f9a72eb02aabe42e1a94b166ecb43e0213125eeb1 SHA512 3983f2021da8045bb25a0f2e761a651d67d5b5f41e5d26ad3e5950f5e74587a6226ae5d1c21e6c7561b16d8cd6f17ca2a693369fc5b2cbb5d4d686a52b29942b
 AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a15422d276bc8dfb6790c41b7214aad3f88ee4927b58de639146cbf633f735df693bd437ea19eae79435 SHA512 45e823f507db103543f024ad557d35f7c09fb51db8a78b978c762ca77d941cdecc5837d2b248fc2c5da6a93b56fe8ded359efd98fb0a74fdf9533783d8eebcfa
-DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
-EBUILD gdbus-codegen-2.56.4.ebuild 1306 BLAKE2B 0822701e68416ff599d2e5980ca176a10841b74a99f036bc4e4fb187cfcb865b99cbe312af75ba208e959d3a765d0d8beb7ad620475fead87087cfb6a5e51b56 SHA512 f671799d602017a6df349a00711edd80136021041e08c5349844ac94c2b6e759ea3160d2b72ed3a1cbc866d2549cc8fbbfe2bad3053804affd8276aaad225015
-EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 2f46a4472a03a12102244dcaf5d9f5b551eae8dbf1f805f0fb81810d9777ebe0b3200ceb418d1185b49b8ce337f81421fef36456127885d32fb62e223f25255b SHA512 2292435122c8fa808244132c28aa358414e4d45e59bbbfd46d42067160680150c181fd8be53cf25e7b46d76330930bfec4f96623f9b99a8132726a94f252739c
+EBUILD gdbus-codegen-2.58.3.ebuild 2115 BLAKE2B fc740403bd1c04d57051d2f271735aa7dd2318d82514aba691f9b65374ae99aae1d4fc05a19ac9cd4f1450507cc3980c5fe2801cddb5603506e2482ab6895f63 SHA512 f529dc8415d1aab67bb65257c00ddfc0d6d4bd686c25fd645756b55683a956d0557b28f6517f59c01586c5b616ff5dccbd12160381b34742716f150ca9ff4655
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
deleted file mode 100644
index cfa3d789588f..000000000000
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.56.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
-PYTHON_REQ_USE="xml"
-DISTUTILS_SINGLE_IMPL=1
-
-inherit gnome.org distutils-r1
-
-DESCRIPTION="GDBus code and documentation generator"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-
-# To prevent circular dependencies with glib[test]
-PDEPEND=">=dev-libs/glib-${PV}:2"
-
-S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
-
-python_prepare_all() {
-	PATCHES=(
-		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
-	)
-	distutils-r1_python_prepare_all
-
-	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
-	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
-	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
-}
-
-src_test() {
-	einfo "Skipping tests. This package is tested by dev-libs/glib"
-	einfo "when merged with FEATURES=test"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all # no-op, but prevents QA warning
-	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
-}
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
index b845598b7295..c82cd61852a6 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 GNOME_ORG_MODULE="glib"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 PYTHON_REQ_USE="xml"
 DISTUTILS_SINGLE_IMPL=1
 
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/geany-plugins/Manifest b/dev-util/geany-plugins/Manifest
index 331254d8fb2b..37642f61c699 100644
--- a/dev-util/geany-plugins/Manifest
+++ b/dev-util/geany-plugins/Manifest
@@ -1,7 +1,5 @@
 DIST geany-plugins-1.30.tar.gz 4469990 BLAKE2B 3cb8434765667814dc95227a82bdf204b2f918c951de8d5d9b56549c3fc343e1fe1c3e225d9f907da6b3227440dbdad09d0318d2738c213640a4629e9f7b42fe SHA512 11dc44215aaa369831c249ef84b5dd0ee7eecdfbbf4707fc6165d78201e9e755447463c171ac6c8b2bc70df28a97b23762073ab9b31f7c33285d4728089da807
-DIST geany-plugins-1.33.tar.gz 4671123 BLAKE2B 33471215480597b34e2733b7dc292e94ff12985b645fda76b2e25492573bb866766a3ea5a4598c4f643e9528f8062ffb9bf6ccabbb9be04aecbf23650d9c776d SHA512 d046eb0b7bd3c704b62c84b05564b973203ddabf6c09b94bf3008955735d672077bff1a7cda27d4eba97824231483f3e64b3b0f0234a97a1a2727d535fb28718
 DIST geany-plugins-1.34.tar.gz 4640059 BLAKE2B f6a2e001db42e348c129b503fd969f142fecbaa06a10bd220d348f70e6af087a0a856a403bdf866f65fdff02889fa03a2f3a662be3efad0a17401266ab883bcf SHA512 31d25e9b0946b7feeae40b81c4e0c177568cc161c24bfa1c8271dda1c15a44e86f5de9b5992a4acde6cfafe2924a1cc22e95c7b6fb253e8a358931fa5f8ecca3
 EBUILD geany-plugins-1.30.ebuild 3438 BLAKE2B a0cf586e95195375680bbde21c7de798fabd3ad944c9a7934ace91285a267436938b8bf158af9a6da5d55caa3b5c258218c0f5f3c44170a0c7384bc447cec0be SHA512 ab7193e7c89b6824c33d489e8bf0b6098b814c9bff52987af9c4ca5eb059902102f94e659b90e4ba1748f9242d7fbb3a3564bd88d0826c36f4b4a3807083eb99
-EBUILD geany-plugins-1.33.ebuild 3166 BLAKE2B 3e6beb940b81bd921424b6d1310c2fe402675a86815c6743483d7d9b5c05b4f4cdd1818bf92086430a03bc44b3a5c4bdaf58fb7e71af5da286dcfe2d71ee11a2 SHA512 7d3ac36a212e1deeeff6256aaf6593a65c0ade96e6da40fafe28a3672d46c4b3960c9c5b68c026acfe8c1bd8bed930a5aab9707168f3e7c4fbfdc9dbcb405d93
 EBUILD geany-plugins-1.34.ebuild 3358 BLAKE2B 9b786c3c6d919ed684661d6ae137d3b0358a8345eced9558653f35feb9878dac508f92b76496619cc3f13fa0f387785033fbcb8cbd685f75a804b951066219fe SHA512 4bc298324fde9550241e3f7bdda73139af8d9d1812f2a5e10a1e782a8f95e79a073e195eff4f4704daf74ecdad11d1dcc8fbe67b3bf81ad59e04543270f390b0
 MISC metadata.xml 1591 BLAKE2B 33b24731bacbd726ff66b7c8915504c7cd74970d3d59a64f7de32c285d0674a272bae2f35798df90aacacc4c35e05ffc155ddb58d1d7f77f17e48d213dcd4f3e SHA512 b305d755827f8e73df732bead1ebc8af4d93a03958bac3e3b00c6cbcf2335caa51f83619779567b3744e76390b8aaefa71cd6487a3f77b54050963bc61e0ecf7
diff --git a/dev-util/geany-plugins/geany-plugins-1.33.ebuild b/dev-util/geany-plugins/geany-plugins-1.33.ebuild
deleted file mode 100644
index 4115b2f8d7be..000000000000
--- a/dev-util/geany-plugins/geany-plugins-1.33.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 vala
-
-DESCRIPTION="A collection of different plugins for Geany"
-HOMEPAGE="https://plugins.geany.org"
-SRC_URI="https://plugins.geany.org/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="gtk3 ctags debugger enchant git gpg gtkspell lua multiterm nls pretty-printer python scope soup"
-REQUIRED_USE="
-	gtk3? ( !debugger !multiterm !python !scope )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-COMMON_DEPEND="
-	>=dev-util/geany-1.32[gtk3=]
-	dev-libs/glib:2
-	gtk3? ( x11-libs/gtk+:3 )
-	!gtk3? ( x11-libs/gtk+:2 )
-	ctags? ( dev-util/ctags )
-	debugger? ( x11-libs/vte:0 )
-	enchant? ( app-text/enchant )
-	git? ( dev-libs/libgit2:= )
-	gpg? ( app-crypt/gpgme:1= )
-	gtkspell? (
-		gtk3? ( app-text/gtkspell:3= )
-		!gtk3? ( app-text/gtkspell:2 )
-		)
-	lua? ( dev-lang/lua:0= )
-	multiterm? (
-		$(vala_depend)
-		>=x11-libs/vte-0.28:0
-		)
-	pretty-printer? ( dev-libs/libxml2:2 )
-	python? (
-		dev-python/pygtk[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-		)
-	scope? ( x11-libs/vte:0 )
-	soup? ( net-libs/libsoup:2.4 )
-"
-RDEPEND="${COMMON_DEPEND}
-	scope? ( sys-devel/gdb )
-"
-DEPEND="${COMMON_DEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	use multiterm && vala_src_prepare
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-cppcheck
-		--disable-extra-c-warnings
-		$(use_enable nls)
-		--enable-utilslib
-		# Plugins
-		--enable-addons
-		--enable-autoclose
-		--enable-automark
-		--enable-codenav
-		--enable-commander
-		--enable-defineformat
-		--enable-geanyextrasel
-		--enable-geanyinsertnum
-		--enable-geanymacro
-		--enable-geanyminiscript
-		--enable-geanynumberedbookmarks
-		--enable-geanyprj
-		--enable-geanyvc $(use_enable gtkspell)
-		--enable-keyrecord
-		--enable-latex
-		--enable-lineoperations
-		--enable-lipsum
-		--enable-overview
-		--enable-pairtaghighlighter
-		--enable-pohelper
-		--enable-projectorganizer
-		--enable-sendmail
-		--enable-shiftcolumn
-		--enable-tableconvert
-		--enable-treebrowser
-		--enable-workbench
-		--enable-xmlsnippets
-		$(use_enable debugger)
-		$(use_enable ctags geanyctags)
-		$(use_enable !gtk3 geanydoc)
-		$(use_enable lua geanylua)
-		$(use_enable gpg geanypg)
-		$(use_enable python geanypy)
-		$(use_enable soup geniuspaste)
-		$(use_enable git gitchangebar)
-		$(use_enable multiterm)
-		$(use_enable pretty-printer)
-		$(use_enable scope)
-		$(use_enable enchant spellcheck)
-		# Having updatechecker… when you’re using a package manager?
-		$(use_enable soup updatechecker)
-		# GeanyGenDoc requires ctpl which isn’t yet in portage
-		--disable-geanygendoc
-		# Require obsolete and vulnerable webkit-gtk versions
-		--disable-devhelp
-		--disable-markdown --disable-peg-markdown
-		--disable-webhelper
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-
-	# make installs all translations if LINGUAS is empty
-	if [[ -z "${LINGUAS-x}" ]]; then
-		rm -r "${ED%/}/usr/share/locale/" || die
-	fi
-}
diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index b9e28d35aa34..a20f6734602a 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,10 +1,6 @@
 DIST geany-1.30.1.tar.bz2 4352154 BLAKE2B 6efceb21e07aba3b0698196543746e926d6a73ef5d5f560467eee18a7b9ade4ce0ce37808176922b3399ea8a72b2f281af313a9f57aa325e1a9cb964f0f1c34e SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3
-DIST geany-1.33.tar.bz2 4106409 BLAKE2B f0f16053eb1894ea98c8e79cd1cc5cb12adde4755358db42afe7c50a940168eeb6d7c5b7778765f28c6f6b029b5e17ac8433580e30c456b1b56fbea07ac16c6a SHA512 7fd53bd61cfe2dc05af69b5739ba2841cada822ea6dd76c6b2eb2707e69210f47cf19308842e3a989772c18a7e4386bf7a2b053085063605d196e8e630ab2b33
 DIST geany-1.34.1.tar.bz2 4474211 BLAKE2B 25c9b3f752b0b19582120ea342d8029f811040ef433adb065aec028f0bcc0909ea1b0005445bae70a53cbb2b1d3bfe0c2dd9d9c25c5e3f89bcdedebc0a392301 SHA512 3e075b23b22682324e4a56046d238d9d0087d095a6157b98c342fbe40a2bfa7118f72cfe1f414d110fff1411e4cc9c33fff800e0a2e32f9f0e5fd7b6fb560c9a
-DIST geany-1.34.tar.bz2 4474601 BLAKE2B 92a2b8343512317ad90cd10bd58b2aca77d7f58dff3548cfdbdab121343b67dcaa7a9d5b57cafd196d599d8bb6a121fa5e49d65a69fa7fd87fe7703be6b8d5fc SHA512 ef506880fbba9acbd2003b207c9897e115d398e716631bc1e164e3455aa9172f34b9955c627fb2f2dd3a3cba0926cce0a774d641517bc94b700d866be00db1a7
 EBUILD geany-1.30.1.ebuild 1572 BLAKE2B 76511c81bddcb43513af0f8c4203137988e12641d1c426ff54aadca90dc3a300224a234d0d6f290687a4e93ee71fd2db9ee5b845eaa27014d32416eea7960fdc SHA512 5598cf20f2a491d24791ff1166457d8dde9aa967170d5140fbc4fac600ae668e1aeb8e26eba147752364fbb7104535003dbe2276d8fe3ec6cb808314813e45c2
-EBUILD geany-1.33.ebuild 1710 BLAKE2B 8cbc60dd1cf2d49a7c2344f1053a96b388dbec3b7f566cab65b3cff3268ad47affdcd9a519fb335e157c46dbca93262da58fdfc6340863215ac81c92f75589a6 SHA512 bd920b5b2008263e171d90da169e08e6b91cdcd206b4190023608be8b2938639f749e37e4a341427e5bacbab9acb860423e0d582703a9e2ee4bd2628ed0961bb
 EBUILD geany-1.34.1.ebuild 1744 BLAKE2B b20dd575bb8fa54293f09f4257b24ee6cacf30a80dc9f3f34cb90002095d81c64325cc54cb3260390201a0f3e5ba3996e5af6a17e8955b1b9c41f07abaec25d3 SHA512 d3c462d73371608807c2c391639c290b3c2235b6d457dc6e3d327236fd1b5d4a588a0edcbc40fbda35d20c4c5d5349fafc40693eb6d8159a96ff1e7f660f5797
-EBUILD geany-1.34.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
-EBUILD geany-9999.ebuild 1744 BLAKE2B ef3bfa5f8ac388d03306af9608c8d24d9a50fe0c9f82762e77ab5a52ca47e6ed44c4716853db551ae28c87298cfd903a347126df32a81d4e38f2f41967461796 SHA512 b88e160f8d33d8ccd746b7e6e26d1e9f2d7ee7ec266de09a65b24899e68b33f18cd0a2156bf14d4a7b721edf2c5397e9a88223daf27c9cd4ebc130bbf155290e
+EBUILD geany-9999.ebuild 1705 BLAKE2B 33a6aaecba29847f556b2e7282f49ad773ff07820b001b131db918932ba05ffcdad200b4ce2996c5d65f106c48153380255a60975e454c00ca887b06ab2671bf SHA512 5d649bed1d8de7a17d7c082fef1bfd11438ef5cfc5c20e685991e93bf3b60238689fb9cb33b7239f71a4359a73ef94f8932682ce10661658e487d0bdb928882e
 MISC metadata.xml 1978 BLAKE2B 04d6567b9c02f927e912c8d35bdea73c8015dcc4a6c7f47d91b50086c619e2e25a472170f46a4d1053cb942a33d66f85da1e837bc7f4397678534702cef964fd SHA512 f070310d9266a11c4b91c4f644534f3ff9d7538c2d97e6daa009d403cb2c8aae2856ed51646315906a51399b6e51a1f32fbd12f5ab616b597c4fc7c97c5f5152
diff --git a/dev-util/geany/geany-1.33.ebuild b/dev-util/geany/geany-1.33.ebuild
deleted file mode 100644
index d99d1cea34dd..000000000000
--- a/dev-util/geany/geany-1.33.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-dependency-tracking
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	prune_libtool_files --all
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/geany-1.34.ebuild b/dev-util/geany/geany-1.34.ebuild
deleted file mode 100644
index f07d539b7273..000000000000
--- a/dev-util/geany/geany-1.34.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils xdg-utils
-
-LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
-NOSHORTLANGS="en_GB zh_CN zh_TW"
-
-DESCRIPTION="GTK+ based fast and lightweight IDE"
-HOMEPAGE="https://www.geany.org"
-if [[ "${PV}" = 9999* ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/geany/geany.git"
-else
-	SRC_URI="https://download.geany.org/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-fi
-LICENSE="GPL-2+ HPND"
-SLOT="0"
-
-IUSE="+gtk3 +vte"
-
-RDEPEND=">=dev-libs/glib-2.32:2
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		vte? ( x11-libs/vte:0 )
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.91 )
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	dev-util/intltool
-	sys-devel/gettext"
-
-pkg_setup() {
-	strip-linguas ${LANGS}
-}
-
-src_prepare() {
-	default
-
-	# Syntax highlighting for Portage
-	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
-		data/filetype_extensions.conf || die
-
-	if [[ ${PV} = *_pre* ]] || [[ ${PV} = 9999* ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-html-docs
-		--disable-dependency-tracking
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		$(use_enable gtk3)
-		$(use_enable vte)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
-}
-
-pkg_preinst() { gnome2_icon_savelist; }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/dev-util/geany/geany-9999.ebuild b/dev-util/geany/geany-9999.ebuild
index f07d539b7273..79034d53feb2 100644
--- a/dev-util/geany/geany-9999.ebuild
+++ b/dev-util/geany/geany-9999.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit gnome2-utils xdg-utils
+# eutils required for strip-linguas
+inherit eutils xdg
 
 LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
@@ -14,6 +15,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/geany/geany.git"
 else
+	[[ "${PV}" == *_pre* ]] && inherit autotools
 	SRC_URI="https://download.geany.org/${P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 fi
@@ -41,7 +43,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	default
+	xdg_src_prepare #588570
 
 	# Syntax highlighting for Portage
 	sed -i -e "s:*.sh;:*.sh;*.ebuild;*.eclass;:" \
@@ -56,7 +58,6 @@ src_configure() {
 	local myeconfargs=(
 		--disable-html-docs
 		--disable-dependency-tracking
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
 		$(use_enable gtk3)
 		$(use_enable vte)
 	)
@@ -68,14 +69,14 @@ src_install() {
 	find "${ED}" \( -name '*.a' -o -name '*.la' \) -delete || die
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
+pkg_preinst() {
+	xdg_pkg_preinst
+}
 
 pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postinst
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
+	xdg_pkg_postrm
 }
diff --git a/dev-util/gertty/Manifest b/dev-util/gertty/Manifest
index bc4ddb1b51be..9c02a455f937 100644
--- a/dev-util/gertty/Manifest
+++ b/dev-util/gertty/Manifest
@@ -1,7 +1,10 @@
 DIST gertty-1.3.2.tar.gz 92553 BLAKE2B 2e6771fcf044a8a46e91dbc6f34869be528e0aa4db8344aa26a999bfb9fe1a8e7b18346f1d90f06b7cb436c74a2c04c5528297d126e66b8f985bfc42483c53cc SHA512 b68acb801ceb225fe86d62015fd89bce7ebe34219dbb2f7fe10d991ff06b558a5ed3512e6435ef3ce13324841c473dbec565c7bef23e01567f5bdcbb6aba9136
 DIST gertty-1.4.0.tar.gz 115581 BLAKE2B af1a4ceac5b1e189305463e91d8d79246ccf16d5109b5100c0f928af42c39632d2c4b904c5586428c31d5d12985baf8ed2507c743364d6b26a4a02967b59dfc3 SHA512 9abba6271d3ec95938f07ab4ee76f0b539a7ce7f0bbf9c08509fe9516c14f99ccb7b439d29a30bff6dca99bf39788dc803cd8aed3cc03b531678225fa41102d9
 DIST gertty-1.5.0.tar.gz 119784 BLAKE2B bc563c10009c372de5a702b4ab33d9b6b26a898486fc5a1d840f298b50a779c36467ccf6600b6f29b61d3c15b1cc0bbfe960d0d6a1a71d3f8b8f75dc392ab0dc SHA512 bc47817a3ba9ccce298ee1a646cb43f8a57e9a57a40d898859836b3171abd0cf3c682a5f5811cf3d987a17dbf00dd6706a5dbc5a6a35f1d5ff3a217c68187cda
+DIST gertty-1.6.0.tar.gz 122570 BLAKE2B 8c3628f9b0b56aaff30f183a1ab0d852b8ee487927833f41b8aa61f94f8d14eaf3a8d515d5edcb3fa7dd18ca36f42a977d12790c52d6c629a720b4f29252b030 SHA512 0fe5224f5b4b06910bba0d19453ea0f273f6ea0688b9aa092e11f929b71801581f6d7cead1d64c00912ee3363b98d4b36e903fa992a7ce36f190a4f3c09375d2
 EBUILD gertty-1.3.2.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
 EBUILD gertty-1.4.0.ebuild 1196 BLAKE2B 55789b9a9b1480e7386592bd2e2d5db8c093af11d2508134152fbb09d3a5cc31173caf4ac1905c32e2f6863716cecf42f0a38bb7cfe3d87327a652340964a518 SHA512 ef6de7a0c5469d8d3ccf8838f1d709dc924cc10036832e5bcbe4da50784a1352859b755144fb6c67aab5d6c17bbe61f439734fc577d098b8d3596526e4c6827f
 EBUILD gertty-1.5.0.ebuild 1155 BLAKE2B f57a4ee9fc24baed0b445aa867b4273745e910cb0fbaa615a7b9aa25f3b15cf286c8b3aa2c2fdff79d1e443900d943ae266427dd1e15ffaac5b5eb27511cd1d4 SHA512 1952c3bbd940575f1218cbf6980012669228ec1642a9d13fd9af4f02742d1dc7b37ec673af515dbef010a8335bd8249db9583339e40a1b03b653a865c354ff9c
+EBUILD gertty-1.6.0.ebuild 1350 BLAKE2B 77213b6db583c228bc2538e96f13dfa3eb2987cf5614b8a0adba2516c4926bf67ba159e81c6edb343ae48f67a5d97f4fb770e4432342c80234e74788f6c5593c SHA512 3f45679c9d7d0eb4910b5a5b58ae8f7a962c1715cf478a6779f30f8862aa86c456faa843e38e7ab2b0ad4edd140ad10430beebf6d7e42a354bf2fd79559b9abf
+EBUILD gertty-9999.ebuild 1350 BLAKE2B 77213b6db583c228bc2538e96f13dfa3eb2987cf5614b8a0adba2516c4926bf67ba159e81c6edb343ae48f67a5d97f4fb770e4432342c80234e74788f6c5593c SHA512 3f45679c9d7d0eb4910b5a5b58ae8f7a962c1715cf478a6779f30f8862aa86c456faa843e38e7ab2b0ad4edd140ad10430beebf6d7e42a354bf2fd79559b9abf
 MISC metadata.xml 500 BLAKE2B 0310d985bd0b3824fcf1522d04cbb253fcb3507b96a75073e0e37481cdc7aaf03da638a592bb1470d17e758f2fbcbd6c60d046a7f7ffa18d3c8a6aced2daa76b SHA512 8a39f2a1e526fa077354eacf6a318b4cb11b7a1ec37f2928578bfb13f7d509226a30c0b2b94e6da070e602e54e02fbce0b2129f9421db1f6981eed1e781493f3
diff --git a/dev-util/gertty/gertty-1.6.0.ebuild b/dev-util/gertty/gertty-1.6.0.ebuild
new file mode 100644
index 000000000000..1987101fe4e3
--- /dev/null
+++ b/dev-util/gertty/gertty-1.6.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
+HOMEPAGE="https://pypi.org/project/gertty/"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/ttygroup/gertty"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
+	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' 'python2*')
+	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/gertty/gertty-9999.ebuild b/dev-util/gertty/gertty-9999.ebuild
new file mode 100644
index 000000000000..1987101fe4e3
--- /dev/null
+++ b/dev-util/gertty/gertty-9999.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 python3_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Gertty is a console-based interface to the Gerrit Code Review system."
+HOMEPAGE="https://pypi.org/project/gertty/"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/ttygroup/gertty"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-0.11[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/urwid-1.2.1[${PYTHON_USEDEP}]
+	!~dev-python/urwid-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.0.4[${PYTHON_USEDEP}]
+	>=dev-python/git-python-0.3.7[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.5.3[${PYTHON_USEDEP}]
+	<dev-python/requests-3.0.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep 'dev-python/ordereddict[${PYTHON_USEDEP}]' 'python2*')
+	>=dev-python/alembic-0.6.4[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/voluptuous-0.7[${PYTHON_USEDEP}]
+	>=dev-python/ply-3.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index bba305b996e5..adc5d83f1a3d 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,5 +1,3 @@
-DIST glib-2.56.4.tar.xz 7029768 BLAKE2B 21cf840128e468151eeac55f0323f8f643973422b70bb65655e24c0a6b2f7ee72d5ae879bfae73df84fa2281fc425cc98328597910ba8fd99d7a52024e1b3ab6 SHA512 280a46c2af13283a08c15ff0b4f5492659c2884521930600ad45310ed181c44a878ad8f9b36bae68ed6e7d92db6f1630f7bf015148c513dc317d25807f13abb0
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
-EBUILD glib-utils-2.56.4.ebuild 1409 BLAKE2B faac06d9c04b56b3566a3227a3b8cbe8170c3aced4cf1ab2fb2fde119e2423cf81fe6a06c5b147f4154f44ea17bf4d1b2149dc9e5580dfb4dc13b59e35ed0020 SHA512 8f6a3b9b1d9bd0f7d1b393122545a0922b699a7c5a43a3c4a1d14390b92e2a7bbd584eb4970f8554c38827585b1d6ae0220b7f67f712105cdaacf87f03d0472f
-EBUILD glib-utils-2.58.3.ebuild 2403 BLAKE2B 7c595e8cb50824739ecf33646f0430347e22a5ef927d87e0f03acf804f0634ad628bde59dc14853d080bb5deb9121c7d54da79ef23fa691f74edb5b8178ea6a2 SHA512 61664c33e416c9ecf7d93e6656ee414dbb83ccb2cdd380cf0f5276cb3e66e24b343e19ce1bbf0dd5391e42cf3c63a36c837f08f5ee3695fbf84aea2b3b9a1489
+EBUILD glib-utils-2.58.3.ebuild 2400 BLAKE2B 0170eb4a4b2148c9e911e9d7fe6e79abf15ec3a1f42bd36f6db8c8d34686202df51ad6774d28a61140a03e47c64cf4f184f9a98d85519ece8e5564058b48d81d SHA512 e902d22a509f2f70f5ce20b3ed92d22c18138ad197c51d060c2619dde5409af3f77f94ce3daa2217ddb35fc13ead3412fe9ee705dce51b93df37aa8fe221b650
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.56.4.ebuild b/dev-util/glib-utils/glib-utils-2.56.4.ebuild
deleted file mode 100644
index 7fbd4e170b8e..000000000000
--- a/dev-util/glib-utils/glib-utils-2.56.4.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-GNOME_ORG_MODULE="glib"
-
-inherit gnome.org python-single-r1
-
-DESCRIPTION="Build utilities for GLib using projects"
-HOMEPAGE="https://www.gtk.org/"
-
-LICENSE="LGPL-2.1+"
-SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="${PYTHON_DEPS}
-	!<dev-libs/glib-2.56.2:2
-"
-DEPEND="${RDEPEND}"
-
-src_configure() { :; }
-
-src_compile() {
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal
-	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums
-}
-
-src_install() {
-	python_fix_shebang gobject/glib-genmarshal
-	python_fix_shebang gobject/glib-mkenums
-	python_fix_shebang glib/gtester-report
-	exeinto /usr/bin
-	doexe gobject/glib-genmarshal
-	doexe gobject/glib-mkenums
-	doexe glib/gtester-report
-	doman docs/reference/gobject/glib-genmarshal.1
-	doman docs/reference/gobject/glib-mkenums.1
-	doman docs/reference/glib/gtester-report.1
-}
diff --git a/dev-util/glib-utils/glib-utils-2.58.3.ebuild b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
index 7492ad8b9c0d..00d825030b3e 100644
--- a/dev-util/glib-utils/glib-utils-2.58.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index e53022e4d634..d1d0c923a3e8 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,6 +1,8 @@
 DIST glslang-7.10.2984.tar.gz 2439082 BLAKE2B f736f0e1c7be39531360de97d0bfb64681fee32dfd324d48082ff286b0a0355f313fe71ddcbac380e48213ba5433e4d0a95fa65a7f0f99c3cdef603e9722ad73 SHA512 4b96ee59745f4ba91e8e89a9a926e93f00db11dba9c74c4997efae5c9252c4e04a0a2cad0c6b8fc2dcbf7d690887486ee59db930628f3284545f89d3d7a3293c
+DIST glslang-7.11.3114_pre20190415.tar.gz 2841827 BLAKE2B 7d1c46f05d0b5def4d9612f45d3c24b67a4497dc229bbaecdad8d2109ae17e5545a12dac04b42bf8102b8d2b3ca6919168d238da7c496a5713ece83a664101f8 SHA512 d75e5a7ceea305bacf489696c14a17209e9793ebc3efbacda8cc26b23fd7ff6c5d2b1b3348df108be6e9249862454e0584772f09f702d47374923c4cde491192
 DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
 EBUILD glslang-7.10.2984.ebuild 497 BLAKE2B 54c82fca49e1f7384efb55844e06ca04f35cbb5a6fb90ddc5a9c410a493583c5c2b683f8d9fefcef9cc0079f459c4899cd97cd86d7b16c38ecb465c5faba0d68 SHA512 29aba720c137737bf5b5b5f71a6ab50412af9808f7b9932ba4ed7341cc6088372d6fa161f50f98f753126ca18c54aab4877427de1b518966fd514c11bcb42b07
+EBUILD glslang-7.11.3114_pre20190415.ebuild 529 BLAKE2B 627b12c32ea476802cca12a473db2ac3fb1aa05477f46aac49b1fe02c92c8a72ecc0e493d4eb1e119b932ab0575890b7ee6f0d5298d36f4f5644ece23826a2ac SHA512 5a11ec19abd207a8c2cec9e65c6f50b4a9e75dd9252cdcecd2c08faf3f758470340e738caa2d1372b50bedc5a0bcd0034ae5453dc7f26020b83c7ed15389b36b
 EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
 EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild b/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild
new file mode 100644
index 000000000000..93f0e5a48055
--- /dev/null
+++ b/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils vcs-snapshot
+
+SNAPSHOT_COMMIT="0527c9db8148ce37442fa4a9c99a2a23ad50b0b7"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 8dd643764641..945752f3ade3 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -3,6 +3,6 @@ AUX 3.24.2-jedi-fixes-2.patch 928 BLAKE2B 8fb3e4bb34217309475431ea66f24c003e27a8
 AUX 3.24.2-jedi-fixes-3.patch 8966 BLAKE2B 9dc40ddc73ae2ca5b0cbb6202391eb3aa550771dd65f7fac84e724d207c5867129c8607417279c78aa469234e62a3e1f62cb294701948b5741b06c4a0aecbf9d SHA512 5481e325a338cea5946a4515e8e532c8d516b0f05a2f3c7ad33dc3e9bbc83024bb8ceb2f0913b1795fdc57e856b37ccaf314e05b414d27669a4819b63747f255
 DIST gnome-builder-3.24.2.tar.xz 4342908 BLAKE2B 5dca80d2e948041bc096fa9a2a5d39322c6fedb0560e3e4f3c60c7b0657c7c62e89387a63f7d050c3df90d8c129485bc5495039802548b22ae268d94c14a37ae SHA512 dec133ad3c5ef96a036598ebbe684667dc44f73d8643e700f1e776cf8eb860b99c1d333f1fed5bc896cb7bdcf607eb51fedb7bb1f5b0cc662e4b2703d74140bf
 DIST gnome-builder-3.30.3.tar.xz 9486164 BLAKE2B b983fd71b1bab31386ab8f4c3a6ff57b33afd2da5aff5e41e7d1cba388a9b6998a0f799c0843bde95f8ce0456fe46457d0c0c46622d59eeb7729d2e8868898f7 SHA512 468605dbd2bd712a76c333a974bb19ca889dfe8493c2e85101641034f3e2c8eba2c0ee2f98ad01f3466f0f42946f05790763ccfaf786d73da192d64360eec47f
-EBUILD gnome-builder-3.24.2-r1.ebuild 5207 BLAKE2B 25ebe0af2a9907e1d9f7c77d079190e35946ca846f1d2a1251a4547e1190f65b45514cdfb9b9f3757c9533b730381f430388b2f79b799c9e5cd496c67b2c200a SHA512 74b8fcee5eacb5a0dabe117de94ef6cc1acf4e5e36d5715563e953d309e3ba89ec3945e546e1897db38da2aa2261e9ebadd38e1caf598525e9a7b0ec7eef54f8
-EBUILD gnome-builder-3.30.3.ebuild 7027 BLAKE2B 0c39dcd0dee45c881e514c4a16b928100e5f98db25b452e469f35dccf5ba67be06f472d466162412a6c8b1c578a328495c9f3b5126a9efbd3fde389ac1cc9281 SHA512 06b450aeb1d5541ee36efb77bfe597b0343387112e2ab162cf7e8b130aaa24d47bc8b8417c2cb68ad90652350fba7c4f5745f4797dbb75d59158f2a3f8d2fac8
+EBUILD gnome-builder-3.24.2-r1.ebuild 5205 BLAKE2B b9c8d1eb7368445ebdda0f1685032d21c8447c4d9477767f3879af96af313b6411724d5263b680491eab323d39a6b3eeb6fb68dea8a98de3667a837ca20af58f SHA512 83ba1c1ec2e0d881e2b20ecdd575df4d994c5dd2b729967c955f60c1d1cdf611e3075c216d9151c1d3561caf7518c57a2f61171dae4453af323309f128316036
+EBUILD gnome-builder-3.30.3.ebuild 7025 BLAKE2B 23691f6c3be1469d84fcedfb9f2ceb6ff2560b58287c90546b6db615361c542b21906d51f24c1b33d35c57bf417d66a78fb489f01512723c9b5fde5aea50eeb0 SHA512 1c7a818d34b6c765a91ec3a8f8ed2e93b08851d90a1be890f1009d80e5bfee48478478aa9fc2c3d1fb1eb157f65a9d6b4830e28166020b563a9b017585bbf2c1
 MISC metadata.xml 1114 BLAKE2B 34d8dba8d48edca606ec56c996b93a6e47736e5d92aa20b71bf8f2a4c46cda82d3023b4c253357c7126e91ece1d12d9043cd020a2de2a5390ee984f97be4e552 SHA512 1882f56d3f5f88db34f37559f4f64bcab0f01e9496c4316358229e5662347f66ad2eb987571df8596b12a4170cf9ba5a2a41d39d82f1687d21753b1c5716c2a5
diff --git a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
index b73fb3fee895..47b71cd77acb 100644
--- a/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.24.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 VALA_MIN_API_VERSION="0.30"
 VALA_USE_DEPEND="vapigen"
 DISABLE_AUTOFORMATTING=1
diff --git a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
index 16fbc931b481..095f2c3b8301 100644
--- a/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-3.30.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 VALA_MIN_API_VERSION="0.36"
 DISABLE_AUTOFORMATTING=1
 FORCE_PRINT_ELOG=1
diff --git a/dev-util/google-perftools/Manifest b/dev-util/google-perftools/Manifest
index 75103ba8db92..c8d0238820f3 100644
--- a/dev-util/google-perftools/Manifest
+++ b/dev-util/google-perftools/Manifest
@@ -3,5 +3,5 @@ DIST gperftools-2.6.2.tar.gz 911744 BLAKE2B e5798a2f0f2973f02bccabb2550a9df54319
 DIST gperftools-2.7.tar.gz 916919 BLAKE2B c48882df45415110c1ec39298e84ec9384f6a82851d95e92435649d2b253b9fb8e29664b474e45881599abf3781731c47ead0b6c454c33be9a207a6a2401a97c SHA512 9aa39689bc18603123204f024ab6dc96099b70a3d304e31ef0cc1e9893cc77bd14ee6eb420e597d40e81e487a2a45e77cf1965873646d056fd4b7bee22a4b0bb
 EBUILD google-perftools-2.4.ebuild 2294 BLAKE2B 1aaa5d14010c35af89fbe126a6c9d24a2a6921300e273be96868a7254dbedc97e5012ac5d7353e3555b2777268cb299ca576452c7d406234f597d010e6577926 SHA512 8a0d186e63ee7aed584cee1d0897c02eda37b7a0f980a11c715e38513ae684cc0c78675aaf6c8c5ebcfc77da4b1f88f8fc364f38fc856a61ae7365a52f802750
 EBUILD google-perftools-2.6.2.ebuild 2313 BLAKE2B 76778b92beab5a0c5c9bcca957551ab891e64dfb47db73eb296fffde41608b9c031e6f20f6d480202865e0776f844bf10b046a2cf4d6d7a656afd05be064245e SHA512 dd7328c32fdf020bfbbd35e074f12b43d7d8fb3cb59aadb430d2c0119be6bb08bb2fd7a22c62314b477aad6edff92e6a42c686d203fd9abceb0e3cd8587073db
-EBUILD google-perftools-2.7.ebuild 2354 BLAKE2B 984b092a3af6c43f7d80cccb130998f692c0e2715aa4e6b3cab18aa19248588eb3b448b79ee131e4bcef3762a4efa46710064d4c52c6738580d17ac821917bc9 SHA512 271e5d2d1b2b94c6d21c56772a90432f0ae59f0a11cdfc109d61ca1c30bbf8387d00aeaf6ccafc3851d1afbf249bafa66ac5fc762b20afe56f451e610adfb030
+EBUILD google-perftools-2.7.ebuild 2353 BLAKE2B 20cf4d3c719658c6172fb116966932cd976fd8d008f0fa50a1a1d1ff4c91050c9d9bdc733fe231189af292ef7a0b53ef6f2c169ae989471533ad68916773a9a9 SHA512 ef93ac049915cb17ac6857b309532c6fb5117ea1bf088d2569bd9cca8b2551102d36d88fa2a5e7eef9541c4e3b8b10804658977a1f5e2cd7f449439ba378c0af
 MISC metadata.xml 894 BLAKE2B 1c28c2e2c55af11aa4f2fa160dc63d16f4ab9deee8be2265af431a4594f8dd6a51a5258dd81b125e2f61f8367e26b6d1ce4248820b437f393051a8f036bd0b27 SHA512 8b940221b8eab122bf8579bce312c71c4ff49e6a35982e9b38990ad181ead444b8cb98b8a919fa941f99842fa28be9e5b456eb07954b3b25f4acc4112d98c0d2
diff --git a/dev-util/google-perftools/google-perftools-2.7.ebuild b/dev-util/google-perftools/google-perftools-2.7.ebuild
index 79113d00762c..86e8f749665f 100644
--- a/dev-util/google-perftools/google-perftools-2.7.ebuild
+++ b/dev-util/google-perftools/google-perftools-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SLOT="0/4"
 # linux x86/amd64/ppc/ppc64/arm
 # OSX ppc/amd64
 # AIX ppc/ppc64
-KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="-* ~amd64 ~arm arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 
 IUSE="largepages +debug minimal optimisememory test static-libs"
 
diff --git a/dev-util/gprof2dot/Manifest b/dev-util/gprof2dot/Manifest
index 226cd148435b..756aafff44cf 100644
--- a/dev-util/gprof2dot/Manifest
+++ b/dev-util/gprof2dot/Manifest
@@ -2,7 +2,7 @@ AUX gprof2dot-0_p20130517-py3-xrange.patch 431 BLAKE2B 634ad067782bc67ee0dfe89af
 DIST gprof2dot-0_p20130517.tar.xz 1080464 BLAKE2B 49fdcc79bc91505cc1d2b8233099766c0b305af145e8f668011429743777b965084baa713664d9fe0c0d17d2ee741b13101c5162baf07c609d1b0b7dd04de6c5 SHA512 1907cb889d1776723ca944d588fa4185afdeee11cc85ec40c03832568d91612bab708160c69036fc45fef05bca62c5bc8f6ef19cbb45c6bfd1952dda94c54a4b
 DIST gprof2dot-2016.10.13.tar.gz 22264 BLAKE2B 612cdaf8491e40223cf856104e49554675f2f83f8fc4ca9932f5b36167408ea51c2020c7c958a014b25010002230b0a6e4d5c70d6791fc445182fc61a9ff7eab SHA512 0568f1afb4e5c9da9e6c3c58d9a3613c90110c338c573e2c088a99f1db4d076a287d1209a132b86334a01404701d6ca0d9b0553e7ce850278956ea79acc2c388
 DIST gprof2dot-2017.9.19.tar.gz 23558 BLAKE2B 3de2a0e7c9731987a1382df9d67badcb19514983fa83af432bb83b5e59762c12fe865af9cb7778ccd37015992384e87b71b53211c33555039ee3f7dffc4e7c9c SHA512 652b38c6cbee47795d866a539e69ff4b2e67e221c8c082c6ecf480a15c24fe6d77e80b7daa5d24e76d27a4ff90836f80e716cb4d51d48d41aea5f661e3ac3598
-EBUILD gprof2dot-2013.05.17.ebuild 1118 BLAKE2B d5c10ab63e52f67a38ba41f308d062bc36d23296f19a32c6d91e0604de0f1f6fa4377388b1893a3aecad792adc1618fbc3f4f1690d523bcf87fb4d9b8af11771 SHA512 6ed2fa61539c3a8c94f343e469655c96e451018143ec359f8de595b6aa34caa874bd4c5c4ad0c2c5284cb2d6455be8c15193a52caf2b4d4534d0fd80a2197e2e
-EBUILD gprof2dot-2016.10.13.ebuild 503 BLAKE2B c2152ff306c97a5f5b78a15389d17318be9e98a172b1a5a01fd9189e250e0f2403fdd080565b5299796238c0ea039b56cb2852359a37ca9ea4aecf0dae121aa2 SHA512 758aef8a94cf85b61ac47528b39fd6de3efee4d27aa433531355dc7a52386957e48dbc34fb287afb99dbc2fbcf443f2cd1e764b065095f5e2ec3b61ea49b4d02
-EBUILD gprof2dot-2017.09.19.ebuild 566 BLAKE2B 362057dcfb4504c1a79af72e146b650b9746500ffc88d85ed702cff949e9ab46d4c0ac6fd23ccf45361b145cdac0e1a993ef8ca69b259411cd11fbe3e04d4645 SHA512 3ae1aa53ca9f696d8b7640b87b212adb54a94c650e8a76f35fe3839dfcc2e2525ec3e4c4a2dcf02300d5e5a35f81f218d822461a960d73655c5c9064e2247453
+EBUILD gprof2dot-2013.05.17.ebuild 1111 BLAKE2B 8501c23d7f826dd4d6badd3423be2eaab70b16ec3da3ecd3308a522feff9556fca77e367a951c9abac450e7c1f262dddbdc5e0516d9666a60c343247a85fb3d8 SHA512 7d9ed71acf649e541c5aa2bf56e2afebdb2774deab4018dd43480074f5fef83daca4664b805b24b089b8c45fa053b021fe1321a2b7e1e31ca8557aa7b140bc79
+EBUILD gprof2dot-2016.10.13.ebuild 496 BLAKE2B 8429f3b0720f8f9a794d782a36076a1313eee3d1339ea5be401cfafcabe7dc5be22d8248d36eeb41b24b065e472e01285e58759096cd5eac2c1c2a6b9c72ce50 SHA512 2c1088eead2bef1e2f13037bf4272cdc2f75148d893a2be95fa2ad6ca6ca9b2451e541edf43ee4eb778a4ec6684ce02859b616c1453c49b7bff28c0c0b9d0764
+EBUILD gprof2dot-2017.09.19.ebuild 559 BLAKE2B 27f1b372d7328f7eef7db430fb021eeec0ce15631e31f99f77e1fb091989c386f68217479bd25325c5241f056637e61dbb59908a4b60ade75223edf135340078 SHA512 da5394975d35c0bd9729b0ca6a521ef9e9313479f04682516d60ef189af9960548f645430834ed33e7fbdeef4cbd3fab5c7462f4127203e87ba3d1817d25899c
 MISC metadata.xml 333 BLAKE2B d1735f6673a0258eadd2d185548fba581c8613d4c8709e388bab630e81d9e835aa1fac22495b400a8db3e9895ba655e273657bd9329c9a9a8022c5bd7ada2f3e SHA512 503d8f740b27ef37b79be92c4652c60f49087634451e0d418da990c7b1f9c911aca461f2578e66e3e09f7db0588e57e304949a04b279fe782ead8222e1324a28
diff --git a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
index 8edb2a36308e..0dfc78249914 100644
--- a/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2013.05.17.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit eutils python-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild b/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
index c58ed8ea47fa..de2c46c6d827 100644
--- a/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2016.10.13.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild b/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
index b113da87a395..6d0d8fc65fa8 100644
--- a/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
+++ b/dev-util/gprof2dot/gprof2dot-2017.09.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 PYTHON_REQ_USE='xml'
 
 inherit distutils-r1
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 927289f0b74b..555dcfa144bd 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,9 @@
 DIST gtk-update-icon-cache-3.24.0.tar.xz 372708 BLAKE2B 2a6bffd4453c2201bbb78e4ba581f6bd6453f650ca32de7e8002cb88f5872c868ef25973587c96b58b28d2b74fbbac192dd608e72cd5bbbc0823486a9c55c46c SHA512 9dada697ace2ea5f3b5ab64c6063c1a9a792f9b9aa23d4c3888e3a487fda9b1c99a5d0793bb0f9e182dc66a1a5c7ff944f8b9f2ca2f4de7ecc24c048d7a55339
 DIST gtk-update-icon-cache-3.24.3.tar.xz 372612 BLAKE2B 6087334fdca3aa7f93b1b6c5a7195ede2376ec80d2618809f924f9b612de46a8d3e95f0a90030deb939f27949458f9ec72b11600c2bf8b1ae6089284324f2c9d SHA512 0e47977567314abc64419440cc0f276525286fb65acbfe7fff21d6cf548fbc072865f8a2ed18e3114508a7e8fa696453c26e1ad53e638ee11dab57b4a6cf75a5
 DIST gtk-update-icon-cache-3.24.7.tar.bz2 91098 BLAKE2B a97bf3e168238afd8c20c9adea281c9bb71764b5227e5e3c5f78b175568e5a8ea14ab7d2de6aa9e6d38b766cf5f7f1c5c0f646b6d2dd55c0747e43bad4c0a319 SHA512 2396034539628f74bee6539666d0c5eed85814044aa58b21272beb27f7fe47cbd6b5326e358cd1cbef0e1498fcef20b2aabed1bb831cfa1e528a011ce8312e7b
+DIST gtk-update-icon-cache-3.24.8.tar.bz2 91113 BLAKE2B 4a930d001a9718b14089962a6c368c9073afa7163217ec2a5f35ab6bcab593490d20944321a2980baef42e13eee43b26a3dee35c8327c8aaa984e5c36611600f SHA512 20ffc1a3570cc4de045a698e51e5b5bc214a78f9b1f730a1930e07df78d965d883262c6776bdcd68b6b39f309d75678531daa6975c0cfc9ecd9070b26b89b4b1
 EBUILD gtk-update-icon-cache-3.24.0.ebuild 952 BLAKE2B e6d8bde862c87e3d257a6c4ac52107e0a742e046fd21803a0429b6e1ad5dd8b1e748e03f4912d685d8cb479903efa86318ad3fb708bd21733f6f8a05d9d7a7cc SHA512 7ce0934ced37329c5b2040aa8370727803fa13a4188190afc3df1822f54557af89423857dae3e4e2867eb90e9bb96a299e33c0af986194619f3d2de097c6733c
-EBUILD gtk-update-icon-cache-3.24.3.ebuild 961 BLAKE2B 1abbab6e9de693e02d2ef284e29cbe32550703f4dde16226212f4049a9404cade3c8291b30f3646fed1419b49a843d2ade2d494da43dcc3c0517a5bb579477b9 SHA512 d9e6dc703493865e9546a0043f8fc371f4511eb8d8f22fdff942c9e980eac77b95524d1af26ba7226e5c1a6c58c7e55331f7d048956b33e222213822ce4933e1
+EBUILD gtk-update-icon-cache-3.24.3.ebuild 954 BLAKE2B 9a9a01468aca36ca33b1407448b7873e029581b95d4aeb53daaa90250cfc09aab48d978ad27acd56fc71d8c0e38359524230e91a7898dcdfabcaf9731e0a3eb1 SHA512 1c4d3f925d1abef1673cc262c6e853d3b88945dc28a1806208171f4a3997cf3b6c280e8faec9e8cf0417d840a0b913ee80d1f5e7ff682599731b73d859bf301f
 EBUILD gtk-update-icon-cache-3.24.7.ebuild 929 BLAKE2B a2e06e40a204b23ba64c05971f0bcea7c40f118ae3ef0ed33b4bd58aab7308cc28e84c93281076eaa5471cb4eda3197656966fed436f8f0e857ebb03cbc90f3c SHA512 343d66080958ca27964b3f6a2795865fb8e080535293182f53e967f91dac4164bf9af9b65463cb79d85402ae9949f417bcdb1269ebac22967be813b9424fea07
+EBUILD gtk-update-icon-cache-3.24.8.ebuild 929 BLAKE2B a2e06e40a204b23ba64c05971f0bcea7c40f118ae3ef0ed33b4bd58aab7308cc28e84c93281076eaa5471cb4eda3197656966fed436f8f0e857ebb03cbc90f3c SHA512 343d66080958ca27964b3f6a2795865fb8e080535293182f53e967f91dac4164bf9af9b65463cb79d85402ae9949f417bcdb1269ebac22967be813b9424fea07
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
index 59f483045e3c..cda6212e6fa2 100644
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2+"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # man page was previously installed by gtk+:3 ebuild
 RDEPEND="
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
new file mode 100644
index 000000000000..8187209413d5
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.8.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
+SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# man page was previously installed by gtk+:3 ebuild
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+	!<x11-libs/gtk+-3.22.2:3
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/dev-util/gyp/Manifest b/dev-util/gyp/Manifest
index dd17b82640f3..2bb597d0b51a 100644
--- a/dev-util/gyp/Manifest
+++ b/dev-util/gyp/Manifest
@@ -1,4 +1,4 @@
 DIST gyp-20170904022846.tar.xz 447608 BLAKE2B 41f0e28d04039358a9e4ec9628fe1d936d19748061ea882a4e47f2cb23549db3866c5281e102b8f95d6ed37cfe999e7342129a81333671ee42534fc53d2a0d0e SHA512 9336be1103048fe5f51f90fcb2a153bba7638e71e4b579c47b725db81ae4257a56a8f7dacddc936e627862ee6149a453f1c7f5bede633cbd3076e0fa2fce07a7
-EBUILD gyp-20170904022846.ebuild 908 BLAKE2B de2be8153c0b4b133f18027a44b203f5e1e9e7ece1737df0afb506f58f53366593e80b99d916436de25543484023a69896a42342f06bfc7ed7df06edbb327400 SHA512 a3051093de1d80548199710fbdd8e9858ea06d094ebfabfcd0542f219a758264afe392226240ac9378822ee31a1649cb7c5a82831483a9920dc580916b80a4ee
-EBUILD gyp-99999999999999.ebuild 892 BLAKE2B bc7cd85cf2fe9f1f6262bd7d1e064853dff7a4f97b9fcf1d9cda47e6caed487117ea389eb26ed5d25af0c6aa4d51b2db4ede47343906ca6c0ed4ef77b2dcb0a5 SHA512 7df9e1d53c73e3e256b4abf9ae71f91ac9105102e41a8f5bec5ef2921f96b4f88c0a2264a7727a55d4de95ea81d84150ecd0aa456cfef02200703fa3392ac6c6
+EBUILD gyp-20170904022846.ebuild 938 BLAKE2B c1711e9a6f0737542267dd8a920b150656c14531e39b80e9cd3379e11597725ae2999c9f72650f04b7bae6aa8c6543aae497b914b3df4f19d07fd4b0ccfc4cfd SHA512 e6fc396ae251df01fe8c2016ef6f5efacca3ee9332fe47bc93d843c43dbdcab427e3a030e7a82db339ea169b7da76b4c65d64ae35b44e56a88127d6ca093a05e
+EBUILD gyp-99999999999999.ebuild 922 BLAKE2B 2574ac2db772ded501d63581a59992d36b14385dcfc5411835391c7f5e43c41deb30ad3c677bc59a2772e58f0d49c443b756efbca816c6e658ed33d79bd782aa SHA512 2d214292e558fc23426a9a1f57ad5f808b3b0a14151fa7c5a1a073d81641f4835724b3aeb790e7464b1199e2d8300a00aa0d1da7e62544d57ec5f9e5e368532f
 MISC metadata.xml 273 BLAKE2B 287fddc66f0f3a2547c1d7892ca0ca381ca3f90c0a24935119d1cf30b0a2be976d20ce00b92f720fb58cec08d6b1147dee207bee998d17c80638c8a6a95d7a63 SHA512 52d2bba092d7ed694e06c90dd9cfca1a0003e34fffc0bebb25fc4262f5b6b2ae8903454f7d406aff28d40c9ffca5157fe021701cd60ac1fbf7a7b24215578341
diff --git a/dev-util/gyp/gyp-20170904022846.ebuild b/dev-util/gyp/gyp-20170904022846.ebuild
index d5f888d0b40b..01a8975bd428 100644
--- a/dev-util/gyp/gyp-20170904022846.ebuild
+++ b/dev-util/gyp/gyp-20170904022846.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2017-2019 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=(python2_7)
 DISTUTILS_SINGLE_IMPL="1"
 
@@ -27,9 +27,10 @@ KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="${BDEPEND}"
 
 src_test() {
 	# More errors when DeprecationWarnings enabled.
diff --git a/dev-util/gyp/gyp-99999999999999.ebuild b/dev-util/gyp/gyp-99999999999999.ebuild
index 0c933a99edc5..f427d6156ee0 100644
--- a/dev-util/gyp/gyp-99999999999999.ebuild
+++ b/dev-util/gyp/gyp-99999999999999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 2017-2019 Arfrever Frehtes Taifersar Arahesis
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI="7"
 PYTHON_COMPAT=(python2_7)
 DISTUTILS_SINGLE_IMPL="1"
 
@@ -27,9 +27,10 @@ KEYWORDS=""
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
+BDEPEND="${PYTHON_DEPS}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}"
+DEPEND=""
+RDEPEND="${BDEPEND}"
 
 src_test() {
 	# More errors when DeprecationWarnings enabled.
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index a31e05a7f0b0..be438ca62831 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -6,4 +6,4 @@ EBUILD hadolint-1.10.2.ebuild 1137 BLAKE2B 3bdb1e21534531126433c77f9e14644d714e9
 EBUILD hadolint-1.10.4.ebuild 1137 BLAKE2B b5fb51af0ca3137c7666aab77ed9fb911f1d3aca892c0dfed7cb9039685566c90a5abf1855034e5ffa841a59320d3b570303c9d0fc80093ad0a8a702c4443cca SHA512 bf97efd4f7d4316e958a8904f372919e1e6dfb3d404074869a94d5ee22ad203705c4ef13280540639d0c078bb7aebd67b5149ce0e87e0dd9977181c82ba8bda5
 EBUILD hadolint-1.12.0.ebuild 1164 BLAKE2B dc3096d62e52a798b0371f5e0b9492f2d142ab65b267cebb6ef18d8e2f1587b227ad1bdcc82eee53fa0630165f09b48cf5038299d12fc2c6ca46156b78908f74 SHA512 8e6ed7a8e3cac87ce38312bf495bfb7382e6a01aa1e9233d7a9d61f656af92b88b29cd0fe9471c0a146f2c4fd57f3d70433d76770b07855e4b499369b4077c9f
 EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
-MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
+MISC metadata.xml 286 BLAKE2B 28047949bae509153b03e8627389845792a69fce265c8c90e9cbd14f05aae3dcf91777ef0a3e657f4c7f4ab4f26b92739fa12b313bfcf986a285e0135722079f SHA512 cfc6ff695eb5112d9be7f5cce18103ab0ba258147d98c31d7446305372bda8dc02f598e52098dbf4630189b7469427b179f71983f00b89c92c5e29bd50f2739d
diff --git a/dev-util/hadolint/metadata.xml b/dev-util/hadolint/metadata.xml
index 1eacbb097674..cc4ea93fc255 100644
--- a/dev-util/hadolint/metadata.xml
+++ b/dev-util/hadolint/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mrueg@gentoo.org</email>
-		<name>Manuel Rüger</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<longdescription>
 		A smarter Dockerfile linter that helps you build best practice Docker images.
 	</longdescription>
diff --git a/dev-util/heaptrack/Manifest b/dev-util/heaptrack/Manifest
index 87727165fea2..88fe87e8dba5 100644
--- a/dev-util/heaptrack/Manifest
+++ b/dev-util/heaptrack/Manifest
@@ -1,2 +1,2 @@
 EBUILD heaptrack-9999.ebuild 1081 BLAKE2B 26b41eb54c27a5698aa6e2c844a95795f62782dc92c8bdafb110eeb8d5a0d10ead0fca3694ec5352609fa45690b2d709d40f949adcabf3f98a8bbbc8f1a412db SHA512 30c1780d74f58a8f0c2a1cd02a2812534130ef30847eafd37eea185618c3ab2860a2b9b1a6ee246b197742028108db630db06a49200b9a159696ae77beb5124b
-MISC metadata.xml 362 BLAKE2B b810739db5ac019dac18f6bf1bcc5f1cc2a26ef076545b96572a3c9c304f115bfa3250293596aaabe56719cafcb1693e63e95dc70caadd9306d64f134fee864a SHA512 0b6416c3084a693617745c2faaa8af4f72540de549d52e719413ae90e467a95912044099705d6bd39517abb56a569870b4ea92201a98dc76d25da013e3774c27
+MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/dev-util/heaptrack/metadata.xml b/dev-util/heaptrack/metadata.xml
index afa56cb84284..c6bc2d94015a 100644
--- a/dev-util/heaptrack/metadata.xml
+++ b/dev-util/heaptrack/metadata.xml
@@ -5,7 +5,4 @@
 		<email>asturm@gentoo.org</email>
 		<name>Andreas Sturmlechner</name>
 	</maintainer>
-	<use>
-		<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag>
-	</use>
 </pkgmetadata>
diff --git a/dev-util/hxtools/Manifest b/dev-util/hxtools/Manifest
index ee696102b839..13e4c59a63af 100644
--- a/dev-util/hxtools/Manifest
+++ b/dev-util/hxtools/Manifest
@@ -1,5 +1,3 @@
-DIST hxtools-20121125.tar.xz 287716 BLAKE2B 66c125e4db14b6a6adb49e0d45944969f6c4a4a238d58a03a2d678eda3e5f8bec002c3fa401c1c9458b4840816a0cc3c357e9e5c8c5ed6a062309785c51ec1a7 SHA512 fa15331d8c961b0a3b1a99f592e2b4f9b0531ac294a2fef0f9a5067b5e427ca57e0c62798b1048a1d6005c9655af45136636255f684a129bc997864e8c7c4915
 DIST hxtools-20180301.tar.xz 301516 BLAKE2B 6b768e316de6d9b724cdca5beef1ec14e3482aaf1aa34abc138861782266eac32565cdf7713cc65d3863fb1b3463a21446165ecc7df4f39c4fed168d8efdd3df SHA512 10b6a59367a9d5127116a81ae46c4c0f10dd4cecd60ff78b2dfeb2a304c7a34112df2355b9f939558c8e27d0e255e2df6277da9cc558d4368bcbe4d7130d5326
-EBUILD hxtools-20121125-r1.ebuild 565 BLAKE2B 62d9727f59390c97157e8685cd9be53d1883d52739bdd76a5c171fe4c3c7af3ffdef772700ec45922cc10f1b9b5d8d1eb3cfd658eaca84ea679afe484f25789b SHA512 4f886b9deb4741ce55c83ebeadadf0225444f8809fb3d07ede72e9125d4e840506a0798cce98e8bf1cad55f68673c8a8cbd57da868c71f871706b22847683f91
 EBUILD hxtools-20180301.ebuild 802 BLAKE2B a35cb67d8dacdb559df4dafed8ce2ebfa2482030fe5e513a0802ccec0b0192d92bda8a09dc0ecf7dbce5dee39463a92667fa67183a773f0572ffc9f16d4746a9 SHA512 d86fd5d656bf6646c2469f2d83c39370943dba1bced7ecabaa5629be4a0ce4a6b8c6a0958af2480543b00b18d9237c42d3106ed76e2a607e92afffecefdc4029
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/dev-util/hxtools/hxtools-20121125-r1.ebuild b/dev-util/hxtools/hxtools-20121125-r1.ebuild
deleted file mode 100644
index 6f624335e2d0..000000000000
--- a/dev-util/hxtools/hxtools-20121125-r1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="A collection of tools and scripts"
-HOMEPAGE="http://inai.de/projects/hxtools/"
-SRC_URI="http://jftp.inai.de/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-lang/perl
-	sys-libs/libcap
-	>=sys-libs/libhx-3.12.1
-	sys-apps/pciutils
-"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	default
-
-	# man2html is provided by man
-	rm -rf "${ED}"/usr/bin/man2html
-	rm -rf "${ED}"/usr/share/man/man1/man2html*
-}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index 003cefd20ecd..d384a45cd394 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,7 +1,14 @@
-DIST ideaIC-172.3757.52.tar.gz 442963100 BLAKE2B e44f924e279a5b8f2bddbe65cffa24306920fa0f5b85e23b823b1e51fd49e2de2c8953a010b66ea325c4b70ae60268639293b67cd6116f4315ded5e5f6130da1 SHA512 a0178c5ef10aeab527bb8064840c53fff97bf9be468a4e5248b83dba96c5114878f5ff1e20436a67ee488580affa3fb3a2ea627407ed57b87949f64fc1a215d2
 DIST ideaIC-183.4588.61.tar.gz 541751086 BLAKE2B 51a5a4dae10d8fd00a0c239f87af3d53b86ffa50f7f9c4f1554265b349d866d60a8994a96f184cc9993fafe12de3dbfa77e3931626436a5f3d3854710b52fb9e SHA512 3e5956353fc0fabbe91b3a946e83b0b3229766a366fdf782c4c017acd7de5a86b3e0cc870a17abe2bdb8b090cb5c58b6c170555f60ba5e6a9a8198073545be87
 DIST ideaIC-183.5153.38.tar.gz 541754349 BLAKE2B 541054736db09c8f0106d5588b224d3033ec21a1e2b566fbc95300fafd39acae5c7f6755082bdb189c5619ed5375ea9fc3e777440d30523a84f864be29e5ad85 SHA512 0bb213da8bffda7d63fa29905d01ee36c3839249dd6e2a58b3941e4317a01bd9315e8bf639f088657938c8197eb2f05fc34fb3e0c49f8c243043cb03f8443f0f
-EBUILD idea-community-2017.2.2.172.3757.52-r1.ebuild 1881 BLAKE2B 00ede33b80b65b56cf716c76236590e470a24ada2ce6ac6350c09c3e7bcf8f478b79e671fa000e8bcd35b280b1fd25914017cba43e50cdeaa9a1e1b81aaa03dd SHA512 69b217495ba22e12ed6cb5bb753ae0d7357c8eb7311f1faf511c7fb9c5cd07b6cd6baab51d957e44c926f8a1010860010d1913655fa6cd6fec1767aaa00d5e26
+DIST ideaIC-183.5429.30.tar.gz 460232784 BLAKE2B 53cd69f5e8927b31a34b23f9e86e0974152cd6282eb4597aa173c06895e1b431360b18c76442094fb9f544bc29f925397242d42943b51840156f8b332e0d5357 SHA512 36c5151410c15e4530af1da5ccfb981ca4fba00577b26fb76fd3470bc3818f2b08b4545ca7ab2979dc87f144712f864811cf73336cf5ff98cb5f63c0e61e1a9c
+DIST ideaIC-191.6183.87.tar.gz 496360045 BLAKE2B 12164308d161c9ac5249baa0e2ec6ec88b96e9e37e25fa1befa5660142a530b40c5fa7bbbac6a6fbea0297de7ba6bcb557b139ea213f5fd75342ec0e12956ee9 SHA512 3c56a265f74c80e15b88a6121d1c462b6a3e394893c0ab522b2935af29e5c830245d9038208bc5358285714969ffd192e1e8c52bd5ac8e5b0425b8a5a1224c7b
+DIST jbr-11_0_2-linux-x64-b164.tar.gz 131483925 BLAKE2B fb9c55094aeb4a9e6b89ef41699252355895fa4bf55eaa0d3c0a637b6485b5a91a0445b5f4af1872b62cd67b639f7354e05770970d41dcfa58ffeda7ae43c5b6 SHA512 4f32940166cc8ad5a138866e18d4cbfcd07f4326a85c051b7a622c9dcb8ee4b6d493331ef24d0c01999134fa2a9bad901f026982c16780fdc5e6b9308821db34
+DIST jbrx-8u202-linux-i586-b1483.24.tar.gz 80740809 BLAKE2B cc420ac646120c7060a3a7697e2a0f1d8a6f9702b1c2d2730f339e7aed405ccf4bb31d4be389686f57066f6add5e8279912e54fd341873ad2c2d1f5292b4d14f SHA512 90280f8a36fa8f20448c27d344de85ae06412f0b1fc717b77b5fbdcc0a3486e0def510e4ef0aedc1eb210b1e3541b0e37f805821731a285c6e78eb87ad083f2d
+DIST jbrx-8u202-linux-i586-b1483.37.tar.gz 80726147 BLAKE2B e4e5a076a541fd7153e861193ff4247c02ecbc144396ed28737afa7440f7771569b8d968b7c67b3dac333a89ff0b54cc9e5e76d1651b174cc7c0c21b1deb033c SHA512 53693f2ce994f4891807873ae3fe46ce60bee000b78be03c5d3df06b436328abe5b5d7e75d43e57f35f24187f49915187d034b39589e29806f55deeb14a029f2
+DIST jbrx-8u202-linux-x64-b1483.24.tar.gz 81829687 BLAKE2B b716ca394a1315d8d6c6ebd57fd35cc37db6429380681c6d5e7d05b4a00036c1aca46820b0a17b824c8742e7ba924b4342eedf08999370c7a9fd2675f99d45a3 SHA512 08db0eb7fc2b5ae734120f276f96f21fe9e6c2bcb84a833fe5a1a8bb3b9b1205c3de06e1c1ad94e220c26f092061d5ec99470619240630f7722d1d64d21ace97
+DIST jbrx-8u202-linux-x64-b1483.37.tar.gz 81812743 BLAKE2B 86ddf0c8dc992a27e680caa821f54fa4d647a8bff78b9fdbef82996bfbba828a2f68f1a00ed64bd92ce24a62bfc6c0240837c396644c6e91244cb0d980b6c704 SHA512 cd31a3c4da7b8c65e9ae89326c2c8b260b51890258d30f64b1e8a7c6c1442bb2cb68ea2aa80387ce0c1a8f50e3533e8231f72c5935b639e3cf82bc1ffedee8e9
 EBUILD idea-community-2018.3.1.183.4588.61-r1.ebuild 1881 BLAKE2B 00ede33b80b65b56cf716c76236590e470a24ada2ce6ac6350c09c3e7bcf8f478b79e671fa000e8bcd35b280b1fd25914017cba43e50cdeaa9a1e1b81aaa03dd SHA512 69b217495ba22e12ed6cb5bb753ae0d7357c8eb7311f1faf511c7fb9c5cd07b6cd6baab51d957e44c926f8a1010860010d1913655fa6cd6fec1767aaa00d5e26
 EBUILD idea-community-2018.3.3.183.5153.38.ebuild 1874 BLAKE2B 4934885f97219f27dcce193cbf7a59c2e48f7eb4921f57d048e6c595823c48b7a99ba832612cc3f32044366e6dcf3a21d20e82a95da7d1ca556b89ac0e6947ee SHA512 884d0ceccf5a93568d9eb5af2f5115d7c8c882d4515e69686336a91d0bd0a6fb5393f1a3845b91189130beb6b9ca45ba7ae4f171a3075bd0efb35b4aa892b47d
-MISC metadata.xml 533 BLAKE2B 1c711c1c3f3527e91ac205b74abb70a8c163abe5a289837ed2a70dd7a37f510c3dae3e37d8540dad6bfa5d7fb7c82d7070df3dfd7e9ea0b1c85745d3eb66bd75 SHA512 b14bce0b72eb777929138e64a53b0069faf51ec4f1d8b3dbb24a9f2d7f9baf68d5e495e784c83c34c1190d52aea16de52485a815786de235091b75f2778d5e23
+EBUILD idea-community-2018.3.4.183.5429.30.ebuild 2395 BLAKE2B c46ebc58e686e62feead0e2162e4b85abdc0520a4581c493f3fb8abe69161e57ff8f69995b9a2bc614002970f099b68a3a148bcf7c85e9c9d299e38b22a632b3 SHA512 a57dd578c417b4e3eff42990862d7bc18daa758895bfecd44b3a5d8d4c9da831967d93c18eb59a61ac7aab1e674008f9e8c37048c65e7b6eb9f2f5641d008caa
+EBUILD idea-community-2019.1.191.6183.87.ebuild 3476 BLAKE2B 9af13d948308491cd3bd35b0e27c60e6261a7a1e7b3e64eff183efc4ad5ce97bf1e5b610f287b679b97b18262cc4765cb0879b70fd683cac92bed6a8c6f47a15 SHA512 fc0358a3f22700f0886e3135a16b971a3c64c355fb4c1524e5bd4f789f4c7f94472e89a95b08fd776caeb2c5571f56be43cf05751e4ef6b43e751ad6fda7bf1a
+MISC metadata.xml 713 BLAKE2B 075c4c3b48a6437c675adabf03346fe90793053182f7d1b8f7b0d6a8fbefb68f01f64feb3fe69e0e42efbc2ae593a088f3e7a5b285de6d07b7bf117a2e9f379e SHA512 7c039238a56e7499d06a02599a300b45fc87cb24f884042a2a223ae4b0bca1e5590428ff4d930b43af4c997f8ad002bedc16ca8de40dc953499822ee6015208f
diff --git a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild b/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
index bfb9c749e703..2f0a755fa416 100644
--- a/dev-util/idea-community/idea-community-2017.2.2.172.3757.52-r1.ebuild
+++ b/dev-util/idea-community/idea-community-2018.3.4.183.5429.30.ebuild
@@ -1,16 +1,18 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils versionator
+EAPI=7
+inherit eutils desktop
 
 SLOT="0"
-PV_STRING="$(get_version_component_range 4-6)"
-MY_PV="$(get_version_component_range 1-3)"
+PV_STRING="$(ver_cut 4-6)"
+MY_PV="$(ver_cut 1-3)"
 MY_PN="idea"
+JRE_BASE="8u202"
+JRE_VER="1483.24"
 
 # distinguish settings for official stable releases and EAP-version releases
-if [[ "$(get_version_component_range 7)x" = "prex" ]]
+if [[ "$(ver_cut 7)"x = "prex" ]]
 then
 	# upstream EAP
 	KEYWORDS=""
@@ -18,7 +20,9 @@ then
 else
 	# upstream stable
 	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jdk.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+	custom-jdk? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+			amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )"
 fi
 
 DESCRIPTION="A complete toolset for web, mobile and enterprise development"
@@ -27,7 +31,6 @@ HOMEPAGE="https://www.jetbrains.com/idea"
 LICENSE="Apache-2.0
 	custom-jdk? ( GPL-2 )"
 IUSE="-custom-jdk"
-
 DEPEND="!dev-util/${PN}:14
 	!dev-util/${PN}:15"
 RDEPEND="${DEPEND}
@@ -37,14 +40,18 @@ S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
 QA_PREBUILT="opt/${PN}-${MY_PV}/*"
 
 src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use custom-jdk; then
+			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+	fi
 	if ! use arm; then
 		rm bin/fsnotifier-arm || die
 	fi
-	if ! use custom-jdk; then
-		if [[ -d jre64 ]]; then
-			rm -r jre64 || die
-		fi
-	fi
+	eapply_user
 }
 
 src_install() {
@@ -52,11 +59,15 @@ src_install() {
 
 	insinto "${dir}"
 	doins -r *
-	fperms 755 "${dir}"/bin/{idea.sh,fsnotifier{,64}}
-
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
 	if use custom-jdk; then
-		if [[ -d jre64 ]]; then
-		fperms 755 "${dir}"/jre64/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
+		if [[ -d ${JRE_DIR} ]]; then
+		fperms 755 "${dir}"/"${JRE_DIR}"/bin/{java,jjs,keytool,orbd,pack200,policytool,rmid,rmiregistry,servertool,tnameserv,unpack200}
 		fi
 	fi
 
diff --git a/dev-util/idea-community/idea-community-2019.1.191.6183.87.ebuild b/dev-util/idea-community/idea-community-2019.1.191.6183.87.ebuild
new file mode 100644
index 000000000000..5d9d1f8af941
--- /dev/null
+++ b/dev-util/idea-community/idea-community-2019.1.191.6183.87.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit eutils desktop
+
+SLOT="0"
+PV_STRING="$(ver_cut 3-6)"
+MY_PV="$(ver_cut 1-2)"
+MY_PN="idea"
+#Using the most recent Jetbrains Runtime binaries available at the time of writing
+#As the exact bundled versions ( jre 11 build 159.30 and jre 8 build 1483.39 ) arn't
+#Available seperately
+JRE11_BASE="11_0_2"
+JRE11_VER="164"
+JRE_BASE="8u202"
+JRE_VER="1483.37"
+
+# distinguish settings for official stable releases and EAP-version releases
+if [[ "$(ver_cut 7)"x = "prex" ]]
+then
+	# upstream EAP
+	KEYWORDS=""
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${PV_STRING}.tar.gz"
+else
+	# upstream stable
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz -> ${MY_PN}IC-${PV_STRING}.tar.gz
+	   jbr8? ( x86? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-i586-b${JRE_VER}.tar.gz )
+		amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz -> jbrx-${JRE_BASE}-linux-x64-b${JRE_VER}.tar.gz ) )
+	 jbr11? ( amd64? ( https://bintray.com/jetbrains/intellij-jdk/download_file?file_path=jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz ) )"
+fi
+
+DESCRIPTION="A complete toolset for web, mobile and enterprise development"
+HOMEPAGE="https://www.jetbrains.com/idea"
+
+LICENSE="Apache-2.0
+	jbr8? ( GPL-2 )
+	jbr11? ( GPL-2 )
+	"
+#Splitting custom-jdk into jbr8 and jbr11 as upstream now offers downloads with
+#either (or neither) bundled
+#Defaulting to jbr8 to match upstream
+IUSE="+jbr8 -jbr11"
+REQUIRED_USE="jbr8? ( !jbr11 )"
+
+DEPEND="!dev-util/${PN}:14
+	!dev-util/${PN}:15"
+RDEPEND="${DEPEND}
+	>=virtual/jdk-1.7:*"
+S="${WORKDIR}/${MY_PN}-IC-${PV_STRING}"
+
+QA_PREBUILT="opt/${PN}-${MY_PV}/*"
+
+# jbr11 binary doesn't unpack nicely into a single folder
+src_unpack() {
+if use !jbr11 ; then
+default_src_unpack
+else
+cd "${WORKDIR}"
+unpack ${MY_PN}IC-${PV_STRING}.tar.gz
+cd "${S}"
+mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
+fi
+}
+src_prepare() {
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use jbr8; then
+			mv "${WORKDIR}/jre" ./"${JRE_DIR}"
+	fi
+	if ! use arm; then
+		rm bin/fsnotifier-arm || die
+	fi
+	eapply_user
+}
+
+src_install() {
+	local dir="/opt/${PN}-${MY_PV}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,printenv.py,restart.py,fsnotifier{,64}}
+	if use amd64; then
+		JRE_DIR=jre64
+	else
+		JRE_DIR=jre
+	fi
+	if use jbr8 || use jbr11 ; then
+	if use jbr8; then
+		JRE_BINARIES="java jjs keytool orbd pack200 policytool rmid rmiregistry servertool tnameserv unpack200"
+	else
+		JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
+	fi
+		if [[ -d ${JRE_DIR} ]]; then
+			for jrebin in $JRE_BINARIES; do
+				fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
+			done
+		fi
+	fi
+
+	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
+	newicon "bin/${MY_PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/idea-community/metadata.xml b/dev-util/idea-community/metadata.xml
index 695fd92bb182..5ca8720092a6 100644
--- a/dev-util/idea-community/metadata.xml
+++ b/dev-util/idea-community/metadata.xml
@@ -10,5 +10,7 @@
 </longdescription>
 <use>
 	<flag name="custom-jdk">Install and use IntelliJ's custom JRE.</flag>
+	<flag name="jbr8">Install and use the Java 8 based version of JetBrains Runtime.</flag>
+	<flag name="jbr11">Install and use the Java 11 based version of JetBrains Runtime.</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-util/igprof/Manifest b/dev-util/igprof/Manifest
deleted file mode 100644
index e8d2f00096fc..000000000000
--- a/dev-util/igprof/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST igprof-5.9.11.tar.gz 174304 BLAKE2B 80e392622d928cfac1352a7c5b65c85b05511c8d10f8067195bd19ee74b0ce42d453a8999378726a52c156b815f69078a76c4d24771cfdf8b657674b0c699bb0 SHA512 1c6a16e286243a997b9ce798f2403597e1d8178a7b4652e38e9afbcd48c84d868dc83ddee7eb76243096f21b9cd9c0337641bba840008c24429e60454cff1444
-EBUILD igprof-5.9.11.ebuild 673 BLAKE2B cd6207f9ce0398f48a0b7dff9ac5b2ecaaff3e44255046b39e4e4dd824b12baca03a303a4ee5b8ba517015a00fc089493f9d003436f5cc8bad9ac78b578b9912 SHA512 a087bb121802b03d459a07106c571371929c0deea8c58a12bb48dc7d05d217a7f54ad2d803bf30f7d7edd9bbbd3d684ae93b295bedd145af7c920913a86ef8ab
-MISC metadata.xml 295 BLAKE2B 04f8d4b0effb517c88011d1be87858d4c877fdd73299438dcd3f870bb44334a1bc29ba7cbed5ab2aa11f7ffac5b1d4a964efea3578131d9ff3ec9c93ae36ebe6 SHA512 da6b377b85e03955329c76f8f05d5933e63fdb826848635b7f6f2df07bfd66dad1592f3b4786556551ebf69fccc7e09475216389a1fda68a00da80a0e8966ae5
diff --git a/dev-util/igprof/igprof-5.9.11.ebuild b/dev-util/igprof/igprof-5.9.11.ebuild
deleted file mode 100644
index 14f8ced68fcd..000000000000
--- a/dev-util/igprof/igprof-5.9.11.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Ignominous Profiler for analysing application memory and performance"
-HOMEPAGE="http://igprof.org"
-SRC_URI="https://github.com/ktf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-# pcre is automagic dependency, let's make it unoptional
-# libatomic_ops is listed as dependency, but isn't actually used by package
-DEPEND="dev-libs/libpcre
-		sys-libs/libunwind"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	sed -e 's/-Werror//g' -i CMakeLists.txt
-	cmake-utils_src_prepare
-}
diff --git a/dev-util/igprof/metadata.xml b/dev-util/igprof/metadata.xml
deleted file mode 100644
index 38187d691182..000000000000
--- a/dev-util/igprof/metadata.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>maksbotan@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ktf/igprof</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 5fbc575af276..1c51ea591450 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -2,8 +2,10 @@ DIST include-what-you-use-4.0.src.tar.gz 437340 BLAKE2B 744f7893169a637636107e23
 DIST include-what-you-use-5.0.src.tar.gz 439081 BLAKE2B 85246aa5333a073bb195b873d7bfe084a56c343cece92322706717ce699bcd75b737203858277202791ec0eb91f560b06a371e902cb175cdb2858562a4830e74 SHA512 9d4a9717a3a3f6752f8bdd1392b6d7a5e8b8dc277ef46a50f24185a089360380e1da92a61fd150598843f5c24cff03e74bc674e57579960d977acde755e34c52
 DIST include-what-you-use-6.0.src.tar.gz 440406 BLAKE2B 485a61dd4f72c158ad9c798c8121d7af9134d79b94c9c30c14674a62007e9fc05acc7e2341cc3282288611beb9138768bf11cd2d73efed372adab83e90b268db SHA512 2bf2593dba252d870074125f976a237e901e969323969f2c8fb030e8376bb230f1d5c2baecc8cd8fad7099e83589c7666c44cd178d2094f6e883cace1e53ad90
 DIST include-what-you-use-7.0.src.tar.gz 541840 BLAKE2B bf20a5598f02f03e5f714582653b8062eab6e414967ef2374c28bb6c1cdce8f73f80e3b2f4953fd943587ce17dc657cf6ab2a9db4208a59030d432f6a40532e5 SHA512 50d186b2e09c3595cc2dc7513e5db74da0038987158c2c45ef4279c67c50de621ca6499b07894ee203f25566aafaddde4b05840946f921678499d2efc131575a
-EBUILD include-what-you-use-4.0-r2.ebuild 1324 BLAKE2B 1ee3351dc1504108c7456713d6759c4e93380ff4af4e81abb19d8e5988b0adb7b3a6b9e005e82dfb912ddf9ab94640d6f6e3f522a4626be17ded615fac80adb1 SHA512 644d95970c6116b5b0b3bbbb6e1683ada92bd06297fb0004216c0c61ebfc51e08337235b38782d6beab26e0cf71b3d336a76a52c0fb19cef24123fcd5330f54b
-EBUILD include-what-you-use-5.0.ebuild 1324 BLAKE2B b1d2c2029248c446ff1eaa7219cd159a225c0f4e7723142ea47b5156e41d1272d4be89829b70fddc10f24baa13ecd76f04195c6cac2ce39eda955d7d6312f595 SHA512 15304bcb7ded3d3abc9932062d303619d068926b7531d6eb829601f431865dca3450b498121b479a3edd01d011151864c0c720288142fb9467381018146fe805
-EBUILD include-what-you-use-6.0.ebuild 1324 BLAKE2B b95d2bb55b44cd36657051c58a7c0272881ccacd8ead2e212458100d558bed579b83cf2dce03955ab82cdce1190257e26cb70313333ec572f469fe4e36e8adf5 SHA512 5a831edfd6dcb48621f2ea89531da736667b0d79a6e9f434e6eab1fa4c75626f2251a84fef8f76950414220b3b835521de242d32952a7b485be199d57b252f45
-EBUILD include-what-you-use-7.0.ebuild 1218 BLAKE2B 7d434cd40397611fb8944459a4040983cc2f5cdf52f1db384d79680e83145cda1965a967ff5d7053bae13a2090422111ad32f4520b8bd47d140fa192f2bdffc4 SHA512 bb7e12da2554927bd29a26dc06c380d909a58259d607aa3ac3a16b57cb54128100ea733334eca2226592a23fe1e99de9d1f61ae4decabc8ddbe19b5606a460ed
+DIST include-what-you-use-8.0.src.tar.gz 545788 BLAKE2B 7b70d951b7ab2d62a8a6168ebf86dc76fd406159155dd93a509b8c39953506166ac18da3028be8dc7edfbb39eb96613b0e344067154dd8614fe7c63ad3ef04c6 SHA512 e75e91ce198b1ec446ed34afcf9fdbcb0534c5edc5346e4884f0f589c73512d778c428aa71c1b109d45a45543a952438610ab21e32ef1f03ff1a014823ed8425
+EBUILD include-what-you-use-4.0-r2.ebuild 1319 BLAKE2B aba4fe812640bf3d0a2e71c7a242f7382c51911fde078d500b2b30321aa57c0ef412fb983635cf52edb9688fbdc6da66e958c02841ae4d9e480b4025a545acbd SHA512 cd2bca4aff3d4ddb6e8dad496b075996b7ebca4f1ab886a8920a5a804f345f05634cc6bf2c7047a2e375cc08562453696aa3f8f160dbe2ec2f51d6fdc393591e
+EBUILD include-what-you-use-5.0.ebuild 1319 BLAKE2B 9e80fbe8541e9a2179a3c3a16ff1664b5ba15ff35723b298a8ffc5764591c2d4508c724341e6989a5e9425008cae3bdad41cec78c5387ca43f2c1fb8982543f1 SHA512 38ef2977761377c078553619960d4fcb71f0d141d08191421eb2f0f3b9e3a01f758ddc22b65d50bb97661b98e42be65905a911de02655e5c73234a4076f10695
+EBUILD include-what-you-use-6.0.ebuild 1319 BLAKE2B f3304e57585cc3e52ea9181fee7214eca19620e239b5009927a967649c8f66288c7044320721755820e54d8ddcc547d15a01b1f894800715340b183042b4e4be SHA512 e511f24c4b09caa070d390e3d9ba6bbe72cdd5cf5157ccbe64836efef525a937923ff42180c1ad5b3f741a495b4a35f7260d642b6d6b625fead0b92f681cde58
+EBUILD include-what-you-use-7.0.ebuild 1216 BLAKE2B c8ee0c61209225b05b50625799b786e6e115576e383d50ebc3fab065e96310019c97dbf371ec683f4cd10382d4e88eebcf114b843736ae1d0e9a3113b0512d52 SHA512 03e2042d26614945f25d4e0f86efb733f51f5e0130b3d44de0fe2d85d00b4f290daa9f9bdff3d0c3af1888d5e1c0e32567112f0c1ca0e1d328f178d16fa0cd05
+EBUILD include-what-you-use-8.0.ebuild 1216 BLAKE2B 09b50d9d452f36bb3d044e42af3952f2612813251209875404847cf4f0d065991b7eef3a31577a876a769263680c9559beba838a2cce97f00876dc17e03d2d48 SHA512 173540c5ca5c145bb3764a9c13fc601e7121be7039a1ec45f0bd9dd6aa91b70a998939b10628024f679b69e267242bd989baba97d9fffd547d800f73a1a78300
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
index f278652a524e..f36a4f63c3e1 100644
--- a/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-4.0-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
index 92dc8c8d1911..9a0851f65682 100644
--- a/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-5.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
index 7cfe58259cc7..9872f8989089 100644
--- a/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-6.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
index 0defc992f95a..3521be3a9273 100644
--- a/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
+++ b/dev-util/include-what-you-use/include-what-you-use-7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
 
 inherit cmake-utils flag-o-matic llvm python-single-r1
 
diff --git a/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
new file mode 100644
index 000000000000..b976a734afb7
--- /dev/null
+++ b/dev-util/include-what-you-use/include-what-you-use-8.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
+
+inherit cmake-utils flag-o-matic llvm python-single-r1
+
+DESCRIPTION="Find unused include directives in C/C++ programs"
+HOMEPAGE="https://include-what-you-use.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+LLVM_MAX_SLOT=8
+
+RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
+	sys-devel/clang:${LLVM_MAX_SLOT}
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${PN}-clang_${PV}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	python_fix_shebang .
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# Note [llvm install path]
+		# Unfortunately all binaries using clang driver
+		# have to reside at the same path depth as
+		# 'clang' binary itself. See bug #625972
+		# Thus as a hack we install it to the same directory
+		# as llvm/clang itself.
+		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	"${EPYTHON}" run_iwyu_tests.py
+}
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 6e27958ccc30..b5170e50c202 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,16 +3,12 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.150.2.war 75969613 BLAKE2B a86cffd210ee40ee01a1f4ee03c59b2c6c04a8d03f8f0bc5688118e00fe59bad2c8c1fe4b37de590929f1d36e9b00a0549e391609646b13f32d34769314369a9 SHA512 38e960b895dee3917146f49888ec23cfdc115354327de3ae63a4003641dd80d1d2565e8256dd47fa966c1b5515f1f90eac466ec007cf6d820958ce43147eb4a6
-DIST jenkins-bin-2.150.3.war 75968662 BLAKE2B f57716fcd6ae6330f291810a947e13e1629c3d7f1fdcc7061862258895bb691c5d43379e5c59956b60557843492f5e096fe43aacae88ba4a1baf3cb67bb28782 SHA512 b2a5bf51b09b9df9bec13f09f911c76c1bb0c2edc91f0933caf6f71e4c296e5f53ad54711aa6632b5f3e3dcb1f335594517a0c086e23fad8892fb6a3e77dd978
-DIST jenkins-bin-2.160.war 76018620 BLAKE2B e215220e978ac0407c742e3e5989b50f9d18ed387991b2c7c1120d4f9018ea3a24dcfa3127d29291af5d7dbf0155c3a68744c429e53ef3e160d33a5a3296cdac SHA512 7e6f6d1381ab9b46cd62423a607a6c8c05438073cd21cd7827f66fb98300a54c9528e87d00ca2332ec43068aaaa54493bf0469fe81be20fe444c10fb25cc6c96
 DIST jenkins-bin-2.164.1.war 77330344 BLAKE2B 6af841ced531f3b095444a4d22a487c6daa63dcbcb7c9dfda3bcd847873d77425b9d12f68a2aae79c1d0bcf8c65bf77eb72baa27ea78924ebbae1d270a60a503 SHA512 44ab0e30509d36af9aef26c34d50c0370ca08a0fd2fb007bcd0bdcdc012464fd7e5358e689cd017e9a4ad3a1c4e87cf4ab03646c4489e6be3b31ba1d3be5b289
-DIST jenkins-bin-2.164.war 77329094 BLAKE2B c8b470ab3f4606947520b8867fbf09611a00385f89ff95b64c9c603d2f3fadcad1a136f73b0fa0f0cbc8bb7df6f77c1449b8556342a366894c358f1117fd9a0f SHA512 92e1a4c236d0091fea9b70236c4cd14560b3d12ebe51e8698e1ad2d70820bd4acae6f0579be741b2eb7749ac95fe4454392f2e1879e54b0b14a265541d7acb66
+DIST jenkins-bin-2.164.2.war 77330993 BLAKE2B 28312c88444b35eb6e64d2c3c7ae0bbead6532b17923ec8b417a2cb3840f02dab5db62d7594cc85d203f4cf8d2fa002f4a467a93a0c797982c8a4b3da1cf3541 SHA512 787f72daa1eb6f3ebc1e46f3c5d23c150eec78dd99e7d329a09bffe53df49cee103d41f56331d3b2648f4d518ff4c386fb87972781e249b2a37a2ef8c7286d21
 DIST jenkins-bin-2.167.war 77246248 BLAKE2B 58cb64cec5f63bc147557098740bcc02a131fd8ed7f935763130f037800aa7886e4c544d47ac595077d490037035d9d83976da4c62e5b7582a6366ab863654da SHA512 55d760aad38d64201cf806e8dcff7b07da8e1eabad279909f6dc342a5312f8f162b584e6fb0e77fb4c2db95424a0004b571c883245c01c0d8352291e33c2a0e4
-EBUILD jenkins-bin-2.150.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.150.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.160.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+DIST jenkins-bin-2.172.war 77330556 BLAKE2B be3d7c82f263b53ccbfab6a069f336bc81120afc8f405c60ee4a3a8db08215e75d362dd66197d020eb5b860b1f910859dbe2602690272653f53b9288b4472a17 SHA512 a6dfd08fcbee88e3655233a7c27ab102707d2b9634106dd1feac131754edda86aea703f28886cca4c9c7ac0765c16f3dbca7b6e4047dac5f7a250c20d47f8bc5
 EBUILD jenkins-bin-2.164.1.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
-EBUILD jenkins-bin-2.164.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.164.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.167.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.172.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.150.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.150.3.ebuild
deleted file mode 100644
index 323b88955105..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.150.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.150.2.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.164.2.ebuild
index 323b88955105..323b88955105 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.150.2.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.164.2.ebuild
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.164.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.164.ebuild
deleted file mode 100644
index 7d232cbccacd..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.164.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:lts
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.160.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.172.ebuild
index 7d232cbccacd..7d232cbccacd 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.160.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.172.ebuild
diff --git a/dev-util/kbuild/Manifest b/dev-util/kbuild/Manifest
index 41191b06de94..200f0a1e5ed2 100644
--- a/dev-util/kbuild/Manifest
+++ b/dev-util/kbuild/Manifest
@@ -4,6 +4,6 @@ AUX kbuild-0.1.9998_pre20120806-qa.patch 292 BLAKE2B 628ee52d1c147864dba48e37ae2
 AUX kbuild-0.1.9998_pre20171020-gold.patch 619 BLAKE2B e4bab6276b521752a60b94ae71f02b0963625eee06fddde79a4449a14fa235fc2dd5c7d8a450ce214dbabce9180c384f31cb2380e3fd49e8d987f56f7036a1fb SHA512 a9d084b34d8bcb431748c6c87679db764557fa2f141f4b942cfe44ca05040dc6eb7f923be89db87d6f35f8d141f3725240dff7502fc919716aa081cdb145d521
 AUX kbuild-unknown-configure-opt.patch 355 BLAKE2B 78c170c4d34d76a07925c08580245afef9859281c3d59cec1e675f19a2c3a86e9936773c62c78197d4d150ba8afd70ed7f100bcfa9fab950462224088d7aa2fa SHA512 26ae63facf7133be4fba606ad0b9488ea4c2ad2290a1e33a0f0c3283e0c8267eaae41bde6efaa52895b444178ec101a800ad580d2d85d0e69c56dc7db32b1105
 DIST kbuild-0.1.9998.3149-src.tar.xz 2314792 BLAKE2B 84aa1dbbaefc64a3ecc954c383d0516d88efd1a1791180164dd7bc3b26cd82a4a8c35c4b308e9fc960f114c40e77ea4a27acd94b62883c379acefb324a7c3f72 SHA512 74808e6279c01739170535655edbbffb73809f60b18c7ee63a110af7af651628789b9e5d253821f5685f8e8c072890c4669493e64886f53587b810ea0f67826c
-EBUILD kbuild-0.1.9998.3149.ebuild 1792 BLAKE2B ffd6f02476b9f7a160e670b9d2d1af31a33803a2c26c2b6881c22f485c295c3e39ac4436b1f610faca4878326fa46f49231a21469e6a0d3eb8f6d1288ab83905 SHA512 01b1a7205a2066808642a61ab5ec067a99f3c631e75a715b434f92ce2e86bff8d0cf23a27236330c31e9bab751bde7c735177736ecc66b6a916994cb2287c351
-EBUILD kbuild-9999.ebuild 977 BLAKE2B 75187d2839087938c7da5e1f134f78040bcde9714957cff4b5ab90574f9b2164f9bce48e34a6b310afa2f03095d200f80320015350cc02e2fc935d09fbd34445 SHA512 bdf1b80acbc2a936aad71d5971410390f2ce5129d8110b0ac40528a1b8ff3c53fde6f02f664d773ce99afee41c0b057b04f6c71e6e07efafcbf99f533067ebcc
+EBUILD kbuild-0.1.9998.3149.ebuild 1877 BLAKE2B 96d29162bea208c46370ce290a54749508a347839c60a89d048d1edd5d2f9422bc871c8c23cb238cd3d1b2984643c7df5336539b72bf57564f385c50b68c7316 SHA512 1b3da6f98cb84a828dcae33dd833871feb7c25d8fd5f30148c54e69714ff46739a3cc2a60bb790e353e9de753f36b8f56b73e4d142d014ea54c32561ad6ecbd4
+EBUILD kbuild-9999.ebuild 1062 BLAKE2B 458a2dfe2a3b753783c49aeb819672e5c0d59858f5b67817b0544c56805d03cb3c75178c582981456e82909792f2fbf8e1873817cb94101076145c7388b2cbae SHA512 492ad0ab9e132b6379ce58eae3670114e1009cc32cf191869e153f4e72d52be17cf58347eaf4e39520909c463632d90d879860b6b361d0dd56568496e369f304
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
index 7c358202b885..4ed9922800e3 100644
--- a/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
+++ b/dev-util/kbuild/kbuild-0.1.9998.3149.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,6 +32,11 @@ PATCHES=(
 	"${FILESDIR}/${PN}-0.1.9998_pre20171020-gold.patch"
 )
 
+pkg_setup() {
+	# Package fails with distcc (bug #255371)
+	export DISTCC_DISABLE=1
+}
+
 src_prepare() {
 	rm -rf "${S}/kBuild/bin"
 
diff --git a/dev-util/kbuild/kbuild-9999.ebuild b/dev-util/kbuild/kbuild-9999.ebuild
index ccbf4507612e..ac794242d86c 100644
--- a/dev-util/kbuild/kbuild-9999.ebuild
+++ b/dev-util/kbuild/kbuild-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,6 +20,11 @@ RDEPEND=""
 
 S="${WORKDIR}/${MY_P/-src}"
 
+pkg_setup() {
+	# Package fails with distcc (bug #255371)
+	export DISTCC_DISABLE=1
+}
+
 src_prepare() {
 	default
 	rm -rf "${S}/kBuild/bin" || die
diff --git a/dev-util/kcov/Manifest b/dev-util/kcov/Manifest
index 11e48da0806c..f00ce105b6af 100644
--- a/dev-util/kcov/Manifest
+++ b/dev-util/kcov/Manifest
@@ -3,4 +3,4 @@ DIST kcov-34.tar.gz 296345 BLAKE2B de6acbecd35b1d85a4a0f9f43fdf5dcb09331f88622a2
 EBUILD kcov-33.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
 EBUILD kcov-34.ebuild 509 BLAKE2B 8e9bb470e023a442d4aeedc2ba564d8ad8c9a2c40c2619b28b130a14b225ab49ec619aa161444ef31d078dd49226c159be28a11833a8dbbebc92dd7ef748f2ef SHA512 7cbdaf21d0b35a72f994c05b1aff180b9f805d7bfb05f1af89e7d5d33db9543bd1cd468813c8c5518305fa0de3926ec1b3d8b093badfabf11df53811086a7a58
 EBUILD kcov-9999.ebuild 638 BLAKE2B fdd240a4bf38de8939b29ba7c04c1f29fe8977a074fb2c35bf23c80ac34539da1a0f39d60073a785d2850194e92d03f8618e6169ab00706cb0b686dd458ba5ce SHA512 cec899ac8769080dfa88b1d34d9f4a0b2da654da9712a4236cc343533e3bc33815159ef84074c843eba3053ee672f034ac2c439e9431ae2e0a0b4eac5f584eca
-MISC metadata.xml 334 BLAKE2B 49f7a7004704c8531accf4ab5979f0823e400f8bb8e79c987091b02e8abf7f288bdeb6eb9c65953605bf95a8eb07fdf9952c1c905a8f588225780d3ddef3b3aa SHA512 1a6d96440ff3def1c7fd765dac9c4f8240b36ce918c6c8d0803b2d2a465be5b571e31a2bdc4540cffc485eefb78e65f7ec5b30300918571e1d641112a078c7b3
+MISC metadata.xml 250 BLAKE2B 4aa2c984b48b686831ccaa542ffffed7eb9bbdbc41d1f4ede551845768fdf0f2a3443502037db80e77e6105f97c0932d4512a84b244d67e6e8aab8e1dcbb83f2 SHA512 aabb9dd0e703f923f2d03a759fbdb731e6c07b2149cea06d1215cb8e282cdddf0a1f9b7bee7adcc391583566bd7962d7e4f2c7d61286bac56c0c2549bfadbc7c
diff --git a/dev-util/kcov/metadata.xml b/dev-util/kcov/metadata.xml
index bbb53844e2b2..44c29bc80358 100644
--- a/dev-util/kcov/metadata.xml
+++ b/dev-util/kcov/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>wizardedit@gentoo.org</email>
-		<name>Austin English</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">SimonKagstrom/kcov</remote-id>
 	</upstream>
diff --git a/dev-util/kdstatemachineeditor/Manifest b/dev-util/kdstatemachineeditor/Manifest
index 67ad1ed115d4..41c3d59c3a0c 100644
--- a/dev-util/kdstatemachineeditor/Manifest
+++ b/dev-util/kdstatemachineeditor/Manifest
@@ -1,5 +1,4 @@
-AUX kdstatemachineeditor-1.2.3-qt-5.11.patch 590 BLAKE2B 144a8c7624e18cd606d14cbc624cb492a162f9adb74b8ba209718f30e5c16004c7540c881462a988705451f5e1588af0c80c070ea195b775254300df5182d8ac SHA512 3edec760b30ef84f77f0494b11b0b9156790d7468e2b108aea19244a4879b4a6aaf78f23135fe1b39cd8ac0b8ee24b5cbab4567a63a5105155c938c39832ae9c
-DIST kdstatemachineeditor-1.2.3.tar.gz 222134 BLAKE2B 3a6360331f314cfe2e57abb2e909a886f4613dc86bf7f542feabf218e2f623366679a339b5ebc941e015fca35c617152ad9ca7e3cb492d01b48f791a39d38ec1 SHA512 1a2cbe980da5e1634abc842834fbb8883fa8919dc3246436f36bb232a29c57255235df1c041353d3e6d2ee82fc8d688cefa7ecec1a7750aae3fe6f13627d0850
-EBUILD kdstatemachineeditor-1.2.3.ebuild 1082 BLAKE2B 6a61691a29ff0e3496c57af5feaead523cf369bfd9f7357410d6aff1e53016df3d0bb3abfe9c9ca106e6b388fd95b14ea1065829055df7fb66837ccbfbd14fa6 SHA512 e209ececcebb8c3bff176f2c6fa755f45ceff409660677b4612655e46b84719f44950c27fd51c85f1a5db3bd12be170aca9e82a77823af41d72a11cf10fe130a
-EBUILD kdstatemachineeditor-9999.ebuild 1036 BLAKE2B 4f40b1751b7373759f72ccdb609e35f8af04f5f54ad0a0b9565c9f9d6b24a3ee190e277bec2831a49a0b4d83c808711cd86439e52bb0c77526ec33e3d90a1c0b SHA512 885c12113c7bd45ac691055f92e46ccd6db010a82b6d52a35efc9c88e8212d2f9a3e89326f8b34d256489f6ad43f93d16f4ea373c81eec3572ef280aa2f15a38
+DIST kdstatemachineeditor-1.2.4.tar.gz 222160 BLAKE2B c0194282b1f17c550454d16fb3790e6747c785b01f867aa115134a3f1298c7d0bdd522d07bdc26ab4353d62482a8602c1418dd8e480a6b5b5665b8dfe8ca1d93 SHA512 f1c076a8646a26d3a6629298523b02589fcf53fc8ac01d93928b1bc42179d3a26c7f90d595e2226e5cf3d54d90d143719e72854f3b756489f6d0b8643810675f
+EBUILD kdstatemachineeditor-1.2.4.ebuild 1058 BLAKE2B 195cedc4077bee3188d1b0f2c684770e7ad17d797388d8c2bd2e82dab5c51af9863d86e6f3ac665a5445bacee8607797cbc2cb5e694327c955568099eca73b6a SHA512 5f6661e71ebdf676480c94dc6f165ae34c68ea8c2fdac9394a00092e408af740cb6948cad223ad7fc807f708dea2fb293809759ab04c7b29d5799e216123d0bf
+EBUILD kdstatemachineeditor-9999.ebuild 1058 BLAKE2B 195cedc4077bee3188d1b0f2c684770e7ad17d797388d8c2bd2e82dab5c51af9863d86e6f3ac665a5445bacee8607797cbc2cb5e694327c955568099eca73b6a SHA512 5f6661e71ebdf676480c94dc6f165ae34c68ea8c2fdac9394a00092e408af740cb6948cad223ad7fc807f708dea2fb293809759ab04c7b29d5799e216123d0bf
 MISC metadata.xml 361 BLAKE2B 679b7e05175ee00d4293a2e6fcc3a0215cc154cfe1bb6436267a4c6e4b4d9bf096b2bd934ce1e3c95458c3f957cf8263fa3f8e09cd9bcce8061e28e868e59dc5 SHA512 63eeeed36b35609aba151c2dcbe1e501355b3e56c0febd52f394a20b5a27871c6d69164b854a05769d3cd0eadf245f23ef4153fd8a2e9208dfb079381bbc0a41
diff --git a/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch b/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch
deleted file mode 100644
index 04a9ac9306b6..000000000000
--- a/dev-util/kdstatemachineeditor/files/kdstatemachineeditor-1.2.3-qt-5.11.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 63ca52af50f94b396182638224fe2c50b4cb7043 Mon Sep 17 00:00:00 2001
-From: Allen Winter <allen.winter@kdab.com>
-Date: Thu, 5 Apr 2018 10:07:01 -0400
-Subject: [PATCH] src/core/model/element.h - fix compile on with XCode (include QPointF)
-
----
- src/core/model/element.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/model/element.h b/src/core/model/element.h
-index ec32cfc..c20ac6f 100644
---- a/src/core/model/element.h
-+++ b/src/core/model/element.h
-@@ -30,6 +30,7 @@
- 
- #include <QObject>
- #include <QMetaType>
-+#include <QPointF>
- 
- QT_BEGIN_NAMESPACE
- class QPainterPath;
-\ No newline at end of file
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.3.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
index 70c5c471dd00..5e4355d14c07 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.3.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-1.2.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils kde5-functions
+inherit cmake-utils qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -21,32 +21,32 @@ IUSE="doc test"
 SLOT="0"
 
 RDEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
 "
-
 DEPEND="${RDEPEND}
-	doc? (
-		$(add_qt_dep qthelp)
-		app-doc/doxygen
-	)
 	test? (
-		$(add_qt_dep qttest)
-		$(add_qt_dep qtxmlpatterns)
+		dev-qt/qttest:5
+		dev-qt/qtxmlpatterns:5
 	)
+"
+BDEPEND="
 	media-gfx/graphviz
+	doc? (
+		app-doc/doxygen
+		dev-qt/qthelp:5
+	)
 "
 
-PATCHES=( "${FILESDIR}"/${P}-qt-5.11.patch )
-
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
+		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
index 5711b07e35a0..5e4355d14c07 100644
--- a/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
+++ b/dev-util/kdstatemachineeditor/kdstatemachineeditor-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils kde5-functions
+inherit cmake-utils qmake-utils
 
 DESCRIPTION="Framework for creating Qt State Machine metacode using graphical user interfaces"
 HOMEPAGE="https://github.com/KDAB/KDStateMachineEditor"
@@ -21,23 +21,24 @@ IUSE="doc test"
 SLOT="0"
 
 RDEPEND="
-	$(add_qt_dep qtcore)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5[widgets]
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
 "
-
 DEPEND="${RDEPEND}
-	doc? (
-		$(add_qt_dep qthelp)
-		app-doc/doxygen
-	)
 	test? (
-		$(add_qt_dep qttest)
-		$(add_qt_dep qtxmlpatterns)
+		dev-qt/qttest:5
+		dev-qt/qtxmlpatterns:5
 	)
+"
+BDEPEND="
 	media-gfx/graphviz
+	doc? (
+		app-doc/doxygen
+		dev-qt/qthelp:5
+	)
 "
 
 src_configure() {
@@ -45,6 +46,7 @@ src_configure() {
 		-DBUILD_EXAMPLES=OFF
 		-DBUILD_DOCS=$(usex doc)
 		-DBUILD_TESTING=$(usex test)
+		-DECM_MKSPECS_INSTALL_DIR=$(qt5_get_mkspecsdir)/modules
 	)
 	cmake-utils_src_configure
 }
diff --git a/dev-util/leaktracer/Manifest b/dev-util/leaktracer/Manifest
index a6206b5fdbce..4d4b14119c21 100644
--- a/dev-util/leaktracer/Manifest
+++ b/dev-util/leaktracer/Manifest
@@ -1,3 +1,3 @@
 DIST leaktracer-2.4-gentoo_p2.tbz2 11957 BLAKE2B 0af20e7a43c88a16027e859779924ef3fc86af5fb8324a96721f190db4ef59d78681ea4b91ef9843ed467541c9ca3a9b1618339174fdc1901a13b5221acc5479 SHA512 12f348564933c8cf372208f846bb21b175f041e7687811e9c6ce8062e7f285b9d2395e7853a20df11d9b0d5b8fff89efc76ccbac9f8b7c0bc4fd4ea25d476718
 EBUILD leaktracer-2.4-r3.ebuild 1386 BLAKE2B fee3816896db6341384016dd300e66d4c3a09368d89ce4b1e1480ca62311176223a18824b164034ff65d8efe1fa57b6d22e5628ddbd0f56f48b3d0ae51318785 SHA512 63bd2edad6fbdd6c710c0bac526b386a787c72aec151f6470ea11081f807c771d4bd797c3ecfcf71493380e35893a9bb279f6d13473a9a02fc1d6a54889df992
-MISC metadata.xml 245 BLAKE2B 61823ae735b381c891f5cae47974d3b1ea6136d6f5f5d449a26dfcdf26472282d760b4ee8a605b8a7b75b9c97443cbc0db309ada118ce186030f276ed7c88963 SHA512 b098db4fb4d9ea116f6246bc6caf0f49e80e236d2fad78d287b638dbd5add7bfaf7feb1ca081ca557b23dde9227ce42fa808f3f6fd8eaba6a7e9cae93342f9c6
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/leaktracer/metadata.xml b/dev-util/leaktracer/metadata.xml
index 41cd682e0ecf..6f49eba8f496 100644
--- a/dev-util/leaktracer/metadata.xml
+++ b/dev-util/leaktracer/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>cpp@gentoo.org</email>
-	<name>Gentoo C++ Project</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 4d649aefe9c9..cfc6a8e244e0 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,9 +1,11 @@
 DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
+DIST lldb-7.1.0.src.tar.xz 19384976 BLAKE2B a1d5afea255f06221516e21e80120cb35d870ec447aff774d8c610c889c8f28228c7c8e93eec160fc5424736666fcaac8ed42d9181373d266202c9f8aa4c3061 SHA512 773f79939c540f349f1c85d6b1d89fa312488c4c70f100f05cb6250f62e8d6a05832d57c02750439ede905fa69e1380a73ddde0d3ad2f99a0910acd1011559df
 DIST lldb-8.0.0.src.tar.xz 19602332 BLAKE2B 85a51b3ccae8fd0074b0f5b54e35d2eb020770246b13a0ec52a4647d30f23a6620ce410af7e49604947ff60f789ecab0bfeddfc3598642c9096cf3362d88b5bf SHA512 5192d6d6d1759db28569de929ba8db2a80283000f1bf8453d9cf172ac85574c8eacc13f9fe64ecabea0533bfc49c0f58ea8fb29b1f4d88c065d905d553f2e60c
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
+DIST llvm-7.1.0.src.tar.xz 28313784 BLAKE2B b78d9a7fc5ef6e352e77d339e5c4eef5ccedf67c05e7abd949e72619aa8a5ed65e7e5e2008354be8e7916d75581719b99f34227838fcc86c5d0080913c2fb22c SHA512 a7dbd5693d1f2dae6b6e52893a100f9349cbfcfb25c5fdcad46364acbff0dbd3573f8fbc026c68eb9fd56335198aa94b866cc3dd7ea0cbd2cbfb5f8fe3444a7a
 DIST llvm-8.0.0.src.tar.xz 30503732 BLAKE2B d89bdeb0ec7d885e49cfe5ae025da84f00502d409710c0807a3cdd58dbd47c50cf6a635593569483150f7f2ecb0de0310bd6785cb7625219bf9f6224a0d68e1c SHA512 1602343b451b964f5d8c2d6b0654d89384c80d45883498c5f0e2f4196168dd4a1ed2a4dadb752076020243df42ffe46cb31d82ffc145d8e5874163cbb9686a1f
 EBUILD lldb-7.0.1.ebuild 3010 BLAKE2B 9d82e23d83a5726a5c966d14e4660e7199e03716597c2be0bf2adf33037c1fb4cd459fda2ab44230e18efc681690f16e25753de7b3bca2932b1081e6feff887a SHA512 92a937daf00ab27650045dad8fae9e7a1e9e2b014b37ee9e13c8452f25fa58a78196711b0e5a41a65f12947a1a9fd85ddbf9c360c4036478a699417501c2c02f
-EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
+EBUILD lldb-7.1.0.ebuild 3010 BLAKE2B 3df47e43fda7564f0e86afe317e3489deba983ec81a349cba2886a13edf70e07e6367ecc85b06aa94a2044763db4357382cdad59ae720dac40c58d546c71391a SHA512 75974325d1a8883f8487725eb0144b5cf6f7e188abf9365dee2983c800cb508bd08e8aa8d017368c4805f87934c8df779aa6ec40e1b35a47c5bf226de7714a53
 EBUILD lldb-8.0.0.ebuild 3010 BLAKE2B 3df47e43fda7564f0e86afe317e3489deba983ec81a349cba2886a13edf70e07e6367ecc85b06aa94a2044763db4357382cdad59ae720dac40c58d546c71391a SHA512 75974325d1a8883f8487725eb0144b5cf6f7e188abf9365dee2983c800cb508bd08e8aa8d017368c4805f87934c8df779aa6ec40e1b35a47c5bf226de7714a53
 EBUILD lldb-8.0.9999.ebuild 2960 BLAKE2B 39990504c70cab7761ae1e465bf257558488f3c90b5e07fcaa72e9b4c6e874e62e4d15ddadcb0fdb3924af3aaecec8f14b1747e1e3cf837c0b77b77b1b44f906 SHA512 68d1ff044126076e1962eb1a09eb0621a313ed92a7ba2fff6a9959f00f39b219ac6478113c641f0c55f3b687ea9ce7cf23ac7c6ebaad51788f162f639598fc94
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
diff --git a/dev-util/lldb/lldb-7.0.9999.ebuild b/dev-util/lldb/lldb-7.1.0.ebuild
index 55be1c6e3754..1da6e6ba172b 100644
--- a/dev-util/lldb/lldb-7.0.9999.ebuild
+++ b/dev-util/lldb/lldb-7.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,19 +8,20 @@ EAPI=6
 CMAKE_MIN_VERSION=3.7.0-r1
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
+inherit cmake-utils llvm multiprocessing python-single-r1 \
 	toolchain-funcs
 
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI=""
-EGIT_REPO_URI="https://git.llvm.org/git/lldb.git
-	https://github.com/llvm-mirror/lldb.git"
-EGIT_BRANCH="release_70"
+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=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libedit ncurses python test"
 RESTRICT="!test? ( test )"
 
@@ -39,6 +40,8 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
 
+S=${WORKDIR}/${MY_P}
+
 # least intrusive of all
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
@@ -48,18 +51,15 @@ pkg_setup() {
 }
 
 src_unpack() {
-	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
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
 
 	if use test; then
-		git-r3_checkout https://llvm.org/git/llvm.git \
-			"${WORKDIR}"/llvm '' lib/Testing/Support utils/unittest
+		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
-	git-r3_checkout
 }
 
 src_configure() {
diff --git a/dev-util/lttng-ust/Manifest b/dev-util/lttng-ust/Manifest
index ccb750742818..809346c84bc0 100644
--- a/dev-util/lttng-ust/Manifest
+++ b/dev-util/lttng-ust/Manifest
@@ -7,5 +7,5 @@ EBUILD lttng-ust-2.10.1.ebuild 687 BLAKE2B e92c5051c63af6f75479fc703ea6167e96b03
 EBUILD lttng-ust-2.6.5.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
 EBUILD lttng-ust-2.7.1.ebuild 631 BLAKE2B 3012f0943c2fa067ada1d93652b7bcefb4742c3a5f2407815827c0ae1648be4b78869d7d353fb5cd7db7676831df8804f56f5cfd5feb443fce8a5a99199bf6dd SHA512 c4c5260b4a5877d48c8bbfac051d7324e53866b46b6cab51d358e5ace976c1a972e929d7915331ca74be191f236f55330d5a0f0014c813d13fc08d945efcaa39
 EBUILD lttng-ust-2.7.4.ebuild 633 BLAKE2B e4164ae6f6415601f7bb4af23173b3434897313b869240aa442a9794811c8da976fc9fe8a3c1e6ede50f237d1e247bd7acf07b29088eb3cc4d1dd7bc720f7a22 SHA512 1b880983ebbcc06762c3c53f4523f35ad27dcaef4a2b1f9d0b929e7f87e465ede3cc92184dd5839ec2689c55e084e5f37c4173541ad9e3b06396ddab14e611b5
-EBUILD lttng-ust-2.8.1.ebuild 662 BLAKE2B 01b73d19f00f06bc77581888b6d5a7e00f1bb2f73809c9e092f4c3dd9ec4853fa8c1b62a139937119b45072f628758bcc9536ca54387126fa54675f05d06bec7 SHA512 0df31509c6f06bd60c8c8edd5d67435b318dda2ea0565d4ed12d0db4913da58d07f6271a77811935987a38727fac80587fb380ba6568fdf7068419cc9e31e342
+EBUILD lttng-ust-2.8.1.ebuild 661 BLAKE2B 4886f6a8028ce3a96027ec9986111429e631e1704ceb96a489139c7ef3b59da323806aeb53ca9c0e963b9f569c0935f23c831a0ff95bd89ae02697d098b4d79e SHA512 6148db2773a462fe98cd97f25f42e49c912e123af657758e174e7bcc6f7d315ae636b2be9104149529c7d7579ec7354364e80bcda9cb4adf94692f11a851523e
 MISC metadata.xml 639 BLAKE2B ad4de0ba5be85b4ff9392746a483348d0ff3b365a50d7be270df6408e41f408069d905e458057af8a32a48d43fd2987c9a66e118a6ec044d7d72e23c16846484 SHA512 4887f60d12b32ff0b08ce5457fa2e56fd76aab443df0fc0a610ddcab02c3a85c7a6dc196ac58a725f7dc268c6b8aadbdddfef78c415bbb640f7b1bc0bda7577f
diff --git a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
index b3bd0a0d3e74..fa4342b4dda9 100644
--- a/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
+++ b/dev-util/lttng-ust/lttng-ust-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,7 +14,7 @@ SRC_URI="http://lttng.org/files/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0/${MY_SLOT}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~sparc x86"
 IUSE="examples"
 
 DEPEND="dev-libs/userspace-rcu:="
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 608580bb7ad3..cc5aa609add3 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,7 +1,7 @@
 DIST meld-3.18.2.tar.xz 568292 BLAKE2B 379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4 SHA512 6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
 DIST meld-3.20.0.tar.xz 591956 BLAKE2B cf4dce55b8282c287a9bcf964f6c412e5db246cc8c85ab98729af0e12f861ae323eaab1db57a7bd7f27028896148a5142b8d02f3f5abbd86b98eeb1882cf76a8 SHA512 33a14aeb474351a35ff08ba828846e849f1c4f000af81c38fa8f7d481b5de464e728d29742eac40164138c44557f92f6b2a329a337ee59f28d00a5bbc4652798
 DIST meld-3.20.1.tar.xz 594812 BLAKE2B a06ae48af37008b99e7110a826e1d97326b71150870c1546b50d971f51d6c9eb3b24fd8e5ae8e8e8daf30f0a83c71356a368d9ed49114989cd22fb793a644a78 SHA512 cd21f298dc1da6eb08261599b9270989c837e0923d5cf5cfdad227dd7f256ac5f53ac903939ebef90ea6cd684c7355ce9482648057284f4ce44f1c7101959c1f
-EBUILD meld-3.18.2.ebuild 898 BLAKE2B 8e4fafffdc83112a8012662e3b26a3e506599fbcfcc385572939cbe8f33852acd5e6077beda2e186cc06174ed25a62099dfc1ec59122b229c1787442355a8d62 SHA512 78ce7d28f88129ae9b461c9bd6240f39beb68e9d472368042e37a77e3cb9a64bdd5e5fa6f7eb26677f107b8f67298ec253428e56b75987c5891644b5f6c0b0c9
-EBUILD meld-3.20.0.ebuild 901 BLAKE2B d6b875a25f7c430de3b47bb858b79ac271da6206fbdf32a43e46e3021319c92ef77befc525c2877fe52764b20203945bf023c2e05c9846ada0ccad16c41dc60b SHA512 8e11722dfa2dc80c11533d8f10d2606f0b952606d91f96a7baa39f7eb15b06f49c0f9e05d72216cfc19c24e430c7dea879539e0aa3e3fb4340c08a6861c00d29
-EBUILD meld-3.20.1.ebuild 901 BLAKE2B d6b875a25f7c430de3b47bb858b79ac271da6206fbdf32a43e46e3021319c92ef77befc525c2877fe52764b20203945bf023c2e05c9846ada0ccad16c41dc60b SHA512 8e11722dfa2dc80c11533d8f10d2606f0b952606d91f96a7baa39f7eb15b06f49c0f9e05d72216cfc19c24e430c7dea879539e0aa3e3fb4340c08a6861c00d29
+EBUILD meld-3.18.2.ebuild 893 BLAKE2B 99ae8520bc2f1e54d049a1ac56a2722939f055fc07617588a42f212f25a91608ae2bc9824bbc163beef7628e4eca89c324659b402174d3494e404c69f4bb0471 SHA512 08ec662a2efd9948c59f4f51f55792badbda0dd2dcf509ed3ebfa99f82e97c07d5cacd600b272c2835543b71b629af8dff96d81933e119670dccd65815b50ba5
+EBUILD meld-3.20.0.ebuild 899 BLAKE2B f05080ca60572c2216598444cc68dd3c4329ba9f4309ed3bab562ec3786a38446ec0a30e2a4ef3ae07d39efe3ae3a611e7a9f38a281c863388de4ece42f0c283 SHA512 7b9bcfa30edbd1c29d776b65b101d181fe145f0640d1bdbd09c8b5548ac95d7d3c69aed39a5d4a44540472b7d94ec275232a1403fe26fdaee9ead79c6774e746
+EBUILD meld-3.20.1.ebuild 899 BLAKE2B f05080ca60572c2216598444cc68dd3c4329ba9f4309ed3bab562ec3786a38446ec0a30e2a4ef3ae07d39efe3ae3a611e7a9f38a281c863388de4ece42f0c283 SHA512 7b9bcfa30edbd1c29d776b65b101d181fe145f0640d1bdbd09c8b5548ac95d7d3c69aed39a5d4a44540472b7d94ec275232a1403fe26fdaee9ead79c6774e746
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
index 85480ada6de4..c64834c8984b 100644
--- a/dev-util/meld/meld-3.18.2.ebuild
+++ b/dev-util/meld/meld-3.18.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit gnome2 distutils-r1
diff --git a/dev-util/meld/meld-3.20.0.ebuild b/dev-util/meld/meld-3.20.0.ebuild
index 5620f4667736..013f796de48e 100644
--- a/dev-util/meld/meld-3.20.0.ebuild
+++ b/dev-util/meld/meld-3.20.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit gnome2 distutils-r1
diff --git a/dev-util/meld/meld-3.20.1.ebuild b/dev-util/meld/meld-3.20.1.ebuild
index 5620f4667736..013f796de48e 100644
--- a/dev-util/meld/meld-3.20.1.ebuild
+++ b/dev-util/meld/meld-3.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="6"
 PYTHON_REQ_USE="xml"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 DISTUTILS_SINGLE_IMPL=1
 
 inherit gnome2 distutils-r1
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index fdd5ffefadaf..be4f745729fc 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,7 +1,9 @@
 AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92e364c5c55debf61c115559cacb676596e98a9e01970661b16c4a95bfbf161d6c02e314bbe746979cb77c8f7f6dc5ce7fa6 SHA512 c856436331f6d80912e0519303051e49f4c2c08d348e575ff71b2628621ce752148bccf7aa348d0f27d7df11ff15ee96439d4438d0a2755e1f6c66d2be0ac942
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
+DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d2615dc03f83f57bfe96427cd44aa95e2ec7c688e87252d0179882f91e0ccf440eda4b47ff2f0d3af7382a530e011 SHA512 0dcc19007b3b1626e198c0a4ddb0f37dfdfe25f447e511a772b302bffc02187a3e56046daea01a0ad5cf611d557bae12d5b858bb7a44f69919b9ac9ad696aafd
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
-EBUILD meson-0.49.2.ebuild 1772 BLAKE2B 465819137a0ad5b52547d88c47a4ea9ac591440e98e1de4deb7c83e9753a16114e0a4a9e84bf0c0c52a2d05ef77baca6ffdc0d30d720aaee6da45a73f8b7b6d2 SHA512 d0043e6282a35030ece03c6ff20b673843b049767ce89f1c1a7832a69931f6ca3773772ec1d99a3673970a5d46056c6aefd7c2acb4c5704f5fce8cfadb737e0a
-EBUILD meson-9999.ebuild 1711 BLAKE2B b2ab12ee5111a491c9e5278cc0cc49cd8acead98418272927c8518c58c31ce7a5754ca8092a749ba40ba35558b11fc3ceffbb8fde736aa442efc71d431e834be SHA512 e502aefc4aec2f7833e9cdc8921591ce0f2e447e029494b50f83df5be7957224ff64e53d6b6ef320b24fe84d3a5d393337098a71a6cde45d51d92504675bd6e4
+EBUILD meson-0.49.2.ebuild 1765 BLAKE2B afa08e7f0136b0db159a09c866bfe8b7244abe3d95ea460ddb450c07c0ad15601b0c4f11ba9136fc85ba01cc72514a9205d6ee13eccc43e97947689971bf05a8 SHA512 658cc3789a6f13a16159182d6074940e8d4dfcb74855129d926368789e3c6b2aca084ceaf923d790cdc7b8b843b5b1c195054990f51ee358ff99ac67c1fae5e0
+EBUILD meson-0.50.1.ebuild 1711 BLAKE2B afaca717bf2a872604765f13ae718d58d18fd47d506eecdfb20732a946b1e6fdadb01f987f1458ee82ab78523e14a86482c079bc5420c453313c7d404a622846 SHA512 30f19f93d1d3f1ecdea9b7174ace190904a94f81793e4085c702ec57be5172eca2ded880cf3735e70abe9c714ac4c3daeb09a00b738dc7620ff5214002b2bf23
+EBUILD meson-9999.ebuild 1711 BLAKE2B afaca717bf2a872604765f13ae718d58d18fd47d506eecdfb20732a946b1e6fdadb01f987f1458ee82ab78523e14a86482c079bc5420c453313c7d404a622846 SHA512 30f19f93d1d3f1ecdea9b7174ace190904a94f81793e4085c702ec57be5172eca2ded880cf3735e70abe9c714ac4c3daeb09a00b738dc7620ff5214002b2bf23
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
index 09b40845cc6a..f598f3fd1ae8 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.49.2.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 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/meson/meson-0.50.1.ebuild b/dev-util/meson/meson-0.50.1.ebuild
new file mode 100644
index 000000000000..11bb7c9a56f4
--- /dev/null
+++ b/dev-util/meson/meson-0.50.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="http://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		virtual/pkgconfig
+	)
+"
+
+python_prepare_all() {
+	# ASAN and sandbox both want control over LD_PRELOAD
+	# https://bugs.gentoo.org/673016
+	sed -i -e 's/test_generate_gir_with_address_sanitizer/_&/' run_unittests.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 89b176910cb5..11bb7c9a56f4 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
 
 if [[ ${PV} = *9999* ]]; then
diff --git a/dev-util/min-cscope/Manifest b/dev-util/min-cscope/Manifest
index bac5e864fd72..00228718d265 100644
--- a/dev-util/min-cscope/Manifest
+++ b/dev-util/min-cscope/Manifest
@@ -1,3 +1,4 @@
+AUX min-cscope-16.1.0-tinfo.patch 1092 BLAKE2B 667ef81f62882781450fbc3445c858c8007a5d49904935ef549534bfbeb73b5e5cd18afa118260e8f34f1c0e035554e77ceab2abfd169ee57b59e9258b51f4a4 SHA512 1b6109add7cb38f60a557f2b7ecbf5ea8de0defe9bab8dc5a8e62f014d5b0833aa4a3646aec2b6c1fbff84e2692836066cfd755a7af3d28ccb3557dc3287919a
 DIST min-cscope-16.1.0.tar.gz 382326 BLAKE2B 7d45df20c5d2decd9ee5127893cb97506420a19b42b371fbcc6bfae1ada2726deaef1ddf2750ed7c1744e5d90f6c65fd99ad71f5609de04d1afa03795ebb61d7 SHA512 434d6333758dbf72c320e08b3b705bbff6c67de8a1380295fe5971af1a2c4659dd3201c726fd318d7715b90f8a693a76599a8659ac45c76568e5a29a399a9c0a
-EBUILD min-cscope-16.1.0.ebuild 632 BLAKE2B d3b3440a1bc9a721630f1129b1959cf7eb88518a0ce79655a7b605883104709a29f58b6ca6994dade90c079ffa9b2466bf5ff1f558fba35a002c5508d80284b3 SHA512 2bf7672cd0555151d3407bda9752b6508b79bea99404ed55bade7ee0fa351fdbf56bedcfb2006144bd7c458f245632f477d4397c60ad4011e67865fbd3f98be9
+EBUILD min-cscope-16.1.0.ebuild 682 BLAKE2B 15681d759e0d858dd02457f62550974366d536e39676569d8c277cf93febbfdaf49483a8068557e937887f6165bcc39694597dd1dc5ca1e48b96cf09a83700ce SHA512 77b736221d7110cfacd00d57ca38eadae4a99b9ec9e6d55635a40a69c39f0f6a063d759b86cb6c93b4afc16dda38cf4c84766a2fe931ac80d4095a237c3f7a89
 MISC metadata.xml 248 BLAKE2B a828276821884acc6a27159241c05f16c4bcb4c913720c567c76df06ca520c37dff7aa596b7cd6fa37ba8715a59fd65d2f8b1ade6d6fabf675a672cdbfe948b9 SHA512 6f50ad3193cddb62d48b3e833f321299930b9755b7e92dd1fa7ac4adb54d08996a75f89225e3d5358e84c5a75480d5b2b54163c717f7df66ef5e779946d342b4
diff --git a/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch
new file mode 100644
index 000000000000..4b7f86f9f2f4
--- /dev/null
+++ b/dev-util/min-cscope/files/min-cscope-16.1.0-tinfo.patch
@@ -0,0 +1,33 @@
+https://bugs.gentoo.org/678886
+
+--- min-cscope/src/CMakeLists.txt
++++ min-cscope/src/CMakeLists.txt
+@@ -15,7 +15,11 @@
+ # Curses interface
+ IF(NOT NO_CURSES)
+     CHECK_INCLUDE_FILES(ncurses.h HAVE_NCURSES)
++    if(HAVE_NCURSES)
++	set(CURSES_NEED_NCURSES TRUE)
++    endif(HAVE_NCURSES)
+     CHECK_INCLUDE_FILES(curses.h HAVE_CURSES)
++    find_package(Curses REQUIRED)
+     IF(HAVE_NCURSES OR HAVE_CURSES)
+         MESSAGE("Building with curses-based interface")
+         SET(MIN_CSCOPE_SRCS ${MIN_CSCOPE_SRCS} command.c edit.c help.c mouse.c)
+@@ -137,13 +141,9 @@
+ IF(WIN32)
+     SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} regex)
+ ENDIF(WIN32)
+-IF(HAVE_NCURSES)
+-    SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses)
+-ELSE(HAVE_NCURSES)
+-    IF(HAVE_CURSES) 
+-        SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ncurses)
+-    ENDIF(HAVE_CURSES)
+-ENDIF(HAVE_NCURSES)
++IF(HAVE_NCURSES OR HAVE_CURSES)
++    SET(MIN_CSCOPE_LIBS ${MIN_CSCOPE_LIBS} ${CURSES_LIBRARIES})
++ENDIF(HAVE_NCURSES OR HAVE_CURSES)
+ 
+ ADD_EXECUTABLE(min-cscope ${MIN_CSCOPE_SRCS})
+ TARGET_LINK_LIBRARIES(min-cscope ${MIN_CSCOPE_LIBS})
diff --git a/dev-util/min-cscope/min-cscope-16.1.0.ebuild b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
index 9ae7cbca4018..2648a185f329 100644
--- a/dev-util/min-cscope/min-cscope-16.1.0.ebuild
+++ b/dev-util/min-cscope/min-cscope-16.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,6 +18,10 @@ S=${WORKDIR}/${PN}
 
 DOCS=( AUTHORS README{,.cscope} TODO )
 
+PATCHES=(
+	"${FILESDIR}/${P}-tinfo.patch" #678886
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
 
diff --git a/dev-util/molecule-core/Manifest b/dev-util/molecule-core/Manifest
index 3dd3c51f6edc..0706d956a0d1 100644
--- a/dev-util/molecule-core/Manifest
+++ b/dev-util/molecule-core/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-core-1.0.2.tar.bz2 30616 BLAKE2B 00aff5ffa61eac63dbd9bf93027f24e5953a1cb1daa8855e9904f75b8afc68677306ccda40cb5a1db765b086a8cce608ffa5a24efd69de7cab86c43ae3aec07b SHA512 1f501960e4029cb993680c7356aa8fc0ac7afa249d106b4ce97afb39f58cd666640bcf9fd8cee64482077ad23f91da743d6ce54e82863faab20d68a1814d92cb
-EBUILD molecule-core-1.0.2-r1.ebuild 636 BLAKE2B 226407ff9b3daa3579cb4594b6a70083599554737324ed761432377f9f8334d9d01ff95b1e54aa0c693eb959638acc0a88b88f27b4185fed1cdfbbaf1f9098c0 SHA512 9798239f564bacbdd13243f3e3357a67419b0f8eb4977a2f8d761008ca8f8af5b7c3fc260d39dda18ea686e88a52865bb5b294d4ab199b9dd5fa49c8a2bb2ce3
+EBUILD molecule-core-1.0.2-r1.ebuild 625 BLAKE2B 83a7f15430cdd5ac29e938792095528b16e474b2778fc769246e6d22ab8f7a494658c8b2af854fea2618e3c5319dd9446400eed142f2f31ecb1a72c0b59181a5 SHA512 eaae8b5cdb45d3ba854c6094e815ae04310a672ee1efc0151415d635722a234a3a73efa9be488591c7ebb7fbbe7591661a0244a16bf0c63c253a3ef7b1ac3a83
 MISC metadata.xml 1197 BLAKE2B 2ab6fff633d6e31b8c8721f39138026dafd6ac7a5fa9e559e93f39b12e59a4f449704a8a2f4c3dd2f2d1aeb1572e0af22afb54ecd0da9b1165c0af5ebeb43f08 SHA512 740155e85fbd48b3e747a88cd6a1b612f1f6802e9a62c7a3f454fa4908150e0c37ed3c10505b4192acba929d45714bad4856aa3945c33ed5fd48e59435553362
diff --git a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
index 5ce8515f2b95..0f7dc44ac275 100644
--- a/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
+++ b/dev-util/molecule-core/molecule-core-1.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1
 
diff --git a/dev-util/molecule-plugins/Manifest b/dev-util/molecule-plugins/Manifest
index 2ecd5587080e..4c6df8aba136 100644
--- a/dev-util/molecule-plugins/Manifest
+++ b/dev-util/molecule-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST molecule-plugins-1.0.3.tar.bz2 17662 BLAKE2B 6bbbd484ec7fc8441bfccc8c716475e9bf831804a79a0add1dedd428f2dadbbd1a3025966db25619c34364f2a0b6873946c121f1df6fd3a2dc041a3a7341565a SHA512 e00bb7ed9a19452f0363e3453b56a86c22b2f96b843798ad20c6c61a87acf72a389158bb7c8b1b09cbcdfbcbb4b081996c47b6327d790b72c98a13270ce4cb6c
-EBUILD molecule-plugins-1.0.3.ebuild 689 BLAKE2B 7a6ae7ef0d22d3f38e262e9d8adcd2b364d0d6dd04294f1b8c8479faaabd9f07c4c01f9cc9690aec58e0fcc34c631e3a5e23b4460dc3994eac717d6df0a2a313 SHA512 36371f37a01f87b25d0b407c251e87bc151cd6d759add9f933a68e18544007ecd10616c6c4fd0850a7146e9852d4f6caebda1e82b1df6a59224ee53c94b9ad44
+EBUILD molecule-plugins-1.0.3.ebuild 682 BLAKE2B 43c4c718948c9870b8f8ff1325b971a167f2d506161d9105cb23d6f16c7c9b6da1ed3bb7a472cee45a5d56cb72c989dc19f7d72a695c954b06510ef032dc0dee SHA512 b1990abe912e1cdf079686d90ee0034e6cd7738d0f6427eb7343935623edca4943f6587d00339ec0ca4c310f0c4eb46c4f796619be2a6aa8f6e70ae9c03646af
 MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
index c06bd99700c7..ab606c5cbc65 100644
--- a/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
+++ b/dev-util/molecule-plugins/molecule-plugins-1.0.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-r1
 
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 75033444216d..3114494cb92d 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -1,6 +1,6 @@
 AUX gentoo-helpers-r1.sh 299 BLAKE2B cac826ecdcf18d07b3bcc612f87090bcb26dc166f49794c0634245e48d0d6ebc93007774e436aa669e0b6eff3ed919524101d8c8b7856cb6cc6c94c48b0bc31c SHA512 71c0c7d8a7cf5c0baa71ecd23d075c8b9d244dbeebfe1c89dad3b8891693f1259de59e8c45718a0a45af97e88c0e943fba5888fbb5018a03fdb24689181019ae
 AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
-EBUILD netsurf-buildsystem-1.7-r1.ebuild 697 BLAKE2B 803dfa0b661778a40fc84e6e216503ea4b5dd3b7c28cc6d3812ac2ed8905a8b6c56bfbcd56d48cbea15bbb32c3fa09b3348fbe2db9142c13ab8f564288df39a0 SHA512 91dc40f9542b22d2a3fe3b61b5d1f5eb457b78d6c72f9ecb53d24872e90e5a299d5c5d79f07aa3bdf44a9f2748dd515f3dc3a4b5784d538988dd121946b7e00e
+EBUILD netsurf-buildsystem-1.7-r1.ebuild 704 BLAKE2B 127aa49ecdbbfee4cfd40bf5dba8d53c58cf6f64c26b826a5470fe6ce8c3fb7bc1ee16cb94fe6748aa55e0b74c64cfb7a72165d60d102c4eda4846d0cd8719e6 SHA512 f9a64ca494d8f1271a05b22ccd0969f2db9bd914eab1e3bcbf858d125412ef17042dd614e1fabb40857ba0c4484c6596df425c672561ec606a246e43d68e0960
 EBUILD netsurf-buildsystem-1.7.ebuild 666 BLAKE2B 7e640a421bb041b10a220cad42afa9b6835b65fe0b39b8cdfc63c8e99129c6396bb8247e7f8a280c62276d41b041892e2162126412aad6c35f3ac39fbe7971b2 SHA512 0818bb0dd1f2eac87fcb5da10128d392fdfe274d9594c910a1bfe14f8221716193bff0fbf514dbe9b8cb10117347f04f63dcfad4772074bca4971e28a9af0af9
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild
index 3cae740cce6f..501f05fcff97 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index fca00b955d16..d50f001d41e6 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -3,9 +3,9 @@ DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 DIST ninja-1.9.0.g99df1.kitware.dyndep-1.jobserver-1.tar.gz 213767 BLAKE2B bb6abbed155d39fe65a3a4bbbba3e577e4a13dfd1ccb9e018084153b0dd6928753be9d8c10a2c4c2ab6a2000c5292f912353f2234b01613f46bfa49d13aabd7a SHA512 6c3aaf8decfd792ce6b035dacb87f978f1052d13e5ceac9ce63bc7051fad0eed83cc530d2cf22649ff4186416b0478bb3eb0507c56fec2848061cdad7a0aa812
-EBUILD ninja-1.8.2-r1.ebuild 2690 BLAKE2B e38c119b8a865e6e367999600ab69f996e782f0b3e7d21f286944c1c7ab235a9e843b046cfe1696131516e22442e61f35ea37299d5bcb6e750b0b316f5c9c643 SHA512 48177691154c54526ef986a43a2527c2c008f272dca54dbd39bc5b8c8a9b45f3c1b26a96240b0008a5f7336c9db6b3d0f7bbc972d1b1ddd7cd304197bc090f27
-EBUILD ninja-1.8.2-r2.ebuild 2690 BLAKE2B 2eb84e017da16e36b88908d6d8e418d8c624e5a70d92ca1bb39e3615098f1872b63f91d4bef9afac6f8e6b398e699897790d5b36bf1b7b0298f53740cbe0d698 SHA512 734a76d4b7e03d1a23af8785442f0fddfb04fb7073782b73ee5631ddbe931df0bb611fa0c2805db9ebc1d8db90f4ef997977e734825b8d00c5c3ffdcb499f78e
-EBUILD ninja-1.8.2.ebuild 2547 BLAKE2B 8234fa945a4908448d202f7fbea1415771fc810f93afc9a02c2696141e15f47c3f2035a434432d0c50494e6e852741b64dcce80ed56c463dd50e411ce4b50399 SHA512 42811e0c8e250c6eabe2bad9ad98c0d94ad81e42100763348f70da8b2e521ad7b3355d613bccfbb51512ba15fc1c204f86ddaac417dfa8e320fb3e5bd398ed65
-EBUILD ninja-1.9.0.ebuild 2733 BLAKE2B 2beb9b4c90a7f7364e485750e562aec9a629d59600d14bd54ea9f7f35035f51fc120795884843ae5bbab3e4a8df704c9ce5ae587702d5f0164e20cee2b5ea3d0 SHA512 bdcc584200015901c35cf7f51960f867e01ee2de42891aa928debb8d2374874e794dd9e18c45d945915ab79858cac96e2cc05ded38158d0b34c55d054ce539b1
-EBUILD ninja-9999.ebuild 2682 BLAKE2B dacad50bfaa4f69a0bd86d5b802e6a096eca82a86944a8438c428fc6862d96e9b824d1bfc876ab3c9b24d87dd61846d9228992fa4cb4453633e4fe39f9e3b4cf SHA512 d61dc38e706761c735bb3fb753a6d664f015ce668677f5b348d369cd3c38a6def4a0f129a70093575efc994ea0b5cd4b570b54ef404676bc119fd89baad69af2
+EBUILD ninja-1.8.2-r1.ebuild 2686 BLAKE2B f44659c2d721e985a35e2b6e6f0ea4db85bdf3a4800359648c77b5d45094760769d251e58945fbaa102426c6e6bdf78725a149e645dc61a225ccc44db7c00c2a SHA512 795f3c6ecc1f66beac5f413f226ba94c06d9f3bf9ab5e8a5c2b0797c352bbc783c80ccdedac2f85e6fd03016eb44e2256c6edd47585e81beac2adec0fcb9194c
+EBUILD ninja-1.8.2-r2.ebuild 2686 BLAKE2B ba47beca4c65d59cdd43dac4dd8f284f12c32f2958bddfc1f2d2ad02d52e8362f653648352769b307ae289a732487ebc0430b40c8bdd4b01cf5b228535104f79 SHA512 a4e8acb0a66ec663983939019f90356e40388a324db1973acece1dbd5945849682c32bec6a072c49d5ee0c6a4167a6c550cc4d2939b40639ad389bd48b4b3604
+EBUILD ninja-1.8.2.ebuild 2543 BLAKE2B 183c144ef094ce3947cbd1a174ab47153a9e062ffb50ffe9681c8c66cbda25537bffc8a3e4accc620b07157f027e4eb2931a97b9f50e761ff0d6aaad730ccf83 SHA512 889e48b42449522739881b2fb403be8421f5916a7aa0b61fb7a0f3dfd758dd3a28a636dbc4f5b3309ac0fdf2a2798721f08dc5a4bcf980b8cbf3f8cf5ef56bab
+EBUILD ninja-1.9.0.ebuild 2729 BLAKE2B 36b4fa8079405aae5583ffdf259ba1f5b6f888f8652e36a3faac26729705b78dd2eed51b1f3653add5eace22068a515136a8d3a3e9e41b332e582649839e6d26 SHA512 447e34da6174cdecb6ecedc54d6d928611122feae13a5cab56d7c31e6058a9bf064ad5a056ff952e6b48bac2f059ce49b2ed64e10c00f5e12b29274927a6d0f9
+EBUILD ninja-9999.ebuild 2678 BLAKE2B b2e18af61239a18107b993bd8d726d6885306070f07c797d90108cc202f5351057df9f64ce7b7d039f515eaea0ed617fa3d0703dcad1cae02c581b2c3e0c14ce SHA512 4dd247f3dfc6830fc94d7d2cd21ed70f6e03f5c94d9c2cb9e42e594fa57efdcee060ef659186d9a7d95c1ffbd49a99f831be4adb075297c5790e96799047ab7b
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2-r1.ebuild b/dev-util/ninja/ninja-1.8.2-r1.ebuild
index 767546f3c055..558e5dc53915 100644
--- a/dev-util/ninja/ninja-1.8.2-r1.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-1.8.2-r2.ebuild b/dev-util/ninja/ninja-1.8.2-r2.ebuild
index bc97b85a2b45..9888ed358e43 100644
--- a/dev-util/ninja/ninja-1.8.2-r2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index 3f5366eac1e6..da66bedbbc77 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-1.9.0.ebuild b/dev-util/ninja/ninja-1.9.0.ebuild
index 4bc01a90da3c..0d23435a03d8 100644
--- a/dev-util/ninja/ninja-1.9.0.ebuild
+++ b/dev-util/ninja/ninja-1.9.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index bd7bd0ad6edf..66dd6e0de6e3 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit bash-completion-r1 elisp-common python-any-r1 toolchain-funcs
 
diff --git a/dev-util/oprofile/Manifest b/dev-util/oprofile/Manifest
index 7b35e2f362f2..a9ce94d26753 100644
--- a/dev-util/oprofile/Manifest
+++ b/dev-util/oprofile/Manifest
@@ -1,5 +1,5 @@
 DIST oprofile-1.2.0.tar.gz 1533343 BLAKE2B 873433ddba11389a221ff3b6eb6b8b19748ac4989232bda7d9af698b95dedf8ecd1112dce3accab5e1b40c87287901c015eec167713b9ad11daa0a0f0e3255f9 SHA512 d642d9a8d71ad271a80d21806ffd8522613830f450a71dc531005e940f31f683936691898d381a31f8913715361db8c1713dfe3744a5f9214419349f6504717d
 DIST oprofile-1.3.0.tar.gz 1547258 BLAKE2B d8777e41856dc2f082570a1542609bd730fd7076000443f2e17c77eaf75df7a7a772ebb49d82ee657f563797858cecb4c23b130b0174d154c54d5619b8528ad1 SHA512 02a940cd8d38834dca2a97c8ac0fff04ef95b3819cfdf74a462b9326c7abbf2dc55d2a9b9d1fbefc7f455465bf85516be2b879d7daf1861ba2c4af51214377ba
 EBUILD oprofile-1.2.0-r1.ebuild 1594 BLAKE2B 9a571f914951aea903761991e020fb481602e3288a4ffaf53b14c5e46fbd0eb7e071e3689faa1422446a64b3f38d4fe915c28ca275d1d087ea8737ddcef3477b SHA512 83e6b5441251e157a3334a0b0412b31dddc7b9465fc9efdcdd5af672a11ecd513197b89b7bc164da723f95916e3addf23fc155c6c10b592243aa13e1581b30d4
-EBUILD oprofile-1.3.0.ebuild 1603 BLAKE2B c8dedc640704b79251bed321963bd048dd2a6d542d54e34eeebad6cfa9b5efdded9ee65d3aa33c51427dc68600723898141557d78433f88a14ca2f04d68c3b26 SHA512 a98f49a3b850744c4b6db4dc3aed7a3aca874fe256b18648805661e452475dac20679eb646386a7325a8ef8f7256bfe7141b126146748c3d7a11654a890ce2cf
+EBUILD oprofile-1.3.0.ebuild 1602 BLAKE2B a3b16b7dd71ac14cae1dd81a5b845a3b3c588ccc437c5a8c4810e07d3493a3a1bf79796b3934e531aaa8a6374bc59211925e76161bac2263d58a43a65754d638 SHA512 6806b807844c7b583ab3cbc5b5add34561c7a81e5aa34007fa7674609b70a5e3f7f9ad343e0a88b76d7fe2ce2d0488e137db1d113845535290764cf6a4730cc1
 MISC metadata.xml 423 BLAKE2B f94e15abeacab93798df7566bd1dc4d8e820aa57ddd71c2e5bfcf0c983bce5961a7c8bffb4f0ebdd92785002745314feece144e29000dd38f29426d2b35b8897 SHA512 01f96b806fca3e20eb84908a1cd77edbe11291be0098aff2e4d20f0fbf86ea0ef9972c7148c791bc826152a109d16903781cc2f2f367a2ac8b8fb7e5efee378a
diff --git a/dev-util/oprofile/oprofile-1.3.0.ebuild b/dev-util/oprofile/oprofile-1.3.0.ebuild
index c7b531f0ad3d..e293136b5352 100644
--- a/dev-util/oprofile/oprofile-1.3.0.ebuild
+++ b/dev-util/oprofile/oprofile-1.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="java pch"
 
 RDEPEND=">=dev-libs/popt-1.7-r1
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 2d36164a420c..2a3e179d4da9 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,3 +1,5 @@
 DIST packer-1.3.5.tar.gz 9198704 BLAKE2B 210c824aa61fed8ab58ea6eed2a1804d8b144e7e20f0794721b2c282d066969d1193fc36b004bb7d31d8a2b19fa609e673d05457653bf8ad694a142563e839cc SHA512 becd747b43c8a9c0aa93d1d723f2e2383e9f2adc19e82653142ea13080aa393750cd3fdf86fa259af21af6b6417bf023e7e482402dfa56d347720fb740ebe906
+DIST packer-1.4.0.tar.gz 9794922 BLAKE2B 2e1d817e0a3f549255ecd8693d6d99b2e45df2e8fb0acc128f03bd1448f28afa865a0849ccf58e9a562ef50b901ea86efd29fe29747c126aa98c05456638719f SHA512 d2dbeb99d1fe44a427d2997eeb4ff6ae66bdf2d7f8f08e2105f8614487a6565b8bc263cf8aab8413520783a4dde18d150aae6c69db171fe1cfab3ee1bd0a0743
 EBUILD packer-1.3.5.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
+EBUILD packer-1.4.0.ebuild 792 BLAKE2B 98101308b1243d57463057ac8be281bab376eb32c5b78156f3d00645335a5de62b71e3422fc14b4c8d4b33994563773e47970a9c671e4341c28e77e731680a0c SHA512 0529bbe8e372bcc7e89ceb7b2f3b3d6a14122d1b1c0276dde64f230430049c3c41f1d443df65ce1413713abf138d7f0eeec81b91909ef92aa675dc5facc59135
 MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
diff --git a/dev-util/packer/packer-1.4.0.ebuild b/dev-util/packer/packer-1.4.0.ebuild
new file mode 100644
index 000000000000..5a13c74a3fa0
--- /dev/null
+++ b/dev-util/packer/packer-1.4.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+
+EGO_PN="github.com/hashicorp/packer"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+DEPEND=">=dev-lang/go-1.11.0"
+
+DOCS=( README.md CHANGELOG.md )
+
+src_compile() {
+	cd "src/${EGO_PN}" || die
+	GOPATH="${S}" GOCACHE="${T}/go-cache" go build \
+		-v -work -o "${S}/${PN}" ./ || die
+}
+
+src_install() {
+	dobin packer
+
+	pushd "src/${EGO_PN}" || die
+	einstalldocs
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+	popd || die
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 86c71a49297e..539148514ddf 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -1,4 +1,4 @@
 DIST pkgcheck-0.5.4.tar.gz 95354 BLAKE2B ce39854d494db7a7d3412690b8a789f3d78d2a7d0519f11397ec8b02bd03118f171eeba8fe37207e9c18bdf28e7e321ec06d8bb84f9302c07b5238c0851df1e3 SHA512 3c196ce170bb01f0a9f15caa8557e30cad8e088ab9bc733ac754e9c5f6d9078a70a4d14649ee5342848cc170f3c34d7575b35872c5d1a5693fb7aad207727b1b
-EBUILD pkgcheck-0.5.4.ebuild 1336 BLAKE2B 7d5beefb887dd1dba9f1ad4cebbd0bfac8a0e6c7633301223a843b4e54c498e43919324c8d10815a4d41a7e08039e19e5305f9b6807bd1ce4d1cca5cfb04d11b SHA512 44b8e3877881af9a34685de4ee1f40e56bb2802581260cc56e3c5add635ee20db2e0b9efca4e6c4f112c78ab20082c03dbfadde80f5d2fb023c230d9f96d9188
+EBUILD pkgcheck-0.5.4.ebuild 1329 BLAKE2B 06d0c18872ff72005cf1f613d3dbace72cab4378e1ea60747e18fa665e4314671c235d8a999beed28cd8957097fcc3cb5099e023042f1fcc8ff87f90a5410d3c SHA512 91fbef02f96fb1c3110f9b58d3ba47dcefe9fa0b0b1b434ffdb5b6f44a7336431816392b0fa38a47393e41ab22fe8d141bf184e45fe9e32dd8c36140e2c31223
 EBUILD pkgcheck-9999.ebuild 1237 BLAKE2B 8db4fb82b419297cba762607febcdc2b2e1b4a8817873f91e3bbcc7e1bfb116314980291ff25171b9a363e2ab46ba879953d873a2f3fd46960e4d98d78031824 SHA512 7e0ca6ec6e6e3dbb066ea94e58a747ae2366d42e191ba847896df5528732371823802b8a0e53848f4c829d049d8284b12fc38957e5f820a4bffc811f59e074db
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild b/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
index 6a4fce0ea524..aeeac7fcdedf 100644
--- a/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.5.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 DISTUTILS_IN_SOURCE_BUILD=1
 inherit distutils-r1
 
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 58e903db0e98..bdd73f782a5f 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,5 +1,5 @@
 DIST promu-0.2.0.tar.gz 1072026 BLAKE2B 2b68d992b37421d6b9a08cc9a9134f9ae52643d4c2844c8e1f6f6724f015582c99a8724ab6b8d1ee69437c660e3b972af85949e3221d8d8c709fd8c1a45e1256 SHA512 4da4716a9d4fb96b6016c9bd452fed0403721ab15f95e6955db2ab6e8e482f3bbb35cb4c1c94f690af9520729a93c100015ee48cb69627e129004ae0b15257ae
 DIST promu-0.3.0.tar.gz 366019 BLAKE2B 0e6e93bb573da0ef20947b72989d8a68a7d6d1490efc802acaee58c9f546e9b46162054172d445e4dcb5cbc33c152529f006edf3acc594b92927df0ab489f86a SHA512 543cb514fcab9700bc45cb1b4a9f056720af4acf8ed949e03445c2f4e52d89f6fb8eda3ee538bc92feb2dc06db31026bebad9bf6c86a6e37a0be294d17e4b518
 EBUILD promu-0.2.0.ebuild 760 BLAKE2B 2630eaaef487fc9edf249c7ec4f61bc6d8d3245e6225c26cee3af0736b1d13549bfafd4be026646e29f29b1e9a5305a4b79c012cd2a03117fbe364091abb614c SHA512 b4ba612c32787b1d85398dc1cefa49e6dd35be60790c5029d4d8a8ed697154b116e2f1cd8b0dfa648df742c7455eeeac2b79113a070b3fec9af8f16ac0e14aae
-EBUILD promu-0.3.0.ebuild 838 BLAKE2B 1da81a88a2ef2a94bc4ff5d0f0e0884348dd9827e38d71b098e9e7f8ec6143c6778ea9ffcd94531779dce1b99633c0894f29e0e9c886635bbb19fcbb6eb90750 SHA512 9baa5ba3573c4edc7e08d1744964d0d514347960cf9ac96edde825d4914cb66df72690b7005d5ca5270630f7281b08cf881bcb5e2ff77dc592530638a6ec7dbe
+EBUILD promu-0.3.0.ebuild 837 BLAKE2B 3eef4f3ae3a39221925fdbecdcb7dbaa01a80755672ce1b8ae19205cb6e475bee57755368fc27f833801dcf783bd59ab08779c49058882a065ba9ca79976403f SHA512 845a76d24b7c81e8bb11bb357ff41d5cdcb20d6df4dac2314009efdb28273e4d3d8d2aa74a304bd904855edd4e17ef1b9e85b32b95c194532238480b2f97ca56
 MISC metadata.xml 326 BLAKE2B 84a14632c102d52e02ac2c9a8e7f8e2edfabb3401ab04d5fe94eab4c83ef053f27260aff0ad2b04769653665325afa6db028c8ee281835b925456b432d593eb1 SHA512 2870183c141e5d9ec65aba01e7ab02443f42d13d0f39c4ba51af7adacabdf360cb2308cb898c4bf4f0a8c3e20b35d511af2b978fafcb4de47177de77819f6853
diff --git a/dev-util/promu/promu-0.3.0.ebuild b/dev-util/promu/promu-0.3.0.ebuild
index ea822459f7d3..b9a06df89fb5 100644
--- a/dev-util/promu/promu-0.3.0.ebuild
+++ b/dev-util/promu/promu-0.3.0.ebuild
@@ -7,7 +7,7 @@ inherit golang-build golang-vcs-snapshot
 EGO_PN="github.com/prometheus/promu"
 EGIT_COMMIT="295a70a7f580b886572861b19545b28accfd4491"
 SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
diff --git a/dev-util/quilt/Manifest b/dev-util/quilt/Manifest
index 2adcaf62f008..2a7497039d43 100644
--- a/dev-util/quilt/Manifest
+++ b/dev-util/quilt/Manifest
@@ -1,12 +1,8 @@
 AUX quilt-0.50-no-graphviz.patch 1477 BLAKE2B f070303e072b26bb70de578277ee9fcfa56975d6c4a3927835f0d3a17d3c40bea5e57ce5863c5f91939e6b0f8ff9b63ebbd039458b474591fc3e545efb4e1515 SHA512 281c3f080e6ce6d4fd38e881b5cf111bc8313a9171a1c93edf9393b4f33eb0bd4fdb4c1b1df2cc888391acc6016c0eae9183948f5a76b8dc492e2ebb99f84f98
-AUX quilt-0.63-bash-completion.patch 584 BLAKE2B 68b9a9aa31b7c59ae32661877629b98c65660cd87d8ef2f3c7787f61acb5d6835ee385b8cef6a6dd611f1f819bb3bec5f5a1866db901c37a721d6b07e9eadf39 SHA512 6ec0a3d36d347573f791c7a8217f65a46c35b7fa510a5092b4d425814656f4ef0d9318da42020dc059caeaa631f13d3c5780bbb3ad19e20c87b60a60d32a7bc8
-AUX quilt-0.63-no-graphviz.patch 1431 BLAKE2B 09823c8292e031a0c660210a7b98abb09d7697603611879319dac49118ea8901ebbdcbe0f60faa100670578eeec5fe8e15a78217bab45b52e7fa890b4bd4d880 SHA512 9e66299df9e83f8d89d25b9d72fccff60c2ada37029f3542667c267527fc4b9f36101c752b8393b137553e7ac277ee344158ca131e931c1a61103621ae4a7027
-AUX quilt-0.65-no-graphviz.patch 1482 BLAKE2B 5ab4cd1b728c61582c513229303e9b4eb0c0a10942ec810546da26c4372c9b41521817d1f5a133a5e3c3906c194458d027316e97f7d3a364cc05696966482355 SHA512 4a70ac2abf6e7f2a63d138035ca5a8194bf4fbee5ee2f7be8c3587cbc94104ffb7abca89e37b2b3bfe9063554bab358a86adb92e553ad72099d8baf35b48444d
+AUX quilt-0.66-no-graphviz.patch 1466 BLAKE2B 5338e26ec3f8f9181f85952b51846d182c69191729c0df4286d3663822ace8e008f2786e71352d1b1cc466a1a85b976a5b64dfb5bc771fad8b802a7aacf40720 SHA512 217576f0b0fac1687dbaabfc2618fd78496f367495af19c8cf368be9abe1d648b0b4eee7887b3c3d5cc5f358076b81ad4fe0a9d26903eae7642a15ba3334d432
 DIST quilt-0.50.tar.gz 452769 BLAKE2B 5d466d1feca8a1f702db9d5f2bb4340331d06e413992fc8f30111d48daf71f560d60444ddb49cc06096552f32feb44cfd369f370222f574cea4664f4324d04fa SHA512 c6258872bc591b35e93ba09cc17b4954696faf391aff71b7789cc8cc58c4c54e51b605896937bd1aa54545eed6bf1e9b70352ad9b643f869154e6953c0340365
-DIST quilt-0.63.tar.gz 389593 BLAKE2B b7aa02819e10d61f45615f3b4beaba993e5a08ee99440d015d1c7a46f34affac391e44a8f75c682d4833055388e27214acaf96533a93728cc0c7863fc74e9722 SHA512 e6d5c601805b664a5586a557799e7b321b6b28f7ccec708f52aa96371c987e5791aa54418c9b89d34154e4967ddfe7a261e37195fd29b6aa529e8fa6e5007c45
-DIST quilt-0.65.tar.gz 410780 BLAKE2B 14b0a36afac1376b18e2bcfb672ea3d497a996223dae2cfa966684eda8e819f9d9bfc87f8307dd2c3a3e4246804ca239725325f9e57a5b60986d6f60ea02fbfc SHA512 37dffe34fe209371f2fbc0af2dbb4dcfa6edd2221aed15f31a0651a0bd457f2af03a98450a3e63406f70e040e944246e5b23733b820665eeb3fd4ff2bdde3a08
+DIST quilt-0.66.tar.gz 413069 BLAKE2B 41201d54cb26d4761413365fe19b65bd6971ada1e69198d2edbc346df6a3060ff3af4d80551d68ab4ffe003183bc0a28515ce1d070db95f2b1a04a0680ac4fb2 SHA512 c2cb75c0937612e1e0da25b713acf629b6b5aacbd8254d8bd17220b63c7b8ca996cd9d0315a32d67d54a4a7dc01b212cdda33afaacf3db063da757f1973306f4
 EBUILD quilt-0.50.ebuild 1506 BLAKE2B 8bcc89c45c61601cfe777bef33830c4f2bbe949209cde060b18c05f3b4435752996bdaa0e4916a87e787f04de95127783b850dcd1639309b8e3332e6b088a6ec SHA512 80bf6055c1096b7b8898166d2e86f434f5bb8351e50ae2eaf64c95cd49e287e504f12fe0a628554d3aaad3264b1ed174fcae56744fefa59479bb4743089ebcf3
-EBUILD quilt-0.63.ebuild 1934 BLAKE2B e921625ccce5e227def5d9b5bb942a7bee3acb7193ff28cdcac545a2fbc2a34f4ec3dd6caa66a8ffa41ffbac88dfb9bd3e963abf9340409b7acd2f2a9b810c0b SHA512 5d60f84f0fa3abd6e15f428182523f9417b5541c3301374b60bfe3704aa2e488628d501f1dffd47028db92de44e95c8fc2e89217d9fe789faff7f56d6c636082
-EBUILD quilt-0.65.ebuild 1647 BLAKE2B 241059eba66ff1af2c563bef7a12cd44e87667e4f1a2260e55c4af1b95fbf4f057d71f0b0c34c21ceb6eab1c0cec0ceaf43e704442e1d5e53052475d743c1c6e SHA512 7be1c157aac11b74de9fe6bd2bb18719f9b5428f58ce8b9d1b1277eeba0f130f591c9815836c6d60004d8774bb5f463aaacdd9ae479ceaa00374fb73bcee49b3
+EBUILD quilt-0.66.ebuild 1644 BLAKE2B 56a0b269585e9918ceaf72a883b23478804700c213b514d92d1dee4e2392b2babc00a879b91041131841bc675b083e5470c01ca38a8c8e96a7a3b6db75176682 SHA512 8c8d5f2084b6fa73bbf830dc410c956123716b65ce05f82bb81af9a79f5e67c2857073a6158c98e5e42693468333705a33224463806169692084a6a6a32b38ed
 EBUILD quilt-9999.ebuild 1764 BLAKE2B a013dfb3d65d2e69077e75673bcdad06216b40cc35a198346681e42162567f327ec4a0583868b1e62d7dfd8ea451abe3d420f0e7cf9b3491b066bdf4ffb56179 SHA512 ab39ceb5756c763b911a077ca98cde61143332b21708f62963ec0632ae3b02e4d319bc92a3b7c9fd74a5fbb04d6c537088bc63aeff1fc5b06f97fece2d07e2ef
 MISC metadata.xml 218 BLAKE2B 01c06279fa64627fda89adb9c5748c7629ff3eb46c10acc15b327a0f432d50b86de1d3980ccdafa9b620582db9abdf4d4506b1a53baebd6334f1a890a10783b1 SHA512 cff4a2ad321709df053184879b278c5a5abc74790344f6170cf020cf45a20d8062421e20d215c73002077d66c6367de5fcede710c2ffdd9f067cdf1f40b784ee
diff --git a/dev-util/quilt/files/quilt-0.63-bash-completion.patch b/dev-util/quilt/files/quilt-0.63-bash-completion.patch
deleted file mode 100644
index c85caca5c9e1..000000000000
--- a/dev-util/quilt/files/quilt-0.63-bash-completion.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- bash_completion.orig	2014-10-21 18:15:29.549789267 -0400
-+++ bash_completion	2014-10-21 18:15:38.489789221 -0400
-@@ -11,8 +11,6 @@
- # completion to work then you must set QUILT_PC in your global environment
- # (for example in ~/.profile) and not just in your quiltrc file.
- 
--if type quilt &> /dev/null ; then
--
- if ! type _expand &> /dev/null ; then
-     # This function expands tildes in pathnames
-     #
-@@ -310,5 +308,3 @@ _quilt_completion()
- && _quilt_complete_opt="-o filenames"
- complete -F _quilt_completion $_quilt_complete_opt quilt
- unset -v _quilt_complete_opt
--
--fi
diff --git a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch b/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
deleted file mode 100644
index 80458120f4f1..000000000000
--- a/dev-util/quilt/files/quilt-0.63-no-graphviz.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	2014-10-21 17:08:25.639810130 -0400
-+++ Makefile.in	2014-10-21 17:09:03.269809935 -0400
-@@ -79,8 +79,7 @@ QUILT :=	$(QUILT_IN)
- SRC +=		$(QUILT_SRC:%=quilt/%)
- DIRT +=		$(QUILT_IN:%=quilt/%)
- 
--SCRIPTS_IN :=	patchfns inspect dependency-graph edmail	\
--		remove-trailing-ws backup-files
-+SCRIPTS_IN :=  patchfns inspect edmail remove-trailing-ws backup-files
- 
- SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
- SCRIPTS :=	$(SCRIPTS_IN)
---- bash_completion.orig	2014-10-21 17:09:08.789809906 -0400
-+++ bash_completion	2014-10-21 17:09:53.189809676 -0400
-@@ -100,7 +100,7 @@ _quilt_completion()
-     prev=${COMP_WORDS[COMP_CWORD-1]}
- 
-     # quilt sub commands
--    cmds='add annotate applied delete diff edit files fold fork graph \
-+    cmds='add annotate applied delete diff edit files fold fork \
- 	  grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied'
- 
-@@ -194,19 +194,6 @@ _quilt_completion()
- 		;;
- 	   esac
- 	   ;;
--	graph)
--	   case $prev in
--	     -T)
--		COMPREPLY=( $( compgen -W "ps" -- $cur ) )
--		;;
--	     --edge-labels)
--		COMPREPLY=( $( compgen -W "files" -- $cur ) )
--		;;
--	     *)
--		COMPREPLY=( $( compgen -W "-T -h --all --reduce --lines --edge-labels $(quilt --quiltrc - applied 2>/dev/null)" -- $cur ) )
--		;;
--	   esac
--	   ;;
- 	grep)
- 	   _longopt grep
- 	   COMPREPLY=( ${COMPREPLY[@]:-} $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch b/dev-util/quilt/files/quilt-0.66-no-graphviz.patch
index ea06a9eebefb..324a38dfef49 100644
--- a/dev-util/quilt/files/quilt-0.65-no-graphviz.patch
+++ b/dev-util/quilt/files/quilt-0.66-no-graphviz.patch
@@ -3,28 +3,28 @@
 @@ -78,8 +78,7 @@ QUILT :=	$(QUILT_IN)
  SRC +=		$(QUILT_SRC:%=quilt/%)
  DIRT +=		$(QUILT_IN:%=quilt/%)
- 
+
 -SCRIPTS_IN :=	patchfns inspect-wrapper dependency-graph edmail	\
 -		remove-trailing-ws backup-files
 +SCRIPTS_IN := patchfns inspect-wrapper edmail remove-trailing-ws backup-files
- 
+
  SCRIPTS_SRC :=	$(SCRIPTS_IN:%=%.in)
  SCRIPTS :=	$(SCRIPTS_IN)
 --- bash_completion.orig	2017-04-12 09:27:57.643126246 -0400
 +++ bash_completion	2017-04-12 09:30:27.673938451 -0400
 @@ -28,7 +28,7 @@ _quilt_completion()
      prev=${COMP_WORDS[COMP_CWORD-1]}
- 
+
      # quilt sub commands
 -    cmds='add annotate applied delete diff edit files fold fork graph \
 +    cmds='add annotate applied delete diff edit files fold fork \
- 	  grep header import mail new next patches pop previous push refresh \
- 	  remove rename revert series setup snapshot top unapplied upgrade'
- 
+	  grep header import mail new next patches pop previous push refresh \
+	  remove rename revert series setup snapshot top unapplied upgrade'
+
 @@ -122,19 +122,6 @@ _quilt_completion()
- 		;;
- 	   esac
- 	   ;;
+		;;
+	   esac
+	   ;;
 -	graph)
 -	   case $prev in
 -	     -T)
@@ -38,6 +38,6 @@
 -		;;
 -	   esac
 -	   ;;
- 	grep)
- 	   type _longopt &> /dev/null && _longopt grep
- 	   COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )
+	grep)
+		type _longopt &> /dev/null && _longopt grep
+		COMPREPLY=( "${COMPREPLY[@]}" $( compgen -W "-h" -- $cur ) )
diff --git a/dev-util/quilt/quilt-0.63.ebuild b/dev-util/quilt/quilt-0.63.ebuild
deleted file mode 100644
index ea76c38419cf..000000000000
--- a/dev-util/quilt/quilt-0.63.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit bash-completion-r1 eutils
-
-DESCRIPTION="quilt patch manager"
-HOMEPAGE="https://savannah.nongnu.org/projects/quilt"
-SRC_URI="https://savannah.nongnu.org/download/quilt/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris"
-IUSE="emacs graphviz elibc_Darwin elibc_SunOS"
-
-RDEPEND="sys-apps/ed
-	dev-util/diffstat
-	graphviz? ( media-gfx/graphviz )
-	elibc_Darwin? ( app-misc/getopt )
-	elibc_SunOS? ( app-misc/getopt )
-	>=sys-apps/coreutils-8.5"
-
-PDEPEND="emacs? ( app-emacs/quilt-el )"
-
-pkg_setup() {
-	use graphviz && return 0
-	echo
-	elog "If you intend to use the folding functionality (graphical illustration of the"
-	elog "patch stack) then you'll need to remerge this package with USE=graphviz."
-	echo
-}
-
-src_unpack() {
-	unpack ${A}
-
-	# Some tests are somewhat broken while being run from within portage, work
-	# fine if you run them manually
-	rm "${S}"/test/delete.test "${S}"/test/mail.test
-}
-
-src_prepare() {
-
-	# Apply bash-competion patch see bug #526294
-	epatch "${FILESDIR}/${P}-bash-completion.patch"
-
-	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
-}
-
-src_configure() {
-	local myconf=""
-	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
-		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
-	econf ${myconf}
-}
-
-src_install() {
-	emake BUILD_ROOT="${D}" install || die "make install failed"
-
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
-
-	rm -rf "${ED}"/etc/bash_completion.d
-	newbashcomp bash_completion ${PN}
-
-	# Remove the compat symlinks
-	rm -rf "${ED}"/usr/share/quilt/compat
-
-	# Remove Emacs mode; newer version is in app-emacs/quilt-el, bug 247500
-	rm -rf "${ED}"/usr/share/emacs
-}
diff --git a/dev-util/quilt/quilt-0.65.ebuild b/dev-util/quilt/quilt-0.66.ebuild
index 40ccf8926d5c..0657d72ccb2b 100644
--- a/dev-util/quilt/quilt-0.65.ebuild
+++ b/dev-util/quilt/quilt-0.66.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI="6"
 
 inherit bash-completion-r1 eutils
 
@@ -32,13 +32,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-
 	# Add support for USE=graphviz
-	use graphviz || epatch "${FILESDIR}/${P}-no-graphviz.patch"
+	use graphviz || eapply -p0 "${FILESDIR}/${P}-no-graphviz.patch"
+	default
 }
 
 src_configure() {
-	local myconf=""
 	[[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] && \
 		myconf="${myconf} --with-getopt=${EPREFIX}/usr/bin/getopt-long"
 	econf ${myconf}
@@ -47,8 +46,8 @@ src_configure() {
 src_install() {
 	emake BUILD_ROOT="${D}" install || die "make install failed"
 
-	rm -rf "${ED}"/usr/share/doc/${P}
-	dodoc AUTHORS TODO doc/README doc/README.MAIL doc/quilt.pdf
+	rm -rf "${ED}"usr/share/doc/${P}
+	dodoc AUTHORS TODO "doc/README" "doc/README.MAIL" "doc/quilt.pdf"
 
 	rm -rf "${ED}"/etc/bash_completion.d
 	newbashcomp bash_completion ${PN}
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index ec8ced9d591b..c83d428ac552 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,6 +1,6 @@
 DIST radare2-3.3.0.tar.gz 6730482 BLAKE2B c6e5ad73d9e34986ba86b73e8410d45c3f99f89a567de85ae22314fd120f358db39a5f8ac9d64af027eb5c7223564d003865f2c8be6ee0a331936e46d02145d8 SHA512 4db9d547b72b952babfd67c8cef2b94fdac9d6fd1194fb50b2ebab538d5bbda0bab4b704d5af64ef684ce9311634c8e04465906a1e7e706b211427054fe0721a
 DIST radare2-3.4.1.tar.gz 7034801 BLAKE2B 7747af8e51c1120ef683884950e0e9e7581627906487449c81decd25b4d4a8ee5222892c42ba66d1a1d0b373b71ee6bf967df6ef117d30b171cf31740ac3058b SHA512 8803d54a8158aedd5900792bd013dad440a14abbb6fcbdf963e5d9031f30e66865479f29877e6f656ab01b59b3138458daf52f1eaeb462ec767c128d0b12640a
 EBUILD radare2-3.3.0.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
-EBUILD radare2-3.4.1.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
+EBUILD radare2-3.4.1.ebuild 1300 BLAKE2B 42e36ad32d575a8365c09b569efb266ed2cdc5ab8b78fd9e3f34b6d4283d51d9637579071e0199beae6be12b85e88c4a5d8fff953c43d8fa1b212dea9588ae19 SHA512 9b0c4b0a47d98df4318f9e6e486c43ed1fe3ed613fa997f16b0322a987574d8cbb77fae25ab10dcc4150a8946c4a4a32d157245bdbcd15bdcf087a2982c3774b
 EBUILD radare2-9999.ebuild 1153 BLAKE2B 1cc298178177ac134372b197db6eb55f771a109b471691e70bcf0568ca390372774304a48610afb60a3dea1f351c9364a401783c63a7a8787591310284712aa5 SHA512 14e492a96c651ee9b48ac9b2add74f1559dbcc32dac568c9273f1609188d86eb54a032ab174e476ee5e1451120ffbf88c1a5d0cfad17ebb55223e5383cb64797
 MISC metadata.xml 361 BLAKE2B f92dfa8905623cd3a34f0b61766ae071d09801460b8b2a13bf4c3bb0a4715446b61b79309101b032511851f9d7a15973bca97ce9d1ed667266e2d6a3485933a2 SHA512 fb01d7b5abd1966cf270227640d1e4197a09930afb6f03e18bf4f79ba74e73fd86782b99efbb710b697315c25b63e575ec6120fb1cedaa19d4562831f41f81a4
diff --git a/dev-util/radare2/radare2-3.4.1.ebuild b/dev-util/radare2/radare2-3.4.1.ebuild
index 0b3f4cfb432b..c746c047f48a 100644
--- a/dev-util/radare2/radare2-3.4.1.ebuild
+++ b/dev-util/radare2/radare2-3.4.1.ebuild
@@ -37,6 +37,12 @@ src_configure() {
 		$(use_with ssl openssl)
 }
 
+src_compile() {
+	# bug #682564: upstream build system has a problem with
+	# 'hexagon_disas.o'. Workaround it until the fix is found.
+	emake -j1
+}
+
 src_install() {
 	default
 
diff --git a/dev-util/repo/Manifest b/dev-util/repo/Manifest
index ffc6fc64d7a2..5ff4988b1f6a 100644
--- a/dev-util/repo/Manifest
+++ b/dev-util/repo/Manifest
@@ -1,3 +1,5 @@
 DIST repo-1.12.37.tar.gz 115098 BLAKE2B 7a54afad5a3355edfab09be62c6881b4c0d3bc521c04313bb1dd428fc7a1c9a82a65186d20fd05d67227c88d2f6a30fd70f53f35dbfc0b6e7e668252ce6fbd9d SHA512 3ff6b5c3bcc8fba1861102035b86b59137e7dcebeab7a0fb01672da28473e1912c3cbac7c085e9b8d3fce404bd18095ba022d4978d83833f666bd31d621d5953
+DIST repo-1.13.2.tar.xz 103068 BLAKE2B 055ca4ffb55aa304a466e32e84e4ed23781f5be4dc82ce854a0f2352e4b785bec55a3ea23cacd06f758ace4b5351c33cd3e32ecfa0fbb04eb5f4b45349ff7196 SHA512 acd02ded7d817c718e29e1c61dcd83b4e40380de8d3450f5b30aef47f9c1ea4872f04e83299e57999318d43a26d407bf73159394d82700a4a2b30611e5f2e2c1
 EBUILD repo-1.12.37.ebuild 801 BLAKE2B 8fe1e4ded31323b6631687429f66c5cb255255deb0271a9bd4c2bff3bf84bf25a4c691976031e7c584ca1a277d410a5a196abcd59012b7623070c4e2910aebe3 SHA512 7605c9427efcec6eec5b89165fd821ceea4a7234cf15c94187f8a890f8565e9dc1a7b3dde4836c285571cce207a3806235ac3d35c60c2c084b69ba9304b55aad
-MISC metadata.xml 387 BLAKE2B 78c64cb9d80402907983723261bc49e4429c0c3be69ea93b06090bd4c7d64b0289a6cdb52cee1fd867c2e2460b59a92a5605126ff3faa1fe7816edae54a2d33d SHA512 25be1dab3058fe3d823c1a0863c9894bf5c7d8020c0faeab73db09cde992589eda83f36ea718396e327bfb18627a58f2db2fc3d21e2f1d490d91ebe867d33dee
+EBUILD repo-1.13.2.ebuild 781 BLAKE2B 9d8098d5693df938b9b5d1df32fa24b9d5b6e39ff9f7641ff8890a028a613a091b892d59e9a93c7485771c8d7b96c4316b7fe6450bc23b63b504098b006ccd78 SHA512 2e472081adc2c202ad872c5c3b8e378e266a5539c936be3ad79754682c2e5c6116086c4db24df3a8324e6a0c15307acfde7ef2c8dbc26069c95eb1b04004e0f8
+MISC metadata.xml 376 BLAKE2B ca33eb393fd109516578a9dfeb59a4f4fad9a99b06496767a9ad916bea214ceb10785e625458464256f682a2a2a2d48a4e8d020f243c55d0a05dfede88fc04b7 SHA512 1d28b7903b27c5d8a97543444d4a09408023af0bd5e17ef3e824dc283173be4d8ad265948872b30e039653c8bd291588ccb13f317b3ac74941a53f50bc05b29d
diff --git a/dev-util/repo/metadata.xml b/dev-util/repo/metadata.xml
index e31c816a429f..26e54d13d07e 100644
--- a/dev-util/repo/metadata.xml
+++ b/dev-util/repo/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>wizardedit@gentoo.org</email>
-    <name>Austin English</name>
+    <email>dlan@gentoo.org</email>
+    <name>Yixun Lan</name>
   </maintainer>
   <longdescription>
   Tool for managing multiple git repositories. From Google, useful for building Android.
diff --git a/dev-util/repo/repo-1.13.2.ebuild b/dev-util/repo/repo-1.13.2.ebuild
new file mode 100644
index 000000000000..1123c98edd31
--- /dev/null
+++ b/dev-util/repo/repo-1.13.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# 3.x is currently very buggy, only 2.7 actually works
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-r1
+
+DESCRIPTION="Google tool for managing git, particularly multiple repos"
+HOMEPAGE="https://android.googlesource.com/tools/repo"
+# Should be:
+#SRC_URI="https://android.googlesource.com/tools/repo/+archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://dev.gentoo.org/~dlan/distfiles/repo-${PV}.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	!app-admin/radmind"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	python_foreach_impl python_fix_shebang ./repo
+	python_foreach_impl python_doexe ./repo
+}
diff --git a/dev-util/rosdep/Manifest b/dev-util/rosdep/Manifest
index 589b9e39dc6a..28f14f6fa00a 100644
--- a/dev-util/rosdep/Manifest
+++ b/dev-util/rosdep/Manifest
@@ -1,8 +1,8 @@
 DIST rosdep-0.13.0.tar.gz 301327 BLAKE2B 39c39903bb2e6c07dfd4e3aa9546acf434498db518c3bda04ef79c46ed5d13b7cd55978c78bea8294d8e5b84ddddef22814436566f3f958d91d3964650399a08 SHA512 c42aa17ee9b31f7013415e99a484a66a7a7fb52abef4cc9045658150ce0c36b475f2885ebfff537f9ce9f8fd5eeaef5482226c5bff5b4a3df03cc72b149db07a
 DIST rosdep-0.14.0.tar.gz 301534 BLAKE2B 86e4fb42e682218dc1d68851a0023f2fbddc5a8a89d90dd33cc7223080792e3d3dea7607a57692428f81589abc693c9f843be4c10ca81b6419da7e383d1c7987 SHA512 abf9c294b9fb01aa4c32bd7ad563119874e162d6031255edce642eeee1512da39a03383aa6cd55f090587df2b6bd1dc83bc53163be9d2b53be6178ec8a422f66
 DIST rosdep-0.15.0.tar.gz 301659 BLAKE2B c7e5602e78e8f4892f16ef41d7423e653750def24f043c2519646b8c038bcb39b62d60323ef4e8a496a863bb74f51cdce7aebb1b5423120562a34c1988437510 SHA512 d9def23a4c01636a42dbccf99be96b9704eb96641da00db4305c63b18fa0f69de1ae402bcf7fff4030bc20097496086ff9168794d1e5cd44153cb3a84ba18509
-EBUILD rosdep-0.13.0.ebuild 1501 BLAKE2B 0930c792aa1630d26ceea2c8cd884001f80b3883516abe2680704fa3df6fd6b0939915fe6caaca5dab1d1cbb45babf3c43163870451a763f3f1fd749b0b32035 SHA512 7ac5cddf69c5ccb31404d4c2b98030a7b63708e9602fae8fba086553a7afd0cd8013de7f82982830161a20e210186152d0450cd1b345778afa7d1a9b1ace4d66
-EBUILD rosdep-0.14.0.ebuild 1501 BLAKE2B cab11ee2dd7f46addc13aa3b48dce8b9b3951013e45ec5e0a6a9ddaa5697f2402135e68f3d88bdf9fc73db12f7d393f4facea49e7ab6edda235a7433cd64b8b9 SHA512 edbacfde3e7668323efdec49f84fec47be982bf99dd26d743394a16d862431792158a5b32c71fef7f635fc0b68ae018cda0706ca779eae51fd28c5c7bc9059e6
-EBUILD rosdep-0.15.0.ebuild 1501 BLAKE2B cab11ee2dd7f46addc13aa3b48dce8b9b3951013e45ec5e0a6a9ddaa5697f2402135e68f3d88bdf9fc73db12f7d393f4facea49e7ab6edda235a7433cd64b8b9 SHA512 edbacfde3e7668323efdec49f84fec47be982bf99dd26d743394a16d862431792158a5b32c71fef7f635fc0b68ae018cda0706ca779eae51fd28c5c7bc9059e6
-EBUILD rosdep-9999.ebuild 1501 BLAKE2B 0930c792aa1630d26ceea2c8cd884001f80b3883516abe2680704fa3df6fd6b0939915fe6caaca5dab1d1cbb45babf3c43163870451a763f3f1fd749b0b32035 SHA512 7ac5cddf69c5ccb31404d4c2b98030a7b63708e9602fae8fba086553a7afd0cd8013de7f82982830161a20e210186152d0450cd1b345778afa7d1a9b1ace4d66
+EBUILD rosdep-0.13.0.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
+EBUILD rosdep-0.14.0.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
+EBUILD rosdep-0.15.0.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
+EBUILD rosdep-9999.ebuild 1497 BLAKE2B 52ad758ce1a78f13c469719de4fc6028a26ac570bd43cef5e16b3325ed60d18e39a8ead39c2d0c6f2b8c87e68165f87ae02fb2701c9ce90cb67b4d3ae5eaf098 SHA512 877053b69a0df566a6a04e261f77b50b55ee1b738571b6113eb892ba3fd2d88beb281ff9455340341175e094b7c5626a41f527de2403a82ea54356d69626e977
 MISC metadata.xml 339 BLAKE2B 98c570641ca07f96e5fcfaece9d49977136f720d77c9cf6dcecbb06bc4016410e082201d69d3c36af5de03cc70ea5a1b726289124324e2f11266e5db69a6ea97 SHA512 62ab4dc2638e4af95290eba19e1755d3bade56e5d1e7251d3cc9da410fcf7ead48562193b2cb6b6f8800daf7df31786e70ce153780b9e278891c31d2b9c257bf
diff --git a/dev-util/rosdep/rosdep-0.13.0.ebuild b/dev-util/rosdep/rosdep-0.13.0.ebuild
index d406809d630f..0c2319981163 100644
--- a/dev-util/rosdep/rosdep-0.13.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-0.14.0.ebuild b/dev-util/rosdep/rosdep-0.14.0.ebuild
index 6f344ec5df72..0c2319981163 100644
--- a/dev-util/rosdep/rosdep-0.14.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.14.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-0.15.0.ebuild b/dev-util/rosdep/rosdep-0.15.0.ebuild
index 6f344ec5df72..0c2319981163 100644
--- a/dev-util/rosdep/rosdep-0.15.0.ebuild
+++ b/dev-util/rosdep/rosdep-0.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosdep/rosdep-9999.ebuild b/dev-util/rosdep/rosdep-9999.ebuild
index d406809d630f..0c2319981163 100644
--- a/dev-util/rosdep/rosdep-9999.ebuild
+++ b/dev-util/rosdep/rosdep-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/Manifest b/dev-util/rosinstall/Manifest
index 75ac5cc5c9f1..7bd96d99288c 100644
--- a/dev-util/rosinstall/Manifest
+++ b/dev-util/rosinstall/Manifest
@@ -1,4 +1,4 @@
 DIST rosinstall-0.7.8.tar.gz 26430 BLAKE2B fae82276f5376a94914272e60b2e3b0f81cb37bd7b41e0a4df73c8b58d19a73505a0c5e193495fd59c931c04265cbb372abfad19fd4043fc77e5224127bd97f5 SHA512 a53ae8fb96f9dda4671b22dfd9dbadc18d1e4adbf34a50b6706baf971c1c7ee418e14641d334346b02638f06c10d1bc984b4759c92a39510dd0044fbc346be67
-EBUILD rosinstall-0.7.8.ebuild 1542 BLAKE2B 0956b9e0e7cbb58c7e7759bbfd64126ffdbafb682f9a1c14eee7a4461aae3fd619a4026554df070fbbfa73dcfc1e51b2c5564b35232fe5a90fc02e8ef89b4aef SHA512 c79f3206b128bcf405cd5ccf5f563887a848605f329810cbe588302d44c837569595eaa6399e8f39ada3e56a9c60fb8d3e7ab5e337fb6b0c190c44ca8d7609b4
-EBUILD rosinstall-9999.ebuild 1542 BLAKE2B 0956b9e0e7cbb58c7e7759bbfd64126ffdbafb682f9a1c14eee7a4461aae3fd619a4026554df070fbbfa73dcfc1e51b2c5564b35232fe5a90fc02e8ef89b4aef SHA512 c79f3206b128bcf405cd5ccf5f563887a848605f329810cbe588302d44c837569595eaa6399e8f39ada3e56a9c60fb8d3e7ab5e337fb6b0c190c44ca8d7609b4
+EBUILD rosinstall-0.7.8.ebuild 1535 BLAKE2B 8836199b7a0848111d86478ceb3db36a88bc87d95f917b50d8f38451fb09aff17109f4d65729552a0ad9725136f2c5621c557c411bb3d394d97e18aeea9a486a SHA512 97524631de8e66c499bcce2962bc59e1d62407457e1e547a7d1fd38bbf4aad92345b57acbdded6a0e7493baf66a4f1e9515d2c2bf560c979c0e57d4fc6f5ca5c
+EBUILD rosinstall-9999.ebuild 1535 BLAKE2B 8836199b7a0848111d86478ceb3db36a88bc87d95f917b50d8f38451fb09aff17109f4d65729552a0ad9725136f2c5621c557c411bb3d394d97e18aeea9a486a SHA512 97524631de8e66c499bcce2962bc59e1d62407457e1e547a7d1fd38bbf4aad92345b57acbdded6a0e7493baf66a4f1e9515d2c2bf560c979c0e57d4fc6f5ca5c
 MISC metadata.xml 333 BLAKE2B 55190f2209aab41e0f1625fb699d61be2a53d0af996feff9ee5b0cbb5326363dcb915aa83427096f1723b885806a4cdb5b6cd2285c76064bf0b889b624fbcc31 SHA512 5c6ef4930985cd5c2ea51b18a25d7cc2a5e387bdbd26e42f8710d6ce903cf13fe85ee1f1d13a0ffe82c8056dd295a3e25268ec58353508f30bf10404ae4ffb8a
diff --git a/dev-util/rosinstall/rosinstall-0.7.8.ebuild b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
index 34fc06b21e2a..02e024f0e55e 100644
--- a/dev-util/rosinstall/rosinstall-0.7.8.ebuild
+++ b/dev-util/rosinstall/rosinstall-0.7.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall/rosinstall-9999.ebuild b/dev-util/rosinstall/rosinstall-9999.ebuild
index 34fc06b21e2a..02e024f0e55e 100644
--- a/dev-util/rosinstall/rosinstall-9999.ebuild
+++ b/dev-util/rosinstall/rosinstall-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/Manifest b/dev-util/rosinstall_generator/Manifest
index 3d211b7ff7a9..be934fe189cb 100644
--- a/dev-util/rosinstall_generator/Manifest
+++ b/dev-util/rosinstall_generator/Manifest
@@ -1,6 +1,6 @@
 DIST rosinstall_generator-0.1.13.tar.gz 11186 BLAKE2B bb6f95eba12ee6b9adfa22d46475d555aa9b3bed225e3be52a52f380bbd1ab3f86871a9a816c56c874f8545d2ef648e226ad5d8d3346444a92202865265260f1 SHA512 c8b5736066f8a42a324b2bed578e03282b6d8ae8df48fb30545617c2995ce53f35d7fea6fab3989383b958e7cb763b24deb67c5ec3496cc77f1ba51f110ab78c
 DIST rosinstall_generator-0.1.14.tar.gz 11419 BLAKE2B af9754f46589aac1e9bb265345319c4037d2b1e10ea8119859e2715b2828974bc4422cac25f84216c401f35b7cddde207e7562afb07e753328940db347b69a20 SHA512 45461917afaf93f38b118951c272ba71a408d2c276b4019739c9c8dc9407812bf166bb762910ce45cedc9b31e2796922a69681ad461c468c7ed2372a1d189904
-EBUILD rosinstall_generator-0.1.13.ebuild 944 BLAKE2B 65e10af020b5e282ad7df1cf0bcf430a70a810b24aa163046917f2a27bd84c26b57928e3a60f3fcf295c1b2a423d11d3423e8b9a09cfce4d8cb15f8d2ebb2c09 SHA512 be7033bc84379134d8e0d04759be6df781a8565147f75eb6213c182b0e16812cfc1f31fb0f9be186f81d3eb51dc9d4313796a003ce740630c00fb0963f7e828e
-EBUILD rosinstall_generator-0.1.14.ebuild 1055 BLAKE2B 208150c09756838a5a97f4cfee646b0cc8402183fbd948eb6ef4073f74a4be7ef1f8fb649cfedf08131b50bd33f5dab102cd60db737f632ad34d170a05804d38 SHA512 4df734f550041942284475d1ba8b02d4214c0de9b3fb4f8ef019c962b12b48d45d4b519f3bcbb6a78a0e0f991b8d028c78bd9c3b2fcc8483739a9e2eb7055a21
-EBUILD rosinstall_generator-9999.ebuild 1055 BLAKE2B 208150c09756838a5a97f4cfee646b0cc8402183fbd948eb6ef4073f74a4be7ef1f8fb649cfedf08131b50bd33f5dab102cd60db737f632ad34d170a05804d38 SHA512 4df734f550041942284475d1ba8b02d4214c0de9b3fb4f8ef019c962b12b48d45d4b519f3bcbb6a78a0e0f991b8d028c78bd9c3b2fcc8483739a9e2eb7055a21
+EBUILD rosinstall_generator-0.1.13.ebuild 937 BLAKE2B 03b0ce63864341e85fb409c94f0f4d3fc152dbd2eda22a1c621d476b423bc8615c3cba5f79d057ac7ba0c9e56f77770b05e4c1d7645ed6e8f571d6a98faa1337 SHA512 b398a001bec815ad4aa0feea8d01b77420c929e92f2b96fa93e74ae0396fdd61818e4081bea33732dbca1250a4ccf7eabc42efb22ba359135d9c12a202918e73
+EBUILD rosinstall_generator-0.1.14.ebuild 1048 BLAKE2B 88209c9ee8bec83d7af33e9a018debe991b39e5ff657a2354ff384ad58fb273c341564811b3e8754150d8e50bdf74a0cdf5b960dc206cf070dde61acc4e0e0e3 SHA512 eeb270631fb19a65baa66c6a75a9d6abbd3a26c4b4aa6eb6968dbdfd23834d40a3615d9b2f04c3259bfb870d92ab4c9c80ce7f2daf3efbe98dda527a98bffab9
+EBUILD rosinstall_generator-9999.ebuild 1048 BLAKE2B 88209c9ee8bec83d7af33e9a018debe991b39e5ff657a2354ff384ad58fb273c341564811b3e8754150d8e50bdf74a0cdf5b960dc206cf070dde61acc4e0e0e3 SHA512 eeb270631fb19a65baa66c6a75a9d6abbd3a26c4b4aa6eb6968dbdfd23834d40a3615d9b2f04c3259bfb870d92ab4c9c80ce7f2daf3efbe98dda527a98bffab9
 MISC metadata.xml 353 BLAKE2B 26692ca3eb76500607275909a9c86bc88f7c80114e7840763136902a59dddc8f23dcd766f821aa5beffff9419d39a48e18682f86c8148df7d640977c9b30ebcd SHA512 a681a9f31c4cf06a775ef57f7a942c76d0e8873c4c854fddaf44df0301f3e14bd836727e6816bc74f0ced9e54dfd9335c376c47b8af2a19455c42a3f6ed38a18
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
index 484e133e8ea0..da54789d77fc 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
index 725ccaf60ba1..82bb67839bf8 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-0.1.14.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
index 725ccaf60ba1..82bb67839bf8 100644
--- a/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
+++ b/dev-util/rosinstall_generator/rosinstall_generator-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy{,3} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index d9df2fd0ea3a..87683116b844 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,3 @@
 DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
-EBUILD scanmem-0.16.1.ebuild 989 BLAKE2B 7beff0a82c896dfae227c5081c69df3e4420c022a20322b27b4b0a2a2a1b33d4657cb8a11d64fc23240d3662ba2c19a2a9476b6052312619e00a20d5fd9d3a54 SHA512 3771f6c6fe69ac354b16dbc3bb89ed40ba112070dbf6a689b5100b400ffd5ac8611115728fc5dc43dbdd53c62232f4b9c725e3ab70cf569d35c0081fe813b95d
+EBUILD scanmem-0.16.1.ebuild 984 BLAKE2B c069e8b0389b74d19120d7646fc686b4eb91d487a5f44e24f3d5d7a09048a7135b27992171d804cc092941f93342531d7ccab0ef4f20c614e554c62ce0c012c9 SHA512 621af86f741b3e24a0a6db83380909b246973c12ed1c2ec1fa565edcc371fc72a581f8f8f7fbbf76112f64631b8f204a420e6fe12f4f4809a0893637b261de3e
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.16.1.ebuild b/dev-util/scanmem/scanmem-0.16.1.ebuild
index 7c226726a1fc..d46dad01e3a3 100644
--- a/dev-util/scanmem/scanmem-0.16.1.ebuild
+++ b/dev-util/scanmem/scanmem-0.16.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit autotools eutils python-single-r1
 
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index b055587acd0d..0ec55a5aebcb 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -13,6 +13,6 @@ DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695
 DIST scons-3.0.5.gh.tar.gz 5510846 BLAKE2B 64489a9335a9aa0e2b58a78c6bba613de41d7035f03e8b5b1c1db8aae92e54808f1bd5ad4e97b8481db0f5276c184040663ec31d7307c30a6b092c860c0bb1c0 SHA512 afd4e3d5a76c009f7a3f55934c2d479c611df5713fdaf60aaa9860fc685f95a314bbe54df92fcbca3570dc9a5b244dcf08bf63ce0cef837c3767a37628abae02
 DIST scons-3.0.5.tar.gz 655236 BLAKE2B 1ccd35e393b3307e0be830c2a5491712cba59fe476dfd9c461567288eb76a42e10ca1552ce7603facb66caf5c0b82583c563bd2342b9d7c68c8cabbd0317467b SHA512 0477038b014674049f12899b64584d44a85283d521b2422561e42020a5ae296a5af005684087c3ff410ed3fcbdcc5ff61998bc429eb29513f2a864138ffc4945
 EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
-EBUILD scons-3.0.4.ebuild 2088 BLAKE2B 987963a902a594266fa6a1da0e2e06f96b439da4ac05b36243a1b02d5f66ad92951cbb0497a41f6bbd9f6d36cf504c8b2e97529c59151584618f8b2813ce614c SHA512 37fbbe605dea48e5d60a29260c26a6040c25ecb19784f631a3f46e68fbe2c9da74ffd66eefa7ea7413c02d6724dcf462ba1046ff62ac1023c927996987648ad6
-EBUILD scons-3.0.5.ebuild 2092 BLAKE2B 40a899fc2889669146e1bdfa5a93e3625c2afb639b8c5d7d2627312b34b3be085c7299b63a82c26a6b4de6a2d89bf3387f9e9d21efc5305b4dfb1a89c97065a9 SHA512 32b0c21d3e3f202df7d3a268d91bd8e945e7a6badbad6529366f3f82846fcc19fdd7b74dc85c587310727a9cb62c06ee93165a4c7a95a854647a8ca2dfcf4fb6
+EBUILD scons-3.0.4.ebuild 2116 BLAKE2B bf772b8bd79ff3144fbd8a32d21058df12c7aa086839316d2d26857b05b33c91f732e6b6f3d819bb4aa1346c94ff471718af3df80243a363c63c47b653706389 SHA512 5c280de11216bbe96c5a302ba0e99f0162338d35951f668414e935982b1b76776a1a2c39142803c59ab33f8651b21b7d8cd93197a3543b17d2daa3c7d958b0d0
+EBUILD scons-3.0.5.ebuild 2090 BLAKE2B 341713fffa258fa6f2c41716499236e77f3dec1c74e03754599192965461a7736e2e7070cdd053d083eaae823231b20820b71b1e337e2a75d528925a1420d6d7 SHA512 da0183be00184c9cdce3827119a7255903d802cc85211faac699d02c976ef88388907cb4d08542f28faaa8c4967f25fa8bbf34fe8d98eea4e68d026026616a5a
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.0.4.ebuild b/dev-util/scons/scons-3.0.4.ebuild
index 480a9f438d1f..cdf49d51a18a 100644
--- a/dev-util/scons/scons-3.0.4.ebuild
+++ b/dev-util/scons/scons-3.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
@@ -18,9 +18,10 @@ 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 ~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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
-RESTRICT="!test? ( test )"
+# unresolved & unpredictable test failures
+RESTRICT="test"
 
 S=${WORKDIR}/${P}/src
 
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
index 7ba0a5a8dbfb..b3f2cb4c7ca7 100644
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 PYTHON_REQ_USE="threads(+)"
 
 inherit distutils-r1
diff --git a/dev-util/setconf/Manifest b/dev-util/setconf/Manifest
index 70fc98675150..7d35cb5e316c 100644
--- a/dev-util/setconf/Manifest
+++ b/dev-util/setconf/Manifest
@@ -1,5 +1,5 @@
 DIST setconf-0.6.6.tar.xz 12620 BLAKE2B 2882c50430a65e6947135808f87674c19bb8a57d0f5ecbb9d3e316b203b359bb79503b1e68931bfac04e52d3d0686fc11f0c74aa4d84797a0d44f8989c26b4cf SHA512 28f62b4dbc5883763cd11480ca059dd8ba120d6dfd964bbf1746ec5cb23fb0f0fd949249f77673d150cb6abd0039ff6f34d79ad744f8abcc765e0af37fbb85ff
 DIST setconf-0.6.7.tar.xz 12700 BLAKE2B 9dd3625f3fa2345ba6f9cb21fffae770a257928c2287e1772f92d831e9b6c09d8c5b09118a146b6704bb5003dd02fb0793ecabc7d8a2410f4f3941bd687b3a14 SHA512 8b247de9f7ac06f77e6251e95c045886cde5b6ca21b0152cb6fdc1456381aacd9051d5221c9fc8149608555e14f85ee2b51acbe65f78d129b1c8b732e093236d
-EBUILD setconf-0.6.6.ebuild 834 BLAKE2B 4c4b2547166426976e5b2c2627c535d6b982716fe979b10ee91279d4721f03eb63995bb25773f5550b68f6207e18d1aa5514974133b622323fc96650ddd08217 SHA512 c5752e1c0685d7bcaac043b5d754ab57d26b06f86f58c58cd1f6e95a878af678a2c8fd4a0eaadc606d4d36272e974bb06a45fe8c486c79b10a566bd27a9adfb3
-EBUILD setconf-0.6.7.ebuild 842 BLAKE2B a294df3d635e6835ef36609721b37eba671326a2c0f5ea980336e1bec76b8b5cd17a2fa8cbb162dc8252d18ed45f189972cc7e9c1987f351dbc0b073b0e1d439 SHA512 221d62759fb5cd629aa00e63634b5b9be3a4925c75a2f86c2d6f77656ee0a4f214b836334a1e9bf7f5962c7bdd4053087f94b775326969b7c52d2a79489b5abd
+EBUILD setconf-0.6.6.ebuild 825 BLAKE2B dfc3a1db922cac2b04b22f9cfc91c950ba671ad50babc0ee5f3c6b8661aa238b962c11b3122191544cd1a4430eaa9f85ff3cee4a79c9d05cd1fa7f3477776c43 SHA512 6bb53533220f833457ffe5eac1a45f70d0d52349d3f9a9af9778fd167d057764d0f7b812e9b732fab164a167b916ca07aff87c8944437a4f23e62f4a25d28675
+EBUILD setconf-0.6.7.ebuild 835 BLAKE2B c319ee13af74dfbbfc9cb87cf81547ff1e8800b84ec375f339f714597d859aa2458b275e5e62722ddb4e797ad8627d51776eca6fc170b0cc4bd84107723a1548 SHA512 019b4457fe1805e5209c0d0daac5696c30bfb8a7b314135f056d3e2150567e52f9b20e656977dcefd12f1b5614a4ba531fd2a50b1278cebdfe0c5e289182b658
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/dev-util/setconf/setconf-0.6.6.ebuild b/dev-util/setconf/setconf-0.6.6.ebuild
index b0646c4fed59..28c40e11ff30 100644
--- a/dev-util/setconf/setconf-0.6.6.ebuild
+++ b/dev-util/setconf/setconf-0.6.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+PYTHON_COMPAT=( python2_7 )
 inherit python-single-r1
 
 DESCRIPTION="A small python based utility used to change configuration files"
diff --git a/dev-util/setconf/setconf-0.6.7.ebuild b/dev-util/setconf/setconf-0.6.7.ebuild
index 1f5e27b579f0..ea8a2e4fb280 100644
--- a/dev-util/setconf/setconf-0.6.7.ebuild
+++ b/dev-util/setconf/setconf-0.6.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 inherit python-single-r1
 
 DESCRIPTION="A small python based utility used to change configuration files"
diff --git a/dev-util/skipfish/Manifest b/dev-util/skipfish/Manifest
deleted file mode 100644
index 53551b441388..000000000000
--- a/dev-util/skipfish/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST skipfish-2.10_beta.tar.gz 243827 BLAKE2B 03c60fb1ec8abc3bdca8b9b0d4c720a14ca8aab8609bd88c8e1b1f06d08c4866338126badf220be659012246a23ad85a92c7e6c28be97eabe41bf6f40853110b SHA512 a726bb7e53299ae3941c6a1645b89bb0a4c1d8a4ced6154696932d9a4844fc22d0a1f29d9311d083908b640155d65466ffea7b342c1f7c38e2c26f657c393af9
-EBUILD skipfish-2.10_beta.ebuild 1287 BLAKE2B 32c5fc30e7cee29a94d0641abdc73f573303d998d3cbcd0db465a618e4b4b54c077d2ffce58c99e5f40b7d1223a7b87f61f5ef42c9a58c64af9b13d7a7b880c0 SHA512 6705b497785661f30b2675093314d856b0785ec14ad22358623a64c55559b0676a048b5a16578cc6dcc1aa29c00acf4fb5062a0b85f93e5222ccc7a46d087428
-MISC metadata.xml 249 BLAKE2B 2435af8a77ab88fff0c2810f37d0d19bf5ee30bc9bea2b7c3d276e315ecff30041481e66f91d4be25576446085b0a4e7b4626e634ee6ac50142b479a2186266a SHA512 66df1edc899ada7514e4682ad663bbfc307b526dd7a1c9c2c9492d429fbbb8e220a137de40af26d4d238262888dde0d25f25e5cd5e1a8864454133e5298cf5eb
diff --git a/dev-util/skipfish/metadata.xml b/dev-util/skipfish/metadata.xml
deleted file mode 100644
index 3e6841b663b1..000000000000
--- a/dev-util/skipfish/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">spinkham/skipfish</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-util/skipfish/skipfish-2.10_beta.ebuild b/dev-util/skipfish/skipfish-2.10_beta.ebuild
deleted file mode 100644
index 81bb804912a3..000000000000
--- a/dev-util/skipfish/skipfish-2.10_beta.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs vcs-snapshot versionator
-
-MY_COMMIT_HASH="093800c9de4116706258982376abce01928a3f7b"
-
-DESCRIPTION="A fully automated, active web application security reconnaissance tool"
-HOMEPAGE="https://github.com/spinkham/skipfish"
-SRC_URI="https://github.com/spinkham/${PN}/archive/${MY_COMMIT_HASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND="dev-libs/openssl:0
-	dev-libs/libpcre
-	net-dns/libidn
-	sys-libs/zlib"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	sed -i \
-		-e '/CFLAGS_GEN/s:-g -ggdb::' \
-		-e '/CFLAGS_OPT/s:-O3::' \
-		Makefile || die
-
-	sed -i \
-		-e "/ASSETS_DIR/s:assets:/usr/share/doc/${PF}/html:" \
-		-e "/SIG_FILE/s:signatures/:/etc/skipfish/signatures/:" \
-		src/config.h || die
-
-	sed -i \
-		-e "s:signatures/:/etc/skipfish/signatures/:g" \
-		signatures/signatures.conf || die
-}
-
-src_compile() {
-	tc-export CC
-
-	local _debug
-	use debug && _debug=debug
-
-	emake ${_debug}
-}
-
-src_install() {
-	dobin ${PN}
-	doman doc/${PN}.1
-
-	insinto /etc/skipfish
-	doins -r signatures
-
-	insinto /usr/share/${PN}/dictionaries
-	doins dictionaries/*.wl
-
-	dohtml assets/*
-
-	dodoc ChangeLog README doc/*.txt
-}
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 73a9bd84a982..a67d530c72b1 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,5 +1,7 @@
+AUX source-highlight-3.1.8-no-black.patch 416 BLAKE2B d53c85b52a04118b613f7683e0506a0f7440c7a0d98f8b8a632ae30da3e0a62e763d51c7341ff3f78a65a02a04b9c0d25909aed847cdd864f4da46876c36e3da SHA512 c65c7f20f5185635153ee111e0b2fd7762065dd00a1773f1a519a449de2355d7255bfb9fda805ec863331ed9df309694fb978a109a479e1c92c7c8dd612945eb
 DIST source-highlight-3.1.7.tar.gz 1600692 BLAKE2B dbd740c79e4368bab6e7207a81e037f3fdf9f4ac5373113aac15acd7c18383cebcc8cadb91f59aa01b5bf30d3240b4510ae8d3af765b6ca579859367aa7e4ea4 SHA512 4a1e733bd06468e6ebd023dfe4a62d7134c35aac311509a61e8d80de35ff3cea25fb79adb56bfe413ee214bbf4d578b4d4ebdcf1236481d9b83152aff6d7afb8
 DIST source-highlight-3.1.8.tar.gz 1648351 BLAKE2B 1ce1590c86f7aed9d27bb21bce6b0869828b28068d71404410e080b85f6354eb6f520cec8c81d1e9170dd90b158dc4536e5287a04bf2d271fa26354fb853ea32 SHA512 00a49ab180460750614b38be9a569478d1d34d01f601ebc7452a4fee8475a19faf9bb9fb2f256c6b40d43fbc3d34962a77ba8b9833483345c4e4a42faad6976c
 EBUILD source-highlight-3.1.7-r2.ebuild 1156 BLAKE2B 148dacff17f075819620fe984b8671e2ef11997e496fdc3337ca0a5cab19d248bcdcc8d754b4bc547dfabfe63edec885738ba76561318798330876d21de7f8a8 SHA512 362e3904871945ffee6096e708ee85ae0e7edb749e1755abd260e8e2ca63587d312c4ed271ae61549b55391bcee543a110eb140eb2614ec754c8d9b053b06075
-EBUILD source-highlight-3.1.8.ebuild 1266 BLAKE2B d0dfde08f934d821f150d2c9a366b2e73974901ba3b2a944b58b99545b4085e88d2d1d209d4f34e21b61376e1150fa1f31696b7dd6facc5b25e6987598566244 SHA512 4ad82b888406c56e9ba7b882671785a7b9073d24dc21d4f299c83ee32c206b8ddab01ee0de5d4663829456560157c12e13b75564ad0782f9aa7a50b830198eb8
+EBUILD source-highlight-3.1.8-r1.ebuild 1484 BLAKE2B 0ee412783a7905c7fce6cc57da0469223e64fc4f74430edfbada7b940be29490cc07274eae2df6804fb80e0d8fb1e871a13484acc488c11c4887f2fe0080bcb2 SHA512 7c580789bb6732f1c92eb6ee43b89e2ce932391c955a04f4f72d51559cf4ed4dfeacf7066eb1438efd622074d72f3ab872c3ac64f79777b958bad6f3400691e8
+EBUILD source-highlight-3.1.8.ebuild 1415 BLAKE2B 8562a018c2aafa335f6391e510040a8e40e1e50e4884cbc9d933e7e47ba508de4478f721006b4d84e52213132af084623f930293b9e0a2c092331262e511537d SHA512 2d457f751bcaea8e8f5728971f31555524bfc7d9381acdb202a43f46cec852c23ebca1294df90dc71b457a2e39a9c7012d1e66766b2734df33780074609817ae
 MISC metadata.xml 250 BLAKE2B 50c4b89c67107f8c4eba77c3b35992d381dfc6a30f5e8fb7c696f6b2cde6b7b1f90566a99ceba3df17485a88283059ef51010414e8df6c72d9e7b8c7f9ff0e27 SHA512 a57d332a86b16f67fe2896c47c6cc9ba57f602b65943080289c816a9d0f70b779f61cde882034cc1c2adda79208865dae0bf43d95deea4556e840b785e062343
diff --git a/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch b/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
new file mode 100644
index 000000000000..b673c2f79221
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-3.1.8-no-black.patch
@@ -0,0 +1,12 @@
+diff -up source-highlight-3.1.8/src/esc.style.no-black source-highlight-3.1.8/src/esc.style
+--- source-highlight-3.1.8/src/esc.style.no-black	2019-03-20 16:52:33.053965325 +0000
++++ source-highlight-3.1.8/src/esc.style	2019-03-20 16:52:42.502965289 +0000
+@@ -7,7 +7,7 @@ comment cyan i ;
+ number purple ;
+ preproc darkblue b ;
+ symbol darkred ;
+-function black b;
++function b;
+ cbracket red;
+ variable darkgreen ;
+ 
diff --git a/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
new file mode 100644
index 000000000000..435b03a9792d
--- /dev/null
+++ b/dev-util/source-highlight/source-highlight-3.1.8-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 flag-o-matic
+
+DESCRIPTION="Generate highlighted source code as an (x)html document"
+HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
+SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
+LICENSE="GPL-3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+SLOT="0"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/boost-1.62.0:=[threads]
+	dev-util/ctags"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}/${P}-no-black.patch"
+	)
+
+src_configure() {
+	# required as rev-dep of dev-libs/boost-1.62.0
+	# https://wiki.gentoo.org/wiki/Project:C%2B%2B/Maintaining_ABI
+	append-cxxflags -std=c++14
+
+	econf \
+		--with-boost="${EPREFIX}/usr" \
+		--with-boost-regex="boost_regex" \
+		--without-bash-completion \
+		$(use_enable static-libs static)
+}
+
+src_install () {
+	use doc && local HTML_DOCS=( doc/*.{html,css,java} )
+	default
+
+	# That's not how we want it
+	rm -rf "${ED%/}"/usr/share/{aclocal,doc} || die
+
+	# package provides .pc file
+	find "${D}" -name '*.la' -delete || die
+
+	dobashcomp completion/source-highlight
+}
+
+src_test() {
+	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
+	# upstream uses the same temporary filenames in numerous places
+	# see https://bugs.gentoo.org/635100
+	emake -j1 check
+}
diff --git a/dev-util/source-highlight/source-highlight-3.1.8.ebuild b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
index 7fc2f8c4df1a..6b4ae33d4bba 100644
--- a/dev-util/source-highlight/source-highlight-3.1.8.ebuild
+++ b/dev-util/source-highlight/source-highlight-3.1.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="https://www.gnu.org/software/src-highlite/source-highlight.html"
 SRC_URI="mirror://gnu/src-highlite/${P}.tar.gz"
 LICENSE="GPL-3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 SLOT="0"
 IUSE="doc static-libs"
 
@@ -23,6 +23,7 @@ src_configure() {
 	append-cxxflags -std=c++14
 
 	econf \
+		--with-boost="${EPREFIX}/usr" \
 		--with-boost-regex="boost_regex" \
 		--without-bash-completion \
 		$(use_enable static-libs static)
@@ -43,5 +44,7 @@ src_install () {
 
 src_test() {
 	export LD_LIBRARY_PATH="${S}/lib/srchilite/.libs/"
-	default
+	# upstream uses the same temporary filenames in numerous places
+	# see https://bugs.gentoo.org/635100
+	emake -j1 check
 }
diff --git a/dev-util/spec-cleaner/Manifest b/dev-util/spec-cleaner/Manifest
index 5fa0911e2942..851b46151b9d 100644
--- a/dev-util/spec-cleaner/Manifest
+++ b/dev-util/spec-cleaner/Manifest
@@ -1,7 +1,7 @@
 AUX spec-cleaner-1.0.6-pytest-runner.patch 348 BLAKE2B 4bdb0a4db5eb581f826f14452c980381756945985e9d45c09f2e7b16fb7f2367e7781d8a1b7b69f02e2c33cb1527fbcd437462cfed9061ca9ed4edfe4a439b9a SHA512 d971124da1dc1b8c93a359bd139bb6fa9226b383d0261a18f2f821a857872b6fc501649f66f5ad754c17e0f86c14c43eba59f25b9f99e804f76ccdcb973bb0ca
 DIST spec-cleaner-1.0.6.tar.gz 450602 BLAKE2B acd298421f2c119e24dc52cf63e149194d5baa1282f9aef902e2ccaf51de040f5817641b4077f209656f715ea6ceb19bf55b8661c32cd24f461c58f9126d9e19 SHA512 a27b5dc7fdb02ca5c632faa5b6a2b71d6db3e9f97950f20c15b14584fa240ff7b69dc981ca67f4fcb6af207dff28a8267447ad0eb918e06ce2294436892e0eef
 DIST spec-cleaner-1.0.7.tar.gz 450429 BLAKE2B 7ec57076f13c526ca10524a3852a26ddee4581137357dd593312cc1b55d908311c9146ac2b9c0a5f0ea491a2e1cec8b8a3e5dba25467881f656d43872bd69f5f SHA512 705fc3b9d5b927a64bd19bbf6c826464e40ec6b3cc97cd032417f8e4debac721c7e5f0c99e02fafbb5ce3454424a8b398a7827779b0a308549955ecac33d39c7
-EBUILD spec-cleaner-1.0.6.ebuild 977 BLAKE2B ea12ef15c6134849b9bffb8b970a343d4326db4a7b07f2b8c13692d9c842b717392141cd52f7d5936e94f8d8dc85087c0f357d6ecdf8cbc77a583a8386164c4c SHA512 50bc9535c4b3cc1a328b7fc4ce3c050efe0985af9325cd947a72616e77d9df9b98c80f700579bfe24bb32d3cbab935e42e2d0d62e5ee0151e4ff8a7260069e42
-EBUILD spec-cleaner-1.0.7.ebuild 981 BLAKE2B f8e296a0b85cc8254a28d4cdeb141eef1afe54d23d0d006a46e7cac9d932699e949bea16dd0b00d74b136cbf22e7ec63b702e1e8d6f71763d71cbfa140a3d72a SHA512 fa24a7f5873195647c23bea3065aa5e02904b2b331b11765a4780bc07f44eb3c4326bdc2c21e68e7b39d8f3edc487f8111ded07ccf5facacc0e350c351610d38
-EBUILD spec-cleaner-9999.ebuild 981 BLAKE2B f8e296a0b85cc8254a28d4cdeb141eef1afe54d23d0d006a46e7cac9d932699e949bea16dd0b00d74b136cbf22e7ec63b702e1e8d6f71763d71cbfa140a3d72a SHA512 fa24a7f5873195647c23bea3065aa5e02904b2b331b11765a4780bc07f44eb3c4326bdc2c21e68e7b39d8f3edc487f8111ded07ccf5facacc0e350c351610d38
+EBUILD spec-cleaner-1.0.6.ebuild 968 BLAKE2B e868d5247773fe0cd677857a3ec81cb01df333eabb754afb853fc114ea38ad1811a9ac193d8fc3c1631dab56ed2ea9a1f00626e8756916e29519afde72dfef70 SHA512 b071574af01366630c8941b521e8b6d9c520c7c88415eba72d24b4dff942fc0839e0cd4be75428142b3b8c165caab986122a7502380feb030c81181398e695b2
+EBUILD spec-cleaner-1.0.7.ebuild 974 BLAKE2B 8f5fd6cf2498a37083428e7a0b69ecdabd9b692047510d3c0b15ea4e94dacde80958d56bb7e514f58ce6fc06d7a75e1e6b56a1be80213b2ea0714d829bdf800f SHA512 3c28aab2c29b541f8781379fa6e2b6de335d00840ca0ed750d6c55a1904a29545154100bfa5b700e29de3bdbc95ee2d53fdeca2b722849283444575b8b6c588d
+EBUILD spec-cleaner-9999.ebuild 974 BLAKE2B 8f5fd6cf2498a37083428e7a0b69ecdabd9b692047510d3c0b15ea4e94dacde80958d56bb7e514f58ce6fc06d7a75e1e6b56a1be80213b2ea0714d829bdf800f SHA512 3c28aab2c29b541f8781379fa6e2b6de335d00840ca0ed750d6c55a1904a29545154100bfa5b700e29de3bdbc95ee2d53fdeca2b722849283444575b8b6c588d
 MISC metadata.xml 450 BLAKE2B b091afea0453f996442347131d337d2cb516a4a5e08a98e0b0ab4a6f2cdd19f7d4d284f02a9fecf35590998fd3143b9151c3cd6632c0bd7148374d307b0a28c0 SHA512 6f10ea61bcc2e9982fb7e1383959f36c77d881a495a9251819b47d168114272c5f26b7e5bcc80657f5d8a79ec18e0a1e7c54201fa6c773bc64d3ceff2a1ddc3c
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
index 297d0528ae6b..3f353a195e50 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5} )
+PYTHON_COMPAT=( python3_5 )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
index f6af4811af24..0d59d5864047 100644
--- a/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-1.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
index f6af4811af24..0d59d5864047 100644
--- a/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
+++ b/dev-util/spec-cleaner/spec-cleaner-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6} )
 EGIT_REPO_URI="https://github.com/openSUSE/spec-cleaner.git"
 inherit distutils-r1
 [[ ${PV} == 9999 ]] && inherit git-r3
diff --git a/dev-util/staruml-bin/Manifest b/dev-util/staruml-bin/Manifest
deleted file mode 100644
index 6f7fe869d859..000000000000
--- a/dev-util/staruml-bin/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST StarUML-v2.8.1-32-bit.deb 41755234 BLAKE2B 2963a3bd90d49aab3e62c94446d7d6fa113b54a7bec712f5ebb3cd97d4cee76b31a4229a9054ef993c55076244003d36fcd0e59f9b4bf3dd53c30922a1b54050 SHA512 c91251574c8b815e02eee63d616bb821178e3b1494e18accad74bd299e5321425f21435731dca3518aa57369788d6cde59dc2287f789701459242d55a92d5f29
-DIST StarUML-v2.8.1-64-bit.deb 43609354 BLAKE2B f0cbfb16ef36a7ff010a04f2919c7a9035dcddf98e1229e67dcb1e3321b1552baddb3edd26503b8ffa5442b0379a89f17ab9b4cd595b65c5d3730fa734403278 SHA512 97c2a33f437c043b5f236ec304a8329dfcf931f69080bb7e47ec1d9e881fe1bcac0f8a0497ad3f8d11dc4c17a887023f46edfa17a612c1a5a6785f3a580070f5
-EBUILD staruml-bin-2.8.1.ebuild 1241 BLAKE2B cfdbb6ade41d75bfdd74883e959232b544269edc447ab88bb1e5e5afc211fa6e56acaa533f444fe3bcd0976e9e29f47efd4775e25428bf9d7d38afddcf325666 SHA512 8068cc89d452d03fd411fdc6b07713da3af646c333d6a7ce685a469ddb1411ec685da26ab05e8b531513f4250a6144f5e65eb3ef81420e6988ac23f126772b2b
-MISC metadata.xml 383 BLAKE2B f3b107fa01c2b2424847e376abf1ab653cab845eedc35dd34f0613a47c513e71450c7ebcb6a42f68be6ce9002703b584f9e40fb19e6272a872430029501752be SHA512 43b9dc9d256d23f9fe81341771dfb4ad64776552c44ebbe3333f8b3136e9e37d0db4b90d0a2d962149f84e93a4fdc43ca0f65e955bbd7b2da9b41975a8849644
diff --git a/dev-util/staruml-bin/metadata.xml b/dev-util/staruml-bin/metadata.xml
deleted file mode 100644
index 3554bdb770b5..000000000000
--- a/dev-util/staruml-bin/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>hilobakho@gmail.com</email>
-		<name>Mykyta Holubakha</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Gentoo Proxy Maintainers Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild b/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild
deleted file mode 100644
index e554b4a392e7..000000000000
--- a/dev-util/staruml-bin/staruml-bin-2.8.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit unpacker
-
-DESCRIPTION="A sophisticated software modeler"
-HOMEPAGE="http://staruml.io/"
-SRC_URI="
-	amd64? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-64-bit.deb )
-	x86? ( http://staruml.io/download/release/v${PV}/StarUML-v${PV}-32-bit.deb )
-"
-
-LICENSE="StarUML-EULA"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RESTRICT="bindist mirror splitdebug"
-
-RDEPEND="
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libgcrypt:11
-	dev-libs/nss
-	dev-libs/nspr
-	gnome-base/gconf
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/alsa-lib
-	net-print/cups
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:2
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libXrender
-	x11-libs/libX11
-	x11-libs/pango
-	virtual/libudev
-"
-
-S="${WORKDIR}"
-QA_PREBUILT="opt/staruml/Brackets-node opt/staruml/StarUML"
-
-src_unpack() {
-	unpack_deb ${A}
-}
-
-MY_PN=${PN/-bin/}
-src_install() {
-	mv opt "${ED}" || die
-	dosym /usr/lib/libudev.so /opt/${MY_PN}/libudev.so.0
-	dosym /opt/${MY_PN}/${MY_PN} /usr/bin/${MY_PN}
-	newdoc usr/share/doc/${MY_PN}/copyright LICENSE
-}
diff --git a/dev-util/stepman/Manifest b/dev-util/stepman/Manifest
index 680a77641670..8c1428acc100 100644
--- a/dev-util/stepman/Manifest
+++ b/dev-util/stepman/Manifest
@@ -1,7 +1,9 @@
 DIST stepman-0.10.0.tar.gz 3054342 BLAKE2B 8d1d6fc8b4b85c79d535c6162a8b7c5ba15042b6a8334286cdf7ad5d498ee20abecaa1bb9ce9ffe5406891271e23a2e2554bea0b52bbf08df23a2154fdcb4da8 SHA512 1437d5c997e62a9da3beb666a15ac665e18300fad3668ee3acdae30307027bbf16c0d95f649a9a62c6203f3e09f9ec83525a23b3789f09c3707ff1937a7affbe
 DIST stepman-0.10.2.tar.gz 3087278 BLAKE2B 224bc6141678d4155474591d7094956ddd230086315ccff8ec2f91bb2d72761f46daa864086a449fb5d79dc2f7ec6f8935fa62a9a5be41a2f0aad9e3de84ca20 SHA512 6b7f1e17ff14e8a0a69056f6a8fa00043b53d818e61603fc2571a42a73e2c88edae1bb233fb734e1796c581c63f7aaf6e91c425525adbb2e1c3429cdc8dfa1e8
 DIST stepman-0.10.4.tar.gz 3173321 BLAKE2B b8dcf7eb7ff5afba1fc12b8bf8d4d594b7c86cf26346de053fd8b50010d6a8dbbf55c6e33eef9e9606c672516319b8bacd66eb8a188eb915280f92d027fea253 SHA512 9cd66e45f9a379ad785dc9a35a022d7f9fadeb9707154890d6c6ee17c716d5fcf319dee80c121f9eedc53baef71aaac3a60a6f32135c05113b97f9a5fc7dd299
+DIST stepman-0.10.5.tar.gz 3197451 BLAKE2B f6a4fd2cc0396c5635d7d45a6d88166669dab0bdfed2d53cb8c809c122ee84039660704326c996436d62797db58d46f35bb73af2415e875cf748be9137304280 SHA512 6bd325e1d50d75bf2a38b89c1faf5275914a3a7f00de0d072450253121d9931c4e32ca85300319aaec90ca108223600d3ff1195276df87b11148d4771c642471
 EBUILD stepman-0.10.0.ebuild 962 BLAKE2B d83a3ee4b3169a85604fd93d8de9ca2b54ccc2c7e47592d98236eda93dd2edc8ef080de477906e2f305d6e855402fdecf60e74b2c6dc959afff19bae1799a78d SHA512 09686058814adcb51f743b97410ea933b4122dbf2b96ace3ddad51499d50f867fb65e253c3ec9c23ed7334fb3b0d26ceb6477d9130bcf96f91d4071edb6eb1c4
 EBUILD stepman-0.10.2.ebuild 799 BLAKE2B d2e4bf1e47c302e80aa19a705c8a6297714834e721c53da69df8234e8e43e655d4be1d3777e92bcc3f457a1570531d08b989880b393ed05099e0048249e31099 SHA512 12a7cbe7df5a571055e3787e5ab337dd996967dc01267d6627ba0f15544bf8ba5e9275f1d1c8b71685ed91025865b33fa6eb0c703bc5c6078a1d04403f37b962
 EBUILD stepman-0.10.4.ebuild 1197 BLAKE2B 8067e8f30073f7c992c6d68af486b9e8bc80321157132f10777e23f5da6b3a2f05523ea25ffd1c79b072ab6ddde50c4145bc01dba47a84368c809c0e16d612a5 SHA512 3e386f354d56a561d25ca860dc0b4ed1cd1cae7afe205f28ababf1dff4da5743f18b17c2a2b508a6914711e2d34b0d6b09a445f6ee22d02e71e29c3cdb220367
+EBUILD stepman-0.10.5.ebuild 1197 BLAKE2B 8067e8f30073f7c992c6d68af486b9e8bc80321157132f10777e23f5da6b3a2f05523ea25ffd1c79b072ab6ddde50c4145bc01dba47a84368c809c0e16d612a5 SHA512 3e386f354d56a561d25ca860dc0b4ed1cd1cae7afe205f28ababf1dff4da5743f18b17c2a2b508a6914711e2d34b0d6b09a445f6ee22d02e71e29c3cdb220367
 MISC metadata.xml 942 BLAKE2B 29a5ac9fabe873c653e59f0afb8e19e23259d5e3116769c6c0371de83b08b89b09ad221e8116f06eca5f49659e25e80fce02f6085a5f16e71cabb6aa4bdea176 SHA512 58bef9578f6df469253ba9d10a2e5e374d1462c9e90b9e1870fa5d812ff5d4d34a834a6afaa4743b7a106116d8f85d722c412e6f2cc03cb27b7e1fa3c6459d1d
diff --git a/dev-util/stepman/stepman-0.10.5.ebuild b/dev-util/stepman/stepman-0.10.5.ebuild
new file mode 100644
index 000000000000..f95a6153f9c0
--- /dev/null
+++ b/dev-util/stepman/stepman-0.10.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-build
+
+EGO_ON="github.com/bitrise-io"
+EGO_PN="${EGO_ON}/${PN}"
+
+DESCRIPTION="Step collection manager for Bitrise CLI"
+HOMEPAGE="https://www.bitrise.io/cli"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/src/${EGO_ON}/${PN}"
+
+src_unpack() {
+	default
+	mkdir -p "${WORKDIR}/src/${EGO_ON}" || die "Couldn't create project dir in GOPATH"
+	mv "${WORKDIR}/${P}" "${WORKDIR}/src/${EGO_ON}/stepman" || die "Couldn't move sources to GOPATH"
+}
+
+src_compile() {
+	GOPATH="${WORKDIR}" go build -v -o bin/stepman || die "Couldn't compile stepman"
+}
+
+src_test() {
+	pushd _tests/integration > /dev/null || die "Couldn't find integration tests directory"
+	rm update_test.go step_info_test.go setup_test.go || die "Couldn't remove network-dependent tests"
+	popd || die "Couldn't return to ${S} directory"
+	local -x INTEGRATION_TEST_BINARY_PATH="${S}/bin/stepman"
+	GOPATH="${WORKDIR}" go test -v ./_tests/integration/... || die "Integration tests failed"
+}
+
+src_install() {
+	dobin bin/stepman
+	dodoc README.md
+}
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
deleted file mode 100644
index 4ef3e8190370..000000000000
--- a/dev-util/synopsis/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX synopsis-0.12-gcc45.patch 486 BLAKE2B 21ecd520052a4836f1ba4a3e2f3df0847c682d052c42a3b5f058cc7f6bbe6fd3fe4e0dc7b6fce6c415edfd07eaba7d6c694688e974ad8cbfaf2a1585ae716819 SHA512 4afc8a63a358980e4f73f6ff8dd68a17bec42ba72938dccfd46228f2667451a7055a91ddcaeeb70e350d2f806ec868b5b011c9893ab681be61051efc02c244c8
-AUX synopsis-0.13-bdwgc-8.patch 1017 BLAKE2B cec979a65c7bbe3aaf4265968df024da9dff107d54b3a8d919d3f392d4f39b346c5e01fa1a943a67d6e734eba76767176ec3e91917a32d983090cc6810b78318 SHA512 9ad8eff9ee3a2a9e7cfeb31ab17aa46cf395be03a38a950fe4a70c8ac1b88852aa0c9dfb2fb5b933ca07a5775230e89ea51e8a32d7019b8f2021c1d117893bea
-DIST synopsis-0.13.tar.gz 10691494 BLAKE2B 8a41505eb77a64bb94b5794fc2a1161e8a23f2e2b3bbf9cebd8216e026a20a56f5036585cc9fc457a6bde980e891861dbf2beffa40ad55ead4e31aa2bb7379e7 SHA512 cdd84f4b9fc8a7b0edaa017e7a332bba06cd4fc804c49b84b1558a84e814e3a8a4b8c5801a8eaf149e6475dbacbb879f04ade57e31d660dfac5e0c83887abd54
-EBUILD synopsis-0.13-r1.ebuild 1296 BLAKE2B 9abf96d35c4759a542c2d5e2e58962b4b0c45d959ace5930a332cc19fbf02d7021877268630c9f7487f0f4432db16b1b66a138fc7cf3d54a9e4755b5f7afadc6 SHA512 41aba6a7e8028c44857889b3aad62caebcb0c8316d0d7682d9da1832adfff4c23dc6fe97c98064a81340ffcdf947c092d0f3633928baff5d844f07486c4e0a84
-EBUILD synopsis-0.13.ebuild 1229 BLAKE2B f0dd4e7fa463025d12eddd818c3b128793a2587a00010cf2b013f91dd099eaa32b3f7814fb320e9a8cf23b5fb56a2fb9adb2a6c8d52cf71282cd9a0036141ef6 SHA512 a3467acc11f424adf0e140b1541ece9c0088a507795eb65f84b2e50f2825f211c93ae12c2f73d9d890f289f635ac25bdd86fc8770ae4d37331a8667bb4a601e6
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
deleted file mode 100644
index c0dbdd91dc1d..000000000000
--- a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Fixing build with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318429
-
-Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
-
---- a/Synopsis/Parsers/Cxx/Types.cc
-+++ b/Synopsis/Parsers/Cxx/Types.cc
-@@ -169,7 +169,7 @@
- // Class Types::FuncPtr
- //
- 
--FuncPtr::FuncPtr(Type::Type* ret, const Mods& premods, const Type::vector& params)
-+FuncPtr::FuncPtr(Type* ret, const Mods& premods, const Type::vector& params)
-         : m_return(ret), m_premod(premods), m_params(params)
- {}
- 
diff --git a/dev-util/synopsis/files/synopsis-0.13-bdwgc-8.patch b/dev-util/synopsis/files/synopsis-0.13-bdwgc-8.patch
deleted file mode 100644
index 5d10b65c60f9..000000000000
--- a/dev-util/synopsis/files/synopsis-0.13-bdwgc-8.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/679642
-https://github.com/ivmai/bdwgc/issues/268
-
---- a/src/configure
-+++ b/src/configure
-@@ -4046,7 +4046,7 @@ if test "$ac_cv_enable_gc" == "yes"; then
-   GC_BRIDGE=$srcdir/Synopsis/PTree/GC-enabled.tmpl
-   if test -n "$ac_cv_with_gc_prefix"; then
-     CPPFLAGS="$CPPFLAGS -I$ac_cv_with_gc_prefix/include/gc"
--    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc $LIBS"
-+    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc  -lgccpp $LIBS"
-   else
-     GC_CPP="-I\${includedir}/Synopsis/gc/include"
-     GC_LIB="Synopsis/gc/.libs/libgc.a"
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -72,7 +72,7 @@ if test "$ac_cv_enable_gc" == "yes"; then
-   GC_BRIDGE=$srcdir/Synopsis/PTree/GC-enabled.tmpl
-   if test -n "$ac_cv_with_gc_prefix"; then
-     CPPFLAGS="$CPPFLAGS -I$ac_cv_with_gc_prefix/include/gc"
--    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc $LIBS"
-+    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc -lgccpp $LIBS"
-   else
-     GC_CPP="-I\${includedir}/Synopsis/gc/include"
-     GC_LIB="Synopsis/gc/.libs/libgc.a"
diff --git a/dev-util/synopsis/metadata.xml b/dev-util/synopsis/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/dev-util/synopsis/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/dev-util/synopsis/synopsis-0.13-r1.ebuild b/dev-util/synopsis/synopsis-0.13-r1.ebuild
deleted file mode 100644
index 9d2b76695a59..000000000000
--- a/dev-util/synopsis/synopsis-0.13-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib toolchain-funcs
-
-DESCRIPTION="General source code documentation tool"
-HOMEPAGE="http://synopsis.fresco.org/index.html"
-SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/boehm-gc[cxx]"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/graphviz"
-DEPEND="${COMMON_DEPEND}
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.12-gcc45.patch
-	"${FILESDIR}"/${PN}-0.13-bdwgc-8.patch
-)
-
-pkg_setup() {
-	tc-export CC CXX
-}
-
-python_prepare() {
-	rm -r src/Synopsis/gc || die "failed to remove bundled lib"
-
-	# the distutils script passes its options to a number of
-	# autoconf scripts, to not all of which these options are
-	# relevant. adding this option disables these useless warnings.
-	sed -e "/self.announce(command)/i\        command += ' --disable-option-checking'" \
-		-i Synopsis/dist/command/config.py || die
-}
-
-python_configure() {
-	local mydistutilsargs=(
-		config
-		--libdir="${EPREFIX}"/usr/$(get_libdir)
-		--with-gc-prefix="${EPREFIX}"/usr
-	)
-	esetup.py
-}
diff --git a/dev-util/synopsis/synopsis-0.13.ebuild b/dev-util/synopsis/synopsis-0.13.ebuild
deleted file mode 100644
index ebf368135bb7..000000000000
--- a/dev-util/synopsis/synopsis-0.13.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-DISTUTILS_IN_SOURCE_BUILD=1
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 multilib toolchain-funcs
-
-DESCRIPTION="General source code documentation tool"
-HOMEPAGE="http://synopsis.fresco.org/index.html"
-SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-COMMON_DEPEND="dev-libs/boehm-gc"
-RDEPEND="${COMMON_DEPEND}
-	media-gfx/graphviz"
-DEPEND="${COMMON_DEPEND}
-	${RDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.12-gcc45.patch )
-
-pkg_setup() {
-	tc-export CC CXX
-}
-
-python_prepare() {
-	rm -r src/Synopsis/gc || die "failed to remove bundled lib"
-
-	# the distutils script passes its options to a number of
-	# autoconf scripts, to not all of which these options are
-	# relevant. adding this option disables these useless warnings.
-	sed -e "/self.announce(command)/i\        command += ' --disable-option-checking'" \
-		-i Synopsis/dist/command/config.py || die
-}
-
-python_configure() {
-	local mydistutilsargs=(
-		config
-		--libdir=/usr/$(get_libdir)
-		--with-gc-prefix=/usr
-	)
-	esetup.py
-}
diff --git a/dev-util/systemtap/Manifest b/dev-util/systemtap/Manifest
index 6d34ef551272..fe27418824f0 100644
--- a/dev-util/systemtap/Manifest
+++ b/dev-util/systemtap/Manifest
@@ -4,5 +4,5 @@ DIST systemtap-3.1.tar.gz 4885480 BLAKE2B 39352f7507eb924fdb79bbedcdad6c200abbb1
 DIST systemtap-4.0.tar.gz 5282312 BLAKE2B 9eac1cf9c9f13255ac12642c910b5591b0f5380b2a6337dedcb3d20785c0416900b9bee05f239632f7c548812be35ae90b24f524ab6f5c0c6ef474cf5de834a1 SHA512 66b5ba1902ed974101429dce9fee849273d3dc64e862c057177d158c5f284cc93299819ee8ee49d4bd3b7ff47a3512b1c68b74cad374147ce67fa406c7518c79
 EBUILD systemtap-2.4-r1.ebuild 1982 BLAKE2B cbe92a7d59e7d59a835260c180fc7040058860f4270b88d7cd62a5db74b46a0d5ab462b2bfece63e355882a4b8bb58145fcce4d05610f1702b19cbe9c34e7620 SHA512 fa2e0db9552365f2645d4c46adc66bd835e964aba86818e9e136e32b5ef1e1d02bf00cfbe23955630b266b836efb2cb15a36cfbd4779f7c5df452417686c9be9
 EBUILD systemtap-3.1-r1.ebuild 2203 BLAKE2B e2683da59a09e3de875911e9e034eadd33b1727e417017a0db2021ba04be93a191051d59be33258a849cd207274c6fa8faaa36350e3682e326e0e0bc4a503880 SHA512 18a941078d6de47680554ea2fcb46f65115d6e0e7c63ae6c261dbaff7b2910be6759b20b5a8bec2a8597cb99784491eb2f33cba62fb593b4e5da672c504ecaae
-EBUILD systemtap-4.0-r1.ebuild 2634 BLAKE2B 54530171c971b477bc7a87b6f9151d1d2d0fc039947b5e367e7010526f258f9d28737fef9ae5979a7665474f766c71345b51c24bebec27efaf1a2290aab5d782 SHA512 3ecd9389be26c5f1a2262b9d3b8ada4b88a76eec11e3f4c885d9c5e7f56b2c45625bff1a8026af0ab45d7663985dddf5ec8a3432ecbc31d9c719b48f64bef6f9
+EBUILD systemtap-4.0-r1.ebuild 2646 BLAKE2B 4e77ae227d92aa502510295e3d5433fbe1b5a7c57e3cec710a7ae702be4e0744958ea69e8c572e60f97c4b8e1654bb1a8d4923f828de62d6536aa6a3583a8a2e SHA512 1ab20cd5c2b02a87aadf2384bbd5d4f8c9c6c3b87ca0a7f06518afccd8e119d06320e863a1e18b0934073fadb650f365b83a0da1bd86ae9a8cdd36bd6809e2f7
 MISC metadata.xml 302 BLAKE2B 1118f1c8c5cb76bb140947afd86eefece0251d75fd99bf58decced339e68a700f140b30d7d7f77f8c89fdcd468e79906574ced8c9339498078e6cc9edab83922 SHA512 4db366a3c2ff95cd2cfe271cf4a50fa2d5189985620d3b9e51708f2811609e53eec2656589ff754731d018bf1c184a1bab662be8683c714a8621e9296eacd9a9
diff --git a/dev-util/systemtap/systemtap-4.0-r1.ebuild b/dev-util/systemtap/systemtap-4.0-r1.ebuild
index c978e0325f73..e8fb664f8f9c 100644
--- a/dev-util/systemtap/systemtap-4.0-r1.ebuild
+++ b/dev-util/systemtap/systemtap-4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit linux-info autotools python-single-r1 user
 
@@ -13,15 +13,14 @@ SRC_URI="https://www.sourceware.org/${PN}/ftp/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="avahi libvirt selinux sqlite +ssl"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="libvirt selinux sqlite +ssl zeroconf"
 
 RDEPEND=">=dev-libs/elfutils-0.142
 	dev-libs/json-c:=
 	sys-libs/ncurses:0=
 	sys-libs/readline:0=
 	${PYTHON_DEPS}
-	avahi? ( net-dns/avahi )
 	libvirt? ( >=app-emulation/libvirt-1.0.2 )
 	selinux? ( sys-libs/libselinux )
 	sqlite? ( dev-db/sqlite:3 )
@@ -29,6 +28,7 @@ RDEPEND=">=dev-libs/elfutils-0.142
 		dev-libs/nspr
 		dev-libs/nss
 	)
+	zeroconf? ( net-dns/avahi )
 "
 DEPEND="${RDEPEND}
 	app-arch/cpio
@@ -97,7 +97,7 @@ src_configure() {
 		--without-rpm
 		$(use_enable libvirt virt)
 		$(use_enable sqlite)
-		$(use_with avahi)
+		$(use_with zeroconf avahi)
 		$(use_with ssl nss)
 		$(use_with selinux)
 	)
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index d005d9f9e94a..d5a304b33d09 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,6 +1,6 @@
-AUX trace-cmd-2.7-makefile.patch 1164 BLAKE2B f3bd1f27d473d9f71eb81cb5d635a798b520a21e25f1bc47f9b78c35c056b74c3644812ee06fb5c49b6cb84d442f2b8a68f230f60da955b1f631e0a2200621cf SHA512 fb96207c85f32d72a28466c9c7c145dea76d39b91fb024cf1d6b8a9dec4f07832d17f1e1d454628ab9535d376ad055fbc5bb00666dcc355aad64fc259a7d2ab2
+AUX trace-cmd-2.7-makefile.patch 1162 BLAKE2B e53e6f5c93445cb4bfbe8dd15bcd01972968fb27d1ca6ed45944f383fabf08cc1850686ca5526fb1de78103e5a49dc756279da91fd75136c56d3cd55c59aa013 SHA512 af6c8c11b13737c6e4e8926bbcc250c19fae22268b05727b2d9cd4e853b43735106b6e4439ccea89f038641f8c4a93494428c41756adc411526030c74d8f3aad
 AUX trace-cmd-2.7-soname.patch 339 BLAKE2B b89d513caa361cfcab00d821e09ae47ce84527add57ce94199262f660f8df5ff436b8ca1d47707d5939c7df760cdfda71c6163d8c4e71ad983328aee5b6f2a20 SHA512 a64a8f6ec1745a1221380b35e779b22d9044df007798eaed5617ea81a391ed0e1baba1f74af9bed280805f748c829b7ca3cc0f7fb773adf791c33373dde3c662
 DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
-EBUILD trace-cmd-2.7-r2.ebuild 1712 BLAKE2B 03502141565b64c9c589e46ac8fa436d6734c120ea5ad15427ee16095d2a84242428aeb81ccf9546a4fe057da06641dc8058327e67283db926c3c1ad6f970397 SHA512 cc968b5d8347869e3503ea3fe696432df1fbd52c77841ea29634ddc447ab7cc74afe908f262d6b27a7f07e4b347bc2cef802de9d2e08082c2bfef88b10207165
-EBUILD trace-cmd-9999.ebuild 1712 BLAKE2B 03502141565b64c9c589e46ac8fa436d6734c120ea5ad15427ee16095d2a84242428aeb81ccf9546a4fe057da06641dc8058327e67283db926c3c1ad6f970397 SHA512 cc968b5d8347869e3503ea3fe696432df1fbd52c77841ea29634ddc447ab7cc74afe908f262d6b27a7f07e4b347bc2cef802de9d2e08082c2bfef88b10207165
+EBUILD trace-cmd-2.7-r2.ebuild 1777 BLAKE2B a77c5ae330fa91888f0140184012f7c52220fff7c09f15a533d972c5c95c6c690085f7a9fab6c7a0d3a97b80ec24a9816baff058a12bd7e048dd614f7d25eb70 SHA512 3c4bf7a879bb2a8efa5cb7077927bf996b6fa2590b2decfacbf1f2f6a0c69a03805324f82238048874835854fb52d2ddaa1a58e3e07cafa5faa79edde8bf992a
+EBUILD trace-cmd-9999.ebuild 1777 BLAKE2B a77c5ae330fa91888f0140184012f7c52220fff7c09f15a533d972c5c95c6c690085f7a9fab6c7a0d3a97b80ec24a9816baff058a12bd7e048dd614f7d25eb70 SHA512 3c4bf7a879bb2a8efa5cb7077927bf996b6fa2590b2decfacbf1f2f6a0c69a03805324f82238048874835854fb52d2ddaa1a58e3e07cafa5faa79edde8bf992a
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
index da1ca62e7c04..a9d7584dc625 100644
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
@@ -1,7 +1,8 @@
-diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile
---- trace-cmd-v2.7.orig/Makefile	2018-02-01 23:35:28.000000000 +0100
-+++ trace-cmd-v2.7/Makefile	2018-09-16 16:42:58.445655156 +0200
-@@ -63,7 +63,7 @@
+diff --git a/Makefile b/Makefile
+index a5d2c38..a99e5a4 100644
+--- a/Makefile
++++ b/Makefile
+@@ -63,7 +63,7 @@ python_dir = $(HOME)/.trace-cmd/python
  var_dir = $(HOME)/.trace-cmd/
  else
  plugin_dir = $(libdir)/trace-cmd/plugins
@@ -10,7 +11,7 @@ diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile
  PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
  PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
  PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -119,8 +119,11 @@
+@@ -119,8 +119,13 @@ endif # NO_PYTHON
  test-build = $(if $(shell sh -c 'echo "$(1)" | \
  	$(CC) -o /dev/null -c -x c - > /dev/null 2>&1 && echo y'), $2)
  
@@ -19,11 +20,13 @@ diff -ur trace-cmd-v2.7.orig/Makefile trace-cmd-v2.7/Makefile
 -udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
 +udis86-flags := -DHAVE_UDIS86
 +udis86-ldflags := -ludis86
++else
++udis86-flags := -UHAVE_UDIS86
 +endif # NO_UDIS86
  
  define BLK_TC_FLUSH_SOURCE
  #include <linux/blktrace_api.h>
-@@ -276,6 +279,7 @@
+@@ -276,6 +281,7 @@ endif
  # Append required CFLAGS
  override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
  override CFLAGS += $(udis86-flags) $(blk-flags)
diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
index d38e2e55b21e..27b25b7f1212 100644
--- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
@@ -41,8 +41,8 @@ CONFIG_CHECK="
 	~BLK_DEV_IO_TRACE"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.7-makefile.patch
-	"${FILESDIR}"/${PN}-2.7-soname.patch
+	"${FILESDIR}"/trace-cmd-2.7-makefile.patch
+	"${FILESDIR}"/trace-cmd-2.7-soname.patch
 )
 
 pkg_setup() {
@@ -51,30 +51,33 @@ pkg_setup() {
 }
 
 src_configure() {
-	MAKEOPTS+=" prefix=/usr
-		libdir=/usr/$(get_libdir)
-		CC=$(tc-getCC)
-		AR=$(tc-getAR)
-		$(usex audit '' '' 'NO_AUDIT=1')"
+	EMAKE_FLAGS=(
+		"prefix=/usr"
+		"libdir=/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		$(usex audit '' '' '' 'NO_AUDIT=1')
+		$(usex udis86 '' '' '' 'NO_UDIS86=1')
+	)
 
 	if use python; then
-		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
-		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+		EMAKE_FLAGS+=(
+			"PYTHON_VERS=${EPYTHON//python/python-}"
+			"python_dir=$(python_get_sitedir)/${PN}"
+		)
 	else
-		MAKEOPTS+=" NO_PYTHON=1"
+		EMAKE_FLAGS+=("NO_PYTHON=1")
 	fi
-
-	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
 }
 
 src_compile() {
-	emake V=1 all_cmd libs
+	emake "${EMAKE_FLAGS[@]}" all_cmd libs
 	use doc && emake doc
 
 }
 
 src_install() {
-	emake DESTDIR="${D}" V=1 install install_libs
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs
 	use doc && emake DESTDIR="${D}" install_doc
 
 }
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
index d38e2e55b21e..27b25b7f1212 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -41,8 +41,8 @@ CONFIG_CHECK="
 	~BLK_DEV_IO_TRACE"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.7-makefile.patch
-	"${FILESDIR}"/${PN}-2.7-soname.patch
+	"${FILESDIR}"/trace-cmd-2.7-makefile.patch
+	"${FILESDIR}"/trace-cmd-2.7-soname.patch
 )
 
 pkg_setup() {
@@ -51,30 +51,33 @@ pkg_setup() {
 }
 
 src_configure() {
-	MAKEOPTS+=" prefix=/usr
-		libdir=/usr/$(get_libdir)
-		CC=$(tc-getCC)
-		AR=$(tc-getAR)
-		$(usex audit '' '' 'NO_AUDIT=1')"
+	EMAKE_FLAGS=(
+		"prefix=/usr"
+		"libdir=/usr/$(get_libdir)"
+		"CC=$(tc-getCC)"
+		"AR=$(tc-getAR)"
+		$(usex audit '' '' '' 'NO_AUDIT=1')
+		$(usex udis86 '' '' '' 'NO_UDIS86=1')
+	)
 
 	if use python; then
-		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
-		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
+		EMAKE_FLAGS+=(
+			"PYTHON_VERS=${EPYTHON//python/python-}"
+			"python_dir=$(python_get_sitedir)/${PN}"
+		)
 	else
-		MAKEOPTS+=" NO_PYTHON=1"
+		EMAKE_FLAGS+=("NO_PYTHON=1")
 	fi
-
-	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
 }
 
 src_compile() {
-	emake V=1 all_cmd libs
+	emake "${EMAKE_FLAGS[@]}" all_cmd libs
 	use doc && emake doc
 
 }
 
 src_install() {
-	emake DESTDIR="${D}" V=1 install install_libs
+	emake "${EMAKE_FLAGS[@]}" DESTDIR="${D}" V=1 install install_libs
 	use doc && emake DESTDIR="${D}" install_doc
 
 }
diff --git a/dev-util/treecc/Manifest b/dev-util/treecc/Manifest
index 50cb52b5f08c..dd1e0930553f 100644
--- a/dev-util/treecc/Manifest
+++ b/dev-util/treecc/Manifest
@@ -1,3 +1,4 @@
 DIST treecc-0.3.10.tar.gz 375762 BLAKE2B 1d4fb6905226d79bef021808639f011731cd665b76db07efbf0ab4285c35986c1efa99381694ab5ddbb20131a8bef0d26b677d1b3e5311f2fe8fa99b1a575efb SHA512 426add1a96913a169a0f03a6e3247a8b48c9073335cf967ef05d4d4188fbe3b8ebc837b38b9a4de94ccdb13685ace47a91b185c75a845cf2670e929802774b73
-EBUILD treecc-0.3.10.ebuild 1136 BLAKE2B 2ccfec687eb4d19811b7cdc3c46addf929050d65c52a09a26900fcad8687ff8f08707b4c1e2737f1ad7887309fe9cc34e390e214b2cd920b51123ad9662ec830 SHA512 7a8067318e17c4eea0262463ca1b1cb384caab13311f4d996ee0e1cc2b6723dd0f4ec3f3c6c81a5b5214b24d6b946fbbd4603a96d8280a29d14ad2b3dfbe9435
+EBUILD treecc-0.3.10-r1.ebuild 1004 BLAKE2B fd82dacd8738fa84f8aaec95cc6835205be791f3e5c9cfc2e54398a7662025e8fe72057585dab66d3a4c08d43d0b9d03a692f79e25041d714ad2f0a153dc8d1b SHA512 8698ec331ae51772cc6664516555caf5aebb52a2114aa825639272c71cd3d290c8232407682b036472dcdd42235df438f623b2d0a1c5b4d5a0254dab79e6dbac
+EBUILD treecc-0.3.10.ebuild 1135 BLAKE2B 9c4d314f1478636dce24b38bbf0bff709236a4ebe59b720973a7348e3965ce8fe1f6216ad585c23e35d6dd7623f70cc98670f233f1727eaf0f68e840f5fc39be SHA512 b84c2984feeb18e72f6c892943a7b4132bccaf8d41d78342d1657630834b1874d5d040d78b4a48cf5b7bb3ae9bc5b86e91801489156b8df04f3bfe38d1e58473
 MISC metadata.xml 251 BLAKE2B 102da490c04b5ec767aebd0f076ea9aa083ec51416f584daad83e4202bd51e7182e95b7c1c98125c2a9da29eaa6b97dd4d9825c9d72e9c89d85d209e89031f48 SHA512 9b3d8ef0e933c58ceeae768b5e07fec1aba98d2f0add71719bcdec0e571b503b102610c0c4cbc322cc15638547e2f26f149d80c1498edb10b16a874014ae20d0
diff --git a/dev-util/treecc/treecc-0.3.10-r1.ebuild b/dev-util/treecc/treecc-0.3.10-r1.ebuild
new file mode 100644
index 000000000000..10b7e4a3fb6c
--- /dev/null
+++ b/dev-util/treecc/treecc-0.3.10-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Compiler-compiler tool for aspect-oriented programming"
+HOMEPAGE="https://www.gnu.org/software/dotgnu"
+SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~amd64-linux ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sparc ~sparc-solaris ~x86 ~x86-linux"
+IUSE="doc examples"
+
+DEPEND="doc? ( app-text/texi2html )"
+
+src_compile() {
+	default
+
+	if use doc; then
+		[[ -f "${S}"/doc/treecc.texi ]] || die "treecc.texi was not generated"
+		cd "${S}"/doc || die
+		texi2html -split_chapter "${S}"/doc/treecc.texi \
+			|| die "texi2html failed"
+		cd "${S}" || die
+	fi
+}
+
+src_install() {
+	default
+
+	if use examples; then
+		docinto examples
+		dodoc examples/README
+		dodoc examples/{expr_c.tc,gram_c.y,scan_c.l}
+	fi
+
+	if use doc; then
+		dodoc doc/*.{txt,html}
+		docinto html
+		dodoc -r doc/treecc/*.html
+	fi
+}
diff --git a/dev-util/treecc/treecc-0.3.10.ebuild b/dev-util/treecc/treecc-0.3.10.ebuild
index 5600422561cc..7538dd6f11f4 100644
--- a/dev-util/treecc/treecc-0.3.10.ebuild
+++ b/dev-util/treecc/treecc-0.3.10.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=0
 
 DESCRIPTION="compiler-compiler tool for aspect-oriented programming"
 HOMEPAGE="https://www.gnu.org/software/dotgnu"
-SRC_URI="http://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
+SRC_URI="https://download.savannah.gnu.org/releases/dotgnu-pnet/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="doc examples"
diff --git a/dev-util/trinity/Manifest b/dev-util/trinity/Manifest
index f76cebcc5289..1cae4ea3384c 100644
--- a/dev-util/trinity/Manifest
+++ b/dev-util/trinity/Manifest
@@ -1,8 +1,4 @@
-AUX trinity-autofs.patch 1688 BLAKE2B 99b068123ff2de6f47569c5286fd12326451be1816f8386ef82fcea97816f7d922cb7496fc8cd356878c1b89434fb033fa345c18d25368dca0f1e1c8973ea229 SHA512 4e8b8fb16d37a8de966ffdc6049743e73c978947b4cbcecd460bc548ea4dc5a2f50e326e5745d7b31c2aeebb53e46026a8504bb26a8d9c2996b375ec2891152d
-AUX trinity-irda.patch 1557 BLAKE2B 23dc97baab847ffe565af9d1b595a01dd2b4355cc265e07eb17a5718630a4b5534b00fc44d828a7186ea565714d94cc6dd49fe9f3e5033390353a25ab8e82e7a SHA512 e84f35f50dbffae42c2986e34f7b13b496d5f44ecadb2b1241682e0281356286cf88868d770fe6ac2a31f91ba2851b0f04970d595463988b44074d90c6babca3
-AUX trinity-memfd.patch 2092 BLAKE2B a29485126afbb6966969284977032bc63634afa0922206d487b1801d017bcae8990ee46f06f7cb63eaea957cb7b469f48a0a222a240efbe73f79fc8923157313 SHA512 ea9b77c5a37d53f329bb185cf6b33c6d26c27c4feead29c7c9e2999818ea5783ef92185ef9aa1676fced1dc24bbf1da9ef3a14056ee56f73baff4886da474bd9
-AUX trinity-net-protocols.patch 449 BLAKE2B ccc3f26e0c27d145a16463cb7573c79c2ebb3b6368b3fb4b63df4e053b8b4edf12e53174b7e967f138e0b8ae4d3c93ca727f8cb18e0ab1a56373550d37b8d93e SHA512 e52a7be4004472ee323e4c51cff65ecbad4464642abc8bee4ec94b588770ac49d814c0db6bce5c932a13fb6bffbe2491c80948d1f2f57835824253ce336319e5
-DIST trinity-1.8.tar.xz 213984 BLAKE2B 56f664023e2bc3648e941e4a3cb20e450cdcad3556289e201513d1755267eb013da2be035e81c87b3f1d1b0b1e12cb041c6bb345f7a84ee4c5c12f20a8e87f55 SHA512 686076dab2346cf9b5d8a20b14db31f460a352fa72eeadbe005a7423941918f5afef08b4987bb68cbbf4218d0cb620adb85f8036294d8df5ab5262e0031a44e4
-EBUILD trinity-1.8.ebuild 1000 BLAKE2B 10318476f98c42d5239e17ae0f6811d048a9b6a5cffa457b5e5cfeafe235ae9d44225931a46955bd658a1b41d8fe1d7a5cb81508224e268a443acbe47d8ab08a SHA512 0a922df41ffe9246f99b751abc4b19ec2b3592c9aa066ac73cdab125c41e2b895ae0b6a792b3a7a9b9a6427ca9727c9d1585e3dd5b6c08fe97ab01a6f217b79a
-EBUILD trinity-9999.ebuild 800 BLAKE2B dc34511a94c365dc6f49b9e9465effd96da1e685065316cfb4a1eb4e3c7a10096c749fadc5be7ac5942ed13d41e63982deb4c0c72d4415b426a3b88c31493239 SHA512 dcb2c5cfdcffa77b9deb1f9abf85619f5d4d1a2a8b1279748335829b325549ab0a9ce3e5356f67924e003955517b9b877dcc6368f6254b8a5560903c0f6b207a
-MISC metadata.xml 253 BLAKE2B e7d65a21b41d6fee02d2ca3ed68a52450a11debfcdf7e029100f010f6bab26aded65447d29bf374ee41d224f8105b57a8b2b6b0400f8ee4844900e6f2025a5cb SHA512 c6d2490fa32bc6e044a6b051ba21210f47d7545271a7437b9ed16f49924837e1c88dffc33efb94557b818a508e068e1405fae056c881078c37a001e30947aa25
+DIST trinity-1.9.tar.xz 216364 BLAKE2B dbf5af03539fc7bac37fd49f495e3feb506c7a403f72d0ef0b85327a3714b8edef52260a03dce1082db05d520376d7b96b0f85d541d6dff67e1245b0e1b35fe8 SHA512 3a2ab84b61b450d50e46a5da5dffa803f92bf469fc3d04ff4cb39f26b4f486bede9790bb48fc6b3bbda0ee882f0acf5b610d39e86b16bea7f2207adef94be31a
+EBUILD trinity-1.9.ebuild 935 BLAKE2B c57a0190ae530d5a0409b0361810973598641c105ec86e51f69439bc8c39c22c27f5c2d7bcb26a7ee3ae1618524ee6cb26d3bb88eeb936ee1a34a81cb8211834 SHA512 cd258c851f925c3a1047be98ed3ff6ed7aadfa68a1befaf25ba102ff89cd31bcadcc48cad414098a934ca569fc8ded2be643a15511474dd8d7cb932490fa21cd
+EBUILD trinity-9999.ebuild 919 BLAKE2B eb7b31f4af2efef42488ea8e674b0c04f499c034ce135d96eef871206d516d7acdac5f899dc30d376969bd67f75e3379a480828d8cea8afda2a671dde8431324 SHA512 955a09b5ef2f7f60a036dbcceb47083630f78e75aeb24092ca07a13f75de442c4b74ff9eaaa0ce29a4d5c657547157359105a33e15a3ed47483ea155053b311b
+MISC metadata.xml 346 BLAKE2B ff94232f302bb57d0d5a0b5819eeac32f2a0757f9df61ecefa1f00f9f43ff02499bd2e9f8f026a5464e2c0d10027190bdd625e6ffa8a9c61d996105a357239d4 SHA512 cdd71a11b6355fc8b7d71804adcd7159df6764d4abe587ebfd69ac4f1159ab7b30d6d7519209a3b53fb201923ef62a4df68907e6bcdcfa78f41c87c0968ce63e
diff --git a/dev-util/trinity/files/trinity-autofs.patch b/dev-util/trinity/files/trinity-autofs.patch
deleted file mode 100644
index b8a6c9fdbd51..000000000000
--- a/dev-util/trinity/files/trinity-autofs.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/configure.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/configure	2017-11-18 14:25:52.095495407 -0700
-@@ -47,6 +47,29 @@ check_header()
- echo "[*] Checking system headers."
- 
- #############################################################################################
-+# Does auto_fs4 define AUTOFS_IOC_EXPIRE_(IN)DIRECT?
-+echo -n "[*] Checking autofs headers ... "
-+rm -f "$TMP" || exit 1
-+
-+cat >"$TMP.c" << EOF
-+#include <linux/auto_fs4.h>
-+
-+int main()
-+{
-+	return AUTOFS_IOC_EXPIRE_INDIRECT + AUTOFS_IOC_EXPIRE_DIRECT;
-+}
-+EOF
-+
-+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
-+if [ ! -x "$TMP" ]; then
-+	echo $RED "[NO]" $COL_RESET
-+	MISSING_DEFS=1
-+else
-+	echo $GREEN "[YES]" $COL_RESET
-+	echo "#define USE_AUTOFS_EXPIRE 1" >> $CONFIGH
-+fi
-+
-+#############################################################################################
- # Are ipv6 headers usable ?
- [ -z "$IPV6" ] && IPV6=yes
- if [[ "$IPV6" == "yes" ]]; then
-@@ -290,6 +313,7 @@ fi
- 
- #############################################################################################
- 
-+check_header linux/auto_fs4.h USE_AUTOFS_EXPIRE
- check_header linux/caif/caif_socket.h USE_CAIF
- check_header linux/fsmap.h USE_FSMAP
- check_header linux/if_alg.h USE_IF_ALG
---- a/ioctls/autofs.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/ioctls/autofs.c	2017-11-18 14:21:14.487774564 -0700
-@@ -238,8 +238,10 @@ static const struct ioctl autofs_ioctls[
- 	IOCTL(AUTOFS_IOC_SETTIMEOUT),
- 	IOCTL(AUTOFS_IOC_EXPIRE),
- 	IOCTL(AUTOFS_IOC_EXPIRE_MULTI),
-+#ifdef PRE_4_14_KERNEL
- 	IOCTL(AUTOFS_IOC_EXPIRE_INDIRECT),
- 	IOCTL(AUTOFS_IOC_EXPIRE_DIRECT),
-+#endif
- 	IOCTL(AUTOFS_IOC_PROTOSUBVER),
- 	IOCTL(AUTOFS_IOC_ASKUMOUNT),
- 
diff --git a/dev-util/trinity/files/trinity-irda.patch b/dev-util/trinity/files/trinity-irda.patch
deleted file mode 100644
index eb298fd99d80..000000000000
--- a/dev-util/trinity/files/trinity-irda.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- a/configure.orig	2017-11-18 14:25:52.095495407 -0700
-+++ b/configure	2018-07-21 11:44:59.235072132 -0600
-@@ -317,6 +317,7 @@ check_header linux/auto_fs4.h USE_AUTOFS
- check_header linux/caif/caif_socket.h USE_CAIF
- check_header linux/fsmap.h USE_FSMAP
- check_header linux/if_alg.h USE_IF_ALG
-+check_header linux/irda.h USE_IRDA
- check_header linux/rds.h USE_RDS
- check_header linux/vfio.h USE_VFIO
- check_header drm/drm.h USE_DRM
---- a/net/protocols.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/net/protocols.c	2018-07-21 11:48:09.065940013 -0600
-@@ -26,7 +26,9 @@ const struct protoptr net_protocols[TRIN
- #ifdef USE_RDS
- 	[PF_RDS] = { .proto = &proto_rds },
- #endif
-+#ifdef USE_IRDA
- 	[PF_IRDA] = { .proto = &proto_irda },
-+#endif
- 	[PF_LLC] = { .proto = &proto_llc },
- 	[PF_CAN] = { .proto = &proto_can },
- 	[PF_TIPC] = { .proto = &proto_tipc },
---- a/net/proto-irda.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/net/proto-irda.c	2018-07-21 11:45:34.330047712 -0600
-@@ -4,13 +4,15 @@
- #include <sys/un.h>
- /* old irda.h does not include something which defines sa_family_t */
- #include <netinet/in.h>
--#include <linux/irda.h>
- #include <stdlib.h>
- #include "net.h"
- #include "random.h"
- #include "utils.h"	// RAND_ARRAY
- #include "compat.h"
- 
-+#ifdef USE_IRDA
-+#include <linux/irda.h>
-+
- static void irda_gen_sockaddr(struct sockaddr **addr, socklen_t *addrlen)
- {
- 	struct sockaddr_irda *irda;
-@@ -53,3 +55,5 @@ const struct netproto proto_irda = {
- 	.valid_triplets = irda_triplets,
- 	.nr_triplets = ARRAY_SIZE(irda_triplets),
- };
-+
-+#endif
diff --git a/dev-util/trinity/files/trinity-memfd.patch b/dev-util/trinity/files/trinity-memfd.patch
deleted file mode 100644
index d333aac2941e..000000000000
--- a/dev-util/trinity/files/trinity-memfd.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-commit c93bb184ce996c4d77eefbae2ab0bf74f396ec45
-Author: Baruch Siach <baruch@tkos.co.il>
-Date:   Tue Mar 13 06:53:06 2018 +0200
-
-    memfd: fix build with glibc 2.27
-    
-    glibc 2.27 added a wrapper for memfd_create(). This causes build
-    failure:
-    
-    fds/memfd.c:19:12: error: static declaration of 'memfd_create' follows non-static declaration
-     static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
-                ^~~~~~~~~~~~
-    
-    Don't use the local definition when the libc provides one.
-    
-    Signed-off-by: Baruch Siach <baruch@tkos.co.il>
-
-diff --git a/configure b/configure
-index dc0a87d8c1ad..c0166af33048 100755
---- a/configure
-+++ b/configure
-@@ -289,6 +289,29 @@ else
- fi
- 
- #############################################################################################
-+# Does glibc provide memfd_create() syscall wrapper
-+#
-+echo -n "[*] Checking if glibc provides memfd_create.. "
-+rm -f "$TMP" || exit 1
-+
-+cat >"$TMP.c" << EOF
-+#include <sys/mman.h>
-+
-+void main()
-+{
-+	memfd_create();
-+}
-+EOF
-+
-+${CC} ${CFLAGS} "$TMP.c" -o "$TMP" &>"$TMP.log"
-+if [ ! -x "$TMP" ]; then
-+	echo $RED "[NO]" $COL_RESET
-+else
-+	echo $GREEN "[YES]" $COL_RESET
-+	echo "#define USE_MEMFD_CREATE 1" >> $CONFIGH
-+fi
-+
-+#############################################################################################
- 
- check_header linux/caif/caif_socket.h USE_CAIF
- check_header linux/fsmap.h USE_FSMAP
-diff --git a/fds/memfd.c b/fds/memfd.c
-index 210678e4571c..aaaac2f78f54 100644
---- a/fds/memfd.c
-+++ b/fds/memfd.c
-@@ -5,6 +5,7 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
-+#include <sys/mman.h>
- 
- #include "fd.h"
- #include "memfd.h"
-@@ -16,6 +17,7 @@
- #include "trinity.h"
- #include "udp.h"
- 
-+#ifndef USE_MEMFD_CREATE
- static int memfd_create(__unused__ const char *uname, __unused__ unsigned int flag)
- {
- #ifdef SYS_memfd_create
-@@ -24,6 +26,7 @@ static int memfd_create(__unused__ const char *uname, __unused__ unsigned int fl
- 	return -ENOSYS;
- #endif
- }
-+#endif
- 
- static void memfd_destructor(struct object *obj)
- {
diff --git a/dev-util/trinity/files/trinity-net-protocols.patch b/dev-util/trinity/files/trinity-net-protocols.patch
deleted file mode 100644
index d2583b56ebd6..000000000000
--- a/dev-util/trinity/files/trinity-net-protocols.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/syscalls/setsockopt.c.orig	2017-11-03 09:14:07.000000000 -0600
-+++ b/syscalls/setsockopt.c	2017-11-18 13:44:19.283946230 -0700
-@@ -90,7 +90,7 @@ static void do_random_sso(struct sockopt
- retry:
- 	switch (rnd() % 4) {
- 	case 0:	/* do a random protocol, even if it doesn't match this socket. */
--		i = rnd() % PF_MAX;
-+		i = rnd() % TRINITY_PF_MAX;
- 		proto = net_protocols[i].proto;
- 		if (proto != NULL) {
- 			if (proto->setsockopt != NULL) {
diff --git a/dev-util/trinity/metadata.xml b/dev-util/trinity/metadata.xml
index 1d8df37aeeb8..7471f5066889 100644
--- a/dev-util/trinity/metadata.xml
+++ b/dev-util/trinity/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">kernelslacker/trinity</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>bircoph@gentoo.org</email>
+    <name>Andrew Savchenko</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">kernelslacker/trinity</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-util/trinity/trinity-1.8.ebuild b/dev-util/trinity/trinity-1.9.ebuild
index 2cb2ae2a86e1..583104b92a5e 100644
--- a/dev-util/trinity/trinity-1.8.ebuild
+++ b/dev-util/trinity/trinity-1.9.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="A Linux system call fuzz tester"
-HOMEPAGE="http://codemonkey.org.uk/projects/trinity/"
+HOMEPAGE="http://codemonkey.org.uk/projects/trinity/ https://github.com/kernelslacker/trinity/"
 SRC_URI="http://codemonkey.org.uk/projects/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
@@ -17,34 +17,30 @@ IUSE="examples"
 DEPEND="
 	>=sys-kernel/linux-headers-4.8
 "
-RDEPEND=""
 
-PATCHES=(
-	# Fixes from Fedora and Debian
-	"${FILESDIR}"/${PN}-autofs.patch
-	"${FILESDIR}"/${PN}-irda.patch
-	"${FILESDIR}"/${PN}-memfd.patch
-	"${FILESDIR}"/${PN}-net-protocols.patch
-)
+src_prepare() {
+	sed -e 's/-g -O2//' \
+		-e 's/-D_FORTIFY_SOURCE=2//' \
+		-e 's/-Werror//' \
+		-e '/-o $@/s/$(LDFLAGS) //' \
+		-i Makefile || die
 
-src_configure() {
 	tc-export CC
 	default
 }
 
 src_compile() {
-	# Enable a verbose (i.e. not quiet) build.
 	emake V=1
 }
 
 src_install() {
-	dobin "${PN}"
-	dodoc Documentation/*
-	einstalldocs
+	dobin ${PN}
+	dodoc Documentation/* README
+	doman trinity.1
 
 	if use examples ; then
-		exeinto "/usr/share/doc/${PF}/scripts"
+		exeinto /usr/share/doc/${PF}/scripts
 		doexe scripts/*
-		docompress -x "/usr/share/doc/${PF}/scripts"
+		docompress -x /usr/share/doc/${PF}/scripts
 	fi
 }
diff --git a/dev-util/trinity/trinity-9999.ebuild b/dev-util/trinity/trinity-9999.ebuild
index 4245b613481a..3910c2f87cdd 100644
--- a/dev-util/trinity/trinity-9999.ebuild
+++ b/dev-util/trinity/trinity-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,11 +13,15 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples"
 
-DEPEND="sys-kernel/linux-headers"
+# We need newer headers to avoid compilation failures in the BPF stuff.
+DEPEND="
+	>=sys-kernel/linux-headers-4.8
+"
 
 src_prepare() {
 	sed -e 's/-g -O2//' \
 		-e 's/-D_FORTIFY_SOURCE=2//' \
+		-e 's/-Werror//' \
 		-e '/-o $@/s/$(LDFLAGS) //' \
 		-i Makefile || die
 
@@ -32,6 +36,7 @@ src_compile() {
 src_install() {
 	dobin ${PN}
 	dodoc Documentation/* README
+	doman trinity.1
 
 	if use examples ; then
 		exeinto /usr/share/doc/${PF}/scripts
diff --git a/dev-util/tup/Manifest b/dev-util/tup/Manifest
index ffb598bc3b5a..1583617f3275 100644
--- a/dev-util/tup/Manifest
+++ b/dev-util/tup/Manifest
@@ -1,6 +1,4 @@
-DIST tup-0.7.7.tar.gz 4033539 BLAKE2B dc4d3fc538c76dac53629991e32de7414f35877af8bb9f2ce4a1f80252317de7b3d2ea1542ab3e58702813b297a42c95610d14122496ac7f23acc1f8f3d62461 SHA512 05407cc923b898d5dcf6652df6395e7618d43fa4e3ace905dda09bcda26f975187761a704d360fceeb38332f29d65cd3d1f9e04c87d93dcffa4e9e2be9b35aad
 DIST tup-0.7.8.tar.gz 4540974 BLAKE2B b6724113fac9920b029604af3bf4fd875c1651b89b6c772bfecef9e8d9612574265fafd0a8eac217a51e3b3fe1d4776e97174d4c89cbf97ee3203dddc0e53f6c SHA512 17d4b76c508749ca011b3c0209bc779d617a091ed2d067bf1095fc840f62ac23145071395892170390ac6217f18bcaabb0cff582aa782838eab190244313d7f5
-EBUILD tup-0.7.7.ebuild 2499 BLAKE2B 27dc4b8f2be59038c7256feeeb0edbd49580fe3b8c018834cf2255ea37f95b9e8898894620a10ff25098b8966aadc9c26a73650c663fb50ff0017a5e394c80f2 SHA512 ae2cdc51894567ae76ccf2b03ab2afbb07d6648e2230a2a94ac8edb4857e3cc40815e05a21343999bb40465922957196a88cc7debb1001bb772b0a6d8fbe53a2
 EBUILD tup-0.7.8.ebuild 2431 BLAKE2B fd243d20be8b10d3634e9be0cbaba643cf206338277b7d6257d49ec73a158c3ef2fb11fa75c3ae3395217e827a4fe34d0544fc75cbd713e24f8109d1f402894e SHA512 ee0b0f687cd39c05a013785f6af1c4b6d3f5d72f3dd8491bba76f057196e5d25036587290676c3c15c03ba6683021863e0d4d1068d7fe155f101aad53b05a3d6
 EBUILD tup-9999.ebuild 2432 BLAKE2B b551f08ef0a190305eca5b3c6bc8151d85062c1e20ee9021faeabe96c367afb1def59f64fbdc6869bb24c79389cd57bc3d217b8bf9cb31b02546e9987eed6749 SHA512 49b29bb44d75761c0525a37472e3d1b245d34324e4dddbc936e0d1de10799e4d0cf56b58cf814f7d4a8600d0764df4902d811ea59d5913622f7935321782c7c5
 MISC metadata.xml 326 BLAKE2B edaa58be0e147ba52e73b1e4ad70250ee2ebf7c31beda95bc4f639dc4759b4a2515a3f927b4c5c3e644a66a58180df7ef6874893908d6ffc55181c8a554f3a70 SHA512 cd0c6ad8e43779608355cc4bd23a03a88d2920ff15269f2b130395f955fe58d63029d6f8567b021c4f546d0c41e8af3d866c0de4b72d042be1ec6eff72cc0154
diff --git a/dev-util/tup/tup-0.7.7.ebuild b/dev-util/tup/tup-0.7.7.ebuild
deleted file mode 100644
index 194cf670515f..000000000000
--- a/dev-util/tup/tup-0.7.7.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info toolchain-funcs
-
-DESCRIPTION="A file-based build system"
-HOMEPAGE="http://gittup.org/tup"
-# Tup itself is GPLv2, but it bundles differently licensed software:
-# - lua: MIT
-# - sqlite (unused in this ebuild): public domain
-# - inih: 3-clause BSD
-# - red-black tree implementation: 2-clause BSD
-# - queue implementation: 3-clause BSD
-LICENSE="GPL-2 MIT public-domain BSD BSD-2"
-SLOT="0"
-
-if [[ "${PV}" == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/gittup/tup.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/gittup/tup/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-DEPEND="
-	dev-db/sqlite:=
-	sys-fs/fuse:=
-"
-RDEPEND="${DEPEND}"
-
-CONFIG_CHECK="~FUSE_FS ~NAMESPACES"
-WARNING_FUSE_FS="CONFIG_FUSE_FS is required for tup to work"
-WARNING_NAMESPACES="CONFIG_NAMESPACES is required for tup to work as intended (workaround: set TUP_NO_NAMESPACING env var when running tup)"
-
-src_prepare() {
-	# Use our toolchain
-	sed -i Tuprules.tup \
-		-e "s:CC = gcc:CC = $(tc-getCC) ${CFLAGS} ${LDFLAGS}:" \
-		-e "s:ar crs:$(tc-getAR) crs:"
-
-	if [[ ${PV} != 9999 ]]; then
-		# Avoid invoking `git` to find version, use ours
-		sed -i src/tup/link.sh \
-			-e 's;`git describe`;v'"${PV};"
-	fi
-
-	default
-}
-
-src_configure () {
-	echo "CONFIG_TUP_USE_SYSTEM_SQLITE=y" >> tup.config
-}
-
-src_compile() {
-	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
-	# which violates sandboxing.
-	export TUP_NO_NAMESPACING=1
-	./bootstrap-nofuse.sh || die
-	unset TUP_NO_NAMESPACING
-}
-
-src_install() {
-	dobin tup
-	dolib.a libtup_client.a
-	doheader tup_client.h
-	doman tup.1
-}
-
-src_test() {
-	[[ -e /dev/fuse ]] || die "/dev/fuse is required for tests to work"
-	# tup uses fuse when tracking dependencies.
-	addwrite /dev/fuse
-
-	# Disabling namespacing because it leads to accessing /proc/<pid>/setgroups
-	# which violates sandboxing.
-	export TUP_NO_NAMESPACING=1
-
-	# Skip tests which require namespacing or root privileges.
-	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/umockdev/Manifest b/dev-util/umockdev/Manifest
index 6df9bbdd18f6..02a797195f2e 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,7 +2,7 @@ AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae
 DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1042 BLAKE2B 4453ef595e762330e829f28e8bfb25b7495f176bb3ebb8f0740efc2e5501601f3b4436d72645c10c759bac2c277a9ee8c68f66ecfc0669cfbbc55ccf845fc64a SHA512 4b46cad4bbde01bc916fe0a15c6b292f34d9a8ca20dd7ef2d37d5ab19bfa026c01ad0233b2a2f928de0d86c931f5822e7b1b39e8c2387ddf6550613cf6bcdbe9
-EBUILD umockdev-0.12.1.ebuild 1149 BLAKE2B 1d32589e3da0ab0194c82edde328571354e202717bde4c32c5ce62d852655a9d528e676a5e0fd8c87d7d2f81568652d3a0bf1884330466ec4b1b88103028ccb6 SHA512 625feddb289a6c7c883cb0b37596d9cd18e77d07ceb2199b53c52109a1bf75a1169756a85a22e24e0ebdff84141da2bd251ce8cac4adb1445657f9a1706e221d
-EBUILD umockdev-0.9.4.ebuild 733 BLAKE2B cefe313e56cf836a624207c5f0fecf9b41400070ad1675404e34a84e6ca684ad3c3835d0af8eb5762b615f077945c126ee3afa8fc07366e3cca298f4df31c525 SHA512 585f9841137d1d74981e7d64d0bcaadf7834a0b1a5689458b8cff8462272e86a48b6878d289bb40a7c8a6b52cb696298008124f048eac9bf38619d0e145eef3e
+EBUILD umockdev-0.11.3.ebuild 1038 BLAKE2B a3a3320532272437cfc288c19dc2d699a23f4680849b9909eba5d870b94cd0f3ac6044b8a7bfcf702837ad2be5a25f9fc99601d87f1aec11436da40f1a2a87bd SHA512 e0ea324957343aafa2dc70c321cdcf842903543900c6458d56ae15d668017b11635fffc65193978034dc3896eca3f03e415f96d11314365f7cef25ce539f2d8c
+EBUILD umockdev-0.12.1.ebuild 1145 BLAKE2B 675257b3395bd6215f59c576561089d72066c91265cab4eddbcd61e60198a4bc00885bf9b70e1831b2037b0cc0fdd7b05ac4c0eeaf2e134dcdead264c28b3be8 SHA512 2ed4e998afe917348d2416e1d4405af6b48db901d8a3cca49f504f2b34a349cdffba10147389f38f0cd3c4b7c8a7a444933604879b188d44879ab6bf110cc374
+EBUILD umockdev-0.9.4.ebuild 729 BLAKE2B fe316c30b4ac67d524b2e25516056170e79cc1d97db52a3b8a564339ef10e5583f8ce37a1929aaf005cf7388a53814fe5cf33b33c7adedbd154957bc6d9b6ff9 SHA512 bb692554b01a023cc9542059128232afc1ee994e18913b02f162eaab462cec7f2e43a5cdc8473cc1325d50193f875ae98f3e2e2d4847a51b81a9fa84779790ee
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
index 6d3b197721a2..3b6f95571010 100644
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.11.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 62e7a21851ea..b9ada4a868ff 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit multilib-minimal python-any-r1
 
diff --git a/dev-util/umockdev/umockdev-0.9.4.ebuild b/dev-util/umockdev/umockdev-0.9.4.ebuild
index 56a4b358cf1e..8f6c4d3ad17f 100644
--- a/dev-util/umockdev/umockdev-0.9.4.ebuild
+++ b/dev-util/umockdev/umockdev-0.9.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit python-any-r1
 
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 53d86cbc524c..ae7264fc2046 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -7,11 +7,13 @@ AUX valgrind-3.7.0-respect-flags.patch 360 BLAKE2B 020b9e3af2c6393193edd8be99ff2
 DIST valgrind-3.12.0.tar.bz2 12788556 BLAKE2B aeebf9c29afb3cce683c6448a3dec8f4edb1e44b2043a8e159c57a28c75fee49c5dba144d7ae2d79d23fe5a6c5b2bbf01fc398909bf12eebc027f8a7d4d83009 SHA512 2c083f7c2e74dc58600397726d9d3af7a2cea40fe3d8733149886d1d77867e6c09996e5be1c58dd932f3662acf7363e04eeadbc0f9c8f0dac089e605024229be
 DIST valgrind-3.13.0.tar.bz2 14723076 BLAKE2B cdf92087575cc851d316e2136081441f528596048bc5d1e9c17539283085dd9accd0c1b3136f9768a62de27d1f1641b450305681a33d9ba9fdfe028a73c0cb99 SHA512 34e1013cd3815d30a459b86220e871bb0a6209cc9e87af968f347083693779f022e986f211bdf1a5184ad7370cde12ff2cfca8099967ff94732970bd04a97009
 DIST valgrind-3.14.0.tar.bz2 16602858 BLAKE2B 00d601593388180cc874cf2f0c78e79f705f145e45ea82996117cb91ba881e7888ef241fb7e45927f82f99666d76ed35cb5d451e9a3ef123c04a0dff233b2269 SHA512 68e548c42df31dc2b883a403e0faff7480c49b3054841870f5d2f742141ba199eca5d83c96bbf283115f0633f2bdb0860161d422f98e3ec720ec65760d250f97
+DIST valgrind-3.15.0.tar.bz2 20241437 BLAKE2B a1bd46d46b3cd9f963773d011e7c74bf5e09e59be13afe38229a3c66a89eeb416498faed67d6ec21489b630b55ac73cc212e17ba515884f8b6374849a60e3720 SHA512 5695d1355226fb63b0c80809ed43bb077b6eed4d427792d9d7ed944c38b557a84fe3c783517b921e32f161228e10e4625bea0550faa4685872bb4454450cfa7f
 EBUILD valgrind-3.12.0.ebuild 2854 BLAKE2B 07c651acb3854432137f09513f991cb549b6192a704a26ed9626816f8650acfca0179c7064e772e59058a7657b1c0407a87753ec30b2209cf47aa04d68d908ca SHA512 a65f3ccca3a33e2bbae7d2616b2fa13a6a3913e927f601f8ef52172981f72c03219ccad126a801719688cb6106dea18c56ac0e14de194e065bffa744151ab457
 EBUILD valgrind-3.13.0-r1.ebuild 3428 BLAKE2B 96f18609fe79c997b4d344ecf59be9356aafd5ed7bc4e03b028f06e3e938ee1f00440289f7918ab935ccc42fa2bea2d316bb1d96c43ef40a85374b12e0b5683c SHA512 aa0fe6e76e52d25c6b05a30c46de96aabf539f7166bd369b21b93522d52e01d9fc50c77769170021038b0ec60911cd07bf5afccca86e35ad49828e401ed4d61e
 EBUILD valgrind-3.13.0-r2.ebuild 3879 BLAKE2B 03709383d7167d639ec5f3d461b0990c1d240a5260f5f4533a7dc79ca3b789ae9cfb7f749a11be2dfb410cadf7364ffd13515c63ee3673fee3fcb4d07b8a4b25 SHA512 c2f81be414f2d5d2853350b1e1652f5cc03578962d3a8ed5a31462defe970b1a5b7f4820f02fb76e4a7494ec5377af35149c0c22c9378619e2705247f490268b
 EBUILD valgrind-3.13.0-r3.ebuild 4121 BLAKE2B 0770974a05e87ad0ffec0516521d5954196b0a5ffc62ce2aae925bbe29a2acd076cac3d5751bf92535ce59f554ae51403849b1b7fb4c6f71ade7fcbe0c333554 SHA512 1f0921aba9cdd3a192fdc3ae5a77da773c7c9e485acbb38c9ac8de6208496d44d10edc01126e8488e17231c45cf8a769d3226ab18d8436e7857497a3b07dd2f8
 EBUILD valgrind-3.13.0.ebuild 2854 BLAKE2B 8228042c5f24ce771f07f3b44c94a26dec805e7ce03ecd545a7b7caee1c3a41f93deeed2b298a99b9560614e64b54961e4df3c8d902984b34ed0b2e005568107 SHA512 771bf52c0436aa15175df29d10e3f191e5e9511a50dd466ef6a102c7b13d677ad84adf387b7edb99b6cdce1f38f644adbdc3a40bdaacabb22168f2aa07302fcc
-EBUILD valgrind-3.14.0.ebuild 3688 BLAKE2B 7f353909403147180ba335c0d937fc30bf47da0ef99f61bcf7ee20c50de67e21b09ca7665e6c35b2c8151e947af8e930fb621fb990028cf0dabc3142d81b10a0 SHA512 d569eb947d00d9426af8959f8073c6c1b2110deba6be2b639a4b1d306818a5a0d9dfd34feb249614ab45ed8fab69bcad67cada53b423c5b35d5a8ebf7c77d7ee
+EBUILD valgrind-3.14.0.ebuild 3681 BLAKE2B 4edebcceac72d0191cc6a7dfc1c47bfb3bf7afb1acc15479346cbb7f4d7afc20311393c68f623e92f6ed7efa12cafb0c33dd888aca27defb6c0e1efe5f235b04 SHA512 e9e987302ff3dc55b345cb5b497b22599eca3c1fda2de35b350189b519ab2a1fcf33e959c814b40918c11994a2421eeb27b66bea48080cc0ac015108828f89d8
+EBUILD valgrind-3.15.0.ebuild 3685 BLAKE2B b7ac7a43be897765449cee359a75b9e276729c9898106bd90ae2f259fabcd6bc947d0ccaf4c9c77823f1089db70357d1a82a5a3f1319351af0dbef95e60cc030 SHA512 da1e9949b59bd238fefd7b8f4dc3bce5a687ff337738f2354d2121bc4da4f44d416b3c7a03cfbf0e74d4e1d7ea0f5137f0b6d017b36b73ae5159c1209b5929c5
 EBUILD valgrind-9999.ebuild 3675 BLAKE2B 4405fa37a59f844c3ab8f5ca933408834a7986b4534542f7276214ed9616912f9df22b62f3bd2dcaa8693acaf0c19f09489d67ea8825bc8d2ee6e5d387aca10b SHA512 408fb2dd9e8676dcf117298f03dcedd5dd54f8eb33d75c04f6f890817a82a9035b7387d4a075ef7bebc52c2008ae99c7831eb0e9e7553eae449ccc3f6160a3fa
-MISC metadata.xml 1139 BLAKE2B fef548fc43861a5c031c4db6fcd5a446cb3a33b030916a118de1d99e78fc893991cd20f06d545d7731668e4ad859ded8e8b980e35e383ba27ecb96b704757a95 SHA512 f3ee37b8e5f408c01d5f6308644305fcb945df008e5f708dbde95f73a1e7988f53799e28bd72f75bd5e01765414a0e11b8045f671e723beb46d90a50f5dd1846
+MISC metadata.xml 1027 BLAKE2B df13361ec401ce5e0bfa11e51378c432405bd296a874d8c71c26c9cbdf0171689e4b3134b5e05672dfc22bbcd6e2b6c74b96c47367725c209990d3e1fcc65e7b SHA512 da5bcaf596f2adaa552cc3b7296891b40be0bafec8a12695076ce8fbe660b8aabe70508eb02ab3fb66b0d9dd0c0c8615f430c1ee0ce3f3579732ea2406c8a778
diff --git a/dev-util/valgrind/metadata.xml b/dev-util/valgrind/metadata.xml
index 31d1b4f644dd..0bf3fac2660d 100644
--- a/dev-util/valgrind/metadata.xml
+++ b/dev-util/valgrind/metadata.xml
@@ -5,10 +5,6 @@
 		<email>blueness@gentoo.org</email>
 		<name>Anthony G. Basile</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>wizardedit@gentoo.org</email>
-		<name>Austin English</name>
-	</maintainer>
 	<longdescription>
 		Valgrind is a GPL'd tool to help you find memory-management problems
 		in your programs. When a program is run under Valgrind's supervision,
diff --git a/dev-util/valgrind/valgrind-3.14.0.ebuild b/dev-util/valgrind/valgrind-3.14.0.ebuild
index e111e5fd3e23..e7ce366d68a0 100644
--- a/dev-util/valgrind/valgrind-3.14.0.ebuild
+++ b/dev-util/valgrind/valgrind-3.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm ~arm64 ~ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DEPEND="mpi? ( virtual/mpi )"
diff --git a/dev-util/valgrind/valgrind-3.15.0.ebuild b/dev-util/valgrind/valgrind-3.15.0.ebuild
new file mode 100644
index 000000000000..b18a128859a5
--- /dev/null
+++ b/dev-util/valgrind/valgrind-3.15.0.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools flag-o-matic toolchain-funcs multilib pax-utils
+
+DESCRIPTION="An open-source memory debugger for GNU/Linux"
+HOMEPAGE="http://www.valgrind.org"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="mpi"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="git://sourceware.org/git/${PN}.git/"
+	inherit git-r3
+else
+	SRC_URI="ftp://sourceware.org/pub/valgrind/${P}.tar.bz2"
+	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+DEPEND="mpi? ( virtual/mpi )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Correct hard coded doc location
+	sed -i -e "s:doc/valgrind:doc/${PF}:" docs/Makefile.am || die
+
+	# Don't force multiarch stuff on OSX, bug #306467
+	sed -i -e 's:-arch \(i386\|x86_64\)::g' Makefile.all.am || die
+
+	# Respect CFLAGS, LDFLAGS
+	eapply "${FILESDIR}"/${PN}-3.7.0-respect-flags.patch
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# upstream doesn't support this, but we don't build with
+		# Sun/Oracle ld, we have a GNU toolchain, so get some things
+		# working the Linux/GNU way
+		find "${S}" -name "Makefile.am" -o -name "Makefile.tool.am" | xargs \
+			sed -i -e 's:-M,/usr/lib/ld/map.noexstk:-z,noexecstack:' || die
+		cp "${S}"/coregrind/link_tool_exe_{linux,solaris}.in
+	fi
+
+	# Allow users to test their own patches
+	eapply_user
+
+	# Regenerate autotools files
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=()
+
+	# Respect ar, bug #468114
+	tc-export AR
+
+	# -fomit-frame-pointer	"Assembler messages: Error: junk `8' after expression"
+	#                       while compiling insn_sse.c in none/tests/x86
+	# -fstack-protector     more undefined references to __guard and __stack_smash_handler
+	#                       because valgrind doesn't link to glibc (bug #114347)
+	# -fstack-protector-all    Fails same way as -fstack-protector/-fstack-protector-strong.
+	#                          Note: -fstack-protector-explicit is a no-op for Valgrind, no need to strip it
+	# -fstack-protector-strong See -fstack-protector (bug #620402)
+	# -m64 -mx32			for multilib-portage, bug #398825
+	# -ggdb3                segmentation fault on startup
+	filter-flags -fomit-frame-pointer
+	filter-flags -fstack-protector
+	filter-flags -fstack-protector-all
+	filter-flags -fstack-protector-strong
+	filter-flags -m64 -mx32
+	replace-flags -ggdb3 -ggdb2
+
+	if use amd64 || use ppc64; then
+		! has_multilib_profile && myconf+=("--enable-only64bit")
+	fi
+
+	# Force bitness on darwin, bug #306467
+	use x86-macos && myconf+=("--enable-only32bit")
+	use x64-macos && myconf+=("--enable-only64bit")
+
+	# Don't use mpicc unless the user asked for it (bug #258832)
+	if ! use mpi; then
+		myconf+=("--without-mpicc")
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		# Otherwise FAQ.txt won't exist:
+		emake -C docs FAQ.txt
+		mv docs/FAQ.txt . || die "Couldn't move FAQ.txt"
+	fi
+
+	dodoc FAQ.txt
+
+	pax-mark m "${ED}"/usr/$(get_libdir)/valgrind/*-*-linux
+
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		# fix install_names on shared libraries, can't turn them into bundles,
+		# as dyld won't load them any more then, bug #306467
+		local l
+		for l in "${ED}"/usr/lib/valgrind/*.so ; do
+			install_name_tool -id "${EPREFIX}"/usr/lib/valgrind/${l##*/} "${l}"
+		done
+	fi
+}
+
+pkg_postinst() {
+	elog "Valgrind will not work if glibc does not have debug symbols."
+	elog "To fix this you can add splitdebug to FEATURES in make.conf"
+	elog "and remerge glibc.  See:"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=214065"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=274771"
+	elog "https://bugs.gentoo.org/show_bug.cgi?id=388703"
+}
diff --git a/dev-util/vint/Manifest b/dev-util/vint/Manifest
index 335e912a1cfa..83a36e6d7366 100644
--- a/dev-util/vint/Manifest
+++ b/dev-util/vint/Manifest
@@ -1,5 +1,5 @@
 DIST vint-0.3.18.tar.gz 95865 BLAKE2B 0f7e61b720aa0998091b9b40118b199392fbf1aeace8801d683e8249179cd3d792e15b42df6d34c567c4df1830629a80e6043e87092f37dc46a0e57c6a56cf53 SHA512 1d3e04527a8f5ffae29395010a88258c1771aff2798143eff6572400eaf96323cad04353a7fcee68d9407afde5808446f515fd3d7e8e62de4bef28edf214ebdd
 DIST vint-0.3.19.tar.gz 96755 BLAKE2B 0b03807a4286b3e030e00c112dd0e879fa39e0d2333d46ea159555de50b30098d9a8b2345da8e18b7e1e5c814f10678df2e64398a615bf381186faa0036939f5 SHA512 b9024ed1cd8a18a916798e691ba0db31985034b2420e33c094459a48254c7c8f6fe89a1a64858a67ff95b0b48e67a780cf975940646af2685d2b95640e8121f9
-EBUILD vint-0.3.18.ebuild 1322 BLAKE2B 5a55a92987bf5877f828f09dd922c16a7b7a1206033e251975bdc949edc1d27d502676bf678da006a8f100209081c7b1e69fd610ee8eea64ede7d09732ecdba9 SHA512 6e54367dc5746fe60d15ff4c80fa97feb4d0cf14ed4631625c1959192c17dd4de9b61336637b829460e2b70d3587f90ddc1a3609999ff32ff55f715561d16742
-EBUILD vint-0.3.19.ebuild 985 BLAKE2B 3558b3b7c61d024e4dd942dda4678f1bb4df36921099310704860491195d887f5ffcd76b6030463a26a13be1d2e5eeb62b2c936bd633ae2c236cf7c44bae9acf SHA512 082dd17850f5f5e547720ed4750e5faa05b783b5493ef85130e81b694974b205118fcb4a54f0e72d427312bb3cdbfbb00d2d950aa78bc01df4695152ea7b57a8
+EBUILD vint-0.3.18.ebuild 1315 BLAKE2B c6ed0e9a0f7f57887fca3ca9bddbf70b4096e36bbdeb2e6e3d4fb73f1a9749d862e92e03cbd0fbe78c46323bd55da152903d0bfc8f8f01cbb6b1f57d3df9e888 SHA512 e40aa6fc1619b0505722cb64272d0b13f73b537650fb6a999aac0e958cc34d9a65397c16ac56a47cb32e76a2f3b2033496426cdcd69fdc2271c21ca9f90909c1
+EBUILD vint-0.3.19.ebuild 981 BLAKE2B 86ff247aebea513fa4a173c5a24e257aeb1468484d595ca779bfd28c480308af4d1a5d3cde9093596ad8f4b2f90271d7cc9bb46d5ca6fdb2d3094e4fa8327be4 SHA512 8ac0b0bf411975913a5c91b09307d15bf6898373f53bcebf77066cfb34c467a76723ab252063053b8eda32f25cbc7e5006b3878a1dbd6088e1a72467f0c52756
 MISC metadata.xml 555 BLAKE2B e81c06d278624abc6cd0f3d1410a79176ccba036344df6a1d414f8efce803e9395116f5fcf9dfdf791971a6160c0514f2a1d613f21b55805e6288fa1d11b4562 SHA512 ed3b8b8054f549adb826668dc08d364b02e86e0ec83d5455c8a9adc21702a143b488d028a8d12135a28f66bb673c3281d0f79fe20773ec1f78b632a86c859129
diff --git a/dev-util/vint/vint-0.3.18.ebuild b/dev-util/vint/vint-0.3.18.ebuild
index 8dbdf65404af..16ebfb587121 100644
--- a/dev-util/vint/vint-0.3.18.ebuild
+++ b/dev-util/vint/vint-0.3.18.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/vint/vint-0.3.19.ebuild b/dev-util/vint/vint-0.3.19.ebuild
index f4c45248021c..f1b5aef200d5 100644
--- a/dev-util/vint/vint-0.3.19.ebuild
+++ b/dev-util/vint/vint-0.3.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 inherit distutils-r1
 
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 7098edb59365..e540665f4a03 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,7 +1,9 @@
 DIST vulkan-headers-1.1.101.tar.gz 556510 BLAKE2B 12cde0e5fe17e4119ceb87d5e58c0147f128af0a435d8be1c0a9fe862c68c59df6ec1ff77b62b07bba4792c3f70c30f172678e60707dc46a53c4037fbdf40dc3 SHA512 36fc1059a50c8f1f66f2f79c1e8058d26a30a2083b1cb431536b476f8e4a6edbcac56a99a35accd20a6e19471f86940d9dd3dfc9f0940be212b36400bd0ed394
+DIST vulkan-headers-1.1.106.tar.gz 576943 BLAKE2B 6985b5635e0e9201dd931035470638f85a0accfa679c71aa98bb6174853eb324cd926941bc8f259a879e4a269c27686ca30e9b83946cab6e42036631a2753c40 SHA512 4b0bd6cdc3b29cff0960c592c9a40fddfe64c828e77f3ff52dcb8d5848e71ad6454b13f95b64e39227bd442b1ba2692abf7a824cdc9476b339fc31e4c8b728f0
 DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
 DIST vulkan-headers-1.1.92.0.tar.gz 541278 BLAKE2B f1743a376d18185bed136acd11cab0f8cdea2146ae4f9d389332b1afd83a29a32f2dc2a66f441cdb07f99a24c68d8743710762716cc3d0baf8f10933a3db0351 SHA512 61e47eec60ca713e958cbe2fe80241afe699a7853a0ca2b7f866aa37de064115df8418226b2ace22def12fdf97531f2301a92756b6ebe7862a11004d2f1d93c4
 EBUILD vulkan-headers-1.1.101.ebuild 725 BLAKE2B 28fdcc8886f41fb8b97dec82330e0fb1519879833fd4de71327f5db77492d1211350b6052387d1dcddcd8c6f3c54852a645937b688f2e6c3b2073c4db555c59c SHA512 78d230adfb3df09d2bf9017152156d0a9127c8bc65e21343b45e3f8ee5f4dd7955a6f5b466d102b9e74b708a2f491ddbb830c35c4f6440e65d05892330987ce5
+EBUILD vulkan-headers-1.1.106.ebuild 629 BLAKE2B ed2bc491d2b9eb6fc3b659d416e45727647a442a90a7080184fed328998737c946607d75819fe95a811392705e6ed7b4eac600e8bd7dba3b15110ce56cc91368 SHA512 ff270e012a210e0b9596b93ecc570130ab795b58f79104dd2c1cbdf0983aa3f7a9a35b8e51b3bfd25875f730864726cf8315642cf6d674c3d542f19a5e8b8b1b
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
 EBUILD vulkan-headers-1.1.92.0.ebuild 719 BLAKE2B 96be71fd80089081a6b2f8b1bf2de8a470029654125df7655fbdbd66ac824d411b57f5deca3196b5d18e19b322f3b92227f5bc2a6f99dcda26376b46cbbafd90 SHA512 bd1a2273d4191b60a46811f74073310618933339305aa81bbcce08d9a54880c85fdd18e44ed4f68042fdf76b5455e9bfe27976abaf58c077bf0df671daaa37c2
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
new file mode 100644
index 000000000000..fb18c44f9ba8
--- /dev/null
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.106.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="08cbb5458f692d4778806775f65eb3dc642ddbbf"
+	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
+fi
+
+DESCRIPTION="Vulkan Header files and API registry"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
+
+LICENSE="Apache-2.0"
+SLOT="0"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index de425c4fbf80..2124ff38ae8d 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-tools-1.1.101.tar.gz 351619 BLAKE2B d00a8adc687c6ac513748fd706b7167dd6e929f37ed2315b8c5e7f302976625848e9ad383261e8948adfc6926247676ccec2b6c8143d23343c4022f3a20795db SHA512 e4f5c3236eded7c17f381a9d6cdd20930444c486d0c8c3aaf67f5a46b3787643517e29d3d5d7305e72a60450b0e73daed996a9336a4166ab5241585e85190387
+DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
 DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
-EBUILD vulkan-tools-1.1.101.ebuild 2210 BLAKE2B 1f83d32e69d98dfa82afa0914e96bffca4851320746520b14ceb50314aa6c8cf7dfecc8958c74aa3165d385a29641a1d0333accec2fe17895e1329975825f563 SHA512 0800c70453967fcc74caf36be755e5ca63e816096d28ebafccffefb6a87b188b7c5f13a4322cc6d2beb91d1413c3bb4543c07afc0871c0ce56344a8a32f57a16
-EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286
-EBUILD vulkan-tools-1.1.92.0.ebuild 2199 BLAKE2B 0ab17921ca1bdce82e1e506514e1bd0c9cebc9248cc5d1d7fe13b2f6b33c0af94d801d66f2c872e0e6f2678f618e9ff990db3f634971023aa77a2c25d9d05219 SHA512 535d82546f589843880b741df3844ec5b88e25690d8da110379a46d3c79cf74ada8ffdfe7becf86ab465514cbbb0170d533c17cbf5335a5844631b1a4bf63db3
-EBUILD vulkan-tools-9999.ebuild 2210 BLAKE2B 313a03c092a3fefda23ec39b5b5449f7a8f3601681f65b37288310e139a3f22a5a678384c4ba4974354b04150ae11cd2482098375bb6889621fe14e15deffb05 SHA512 341043f3fd1c37bf3f8bdfb45026924d511ebb9b11de50be596b8aa09f2abe28eb44751d6b55c790de78fd6ae550973285d5afe6a8a2b222d9730a0b1a941472
+EBUILD vulkan-tools-1.1.101.ebuild 2208 BLAKE2B 248b656b974acb54eb9131bde630ce7b92f452ebc8f967c73842d86e811ec0e463466140eec8823a60124db0cae6bdca775b56311bd25af1afe251c66e827aab SHA512 4924ab523d4eb964ac0b52e02cd6be6a4122cbf73197501116a121923f6650a147b82094c53bd62a5cd560c0df6ce715e5884ac241a600841684ab8c91debd1a
+EBUILD vulkan-tools-1.1.106.ebuild 2208 BLAKE2B 5a569bd1f034346163b0d5d7e37d1616b8b114ab5107c760187e6c36f49d2ce7808a8502c8210b6649c43f846a5f9cd899c359e741e5f5531a2904cb73592225 SHA512 890af6842861103a98401d84b9452be7f67102cf2ebf0e3bbb41a6f8fd0a896e94d0203408c9d6b17c02847368affd1f5e43e98d74ff410934f506c48f1d8e97
+EBUILD vulkan-tools-1.1.82.0.ebuild 2568 BLAKE2B a3483e8c1fd1983ffd9d98622be5ca1d1420f0da85b767f17bd7acde93b9d2fd15d7ac2b879e0f1bda9b46204163f4aff78bb19a15e9c4b7abab60a19f368a93 SHA512 395ca53f6cb19a39eda8de33c184300017c4b2000a5f17582527afd8edaaa7609b0db3d396a9219d7d3a9c1b5c1803280a639c2574f0600a85fd16f877a08b4e
+EBUILD vulkan-tools-1.1.92.0.ebuild 2197 BLAKE2B f444cada3d7d3d3737059861433731d05eebc12330f26adee3aac7b704ac0c13bf966a036f19f2a26344ce0a667a4dc45d02855bd4ce0ff83ea08f4e67ae8726 SHA512 92933038ac146ec3b8dccbc55f194a99a622f94dd67e548319e44573d9800a1550886121b5d6bd01dd55e4b50c14ca2246d280448049c6b710cf50dd1decff93
+EBUILD vulkan-tools-9999.ebuild 2208 BLAKE2B 03b2e4bf54cc433d35c6a4bfdbddb0a704561f41ddb4dca2cf633c5f45f7480ada3c2f19940c262dc79434dcf794e6027ad44840b942c6308aa802f116f3c753 SHA512 65b3dce351b578d2d9c7d8a8f65585caae3a7209d8a54e1e148a8e2e541700091ac8c06068f2182a1d22af7b21fd99b84e9c59d041cffd54f962f8cd12b1f3cc
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
index 05eddd6d1e94..d4288937063e 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild
new file mode 100644
index 000000000000..ddc3a474aef8
--- /dev/null
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{5,6} )
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	EGIT_COMMIT="2abb69904b9ad017d39d3da1e7fc3dec1a584cd8"
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
+fi
+
+inherit python-any-r1 cmake-multilib
+
+DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="+cube +vulkaninfo X wayland"
+
+DEPEND="${PYTHON_DEPS}
+	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
+	>=dev-util/vulkan-headers-1.1.106
+	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	   )"
+
+# Vulkaninfo does not support wayland
+REQUIRED_USE="|| ( X wayland )
+			  vulkaninfo? ( X )"
+
+pkg_setup() {
+	MULTILIB_CHOST_TOOLS=()
+
+	if use vulkaninfo; then
+		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	fi
+
+	if use cube; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/vkcube
+			/usr/bin/vkcubepp
+		)
+	fi
+
+	python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=True
+		-DBUILD_CUBE=$(usex cube)
+		-DBUILD_VULKANINFO=$(usex vulkaninfo)
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DGLSLANG_INSTALL_DIR="/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
+	)
+
+	# Upstream only supports one window system at a time
+	# If X is set at all, even if wayland is set, use X
+	#
+	# If -cube and/or -vulkaninfo is set, the flags we set
+	# are ignored, so we don't need to consider that
+	if use X; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="XCB"
+		)
+	fi
+
+	if ! use X && use wayland; then
+		mycmakeargs+=(
+			-DCUBE_WSI_SELECTION="WAYLAND"
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+multilib_src_install() {
+	cmake-utils_src_install
+}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
index 1c16cbb616eb..cd64798512d9 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
index f780cede7c81..f3e214574ec9 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 0409548ade33..111b3d75d352 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
@@ -26,7 +26,7 @@ IUSE="+cube +vulkaninfo X wayland"
 
 DEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	>=dev-util/vulkan-headers-1.1.101
+	>=dev-util/vulkan-headers-1.1.106
 	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/dev-util/waf/Manifest b/dev-util/waf/Manifest
index b5567cbe29fb..eb726165e03a 100644
--- a/dev-util/waf/Manifest
+++ b/dev-util/waf/Manifest
@@ -1,3 +1,3 @@
 DIST waf-1.9.14.tar.bz2 631021 BLAKE2B b822cfcee033846b075baad98c69833d54563a23075704acdf6c140b08cf4c5e263465b618830ecae979eaf741f83a849f37d714c18cf355b49a62bc30214904 SHA512 5b7e556eeb3ceec83e81e9b849786d7921aa06e443aa2fb5f288e3fcef6b05b3a1a6aa4ebcdfd0bd345ea3166980cb926cbea2260a229613bdcb2def86fb5816
-EBUILD waf-1.9.14.ebuild 1009 BLAKE2B 45c48e710b7385727ba3a4217555b7e46ef05906d85bafabbf3c2432705d7d0761eb24af915187a7cd7c452b7127b10a56ffa85c950b6a5b1959a6e96d869e0e SHA512 d5ba9c1b80a2550cc660e96831a50da9b9b4bffdf27824d05a87925bf9a09d240fb1f74012640b30ac813a3dca8825c1d1cda26a769c053e561b233aeb1b4478
+EBUILD waf-1.9.14.ebuild 999 BLAKE2B 5fecf055b4bd7af239e8218e99c70f0785fe4a6482d1d44ef9bdbb0e4b65cf1494ec8fa5c1a9b301c71d436d04efc3da1acd6e2bb73b01a6fcd09f7500a9307b SHA512 54b965e757c45f444e800e705565aeeb24165bf17bc90e38a747beae13174e667b7563b517d58e64a6866563e3dd26c3cade87141a52e571ce4fa78e8fee00c2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/waf/waf-1.9.14.ebuild b/dev-util/waf/waf-1.9.14.ebuild
index e37a34205025..a8c8f22d29d2 100644
--- a/dev-util/waf/waf-1.9.14.ebuild
+++ b/dev-util/waf/waf-1.9.14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 python3_6 )
+PYTHON_COMPAT=( python2_7 python3_5 python3_6 )
 PYTHON_REQ_USE="threads(+)"
 inherit python-any-r1 toolchain-funcs
 
diff --git a/dev-util/wsta/Manifest b/dev-util/wsta/Manifest
deleted file mode 100644
index 55c971139f87..000000000000
--- a/dev-util/wsta/Manifest
+++ /dev/null
@@ -1,51 +0,0 @@
-DIST argparse-0.2.1.crate 18969 BLAKE2B 68e4b5502409b2d2b8d2891164d114bde6b65babca241f8c881b07483dd78b114594c1450c06124f04946022303fa41d8b108122757ff2117ca6be3a0e619ad3 SHA512 f12aea4ddc0d619d40194f8d3db3c4d952521d1dfad6bc21b5b7cf8db91c30f70c5259bd6a0cf40d521e4d0cbaf3e4d59ae0bd40554772c79a4b200ebcfa73fe
-DIST bitflags-0.7.0.crate 10851 BLAKE2B 00a4e2b66275d6fc8a7374aeec275b5fdf0e2c197e7e90e56afe89ac45554d14ba2063aa26a486dd88d822939b6ea5a5b40936d45d8717e2a98e95ba1d3f501f SHA512 fdfe472c26e5486d1a3f1bfe5a27d26678781235c6e14b49bdb75388359cb78841f38d794fc4557548581a80a10b715d8840182c9ca3316049984a6b9f35b3c0
-DIST byteorder-0.5.3.crate 8643 BLAKE2B 938104ec31c8e0282bf3aac9e3c624633ad4d9d4b0700abf91480b519c5dfab2f29b547213f34d0ff36a39b5029a79dc5b349eb9f2337ac20079722251facf94 SHA512 c6134458bc5b05529cef261c519b1d1e515fde37143690cf365dfb7a65d1fa91f1689bec1d1d04dff7f6417ed1eb2e70aef40c78400d7f1bc90c12eac085496b
-DIST cfg-if-0.1.0.crate 2758 BLAKE2B 8ba4ea4deb8cfeb4927edcc9112346650eb9b2f5ced13e4130aed6c030f8f7bafdb50ca4b25f2124636058f09ab76f70f6a5820cdf31186b5f5699d7da4db03a SHA512 d2f10ae39a7fe712cd9d228e3b5a96448acaeab3b92d1b97229d54e5201237b9434ceecb1f38f1ebc1f678da5cfc33aa46c810f422f68a21aa341666c27572fb
-DIST config-0.1.3.crate 29564 BLAKE2B eb6e6981f5b67530cbfd5deaf96457e36cda59561c77a9509a7a5fd8b19a1d9b675184d4f85218e24280c03c1dd9d64790918a19a1acd5b582f1577a201c349a SHA512 c2acf4ab9976b11bd99d8b3b7c0f8bddcf16b91ff4979aad8db79733b2ea8073f5e96d8333238eb1e2418ce07605311907aed59920b5a578a7efa23fe53ca641
-DIST cookie-0.2.5.crate 12969 BLAKE2B a0802e466be4cb9a83f41b67e14d41ae79acde83661ab4e7144a4137b268c0f7a102dfb5b8b2143ba3f8f66f39d123bd0164e6006a5c1c686a4c266fb8eb9784 SHA512 41705087506d3bf7d8de839245eabc032c79c712e6b1fda111139afd92b267c0e2aa61013020b8b5a3a679aa779861fa2ef9397b9bbb3c5705ba2585ea02afaf
-DIST gcc-0.3.40.crate 25010 BLAKE2B b1a46ec7e7076f3acb29d31ce94d397672a680f28e35d74270d49b525ff3c651d9a6b05d2831a19c6f029ddceb55019fba1289127fe188be47bf52098aa0d1c1 SHA512 8facf1c0f85642047386ae41f7dad525007ef8a3e898e6f21985200fa564bac54af9c97f2340c094d05b04bb8741352f71583ae8c2186e6abcb2ec8286e5dbe6
-DIST gdi32-sys-0.2.0.crate 7643 BLAKE2B f6e54cb186437c400eb4625a242cbb96c212b5978943b761f3cd524d8d55bed4962cafd036a2a61bb71d2fd71400352f5d6ec827f5634de2a3eb30f9a5a4bf14 SHA512 009f51899ecf9c8a6c688c3b087c294482c9d4c09b9c2b7fd5d949ed269bed9dea7ab5ff95ba9524c3402e4299d944205187f99ce0d0300a1646ff021030f19c
-DIST hpack-0.2.0.crate 26932 BLAKE2B eda1c86cc97ed92708d08c901cf8c16e1668d383f27893e6f60ef45a43fbe8a75915d640f5aea18821e6ef637925f65a7569ce4dd877cf7fbae576bb3d917f04 SHA512 d77b4329d2bed10fc00b49e5f9228a03c6f95e7bab5fabe02a6f88e3bde8bffed34c2f12c11fbe6283697f473543cdff37dbda10b159185c7a13a47142e168ff
-DIST httparse-1.2.1.crate 14239 BLAKE2B 1fba0a5ee9beb7262521644200fd94697d284b0124798e254a058d2c9532a62bd3b7c1d4adee864279f851ded2b9c53e3ba76fba1218a1cd7f0c01393f222713 SHA512 ac74673ed9420bbf483e920a256e3625b5c3da8a7668de7aead5fa14cfc0334910c838356af711ddefedb32edf86aae68c2d72850dfce345eb3f05927c37cc9f
-DIST hyper-0.9.14.crate 133777 BLAKE2B 499dce371ca65622485c9be6107bab829d5c31617b6a82b61dd36088fdd0fbe4e6532f75d3eb134deff3c7dd6597e51236eb58221f986090e743bf4c8da4d51c SHA512 86f7f69105a1c0083061265bf689478241b9e854c11182cf5ffb40b30a7e1d59762f57eda1f614391957f11aec44536070c5092439550ae488d98217c59b23df
-DIST idna-0.1.0.crate 234027 BLAKE2B ab59c9574c1c7c830ae9e183795511b9a9bfe2300e631952edd09927845457f1d5eb36a71271d50678e8e4219e230c472b24c78e192550fabf5f1eb49e710a60 SHA512 a3bdcd7934c8f2823e8be7b467a829334ab53c71e225f2ae73b379db6bf47c8c8fb28d30900eb18c7ce79e9d9780d45babff3d7e77c20640001e6f6ad93b2424
-DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST language-tags-0.2.2.crate 12754 BLAKE2B ea59a130fa723b1537e451d5a51914391fc0d375d40df1d8b3ccda64819e918332e344585523d3ba61bb0394899fc1663cf7a452aafd4a7e694f8d70627f1bc1 SHA512 54a6c7d1bc985860c194c842d7b5ec731d0e06f9c77ead8cb0156bd34addd957d0bbf8b6a9dfc6bef5ea31e39f84ab447d1ccec3c178a6c18c4a222a51e1abc6
-DIST lazy_static-0.2.2.crate 5026 BLAKE2B 9840a70456cc52c40c983ab1f516dd8a3667ba94e3758a14f92b29717adab6e9072de254d378f8702d461879694a0d3f313a941afc6d56ce6431efc0dc6d7f2b SHA512 d151405da0ff2305cb9556325c783c3214f57f7d905a9de9e41aabfcfa3921a402957b71e48b307feff4c34372e04075864d3eef3b44098df3f8015264eead09
-DIST libc-0.2.18.crate 114209 BLAKE2B dfe3d850c4d5ec14ce1acbee4f8ff50c098b269c064279ac639195fb67da0c5a1c7f75dee7c79657a41a8ca34efaeb0b1517b59fda4262cfab82489e1247f759 SHA512 d99e0db6fcc6538ee88109c2857a9e24641326c399f604d9704b9fc9e1d3e79eec8dfb10291499b1900a9a40f0d3d00f50d4709808683032f10fc3bdddebc2bf
-DIST libressl-pnacl-sys-2.1.6.crate 2697179 BLAKE2B bdb6f9bc7927e6ea5580b0b90928eefdda75cae4539c26c1d6aee6792d3bfed464e92176240631229a5b14fc8e292e1bb05b24b444f98596f3c190f02d6d49ad SHA512 b4e315900e88d4e00b99c76388658f1b1e6761dc4b9de72804dc9ab946a2fb1bcdb8711de0c99a123f3180143c55625cafbec9db69837d2d5e1a79b2df87d983
-DIST log-0.3.6.crate 16110 BLAKE2B 6dc589c3c24f3bbecf60310bfbd187179ac18afae1a17e6d28abf38f322e740aa02d73d396926650c347dba24afc50e3bb4cdeccf74ec7511ff9a7277084f5ec SHA512 f2e5526a2613f70301a607cbc79213a946a6039f85473f9de28ceb2f3b464be61a584f34ca6381e077d8bf6ac751c93011087d1723649c0d7722281f1a2b7174
-DIST matches-0.1.4.crate 1530 BLAKE2B 1c823cfa18f896d490f0a5a03bcd3afe735418a13334d8d0f76bb2f2d2903659729f399725ff20392834566aa2d8605f670cd8f9474ae62464ebd95662cbf850 SHA512 a0248296a155fd3132150dcd95d3e51b62cf7b99a8530f0c2ea34455a224613bd7a2d1803fbbe1627aedf826e82e746495df319b62f1189e361c9fa1cd8a380e
-DIST mime-0.2.2.crate 6391 BLAKE2B 1ee62a92416d47f04b3199c5c20c4e231f1867c13df8f3b847a39d45ce57c01a260d302b0d5772fdcebe2511201257808420d1bf22795202faf13f581689dbda SHA512 4e214b0314e0a5863bf359f15cc47fa80e4e69c852b89b8d839825cc926488382f209cd3fdcbd4aa71e8514c5537578f4c12b678f97276fbdb059af51f5d053e
-DIST net2-0.2.26.crate 18489 BLAKE2B 702431b884b99212b6cb00125d4de249754512685d14b10e21161e4d619943c4262cede67efc49b782fe324b38da651cbc57ac1d8478a24b16a75d837421763d SHA512 60c6c3b0b9dbfd844c7b52565bf3ed4977394be6396c19aa872d9377bf1961ae3e2cdf87da3822a81d78d453369d740b0477dc48ee62834bd6be4ead6cc92fb7
-DIST nom-1.0.1.crate 46800 BLAKE2B 50a8c3bcedd140d1dd8ca7d2af2535c37a30e818841ceeac7efffcc09e45f2b73117017be738c71d67415ebe2a07460543afc6b2ba3c848927ec9a4192dd8ee9 SHA512 906a6ac89caa0530c18d8ef1ecad3b1b6a21364c539254fb45f369f05f55dc2d8af470d80b528c0158a72e664b2113e10e69d2db5ce155ca776fa88fefc3240c
-DIST num_cpus-1.2.0.crate 6463 BLAKE2B 396a33ad820966d8e17b37923b92db86bc9f684b605a1120d1fe9f3912ce72838d458083a73ab8bad7e0ede3eabe4202b8fd9c5b66a0beff9ee9840d3f204868 SHA512 f72842d71324638b7be2fe2f40f917cd792d83707480bf4d1f8c7f896689297c5e6b521a1643d4a77e1c2e91e18a3106bf065104592e2fcf0b2d06a587e4dc35
-DIST openssl-0.7.14.crate 63824 BLAKE2B 1b2f923a7bd388feba3d129590d9a8e94d3ff82c3a3db63de8653f2375e57b3735ffcbfc271da849ec21c6b0b983edd3bce39070c806cd68007102540e900dee SHA512 e36943d907d1846a619250de6db1b3e48ca729a34bcb21ee7f47ab1ee5535682ba8b8f73e60e3321e6ae321114891c9e98bdf0af1685175c1fa342b84e9ce33d
-DIST openssl-sys-0.7.17.crate 12097 BLAKE2B cab9acb838d5aa7caf27be1300aa9edddb74a42dfd7b328e6b67081701ea04b3ae7fc32b0baa8199d2d6bedcc4b36f1feed2efe418be2e8d1ccb7e14bd7c1305 SHA512 4ba167b098bc7b30d1d839e4e5a11267c2d54221fc7c6b1de03875f501fa3de6b71110e4af52d6e7d71b5342969a58fb4961050744c19bfb995ae7b74736de31
-DIST openssl-sys-extras-0.7.14.crate 3871 BLAKE2B 6cca7be0b0449e7083cf129c0b36b1705e94d5bdd11a2d95ad5c9a9c60827f10df6769f3b1a7e0649442e4911441257a4d91140af063d4694e3a6994e8553c51 SHA512 3fdbb09fff2e75cbb2a7e8e279930010df0ca478376afc15c9b2e15259ee7167ac7d59c36c209f95a17b284b42352d4527302ba1118ecd70295afa84422269f8
-DIST openssl-verify-0.1.0.crate 19367 BLAKE2B bd502fe3ade49ce1c28d6685fb5b315de009da988673129e38c63590f1b9cf926c0f4e23343edd107da0c38f6c493fa4e203b21d56b8ba59b08061b2df5f2cc4 SHA512 e5ea4c3201dfae719dc5f021d86cb868a4c7e818fd131ea31b3229b41c57eb63352c14f75e7eeff44e803ac87e0170a4eaa7203182d6a33d07fcbca344561eed
-DIST pkg-config-0.3.8.crate 10814 BLAKE2B fc0778d1544269a6aa82701c3664b50046969883aa632967af08517d1a82cfc145f4f0790a4d4c9309d490f4b77ee23eb67ee64220a8f1a7f0f1ff3348fc75d4 SHA512 a58102ea0c6063c53e45e2f5005888fcac7a8e27dceeae4fae8d672ed0690f062386fe175c968b17c127b622b80fd319448faf9fe8ba3422e24f6fa17e8ccb77
-DIST pnacl-build-helper-1.4.10.crate 5470 BLAKE2B 2c51589e1a97b5f761938e086d00800fba5eab3590b35488a05cfeffdf9a9654a2e2deb9cc006c755b4544c2327e885f707c42237554bfaaf58c46149dca19fa SHA512 c170589b379378a4f33ee1ae40de6f649d573e9c9288ad9603a958c9dedf04f09b268539e922a91c060f40374bb697f190fde055ea057de57bfae2308b512707
-DIST rand-0.3.15.crate 55312 BLAKE2B bde7d5bf10e153d793d0ce9711c6626dab545e1b42296c6c4f0f104bd316bccc51fad3d6321c504069360fba96a74d2af756c92db3859675295c33d0be46c660 SHA512 4c812b1f742adf94fe45c806fd66a360a2490e474db6cc1d13acf4101fd63072429f1b50aa84b51cc742c1624a871a588769f4c12faa775f6f275a028fe96633
-DIST rustc-serialize-0.3.22.crate 45545 BLAKE2B b367550233def2244b15cfffa7b089a0771e99047f477dab92a44c3b228b8879b92fba3f76998e9f6babb5b0a0ea8062f619bc8d9256f6e8edbb1680a4c548c3 SHA512 833649dc82e0a568eee051a37856983aadb3a33ca5d20c02e6ef057c7fad802c19d3131cc7108b33b098a964a2492e43d796f36b600fe3df4c93c76c9abb219c
-DIST rustc_version-0.1.7.crate 8816 BLAKE2B 1c3cd80bc3204d27a9a09f4ea8dbeb1624decf9b39ec9e78276fd50362354e59a5c31250c01d136cccb7c717655765d6f2781ab7e04a614f55bfaf334962784f SHA512 f7ceb913f93444bf98ff8113beb96fbd013ecd6c0f31c49aeb738f418f2e5a958c54afcce6e5d017d66a2b47e07fee032aa07b0aa748cd3be67e672cf48f2b48
-DIST semver-0.1.20.crate 15876 BLAKE2B 33cd644289ac054c0b2423373e4539d95c494f21e5c3a8290d9a8521b25e86222e7abe697f504a4acad0e6caf72754c211f0fd0b3feae69f7dfa98d020158968 SHA512 d24401aa4a1e12472c799fd9d2f50f5965e4d2d4a5eccbd244a3f817797fd58cb073b933d45415a1a8d71084deebe04c2277c435da7f359e510c52133bdaa08d
-DIST solicit-0.4.4.crate 61955 BLAKE2B 2ca0c4fd5a6f6aaaed43c67c85709c7f0a5e6b75f07e0d9fee427f1e14c51bb0638056fc3b3d811aed36610ed7e68ccee3b35cdf0e8e3d8fe15e846b1541060a SHA512 46ebf883d8c162747bc1b477209a746d28085325097cbfeced93c52cdc5edc3b7c98b3e0b4770b554ed1dc7189eb02b9d7d7c2e3f5ad785cb208f8b21744f908
-DIST tempdir-0.3.5.crate 10605 BLAKE2B 1c15dca19ae03d6c8c5f189e25b484e3de70327239dbaa48b78d4f9a6231b07249d88e111d0c011ea49d0416438c3b66fa6bda9a6cc09f092b6d07a45ff893a7 SHA512 5ef3cb15064fc51ab2b371f8a48694205ad831fdcd11ff0fd6be85708a8ee955c82c3cbf926360fabc2cac91528a1db90f8425090bb361fa192c8ce9b1e1f0ab
-DIST time-0.1.35.crate 27419 BLAKE2B b96ee21361bf3b1283d3e2ef6b493659442b54957678523bc20b7fc576d03de9a6b331947b841e9e6343082147ce90777b4dac99bde551f66f5e6d50722c4ddc SHA512 2681e38885273109b9e274b033b9d4a9f88d5c49b8d5d1872bb75ccb8a7e6c368e4580534f6b76d7edebc5680314e6dceb6ed087b10d5f2f5a6271fa2ba699a1
-DIST traitobject-0.0.1.crate 1389 BLAKE2B 8c5454ce74e365a2cb1b6e9e0d3e4dd8bcf747327581f3a5171917b64a82f7d626ab0f1f15d13d430bfa3320f85cab674880e83f5cc6be8facf14aa1b8ad1450 SHA512 acf10ffb1d47ad9182fe981b021818724c7de2aab3cc40edd608a98409d24b181e3e2333b034d96e87454438ca6951738ec976ef449fcc36958f9ade38ea2eac
-DIST typeable-0.1.2.crate 901 BLAKE2B cf5fede9fe91f61df1b99b346ebd56145519f2121d027b72f1ccfa9cc24752c80dcc20166327d9ee751c5b344186a36d0f1a119e0b7f941de9739559557c2578 SHA512 336083ea6c8cc64fce1cf14443b1afa955a71302cc0a2023e3c52aeadbf3832c59aa8b8ae0c87d3062658cb7c98e9f79dfac9db7f5831642075ae8f9c0bbebc9
-DIST unicase-1.4.0.crate 3385 BLAKE2B 14ab4975c695455093dafe03ec67238d04450c0b4ccdfc2d94010677c7526f1531013302bb64af0cb5dd07b8ac24c1ee5285c0246c4e178aaf0838d6ed1c3d06 SHA512 d5b0c005d81c587fc90e9c5bbb8421575cd14ed74c512ce17d7ebeb5a538bde9ac5bc6e8a96b080de03f13271a97a83aaef21fd98552703dd7d24f8a2ed065ac
-DIST unicode-bidi-0.2.3.crate 1744003 BLAKE2B e6a5a5cba379ea3eba12b42808148d8013cc99e4fbcea345e94b9cbe3b6fa4da5a41f72f4a3dc4ea4e6c5cc0eeef6230fea8868b2a31891c7e234b277d9c6608 SHA512 fb067746b4788c7110bc2687850dc11183c7e596453b42c0c4764c59c1686faf4d03a52b6c147c6578d88b8a2f3f1257d88010874b6ff0bb942b41e055c00a08
-DIST unicode-normalization-0.1.2.crate 612931 BLAKE2B f58526a5ac064203f19858edb5677644c7f05bec8d0fe3f53506d9a72d2824f75591e3a46b58f6836b3a1204b7609a56ba5f2ff55d45670b87c38949133198c9 SHA512 b6dc4316a875de59ee00f89ac0e9b255d0111dc2e2e45395ed726282502ab7b6cfcd56acff7f409b97a2f36d5278e16936359791be6bc8fba1213ca6c8a888df
-DIST url-1.2.4.crate 69521 BLAKE2B 66eea3ed6517c6c0fa4f589d782f49e954c998a24023b28a32fcc770f039af224a8a9796826aec24f1c2b6cebd3dd7d30426d0664c2c09fb7e26799a7b6fe19a SHA512 4108c59476ae35be6ca8018f81106f2981cb0be235a92d79182f15c40f5a4147383b3a3261979cac1db587b4a419ad50207f54d754765dc3b03d0f9e99dafe5f
-DIST user32-sys-0.2.0.crate 10624 BLAKE2B 76e57ff5dcaf533f7087073d85b3ac9a5825ca5c7251c1e8729cd35c9c3bc3c0cfb6a4d7586c3490fccf1aa581a6ce7c58696b161073bb23e524a20ca5c30be3 SHA512 75fa43621acff70425ca40a132a25fc67923526c895c51edb6b49ef507d1d461383e1d92b5dbb5c5aee9207cc76b9a9e43d27efa0b65476bc5ae0c122a2dcc19
-DIST websocket-0.17.1.crate 30977 BLAKE2B 6898cc46441a4c9a6e5c8ed631dc9309e4cbe035535ec4d90cf9643a7e15b29af11c9fc52cac61b1a69f66b03c0f88c0f58ed1a097dcd4bcb4c75db1586f6636 SHA512 7d2493531ee89fc95cbe31a0f523ab3814480bba27174c80bdee13fa9321c434080186e7f6e0adb9818e97f88d42c07cf170a65842848c054d9deb3649397417
-DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c9064e0928e09de13a95bd9237f884538e5f9368b47a7ac3c425f0f798c26bad85f20bed4ea26c2fa16c779b97 SHA512 18356861fc595efe7d0180afb8ce7649da35a4f9ba456271d2068679ab258a861af32a2e016e241fbfbf5f6ef0eb33127b26eabfc11428af39506538faa4821f
-DIST wsta-0.5.0.tar.gz 43058 BLAKE2B c569dfcaf76fdbe7d1122eff2231f4168ebb4517a87db367503dfdf37d4bde5d39ba5b71b846c876c1f04c2bea2e73ab0be0c385c178b0c538a25ffb498431a3 SHA512 6d1b5aa65f70d78e47cad91d84ada9129076fb9714e2add173f965503d8c12829702f4ef29592015e7e06f126f7518199430f1d2f076cdff640c05db5c42b130
-DIST xdg-2.0.0.crate 12301 BLAKE2B b058d3445df3f1e12a4c06a1aecdf20b5469214cb48fb9b81d0506a4c06792c4757ea83a24e0511764ba84dbc901f47f9155317d0ffc37d7d3a919bcde17f415 SHA512 9acf7c2210148227000ad837551344366650f5f05eeebf3d69da73bf215e1f66fddcb21c57371598db85d8b669e6f337c5eeff9650e2c7ce9b75cd133f9a3a4a
-EBUILD wsta-0.5.0.ebuild 1460 BLAKE2B c327fcb6052901616f9aed246e7b25b481c3320cd595540e0510c151ca3c2c692c4c6d3444f1e546324d69690519a4097a3e2a845032c3c6793a70d266d9163e SHA512 5f113489813459b85563c1b641f9ac6b593aa376cad65fc7a8efad2f12faa0657ae1340fdb517eae5e89d2aabf6c8079d91b98dfe97cb2ae78264f99d7da0bd0
-MISC metadata.xml 696 BLAKE2B c3a645d00cd208a052a01399f27812adec35c54378c119a92be61adf5b1082f40fd0a45329085371b9703996acd60fd77be9ad14e20afad83cd58a6137b0089b SHA512 660fa12550676a342b4e650964959bafb511d00bc6ccfc51981e6695034cb78de347b58ff49e96bc353f9a682b87c191573f1d5cf6d4d494e437fc09b6ea613c
diff --git a/dev-util/wsta/metadata.xml b/dev-util/wsta/metadata.xml
deleted file mode 100644
index 04683970c888..000000000000
--- a/dev-util/wsta/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="github">esphen/wsta</remote-id>
-	</upstream>
-	<longdescription lang="en">
-	wsta is a CLI tool written in rust for interfacing with WebSockets. wsta has
-	the philosophy of being an easy tool to learn and thus gets out of your way
-	to let you work your UNIX magic directly on the WebSocket traffic. The way
-	wsta does this is to be as pipe-friendly as possible, letting you chain it
-	into complex pipelines or bash scripts as you see fit, or just keep it simple
-	and use it as is.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/wsta/wsta-0.5.0.ebuild b/dev-util/wsta/wsta-0.5.0.ebuild
deleted file mode 100644
index 17d043436473..000000000000
--- a/dev-util/wsta/wsta-0.5.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-argparse-0.2.1
-bitflags-0.7.0
-byteorder-0.5.3
-cfg-if-0.1.0
-config-0.1.3
-cookie-0.2.5
-gcc-0.3.40
-gdi32-sys-0.2.0
-hpack-0.2.0
-httparse-1.2.1
-hyper-0.9.14
-idna-0.1.0
-kernel32-sys-0.2.2
-language-tags-0.2.2
-lazy_static-0.2.2
-libc-0.2.18
-libressl-pnacl-sys-2.1.6
-log-0.3.6
-matches-0.1.4
-mime-0.2.2
-net2-0.2.26
-nom-1.0.1
-num_cpus-1.2.0
-openssl-0.7.14
-openssl-sys-0.7.17
-openssl-sys-extras-0.7.14
-openssl-verify-0.1.0
-pkg-config-0.3.8
-pnacl-build-helper-1.4.10
-rand-0.3.15
-rustc-serialize-0.3.22
-rustc_version-0.1.7
-semver-0.1.20
-solicit-0.4.4
-tempdir-0.3.5
-time-0.1.35
-traitobject-0.0.1
-typeable-0.1.2
-unicase-1.4.0
-unicode-bidi-0.2.3
-unicode-normalization-0.1.2
-url-1.2.4
-user32-sys-0.2.0
-websocket-0.17.1
-winapi-0.2.8
-winapi-build-0.1.1
-ws2_32-sys-0.2.1
-xdg-2.0.0
-"
-
-inherit cargo
-
-DESCRIPTION="A CLI development tool for WebSocket APIs"
-HOMEPAGE="https://github.com/esphen/wsta/"
-SRC_URI="https://github.com/esphen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})
-	"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-libs/openssl:*"
-DEPEND="${RDEPEND}
-		virtual/rust"
-
-src_test() {
-	debug-print-function ${FUNCNAME} "$0"
-
-	export CARGO_HOME="${ECARGO_HOME}"
-
-	cargo test --release || die "Tests failed"
-}
-
-src_install() {
-	cargo_src_install || die "Installation failed"
-
-	einstalldocs
-	doman ${PN}.1
-}
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index 32fa552af5e0..e566f5af62ad 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,7 +1,7 @@
 AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f73ae99ebc20e398d070716bce1df2fa554da382882385693ead202b19af1aaf979b4eff3639dc5b5 SHA512 747b973ec84a31213de84fc15f40d4d9dce854a32602b3dffaac088992578a07f48047358bf7c38b6ca597c251232f48432404836cb2304f5423db4ddf2f9345
 DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
 DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
-EBUILD wstool-0.1.13.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
-EBUILD wstool-0.1.17.ebuild 1459 BLAKE2B 9598cc74373117ea94f5eb862a7f2bbe11932f1d43d750651354280da580ed01d6b1ba0b905b411916821d365aa6eb7829c1dc64ecb801c112212e8c548cf138 SHA512 83e34adf6f66c2fd00eae5a327f29e5dccf8798c139eba5a49aa65791d8186a4d1bce56bc0e246576e500c2b2c1643a0445c8f93f2d94e2d9f507db768f2d9bb
-EBUILD wstool-9999.ebuild 1459 BLAKE2B 9598cc74373117ea94f5eb862a7f2bbe11932f1d43d750651354280da580ed01d6b1ba0b905b411916821d365aa6eb7829c1dc64ecb801c112212e8c548cf138 SHA512 83e34adf6f66c2fd00eae5a327f29e5dccf8798c139eba5a49aa65791d8186a4d1bce56bc0e246576e500c2b2c1643a0445c8f93f2d94e2d9f507db768f2d9bb
+EBUILD wstool-0.1.13.ebuild 1448 BLAKE2B 062e745e900b7a6c0da45c3c781dc5986392313e55cbea79355bb8729c0c918494f7a8674bd8f96f6f43bf378eabc3a135192110cad55e9a67bf86c6a3ae1ab8 SHA512 cea8fceaf3427e8711a02757547379ce3929cdeca0b556740fb441ba8d4897c2fb8886e64771cef09bc74183fccaec67f7d0877811130ce0535ea6236d259838
+EBUILD wstool-0.1.17.ebuild 1452 BLAKE2B 61d45d7c99d618a7f2b2960b557608184e18062a6a89c69da4363861e24f67140143fee13dcd0c7810461b65d0c0d336d838c04bd796ba6a138659ab2dff501a SHA512 953ddad06f06f0f23a65c3b750ea24ecb61703d9f379ab16f2caa924fef0943d6327d1014bf7787993d02aa3960eab5d108c56dd55453a913bfe4a8f151a190b
+EBUILD wstool-9999.ebuild 1452 BLAKE2B 61d45d7c99d618a7f2b2960b557608184e18062a6a89c69da4363861e24f67140143fee13dcd0c7810461b65d0c0d336d838c04bd796ba6a138659ab2dff501a SHA512 953ddad06f06f0f23a65c3b750ea24ecb61703d9f379ab16f2caa924fef0943d6327d1014bf7787993d02aa3960eab5d108c56dd55453a913bfe4a8f151a190b
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.13.ebuild b/dev-util/wstool/wstool-0.1.13.ebuild
index 68bf771bb166..6019b9d53713 100644
--- a/dev-util/wstool/wstool-0.1.13.ebuild
+++ b/dev-util/wstool/wstool-0.1.13.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
index 0c19d47c0322..694a26e5ca68 100644
--- a/dev-util/wstool/wstool-0.1.17.ebuild
+++ b/dev-util/wstool/wstool-0.1.17.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
diff --git a/dev-util/wstool/wstool-9999.ebuild b/dev-util/wstool/wstool-9999.ebuild
index 0c19d47c0322..694a26e5ca68 100644
--- a/dev-util/wstool/wstool-9999.ebuild
+++ b/dev-util/wstool/wstool-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
author	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-04-28 09:54:45 +0100
commit	b7ebc951da8800f711142f69d9d958bde67a112d (patch)
tree	e318514216845acb8f2e49fff7a5cba4027e9d91 /dev-util
parent	dc7cbdfa65fd814b3b9aa3c56257da201109e807 (diff)