gentoo resync : 02.08.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2019-08-02 19:14:55 +0100
commit: b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree: 0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-util
parent: 121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)
182 files changed, 2284 insertions, 4998 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 57389ca666d3..0c7ffe34a793 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 9b23992fdb54..0e3b4b1a6c9b 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -3,10 +3,14 @@ DIST bazel-0.22.0-dist.zip 88633015 BLAKE2B 7cb7ef53c9acb4089b92d82679ad82739fd3
 DIST bazel-0.24.1-dist.zip 174691842 BLAKE2B 56d42421ac6f5513f019f3b71ca0c5e7b499c199dd8d9f22ca4fdca832527a1974afffccd6bff6b1d29dc3156ee28ba7f91a9a37f2f8524da5c5f30645be97aa SHA512 a78c871eb517ec53a0d1d9592887288fa54e5e9f44b0b7dba44792a74a1ba0c98e38ff2f6094ab6e8b3add3ec4a0188de3b2489d94d419373e210d16db641774
 DIST bazel-0.26.1-dist.zip 244633948 BLAKE2B 667078bda6e52f696127b7a4914ec52ab67a84f89ac957304a281268615158cc813d7d7cdac58b336dd8ef1d3cd117f1474f64f741e0a3119034dc43ca3b58b0 SHA512 f43f156947c2e9effb1f3ab79235d47d00254103b5a5aac62001008403216b2330c9062ce85d42be4fa582ad52d14ba52a47875df40c58a7e18c391684407574
 DIST bazel-0.27.0-dist.zip 247946763 BLAKE2B f061793de89144c77bd42de56c495e8b3399ac1892bdd2b0e210102ea1c2835a848432b2964ddcc6ebe77aa580efa378d46afad1faa6dec0831666f201a6dd74 SHA512 f5c6a0c789eb55790479ff839f7f959e7d0e46e5f14b5cdcd720e4dc2c36122345c9dcd6bfa803f88fb5264553a3d63ae0c8e4c7b9779bfc65183e2aaee5a666
+DIST bazel-0.27.2-dist.zip 247948037 BLAKE2B ee3dafbb104f434080ad803cb40585e36a8c816eddac3d1a680752dd4ac65d588f1d5f4bb759dad0f59e9f6d7aad0ea5b54cd050d75a5434ee6ef079d8127641 SHA512 5fd7c2af2123424d3e5e4c9216de10d12ce604798f4831800c8d68cfd9bcf1133f4db9a947f0ee16db1a1513be17340ab8e36fba994a016d98c74ad5e026b4ab
+DIST bazel-0.28.1-dist.zip 256641169 BLAKE2B 489dfb1a27f83ff244cd05c11ec206689c12319a48f000379277073a108a79ad2dff61ed159efcbb1405531114ccb2d749e974004f969623cd4e9470166609f0 SHA512 640d3a9644436379e989d5993b5de9f2dc14d651a9f444c8795853989fdded7a62d71ab7cfa491d2aaf6402020c4931c8dc190d4dae63727b172ccb48ed55931
 EBUILD bazel-0.20.0.ebuild 3072 BLAKE2B e357ef6c41a91ecd538250fd47830076db961e2234c7c734d24ae3c501517d0f16bf5934896a0e7efe271af926953b083c47c924c581b7ef208af2c4d53bf623 SHA512 982ca89595f13670dc117ba3504e8de6f3d5f4a7ec2af3a11bfadc3ce25bd75c85387b53464bd0348b0842d25454a1c1398ecc4f1146f9eb2fafa857e2193487
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
-EBUILD bazel-0.24.1-r1.ebuild 2536 BLAKE2B c738d9b9155ad0d95f801c20ba7b79a493cad2d49abf3e4ad16fa31d9d5a9107028e735cfbc6075255c062e033b0ddcb0767809c61486a2095194fd05413b508 SHA512 6a565ea0494bc8723ec9895fe6bd24869801a950d15812422c643bceead44d49b647a9557a2164aa781d4a788758dec1b0eab43deaa83ff0880650482bddc734
+EBUILD bazel-0.24.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-0.24.1.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
-EBUILD bazel-0.26.1-r1.ebuild 2536 BLAKE2B c738d9b9155ad0d95f801c20ba7b79a493cad2d49abf3e4ad16fa31d9d5a9107028e735cfbc6075255c062e033b0ddcb0767809c61486a2095194fd05413b508 SHA512 6a565ea0494bc8723ec9895fe6bd24869801a950d15812422c643bceead44d49b647a9557a2164aa781d4a788758dec1b0eab43deaa83ff0880650482bddc734
-EBUILD bazel-0.27.0-r1.ebuild 2536 BLAKE2B c738d9b9155ad0d95f801c20ba7b79a493cad2d49abf3e4ad16fa31d9d5a9107028e735cfbc6075255c062e033b0ddcb0767809c61486a2095194fd05413b508 SHA512 6a565ea0494bc8723ec9895fe6bd24869801a950d15812422c643bceead44d49b647a9557a2164aa781d4a788758dec1b0eab43deaa83ff0880650482bddc734
+EBUILD bazel-0.26.1-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-0.27.0-r1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-0.27.2.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
+EBUILD bazel-0.28.1.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.24.1-r1.ebuild b/dev-util/bazel/bazel-0.24.1-r1.ebuild
index a1d730d57133..84224be11667 100644
--- a/dev-util/bazel/bazel-0.24.1-r1.ebuild
+++ b/dev-util/bazel/bazel-0.24.1-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples test tools"
+IUSE="examples tools"
 # strip corrupts the bazel binary
-RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
 RDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${RDEPEND}
 	app-arch/unzip
diff --git a/dev-util/bazel/bazel-0.26.1-r1.ebuild b/dev-util/bazel/bazel-0.26.1-r1.ebuild
index a1d730d57133..84224be11667 100644
--- a/dev-util/bazel/bazel-0.26.1-r1.ebuild
+++ b/dev-util/bazel/bazel-0.26.1-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples test tools"
+IUSE="examples tools"
 # strip corrupts the bazel binary
-RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
 RDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${RDEPEND}
 	app-arch/unzip
diff --git a/dev-util/bazel/bazel-0.27.0-r1.ebuild b/dev-util/bazel/bazel-0.27.0-r1.ebuild
index a1d730d57133..84224be11667 100644
--- a/dev-util/bazel/bazel-0.27.0-r1.ebuild
+++ b/dev-util/bazel/bazel-0.27.0-r1.ebuild
@@ -13,9 +13,10 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="examples test tools"
+IUSE="examples tools"
 # strip corrupts the bazel binary
-RESTRICT="strip test? ( network-sandbox ) !test? ( test )"
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
 RDEPEND=">=virtual/jdk-1.8:*"
 DEPEND="${RDEPEND}
 	app-arch/unzip
diff --git a/dev-util/bazel/bazel-0.27.2.ebuild b/dev-util/bazel/bazel-0.27.2.ebuild
new file mode 100644
index 000000000000..84224be11667
--- /dev/null
+++ b/dev-util/bazel/bazel-0.27.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+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
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --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
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/bazel/bazel-0.28.1.ebuild b/dev-util/bazel/bazel-0.28.1.ebuild
new file mode 100644
index 000000000000..84224be11667
--- /dev/null
+++ b/dev-util/bazel/bazel-0.28.1.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+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
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --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
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index a0daad7ceed4..5320415ff610 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -3,8 +3,10 @@ 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.1.tar.gz 704365 BLAKE2B 03c73eac9cc116df916536239124a6a649aa1a390c97848baedaf5b329f5eda8752c9e39053e741a485d623240954f6659099f0c0ab65cc4bbf00fc6e52d0b46 SHA512 e813c598b3acb85d94e1cb02f75b5fa849f10ee1cc39fb73e843a797946d7642463bcc3d083ff377d68b9e2a1aabb56995ab4ebe2be822f4f393448c7f02ca4b
+DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
 DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
 EBUILD bpftrace-0.9-r1.ebuild 1369 BLAKE2B dc88a0672c969716d83aba591e99c477dee5527faa60bf418fe8547b5d86286d743ef04e673e0aeae418f3bab34da0768b2d3575f0a9ae84a8467180931ab903 SHA512 6865fad28da5145dc206c42a52e99efa372f1380751980b0210a0cb0e62bcde7be2cb3ddccd0724b9c9de1ffc4aac075e61df4b2fd8441b8adbb7183070e126a
 EBUILD bpftrace-0.9.1.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
+EBUILD bpftrace-0.9.2.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
 EBUILD bpftrace-9999.ebuild 1350 BLAKE2B 76883153a41d52398860f2868517d2e6d2445547fdc2d3770d3988bc25d9dde5c709c1130b814c1cf312d632ee0c62fd40b348e0bc8a1f27dd356a0ab242ab81 SHA512 ba62b663bc23618228ce110fe4390414a463dec185fe1b2760d54073e61625264a08d305b65b0de2721a6d62e0f7488e6ca2abe7e31c36258864c01dbc82786e
 MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9.2.ebuild b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
new file mode 100644
index 000000000000..5fcb41040f5d
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs linux-info cmake-utils
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+
+if [[ ${PV} =~ 9{4,} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/iovisor/${PN}"
+	BDEPEND=""
+else
+	MY_PV="${PV//_/}"
+	SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+	BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-util/systemtap
+	sys-devel/clang:=
+	dev-libs/libbpf:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	>=dev-util/bcc-0.10.0:=
+	virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+	sys-devel/flex
+	sys-devel/bison"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.10_pre20190614-install-libs.patch"
+	"${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# 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
+}
+
+src_configure() {
+	local -a mycmakeargs
+	mycmakeargs=(
+		"-DSTATIC_LINKING:BOOL=OFF"
+		"-DBUILD_TESTING:BOOL=OFF"
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index cf50b26b40ad..da24d27f99d5 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -1,7 +1,7 @@
 DIST byacc-20170201.tgz 741550 BLAKE2B d72e2361cbc02d37754d7ca2b0cdabe39bc5b60728e7edf6c0040ca87f991469c918fb0d4c96239d1483ccce0b729698cae9fd6d9988626c1a7ca2d58f47bf1c SHA512 f45e6f5eefe4a4bbcd233fbe06cf25fecec3ecabebea9064db0f52d900ae90783dd180f90d70901f82e2b632ce0432d28a913d312b15225e6256344c176a3638
 DIST byacc-20180609.tgz 745317 BLAKE2B d544e2c81540c711fac57ac3179aec9f44b4db808e44318b3046443c29870351b5251383542caec9f65e06a6d83f481f2c8c4e73a28e59d5a57e854532404df4 SHA512 45aa6de839ca23385ab832685fdaa49225dcde6a40bdb990eefde8ab1be2cfe063875072e844629ac91e9533e6e310fa0bb8a6bd01e246a1cefc67bbc3c175f9
-DIST byacc-20190616.tgz 799301 BLAKE2B 40f052820c6e1d6e15fbf870acb417b686f8768d3a528f07248965cc14fd1ea8894f2cf89c9e3e23694aadf14af4f275554d311b154e51250876fc649d766bf2 SHA512 015c4a640a0aea33c5efdfe9fb88a5d8ca7707caa123549ca5179b35d9f00b83d83ce4b7d52a38843c27169b24d956a9a501a4ae80b22df4f9854b886436bc42
-EBUILD byacc-20170201.ebuild 610 BLAKE2B db86272365c30ac4a30d1538078bc3b6e436e624b70c1a403a8e6e878480c075910e72e188d91e60d2b4d71edea2dae6370d81b9bb2685dc8f177c069edddba4 SHA512 22ad1a4d24aa1ae4ec9b7de9e5d6a881547bd4fe4baec8a884313201c2193ca85a8fa30fed24b23ca8b4c6295388dda357f2e5a50a8368831a0ed600596c9755
+DIST byacc-20190617.tgz 799465 BLAKE2B 2baf34b20da049b3b1d2a569ec6b5470fe4935c9b13062fc58e6c73de6cbb1823736532686d4c9c083771432ce1caccc369c87070b27d59e9cb7c5c5bf1391c9 SHA512 79d04d7aa976e8b4e1bbd69f75ac1f0dbe005b1a7b072ce5ef75c877e8ece043e4adf48645c10ef036ee02de639b56b9befebb34f6e46cac1a59f8f641cc7cc8
+EBUILD byacc-20170201.ebuild 606 BLAKE2B 17b57c9e8ac1f5d3982f29d274e40458de77171d38bc4d82cddd7580fd021664111e4f430469939548650de434885854f74e7411c8c370a4a8205ecf05d803fc SHA512 63f4b681f52dda6dcce887be1d5cc276f01969346bd5aab0e7248f0cdd353c6a1bc6a0735f6983707311e42587421143f2d444c7ce19b4f029c07bc68dece774
 EBUILD byacc-20180609.ebuild 631 BLAKE2B 1bc795a89457b62902407f047bf3989043137e5bb864cd342617522ae7bffb85f18bcb74cc60ff31a099940ad85d9404a550c7a30c00421d7cdc4b18be6144cd SHA512 52450be448ddbaef7e5292870ee6f48e83f0629fa6793410f65533e1af7c66715928bb3283968063e631260f821789b37a4eb5d9b37fcb439b3c876edd624099
-EBUILD byacc-20190616.ebuild 628 BLAKE2B 7f22364a3b39f7f0eefb08c1a46a59e7e6575b15f97fd635ef58d24550b525f9584955cceb19423332128b6781c61d2b28bff072064954a4c09b3d259e85a26a SHA512 69977bf34eca30e0bd311395d6c9a201de6fecfa24418c4f7cd4e1011b4c045931e08ef5f4e10077aa66ddff7a121def2abbd72e76be2383f57dcf6c7660f9c9
+EBUILD byacc-20190617.ebuild 628 BLAKE2B 7f22364a3b39f7f0eefb08c1a46a59e7e6575b15f97fd635ef58d24550b525f9584955cceb19423332128b6781c61d2b28bff072064954a4c09b3d259e85a26a SHA512 69977bf34eca30e0bd311395d6c9a201de6fecfa24418c4f7cd4e1011b4c045931e08ef5f4e10077aa66ddff7a121def2abbd72e76be2383f57dcf6c7660f9c9
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/dev-util/byacc/byacc-20170201.ebuild b/dev-util/byacc/byacc-20170201.ebuild
index 0ebf724c67b4..e15ab9e8588f 100644
--- a/dev-util/byacc/byacc-20170201.ebuild
+++ b/dev-util/byacc/byacc-20170201.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 @@ SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/byacc/byacc-20190616.ebuild b/dev-util/byacc/byacc-20190617.ebuild
index 52031138194a..52031138194a 100644
--- a/dev-util/byacc/byacc-20190616.ebuild
+++ b/dev-util/byacc/byacc-20190617.ebuild
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index 5f717728c765..13f5d39e0fa7 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -1,20 +1,4 @@
-AUX catalyst-2.0.18-Do-notuntarwith--acls.patch 6156 BLAKE2B 921e36d63c3a51f212c3a8a3afd054737e9d21f9870d82249a701a2fb00c27f9f97d7411df46357509477c3cafdd9341752fee77321f94910fd18b9a1d5ffef1 SHA512 500d72f7e11f99eb53275aac3e1b94394826cfa271312ee268092d12a70128b46455c5da1122fb70e21459f56ded3e3ad2752c33516cd3dc4ea4ac70cd0ec32f
-AUX catalyst-2.0.18-fix-quotes.patch 1663 BLAKE2B 3fcd863f94eb9d8e659520d29b8ec9c576b27c25f00adf5d47c60aa6cfa0e6da10b9745e4c6752fc7682f13423180e6f58777c584a7283eee4fc9db02ef34a1f SHA512 185705eba562dfeb52740ad3a0c3ea611648d508079ad54c9e5680d318888cc5123c5ff365b1c575a5348ddfd8210763277daed226b564ed3a59e15f18bff205
-AUX catalyst-2.0.18-remove-machine-id.patch 778 BLAKE2B 1174a6d9c777144d204fed28e912a981b5df93c2c7de983555c53863b5f1baa2a5d1f184fff7f6bb84534f884302ebc97d525d4db2250e0602b841faa7994a41 SHA512 7e5230eacc6ca7b535d416cd2dd846fa9fbc58951ef4cbdb14108afcbcd63f2d8a7b082920d04dc51b9eb47a6d44eeb5a07d704b14e71b6a972d96ca79f807d6
-AUX catalyst-2.0.18-stage1-export-ROOT.patch 1274 BLAKE2B 336c159e54f0a629c73b61814c1d2d9be5996af4367383164c446e9d5067eedff8094724a3830f3e50c922af72e9eacb90168e603d2506c4be4769d1fc549793 SHA512 6372917d395d8129c49c4dd8de7e6a8e7797f6c535e39713fa68059d82f398aa1fb0ffb1b6a65c91f9b5a4861f29cffd4717b7a612276e78d22ac1985ee32113
-DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a3642e92e4f7b7e9944cf3653e7e2ba987ffb34a614b261a22ce3bb964488181c019f92bbc9c73567f89be04c0989 SHA512 5a1408ffe06ce5c06a6bca8f0e3ecd91c17cdc36e2dfa37881d843432bdfe987fd2cfd988cd5719bdf378c18c2e79ee59e281c3b4dba4ae9edfc2dd654b8ee4a
-DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
-DIST catalyst-3.0.2.tar.bz2 878157 BLAKE2B 3711e89be416cd79e98b25fbc432375257749af96a1de6401749131a40c2f1f70975d0c449e1a116623c1aec4d3302670ac058fffd80c4f546fae0609d0c3b7f SHA512 02092b39c70095ab49db28c3289a5d3eb4f73cb3aeda79b3e707cbe2710761cf0060493da7d8a5098e1453320b65654bbe34dd37d5f07623fa90d52579869070
-DIST catalyst-3.0.3.tar.bz2 878309 BLAKE2B 38cba740718a034c104d272aa24fa6964a8dd7fc77d5ccbb481308bb0a38c01d3f0d64e48c1708cab4a723b5a4e0f23727d1c2a0dd0ae4832810e09f76aa335c SHA512 26024dbea3afbc843563a0bf2cd68cc953818caccdf8a42c45ac1df25bd396064a604787807e2db847b4467e9a19df6b2f746eb178d99cbe79889070a2fc4b8a
-DIST catalyst-3.0.4.tar.bz2 873281 BLAKE2B 8177cee09402ccd02343766facbac3011b45165211a207e8e2c07d53a40091202c84e8294a58ed02a193cab3b3d704fafb50322719257a62092fe39b895d7771 SHA512 5fc5ee9faba6874d1b57fed47a9f92fab9adc03544938d1b1f1d6d867215a36f1efd391849b21300034d27be3207bcc28b4792b8c9c4caec72040d4d30741c2a
 DIST catalyst-3.0.5.tar.bz2 873286 BLAKE2B c4cafccb0dcee19d6b0dd30e57c99da81b3485342b6d5405cdbe2e2b59a4631f3223e7d13c5041783a7172361b4a1b69ee5ff68e29ee8bec2f76165acdc5686c SHA512 35cc16391100394f97af4cdfd14f9de2ab4532c97c213f43dd0be927766dc3892768be5aa899fc8919414743c9ea63b4489a2690437b3e7985951eb68c19d0a4
-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 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 1911 BLAKE2B 5efac1e33f57d80c79510e6a5110c631464c197d926ee8b4362f8f36b5bd2fca844c26ac3aeb939d33154eb0007bcda2238177862312ade31a5042026995fff1 SHA512 984489ead5a1707b52c7f693aa727de8a7f8f0c79c0657d5faec883b74cb36af5e9c974556785440881e10d8e7aaa2248e1e429a42353f34a3a637874c906d61
-EBUILD catalyst-3.0.5.ebuild 1911 BLAKE2B 5efac1e33f57d80c79510e6a5110c631464c197d926ee8b4362f8f36b5bd2fca844c26ac3aeb939d33154eb0007bcda2238177862312ade31a5042026995fff1 SHA512 984489ead5a1707b52c7f693aa727de8a7f8f0c79c0657d5faec883b74cb36af5e9c974556785440881e10d8e7aaa2248e1e429a42353f34a3a637874c906d61
+EBUILD catalyst-3.0.5.ebuild 1899 BLAKE2B 4de4d9971e7420b86257f67037ede0afdfd0a531cc1c59a588f8daeca00b624436ca650cda73b1bf6732e096b8b481bd6b8ce1e5d94a73029771058ec90a42de SHA512 771e7a8960f9783a8ac9a36a00187f10871cc3b3ac413bb4162277a29a6a086b1ae1315814f122c6072d39d8be0ca7cc54dbd2abe792a0f21a35f3733bc29cbe
 EBUILD catalyst-9999.ebuild 1911 BLAKE2B 5efac1e33f57d80c79510e6a5110c631464c197d926ee8b4362f8f36b5bd2fca844c26ac3aeb939d33154eb0007bcda2238177862312ade31a5042026995fff1 SHA512 984489ead5a1707b52c7f693aa727de8a7f8f0c79c0657d5faec883b74cb36af5e9c974556785440881e10d8e7aaa2248e1e429a42353f34a3a637874c906d61
 MISC metadata.xml 634 BLAKE2B 2616a9220096593cc1cb863a560101bb97a1672ad84093f951968ef0482950b6c72f8226e66a4e0d8bcc30dad6db9cb3511581f5d9e2f7cbf7c1ba9e7b30dd70 SHA512 ac7464e724232bf7a9211ab3c845b5b7ead26d8ff750a249c4e7646683926e4659581d3783b4e2de9b9324b8df71a6791221900629e633038a6f6aa1c8b59b25
diff --git a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild b/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
deleted file mode 100644
index 9562f69636d7..000000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=( "${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch" )
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
deleted file mode 100644
index 98e502b926c4..000000000000
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="anongit.gentoo.org/proj/catalyst.git"
-	EGIT_MASTER="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils multilib python-single-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	${PYTHON_DEPS}
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	app-arch/tar[xattr]
-	sys-fs/dosfstools
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-	${PYTHON_DEPS}
-"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-PATCHES=(
-	"${FILESDIR}/catalyst-2.0.18-Do-notuntarwith--acls.patch"
-	"${FILESDIR}/catalyst-2.0.18-fix-quotes.patch"
-	"${FILESDIR}/catalyst-2.0.18-remove-machine-id.patch"
-	"${FILESDIR}/catalyst-2.0.18-stage1-export-ROOT.patch"
-)
-
-pkg_setup() {
-	if use ccache ; then
-		einfo "Enabling ccache support for catalyst."
-	else
-		ewarn "By default, ccache support for catalyst is disabled."
-		ewarn "If this is not what you intended,"
-		ewarn "then you should add ccache to your USE."
-	fi
-
-	echo
-	einfo "The template spec files are now installed by default.  You can find"
-	einfo "them under /usr/share/doc/${PF}/examples"
-	einfo "and they are considered to be the authorative source of information"
-	einfo "on catalyst."
-	echo
-
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)/${PN}
-	exeinto /usr/$(get_libdir)/${PN}
-	doexe catalyst || die "copying catalyst"
-
-	if [[ ${PV} == 3.9999* ]]; then
-		doins -r modules files || die "copying files"
-	else
-		doins -r arch modules livecd || die "copying files"
-	fi
-
-	for x in targets/*; do
-		exeinto /usr/$(get_libdir)/${PN}/$x
-		doexe $x/* || die "copying ${x}"
-	done
-
-	# Here is where we actually enable ccache
-	use ccache && \
-		sed -i -e 's:options="autoresume kern:options="autoresume ccache kern:' \
-			files/catalyst.conf
-
-	sed -i -e "s:/usr/lib/catalyst:/usr/$(get_libdir)/catalyst:" \
-		files/catalyst.conf
-
-	make_wrapper catalyst /usr/$(get_libdir)/${PN}/catalyst
-	insinto /etc/catalyst
-	doins files/catalyst.conf files/catalystrc || die "copying configuration"
-	insinto /usr/share/doc/${PF}/examples
-	doins examples/* || die
-	dodoc README AUTHORS
-	doman files/catalyst.1 files/catalyst-spec.5
-
-	python_fix_shebang "${ED}usr/$(get_libdir)/catalyst/catalyst"
-	python_optimize "${ED}"
-}
-
-pkg_postinst() {
-	einfo "You can find more information about catalyst by checking out the"
-	einfo "catalyst project page at:"
-	einfo "https://wiki.gentoo.org/wiki/Catalyst"
-}
diff --git a/dev-util/catalyst/catalyst-3.0.1.ebuild b/dev-util/catalyst/catalyst-3.0.1.ebuild
deleted file mode 100644
index 7792b7e20a3c..000000000000
--- a/dev-util/catalyst/catalyst-3.0.1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-2"
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/catalyst.git"
-	EGIT_BRANCH="master"
-	S="${WORKDIR}/${PN}"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1 multilib ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild b/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
deleted file mode 100644
index 7aab281c337c..000000000000
--- a/dev-util/catalyst/catalyst-3.0.2-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.2.ebuild b/dev-util/catalyst/catalyst-3.0.2.ebuild
deleted file mode 100644
index 12d4b9dbf83d..000000000000
--- a/dev-util/catalyst/catalyst-3.0.2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.3.ebuild b/dev-util/catalyst/catalyst-3.0.3.ebuild
deleted file mode 100644
index 7aab281c337c..000000000000
--- a/dev-util/catalyst/catalyst-3.0.3.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.bz2
-		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2
-		https://dev.gentoo.org/~jmbsvicetto/distfiles/${P}.tar.bz2
-		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	app-arch/lbzip2
-	app-crypt/shash
-	>=dev-python/pydecomp-0.2[${PYTHON_USEDEP}]
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	virtual/cdrtools
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.4.ebuild b/dev-util/catalyst/catalyst-3.0.4.ebuild
deleted file mode 100644
index 8126cc048190..000000000000
--- a/dev-util/catalyst/catalyst-3.0.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == *9999* ]]; then
-	SRC_ECLASS="git-r3"
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/catalyst.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit distutils-r1 ${SRC_ECLASS}
-
-DESCRIPTION="Release metatool used for creating releases based on Gentoo Linux"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Catalyst"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ccache doc +iso kernel_linux system-bootloader"
-
-DEPEND="
-	app-text/asciidoc
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	>=dev-python/snakeoil-0.6.5[${PYTHON_USEDEP}]
-	>=dev-python/pydecomp-0.3[${PYTHON_USEDEP}]
-	app-arch/lbzip2
-	app-crypt/shash
-	sys-fs/dosfstools
-	!kernel_FreeBSD? ( || ( app-arch/tar[xattr] app-arch/libarchive[xattr] ) )
-	kernel_FreeBSD? ( app-arch/libarchive[xattr] )
-	amd64? ( >=sys-boot/syslinux-3.72 )
-	x86? ( >=sys-boot/syslinux-3.72 )
-	ccache? ( dev-util/ccache )
-	iso? ( virtual/cdrtools )
-	kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 )
-"
-PDEPEND="system-bootloader? ( >=sys-apps/memtest86+-5.01-r4
-				sys-boot/grub:2
-				amd64? ( sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64] )
-				x86? ( sys-boot/grub[grub_platforms_efi-32] )
-				sys-boot/syslinux
-				sys-boot/shim )"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PV}" "${PYTHON}" setup.py set_version
-	VERSION="${PV}" "${PYTHON}" setup.py set_version || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	# build the man pages and docs
-	emake
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	if use doc; then
-		dodoc files/HOWTO.html files/docbook-xsl.css
-	fi
-}
diff --git a/dev-util/catalyst/catalyst-3.0.5.ebuild b/dev-util/catalyst/catalyst-3.0.5.ebuild
index 8126cc048190..0ca5875c8c60 100644
--- a/dev-util/catalyst/catalyst-3.0.5.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.5.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x86-fbsd"
 fi
 
 PYTHON_COMPAT=( python{3_5,3_6,3_7} )
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch b/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
deleted file mode 100644
index f4cbcfbb7d38..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-Do-notuntarwith--acls.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 45286727a63d16d0688a88bf7cf68289efd26861 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sun, 18 Jan 2015 22:21:16 -0500
-Subject: [PATCH] Do not untar with --acls, fixes bug #536762
-To: gentoo-catalyst@lists.gentoo.org
-
----
- modules/catalyst_support.py     |  6 +++---
- modules/generic_stage_target.py | 18 +++++++++---------
- 2 files changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
-index 0e9faac..702887d 100644
---- a/modules/catalyst_support.py
-+++ b/modules/catalyst_support.py
-@@ -108,9 +108,9 @@ contents_map={
- 	# 'find' is disabled because it requires the source path, which is not
- 	# always available
- 	#"find"		:[calc_contents,"find %(path)s"],
--	"tar-tv":[calc_contents,"tar --xattrs --acls tvf %(file)s"],
--	"tar-tvz":[calc_contents,"tar --xattrs --acls tvzf %(file)s"],
--	"tar-tvj":[calc_contents,"tar --xattrs --acls -I lbzip2 -tvf %(file)s"],
-+	"tar-tv":[calc_contents,"tar --xattrs tvf %(file)s"],
-+	"tar-tvz":[calc_contents,"tar --xattrs tvzf %(file)s"],
-+	"tar-tvj":[calc_contents,"tar --xattrs -I lbzip2 -tvf %(file)s"],
- 	"isoinfo-l":[calc_contents,"isoinfo -l -i %(file)s"],
- 	# isoinfo-f should be a last resort only
- 	"isoinfo-f":[calc_contents,"isoinfo -f -i %(file)s"],
-diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
-index c7db027..cc24c63 100644
---- a/modules/generic_stage_target.py
-+++ b/modules/generic_stage_target.py
-@@ -660,10 +660,10 @@ class generic_stage_target(generic_target):
- 					self.settings["chroot_path"]+\
- 						" (This may take some time) ...\n"
- 				if "bz2" == self.settings["chroot_path"][-3:]:
--					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 						self.settings["chroot_path"]
- 				else:
--					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+					unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 						self.settings["chroot_path"]
- 				error_msg="Tarball extraction of "+\
- 					self.settings["source_path"]+" to "+\
-@@ -675,10 +675,10 @@ class generic_stage_target(generic_target):
- 				self.settings["chroot_path"]+\
- 				" (This may take some time) ...\n"
- 			if "bz2" == self.settings["chroot_path"][-3:]:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 					self.settings["chroot_path"]
- 			else:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags  --acls --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["source_path"]+" -C "+\
- 					self.settings["chroot_path"]
- 			error_msg="Tarball extraction of "+self.settings["source_path"]+\
- 				" to "+self.settings["chroot_path"]+" failed."
-@@ -777,9 +777,9 @@ class generic_stage_target(generic_target):
- 				"catalyst-hash")
- 			destdir=self.settings["snapshot_cache_path"]
- 			if "bz2" == self.settings["chroot_path"][-3:]:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- 			else:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+destdir
- 			unpack_errmsg="Error unpacking snapshot"
- 			cleanup_msg="Cleaning up invalid snapshot cache at \n\t"+\
- 				self.settings["snapshot_cache_path"]+\
-@@ -796,10 +796,10 @@ class generic_stage_target(generic_target):
- 			cleanup_msg=\
- 				"Cleaning up existing portage tree (This can take a long time)..."
- 			if "bz2" == self.settings["chroot_path"][-3:]:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -xpf "+self.settings["snapshot_path"]+" -C "+\
- 					self.settings["chroot_path"]+"/usr"
- 			else:
--				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
-+				unpack_cmd="tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -xpf "+self.settings["snapshot_path"]+" -C "+\
- 					self.settings["chroot_path"]+"/usr"
- 			unpack_errmsg="Error unpacking snapshot"
- 
-@@ -1224,7 +1224,7 @@ class generic_stage_target(generic_target):
- 
- 			print "Creating stage tarball..."
- 
--			cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --acls --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
-+			cmd("tar --xattrs --xattrs-include=security.capability --xattrs-include=user.pax.flags --selinux -I lbzip2 -cpf "+self.settings["target_path"]+" -C "+\
- 				self.settings["stage_path"]+" .",\
- 				"Couldn't create stage tarball",env=self.env)
- 
--- 
-2.2.2
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch b/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
deleted file mode 100644
index ccaffbe6b034..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-fix-quotes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1eabce3a9c15c5caf022e71c1959e8c8f4819fad Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Thu, 3 Mar 2016 20:48:43 -0500
-Subject: [PATCH] targets/support/chroot-functions.sh: correct quotes to allow
- expansion of $1
-
-This is a backport of commit b2473eff.  The single quotes prevented the proper
-expansion of $1 in setup_pkgmgr().  Since this is usually called as
-`setup_pkgmgr "build"` during stage1 builds, it is surprising this was
-not caught earlier.
----
- targets/support/chroot-functions.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 3b7f77b..6c1a31c 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -172,12 +172,12 @@ setup_pkgmgr(){
- 	# Use --update or portage might just waste time/cycles and reinstall the same version.
- 	# Use --newuse to make sure it rebuilds with any changed use flags.
- 	if [ -n "$1" ];then
--		echo "Adding USE='${USE} $1' to make.conf for portage build"
--		[ -e /etc/portage/make.conf ] && echo 'USE="${USE} $1"' >> /etc/portage/make.conf
-+		echo "Adding USE=\"${USE} $1\" to make.conf for portage build"
-+		[ -e /etc/portage/make.conf ] && echo "USE=\"\${USE} $1\"" >> /etc/portage/make.conf
- 		run_merge --oneshot --update --newuse sys-apps/portage
--		sed -i '/USE="${USE} $1"/d' /etc/portage/make.conf
-+		sed -i "/USE=\"\${USE} $1\"/d" /etc/portage/make.conf
- 	else
--		echo "Updating portage with USE='${USE}'"
-+		echo "Updating portage with USE=\"${USE}\""
- 		run_merge --oneshot --update --newuse sys-apps/portage
- 	fi
- }
--- 
-2.4.10
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch b/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
deleted file mode 100644
index 1c641fd2b905..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-remove-machine-id.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fbf94254a714c8d72840faee42cf348eb69b1a43 Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Fri, 8 Apr 2016 17:58:15 -0400
-Subject: [PATCH] targets/support/chroot-functions.sh: remove machine-id for
- systemd stages
-
----
- targets/support/chroot-functions.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
-index 6c1a31c..67874a0 100755
---- a/targets/support/chroot-functions.sh
-+++ b/targets/support/chroot-functions.sh
-@@ -223,6 +223,7 @@ cleanup_stages() {
- 		stage1|stage2|stage3|system)
- 			rm -f /var/lib/portage/world
- 			touch /var/lib/portage/world
-+			rm -f /etc/machine-id
- 			;;
- 		*)
- 			echo "Skipping removal of world file for ${clst_target}"
--- 
-2.7.3
-
diff --git a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch b/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
deleted file mode 100644
index 67fc2c631b02..000000000000
--- a/dev-util/catalyst/files/catalyst-2.0.18-stage1-export-ROOT.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 5fd2d5edd3c4c1e99687beb9acc130bab162866b Mon Sep 17 00:00:00 2001
-From: "Anthony G. Basile" <blueness@gentoo.org>
-Date: Sat, 4 Jun 2016 12:43:44 -0400
-Subject: stage1-preclean-chroot.sh: export ROOT=/tmp/stage1root for
- setup_gcc()
-
-setup_gcc() calls gcc-config to select a particular gcc profile.  At stage1 this
-needs to be done in the /tmp/stage1root chroot.  gcc-config looks for ROOT to
-choose the root directory in which to make the selection.  If we don't export
-ROOT, then setup_gcc is ineffective.
-
-X-Gentoo-Bug: 584234
-X-Gentoo-Bug-Url: https://bugs.gentoo.org/show_bug.cgi?id=584234
-
-Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
----
- targets/stage1/stage1-preclean-chroot.sh | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/targets/stage1/stage1-preclean-chroot.sh b/targets/stage1/stage1-preclean-chroot.sh
-index a80fc92..dc67521 100755
---- a/targets/stage1/stage1-preclean-chroot.sh
-+++ b/targets/stage1/stage1-preclean-chroot.sh
-@@ -1,5 +1,6 @@
- #!/bin/bash
- 
-+export ROOT=/tmp/stage1root
- export RUN_DEFAULT_FUNCS="no"
- 
- source /tmp/chroot-functions.sh
-@@ -8,8 +9,6 @@ update_env_settings
- show_debug
- 
- # Now, some finishing touches to initialize gcc-config....
--unset ROOT
--
- setup_gcc
- setup_binutils
- 
--- 
-cgit v0.12
-
diff --git a/dev-util/catfish/Manifest b/dev-util/catfish/Manifest
index a244ed42cc3b..6da020da3372 100644
--- a/dev-util/catfish/Manifest
+++ b/dev-util/catfish/Manifest
@@ -1,3 +1,5 @@
 DIST catfish-1.4.7.tar.bz2 162289 BLAKE2B 2f24485f0f059a177a8544632ab583acad1149f96921f8b10027e5788adb2eaf4da0911f3363174feef570c8f75615ec1f943a2d5d2e8622efd4be9892a0fcd2 SHA512 cafa8eaaa40522f50111b3bb9c09a116ebad827532b0cfc88bc643fb2e2d89edee53057fbbed23719f4091ca384d7ea025633e571e160d7dfced008f788a3ffd
+DIST catfish-1.4.8.tar.bz2 181027 BLAKE2B c03270832cb2e6bdc39528801d257d37c52f0c6f361c9225002c31a258a18a1c98cf7af640ca15a4f6e32ac4ac802bda84327123a7bf13d47a1410e67988bfab SHA512 46c9e9112116e0f8ee7957c5a71d16ecdde8c16a60a030f3339933a6f9e73d61d360fed52d5904b0fff21448050cc17df5af63f6254476404760fe9166dfad00
 EBUILD catfish-1.4.7.ebuild 947 BLAKE2B cb3fa62e138ae25d38f6d01e9adf0dbaeb6b4d67b6dd35de6f1e479ce29a1fd12ae1dd8a020db2d77e26cc8ee1442c9f5bacfc49fbb14eb18ac9b2792641feaf SHA512 0cb196c16e7f798c0db251f5aa1942d5c9c7388dad8e44e153c86c3fbcc981d1a86c1a91807de303a68a739d7c8ffa8bc28e9a923a1da242e814a27d9525b2c6
+EBUILD catfish-1.4.8.ebuild 949 BLAKE2B f07556d8a90c1f5fb0510ddfd10ed5721871be076199e51fb5caa2bcac541e85b1202c336fbc0febf1ea34792c259647b0216c6a74554f027a6e755947fd55de SHA512 dc32d008d3620f787b21013a454021290e7e5ed45f5fc299a75361ceb2b48f4870824aaeacd10c238eeba06a1630560e2655f0bd456aa2b8208e220541fab890
 MISC metadata.xml 216 BLAKE2B 9fe308faad3ff5d9aac2a6d04341fe2b775153198ea734e1b17d15eab6b9eb1f781686089a6487ebc2e9cceddfd3f8c4ad1513baaacf931802201aadbe9589f6 SHA512 780eab488d269f38416e3bfc9c02d1a6bc70cee7755ac7cdc9b0bc42a3a50bb8b0b403da139629767d2f0439b15edce7d7b4078a6f528a4e04cecc1aa9bd01e7
diff --git a/dev-util/catfish/catfish-1.4.8.ebuild b/dev-util/catfish/catfish-1.4.8.ebuild
new file mode 100644
index 000000000000..a6d1ef38c048
--- /dev/null
+++ b/dev-util/catfish/catfish-1.4.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,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/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 8860ee341843..0b3077ac5943 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -108,5 +108,5 @@ EBUILD cbindgen-0.6.7.ebuild 952 BLAKE2B 25e4bdcde7e4b0987b0f03a838c4bb3d6c01b58
 EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df2f53eb9384dd9446cb034916255f1afbce29a045553177daffe94597c6991dd30917f7a17ad86100e530121c1 SHA512 be4cae3e22bbe5f9ebd6e00627d626615a9e8a04118e080432d4415ca0fe201aa76b5553e6360fa3b429624bd6f3850540e9b348e6751b5a3ba8b58becb5fe75
 EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 EBUILD cbindgen-0.8.7.ebuild 1126 BLAKE2B e4ba38b90ac624dd8c6c3fa781e45fbcfbd625be3477861d6390ca35821ea9032cbeb5ae06ee5e629cd191480c6f5dd530b9334e731740922b0fdea3109f7164 SHA512 81391a5777d22c6ef923075845cff5999ffc2b36d2bab5d7d79e6f3f7824eaa4d6a9742915e49adf840f38d0807ccd0d60e0049f99810b47addf4996df06a1a1
-EBUILD cbindgen-0.9.0.ebuild 1093 BLAKE2B 270cb9f3000ab7a9700d768a65bbb7be48152c21a77d91eb8c8e0255aaba829e5d0ebde3553f628cc0e7170599122923dedbdb57d6c9d922df62a10c21e8a4fd SHA512 cfea23186a176538bbe6903816076cf0ef5e571427e7c03eb0730e561c7ed01ed655adc58415b4eafa4421fb9ff948f28ba01c998ebe8bfced82fc7de2253e36
+EBUILD cbindgen-0.9.0.ebuild 1100 BLAKE2B e544beb72172f7a69a9dcf5d6a77dc573a243efd4a493a9603087a6c5d3406d3196fb9a100d8921590557e4b173931ced9f2d2ca0f94bf8fc415e196a2664bfb SHA512 e251dd0b30790ed03976f0400501d286ecf1ae41909b5de3a7b0c59eeb1a7f9fa51cd76cc26950d783ce90464af476321ba007483d3275f3d7c99433c282937a
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.9.0.ebuild b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
index c2758e552539..ff6909f7da6d 100644
--- a/dev-util/cbindgen/cbindgen-0.9.0.ebuild
+++ b/dev-util/cbindgen/cbindgen-0.9.0.ebuild
@@ -58,6 +58,6 @@ HOMEPAGE="https://github.com/eqrion/cbindgen/"
 SRC_URI="$(cargo_crate_uris ${CRATES})"
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index f56dcad1f4a1..3a3b83e15f78 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,15 +1,14 @@
-AUX ccache-3.1.10-size-on-disk.patch 518 BLAKE2B 1f949d0cb0168e3de0a4e142db339f59b1dabda2b06912133e10c536e23f7912e002c7d4cf6ec90654863c0339339bf17baa9b3b107110e4f25e6876ba8fe39b SHA512 bf7a160b091798e7de57748f4f9e0d6f027872c713108e3791cfc82bf64d3ed843607267ff0cca9e0848abf8bbcbbb6c19921560032576849a42f29ecc496212
-AUX ccache-3.3-size-on-disk.patch 514 BLAKE2B 93ce94415da1ac5af7ccf60958908f7b1b75b9a7af2602c1f23113b06dbc15489f797a188103a948cb7dd81ffba11797fa0e525c2ab667b9fb5a2a890097028b SHA512 7e7f01ca602722a1add1615223bb109cecfdf69ab7612a0424732f992331b0addd7b94f684fedb91486f69cbe57fcb1961d1069116a27458f1f5b20a169f2569
-AUX ccache-3.4-size-on-disk.patch 522 BLAKE2B 6ec1f4cdb75d39997e16716caf3195c180ef7796568031b0dcbb92c385034b793fef2ad7afd9d3aaf66c37dd562447fca3bbac8b42909b2fa4e2b2ae1f8008ea SHA512 91757a176c813076d90f1a44b6a605bf1fac30e47caf253883c59e8f9e0e257d6aeceeb3f3f96351fc5c24f413eb7bb08a811e4be0991fe653ae62d68cce565f
+AUX ccache-3.3-size-on-disk.patch 559 BLAKE2B ef3c24c4094153e2ed2b071f42d83c86352bad696bfca2b59357973be83afbb5dd9fe7f0df25604808db59b97a193815b8b31f5f07819c1da0f7776aea36e6aa SHA512 09341435cbcafe38ba641ea4507091bf5e7b4ad38922d5ca0f7750637d65fbef64504312eb5e0ca1551371da64d76acf2d5461a59cb04d23d812e4050772253f
+AUX ccache-3.4-size-on-disk.patch 567 BLAKE2B 8ac22301eabf54922f69d135ad99a8ad9ac83df956af274bd088909ae973af18c476b408f126ad59e60c69fc1ed02f90b0021074a24ca47f804f539063303dd3 SHA512 9e8eba9926fd8e8b90572365729388bf1bfdadae9cab8b739a614de10759bf69d709075fd92c77d1945e45cc4f6c3865c694a2129d7c30f0b14f2324b4df2133
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
-AUX ccache-3.6-disable-sized-cleanup.patch 790 BLAKE2B b3f0e08eac186304b79a1b181a63f237606ab111ca59735c3dc1e7e48f36e3cf9d7e96b89098edde3bd50c537e3c4d19388dedae9c1388f0284f366e57180c8f SHA512 be3e2389d73f71576cc7065cfbf379700b5028ef5f7242427467c3c76e2e006c5ffe5f70a166cace3deae9c03db33212c9d03908083bd3c49a4789fce2a1f449
+AUX ccache-3.6-disable-sized-cleanup.patch 834 BLAKE2B a8f6ef6fc900c7cff9ae68a25f997c8e5b2cf1e98392047837efd07c91ede129dbbca2d6aa1a2532d149675f658220aa251b0fe066597f862aa2c44ec30fbda3 SHA512 3d0ab124e119b1757fd272a3585aee14e83c092459411d300fef198ca16483ec9149baedb54a9a8333b5a24a34506da550afcdf4e10ae2657c01164244e1519d
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.3.4.tar.xz 314468 BLAKE2B 6e465598df428979a2c821a698afef25c05d09045cbb54ec54cc3b65b8ce6416b6eb46fae0cf5d60f766129cef11eb01410b522318c67416fdf47f6e8fceae66 SHA512 891bcf11b27fa20a250bc86d182663e46af450a3a807b6cab502f202cd57123ce93bcb1fe5e48866feecda76912a5f742efa5869df9117d81624ba185dd4e02c
-DIST ccache-3.5.1a.tar.xz 335888 BLAKE2B 66c044b39dd42c91327e02528a4d6c917ac012c2d08190f7dbc2029ed6d1525aa3a6262fb7528f1721cec510306baa59b498a5afbcf955bb6aaf13594c00d178 SHA512 8a2e9eb06ba21fcf92084afd94fc221168693de545e0448f4da2098bef2bcbfdb017117c325b0bab4931b9e346dd8c1a9d1ebaed0cdc36496d9452985cdd1b43
+DIST ccache-3.6.tar.xz 340608 BLAKE2B fa92180f53612f84b71c68da4acccefee129e5bfc9b269caa45a9c16219ed835ccf034d61ff938a54f3673fa23410d960475cc37cf5d27d7be641e7518a43f0a SHA512 13ce4c9084983ce77617cf005235987715cd6b630dac13a17cb9badce24aab71bff505e63da4206878e32d337cc674f05fbf78540711ec5b33a0b8384c47fa0d
 DIST ccache-3.7.1.tar.xz 349276 BLAKE2B 4f36ccb378b614668777d8be32dd343a0e59e36885a845ba004082f7ca0f69a5e4d01ed08af445c33bff218d33ad0385ed6ade383c06da20e3d0271b2f7423dd SHA512 c2f369c861998f82600272deedc436840af7f85baa355a1e119dacea8f41275d601a0805c3e2a8bc434df621a4e52647bd8654a71c2329542a8b160f7f179cdf
 DIST ccache-3.7.2.tar.xz 351168 BLAKE2B 6e5c8847f961bd5aa2cf325e582ece9e8bfb9c015fe3dcb01c8ca1e1834fdfb82a351ec49e203721486817df58c6aebf28e0af011f470fb739d5016f72191654 SHA512 3290f0609c27a2f063e632392be01ef163273115700f87a6d2954fcfd52fcc14bf66fc147ecbd2b692258317e113bf8be9f7efdf377560e2e8d9dd67cef58147
 EBUILD ccache-3.3.4-r1.ebuild 1917 BLAKE2B 740c0be412ab1c4402682dc403e292c96e3f7b4ef9c881bc71d8a4dfcf58716141a8eba73baba94ceb21d25cb3398c1e3f2a5a0e5435acc02f9c561e3777dc9b SHA512 d4c0899d3bd5f7c8040e4591a658ee93fa7fb96339a0f72169016ef433266a98e558242250697ba9b5abad0eccd636fd23892f6e88e7ee30f9bed84a38eba04b
-EBUILD ccache-3.5.1a.ebuild 2096 BLAKE2B 3334ed2e2f022f39b27aa9fcfd39d98eb8982bad09b67d3d7a1cbb0a47115dbd416f886121e32aab00c75ee729038efa5696c8bf9c00e9ac0a513d99483ec2ad SHA512 246e5d788fcb590be2b2fe9cd6e214a87934e0547a6d0dd9e3c888f4955ed33be9cc87a2eb0afdc517e48d6dd1bb02129975b4a7b27fbaf77fe76e4a7d971137
-EBUILD ccache-3.7.1.ebuild 2149 BLAKE2B 4445dbcc88ac22f85a29fa14259181fa0b4f3a1084615ca988085694dcba1387b93604dedd20945fd94e5294b8adefe412da69ed34a037b33193d5979a2e95ea SHA512 289124fd35a518af43a580d39096eeb6d4ddef8b515334dd6035d063f9521f32b2e9b43c6b37cf7f8cf87561354fa23553229cf2af8feaf9bd4d4a10496a3f4d
+EBUILD ccache-3.6.ebuild 2095 BLAKE2B 55e4efe5c7aca294c71b4233840bdb9c71a72160f67857c96711e6f7856f464c647dfba632ef193ceb79aadea423a89fe974f39810c3c06d6a705364ae0cecbc SHA512 d90c00c9cbf75b7cca03c22e35976c14e1ede3a35954c984ca4d5012318fb2f21fe84bc34d4248a1e71c5d6c6059a56e95fc8f0300db881ccda661692f13e5d0
+EBUILD ccache-3.7.1.ebuild 2136 BLAKE2B c9e243c7cabac39716581c38271779a706f95a20d35cb40c3bef1d6b3768260fe5abcc05a35a43b34017e3ad5637758f27a386ff0b9cddf6be6751fe3a9fb50b SHA512 77335fd55a5fc9166a21a6b94a272107c97cb5b8b74bef26b3cc69a50f62a2c4f04673dba3f9dda1784c962effc2934be25fd5fe838ca5523c59a3131e1fddd2
 EBUILD ccache-3.7.2.ebuild 2149 BLAKE2B 4445dbcc88ac22f85a29fa14259181fa0b4f3a1084615ca988085694dcba1387b93604dedd20945fd94e5294b8adefe412da69ed34a037b33193d5979a2e95ea SHA512 289124fd35a518af43a580d39096eeb6d4ddef8b515334dd6035d063f9521f32b2e9b43c6b37cf7f8cf87561354fa23553229cf2af8feaf9bd4d4a10496a3f4d
 MISC metadata.xml 445 BLAKE2B 8ef8f120989420428ea85108180c659c72a7553f3f20ab96597d26aa04b059f491aeae8c887697a214c437f2dba30fbb934cb47c1db93821eda7dd489e6cb693 SHA512 41ffcad23c9f0274c48a058090d6404cd782dea6674b81615a6b3b7fa272ff5df4c68404fb4dcdb9d2275c13fb137f21f0f65232d5fb1ef6152cc25213893249
diff --git a/dev-util/ccache/ccache-3.5.1a.ebuild b/dev-util/ccache/ccache-3.6.ebuild
index 7491315da2e2..905e13b61112 100644
--- a/dev-util/ccache/ccache-3.5.1a.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 s390 sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
@@ -23,10 +23,9 @@ RDEPEND="${DEPEND}
 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
 )
 
-S=${WORKDIR}/${P%a} # 3.5.1a->3.5.1, bug #674516
-
 src_prepare() {
 	default
 
@@ -55,8 +54,8 @@ src_install() {
 
 	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 2.0.46-r11+ will automatically take advantage of ccache with
+'${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
diff --git a/dev-util/ccache/ccache-3.7.1.ebuild b/dev-util/ccache/ccache-3.7.1.ebuild
index 9722ebbef665..7e0c22e120ad 100644
--- a/dev-util/ccache/ccache-3.7.1.ebuild
+++ b/dev-util/ccache/ccache-3.7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/ccache-${PV}.
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch b/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
deleted file mode 100644
index 5e502912bfa2..000000000000
--- a/dev-util/ccache/files/ccache-3.1.10-size-on-disk.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://bugs.gentoo.org/56178
-
-stick to the size of files on disk rather than their byte size.
-this func is only used for stats management, so this should be safe.
-
---- a/util.c
-+++ b/util.c
-@@ -845,12 +845,7 @@ file_size(struct stat *st)
- #ifdef _WIN32
- 	return (st->st_size + 1023) & ~1023;
- #else
--	size_t size = st->st_blocks * 512;
--	if ((size_t)st->st_size > size) {
--		/* probably a broken stat() call ... */
--		size = (st->st_size + 1023) & ~1023;
--	}
--	return size;
-+	return st->st_blocks * 512;
- #endif
- }
- 
diff --git a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
index e4e2ff8c6477..277e9a6469a0 100644
--- a/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.3-size-on-disk.patch
@@ -1,4 +1,5 @@
-https://bugs.gentoo.org/56178
+https://bugs.gentoo.org/456178
+https://github.com/ccache/ccache/issues/442
 
 stick to the size of files on disk rather than their byte size.
 this func is only used for stats management, so this should be safe.
diff --git a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
index 4f39a0348f2f..a2f4a554cab3 100644
--- a/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
+++ b/dev-util/ccache/files/ccache-3.4-size-on-disk.patch
@@ -1,4 +1,5 @@
-https://bugs.gentoo.org/56178
+https://bugs.gentoo.org/456178
+https://github.com/ccache/ccache/issues/442
 
 stick to the size of files on disk rather than their byte size.
 this func is only used for stats management, so this should be safe.
diff --git a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
index 2b12542d26f7..dcb5cf1f497a 100644
--- a/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
+++ b/dev-util/ccache/files/ccache-3.6-disable-sized-cleanup.patch
@@ -1,4 +1,5 @@
 https://bugs.gentoo.org/649440
+https://github.com/ccache/ccache/issues/442
 
 Disable cleanup based on free filesystem size.
 
diff --git a/dev-util/cgvg/Manifest b/dev-util/cgvg/Manifest
index 7b059ffa7b59..f032dfb84151 100644
--- a/dev-util/cgvg/Manifest
+++ b/dev-util/cgvg/Manifest
@@ -1,5 +1,3 @@
-DIST cgvg-1.6.2.tar.gz 41790 BLAKE2B 7d3313172862c6b1cd41b3ab824b5c164b498012b8c3a9017804569757aaee0f4e20f7dd14c458eafed6629480e6a0e5c450ed16a06f627735f74c57b1156ad2 SHA512 b2b4ec973515a4282c7b5d4ac1009682ac64f632509717fda88c3fa91ee59c21c950b085b86c551d8f2fd75539a319eec0c8837655ad025042cbf6e101c92173
 DIST cgvg-1.6.3.tar.gz 42130 BLAKE2B e272a42cbc2c5edf08459273eb9f71036ec1afde4d20bb39593028eaf40026b83707b327ef8892a39b1e6f0f399dff3b52f9ff023e9092e26439d1e935da99d5 SHA512 9aeebd0952fc6a99ebeca54bbc54f9ff8858baed3b6c16ae391c033ba6ec6c411e34da88e25ec1208c8f0c536a47424ef09af15bf650485d54921b33c652e0ab
-EBUILD cgvg-1.6.2.ebuild 534 BLAKE2B d47e1a4dcacbcd5ea5680463df91bb5c8e630139808e8b573716cb7a0ac04d796bbf88ed75747c71af761e48849188414f0ee6b99ecb35635b4e11df937434bc SHA512 e84627deecc6d68e07356bf7de43ee0dc5d99f3646b7f66454db575cab235daf4c820d78194ef4de2c0897e1b6111a6cf1292b593ba4a1e18c5dcad5d2cce63d
-EBUILD cgvg-1.6.3.ebuild 427 BLAKE2B 0ae5ee8e8d76deb673f40b9caf26d155ad2ec6ade1fd9b0df44157c74c269dbafa2ae65e126f018bc0f50ccc3c220b617fb4ea1aeb16a960511d6f157095f2d9 SHA512 5cd0abcca7e83ab8ff6f1cdca3d7dbb3e55f54e13b96965a6f0b612666902963688a1898ee88d3469ea5976f167fc7fa846d5956622f79ec5d98f7c6c92ccdff
+EBUILD cgvg-1.6.3.ebuild 424 BLAKE2B 14165382e79cf4f22c987ed3109c5d05ef72af4201fbb7955b3197285f2f5b7beea9df5d3765cc290e11d2c428aff1989a834e043183826904bb906132575275 SHA512 7ed1eeff0411f0b9492e983dee2740875e45b426fe96b79f457deb43747a38b41baa8fc3154fb5f005dbbb8ac1fa9ed47e8902425d54a8ed5a5916c9292ef0dc
 MISC metadata.xml 165 BLAKE2B ed7e2ebe9f71491aa6163627bdb6606e798b98ca85c053b50442182a245074a9e09b290835e7c8fb4a10e4e8227c16ec306fd16f337cb66904095d864e698e8b SHA512 bebe508b4e0a7ca4a046f9befd3d7ddb702756024756a5f0d9fb5ace5fe3f5a98f9d42afda4597b7d1338607b8d43e41c8fcd6d20d31da3ebad2b420edd2cb59
diff --git a/dev-util/cgvg/cgvg-1.6.2.ebuild b/dev-util/cgvg/cgvg-1.6.2.ebuild
deleted file mode 100644
index cc5658993b5b..000000000000
--- a/dev-util/cgvg/cgvg-1.6.2.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A tiny version of cscope that is much more useful in certian instances"
-HOMEPAGE="http://uzix.org/cgvg.html"
-SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS NEWS README TODO
-}
diff --git a/dev-util/cgvg/cgvg-1.6.3.ebuild b/dev-util/cgvg/cgvg-1.6.3.ebuild
index 3ebddf1f1c2d..de3f1d265025 100644
--- a/dev-util/cgvg/cgvg-1.6.3.ebuild
+++ b/dev-util/cgvg/cgvg-1.6.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://uzix.org/cgvg/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
diff --git a/dev-util/checkbashisms/Manifest b/dev-util/checkbashisms/Manifest
index 16009f14703a..d45471131487 100644
--- a/dev-util/checkbashisms/Manifest
+++ b/dev-util/checkbashisms/Manifest
@@ -1,8 +1,4 @@
 AUX checkbashisms-2.18.6-command-vV.patch 1155 BLAKE2B a9255aab4b358c09a211c06bc1f2357c9eb653a1d05b18f9be87e7bca47c251dd2ed9a841fd4d5e46fbf82632e2fed50d86f5e2de8a4edbe09a6e0c819e9dc7f SHA512 91f002981b918e35fff1ca9cb30a5b3f5a56f392d0222a3cce3ee1215bce529e58ff938c049e6823975825f8ebfc2d0da583fe1c360ad849b1a306aa09ef013f
-DIST devscripts_2.18.11.tar.xz 793112 BLAKE2B 8c1d40a13f6ce1bd804d7fb1300721485aea88b3ea2ad35c59c87f8fd85057cd26b1f40ea73d1919d45b8f0765610724fd3018c05d09e287554725f4425e146c SHA512 4c6c4b0e08115accaebed89fd5362842e6b8daaf9e1725684d0af1ad8cada7bd7aadce8640b766cfdd3a5784bb32ea177019781b2f13bb5da6b55389579ff07e
-DIST devscripts_2.19.3.tar.xz 810356 BLAKE2B af3f3e44d2f206226667bf6d3a0d1275ff2cc88e890817f2982c1c47bd8cbf8ca6a75357a4fa1dd2958be9ec97b870a2ee612c478a75bb23256c8aa5bae1f2fc SHA512 c5745e7aaa7ddac1be2f1da68b6c03c35e6b2ecde824a7c951ecf0fd0132315ebf40f62013de6da51f79ed473e3462634fd4057704236f5a1abd479b734c959b
-DIST devscripts_2.19.5.tar.xz 840936 BLAKE2B 790e31194f54513dd17ddb05cd1c94dfa1186ec2b4784c668c4119d0d10fb150061bd13362600b1955875cf33d36f38e1419735abec1a9fcc260baceea3e409e SHA512 23cfe9bd8288a9d3a2449a16f46a7c1960813a335cad99b8fcada074610837795be2a26768dab555dad84e4fb7cb7d99ba22979eda9c995b14d0297c7a1bb1c5
-EBUILD checkbashisms-2.18.11.ebuild 890 BLAKE2B 56e8be2ace145d6c7ef7d97a641cc2e5d51f508fe8ce015218df3e3311b6aca7de1488c4e1391ea5f267d56e970e94f3d9c6c271f13e175df0f5438268043520 SHA512 e1d82322e345aeb319842158ad409f62d6f5cc8489e6fb7079e92aab70e5d0eaa447fb89b067cc3dd4bb3b4b0ff9ec86ba377c458bd5f9f73cb9eeae39ace448
-EBUILD checkbashisms-2.19.3.ebuild 892 BLAKE2B eaa6bf69f04f49b27840c4c8ef3bdf514e62b135a628dc55a2bb76a9245d1d30327854fa1355ddb7535bfb26af1cbb9f6c1bdf5cea3acfe887d07cda3fd43ec0 SHA512 5a7247ffd1d196cce9fcd36e4279d1d052cee6edc14d259b1c3d118e7504ab4a5f7a7d1e515450c77e281d6d62327e5d4d69562268385a102b928a9489916fdb
-EBUILD checkbashisms-2.19.5.ebuild 892 BLAKE2B 07b1578c67cdf6a8e53005e9ecec39c1d2d854d50ae595b81079cfda2141023bd699f62dfa45824026e16496a9ff879c7397991b8038afa82bf394f7d39c8961 SHA512 186da6cbc20eba27c969e2b84a4896908c268675d6db9a53201ba31a1e5757e16ae5637182ec77e8ac8d2f320540a96927c7190f7492596b95262eaeafaca404
+DIST devscripts_2.19.6.tar.xz 844316 BLAKE2B 93eddc1d5ff78c579a28f8f54ce317cc251864917aa579094bd392f0811f07dc38447b3bd36a608431cb3d576b05c5e1f6cdc51a453b1c07389a5e1794f1acb5 SHA512 9313af1777d9a9932a81f95492b7cd423afbeacc8afbf6d9400e6430d2ce83abef0e0228a581f705f661183f605f2cadc95e11f1a43daf11fb968bcefc352422
+EBUILD checkbashisms-2.19.6.ebuild 890 BLAKE2B b766261b04b2be48b2c9ed540c48e9f8e6a5de05498dd55f3a5740a89b27f2c9b713fe65c275ba21d791f985d9800d9dbd5c034b646f36bd9822e1d992e55c7e SHA512 3bce9e58d293dd4772b23674342bcc96af079aeace7512b04fcdcd51f20d07a739c8461669270d08d7da57c049b895f03ddc33d7f8d2f8d73d264253b79dd56d
 MISC metadata.xml 433 BLAKE2B b54d1290789d3ce8931f832c8c1ca7a56fbdebe85c0a81c32a929168fdf2d5a7be0dea01881e8fcc583061db1a071d1787723c9342c77a5862e228f0203c178b SHA512 945c3b95a61d4219e98ce5be3aed255cb148867409aca572714e8679bf623ee0c3396966cd80d783ace60bae7e6c01b85fad6c7f7ac9056422d732ed07f54716
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
deleted file mode 100644
index 326e6817dffd..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
deleted file mode 100644
index e48d94ca95a3..000000000000
--- a/dev-util/checkbashisms/checkbashisms-2.19.5.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="devscripts"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Perl script to check for commonly used bash features not defined by POSIX"
-HOMEPAGE="https://packages.debian.org/devscripts https://anonscm.debian.org/cgit/collab-maint/devscripts.git"
-SRC_URI="mirror://debian/pool/main/d/${MY_PN}/${MY_P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# Requires python packages to check tools we don't need anyway
-RESTRICT="test"
-
-RDEPEND="dev-lang/perl
-	virtual/perl-Getopt-Long
-	!<dev-util/rpmdevtools-8.3-r1"
-
-S="${WORKDIR}/${MY_P}/scripts"
-
-src_prepare() {
-	default
-
-	eapply -p2 "${FILESDIR}"/${PN}-2.18.6-command-vV.patch
-
-	sed "s@###VERSION###@${PV}@" -i checkbashisms.pl || die
-}
-
-src_compile() { :; }
-
-src_install() {
-	newbin ${PN}.pl ${PN}
-	doman ${PN}.1
-}
diff --git a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild b/dev-util/checkbashisms/checkbashisms-2.19.6.ebuild
index 6cbe1ced2479..425cf48b4740 100644
--- a/dev-util/checkbashisms/checkbashisms-2.18.11.ebuild
+++ b/dev-util/checkbashisms/checkbashisms-2.19.6.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
 
 MY_PN="devscripts"
 MY_P="${MY_PN}-${PV}"
diff --git a/dev-util/clion/Manifest b/dev-util/clion/Manifest
index f693c75ec0b2..74f53bdd473d 100644
--- a/dev-util/clion/Manifest
+++ b/dev-util/clion/Manifest
@@ -1,3 +1,3 @@
-DIST clion-2019.1.3.tar.gz 431393782 BLAKE2B 5612f8109d7ad7dc98990a8f549383086263a980b482fba0c2357e86fc09b474e597b0ce8f911f287b7ba6837247f2be47372a79ce416bb16e10c0ffdbec2588 SHA512 9c0971db22f87447edfcc6c6089470bbda507bff5755ccf4efff3dfb4704ebcb4b1b0fa71580824af2ee0a1bf0036475220deb5948bdf2f12e4f151cd55a230e
-EBUILD clion-2019.1.3.ebuild 1991 BLAKE2B fe36412d01be6e8fddda6c98dbee6e10e5a85eda0b1204bfce6e5d2018a4c7ebaeed40d57b9263bb27ee241f36e29342a17b3be57b77bcec9b2ab25512a189cf SHA512 41a730e5466f0125fd85efdd32f897958649033adbb23109b08692bc3908eb613da322194feecb54325f98734fa4ec27c42adc5c6a7289e3503e851d4b11cece
+DIST clion-2019.2.tar.gz 485913295 BLAKE2B db723c1785cdf09f35299f89bb89f21c4f4ea96cc89de73484e31d042088cf613f634fc16e4c9d927f6903be3c401002836c0628cb80be7b029c4b28a67515ee SHA512 eb0a1acb9f267fa36f3cb2924cd9caa2f84367401c271d99458fc90b40cd62f97f566270ef1cd03bd0ce4160ab4bc92182fd468b860c67f2358e3c6adb021ddb
+EBUILD clion-2019.2.ebuild 1985 BLAKE2B 79f06071c573c312dd787c8974e342e0a9ec4d107199d8305e72a851724c0f9a39e6a9f555ce183da3bb74fc05182536123403f111e584bda72d9915c479d3bf SHA512 b7972ab43f90af2d74e4b8b2c588b0964944b4ac1765b12edf7becd0d224a80602751695d6b1903b02fd83fa52e0802d749fbc3cea35a1b87920ca40a8742642
 MISC metadata.xml 557 BLAKE2B 39fdc63d65191a426d3a51303810cfe941fe4f11f36c650c8538e2035ac1a93f42aa537f23d9384ac5a0f6db90a2e1658f35618918d692940832926fe830d5eb SHA512 a9e80ae43985b3921ea1b3a292da275c49cf8d7a965573e55a116fb2efc6e108a111de64fb6f21c21ec3f3ce3c7d0e960c79909e5699d9903db0a6eb92d64871
diff --git a/dev-util/clion/clion-2019.1.3.ebuild b/dev-util/clion/clion-2019.2.ebuild
index ac0d030149b2..b3360455dab5 100644
--- a/dev-util/clion/clion-2019.1.3.ebuild
+++ b/dev-util/clion/clion-2019.2.ebuild
@@ -40,7 +40,7 @@ src_prepare() {
 	use arm || remove_me+=( bin/fsnotifier-arm )
 	use x86 || remove_me+=( bin/fsnotifier lib/pty4j-native/linux/x86)
 
-	use custom-jdk || remove_me+=( jre64 )
+	use custom-jdk || remove_me+=( jbr )
 
 	rm -rv "${remove_me[@]}" || die
 }
@@ -63,8 +63,8 @@ src_install() {
 	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 jbr ]]; then
+		fperms 755 "${dir}"/jbr/bin/{jaotc,java,javac,jdb,jjs,jrunscript,keytool,pack200,rmid,rmiregistry,serialver,unpack200}
 		fi
 	fi
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 22a9844ce8b9..17c67e23b8ec 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -17,8 +17,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
 DIST cmake-3.14.6.tar.gz 8861359 BLAKE2B 257a9a89fe880f8945f47a4bb1980e66f0f28ee5cebeb161012860ae8578487e50c60060ad5144ec6f5b7ea860112edd01909ebceec24b8370e3769ff2a79e99 SHA512 8cf3afadec3fe931d9f954e3148a398939cd16c1fbcb4c5303ac635e2b5029960867f317fd13a46fceebe46e7328689e847f03d7d7c74bb31e23c9cc55838f56
 DIST cmake-3.15.0.tar.gz 9266870 BLAKE2B e0ab6950d96a95c972e04dcdcecbf999262ddbd753784bec81954a85730279ef0298bdd7079d2d1095a14de7be5349749b1c5d54e022c6443e041e7e75cb0bab SHA512 f7286513a215a9b9094c1f630761995dbc7f4e33c38bc5585ddc89d9b4742630962921aff59570e0de39887e0cc66df6eebc83ab478796876364d2de5d2c0d6f
+DIST cmake-3.15.1.tar.gz 9268592 BLAKE2B 3b0dbca9203b1029922d06df9abc3bbfa6f7b8320e43b11b468cd7e129171e2bb1b645fc07bf2d46c9b3c08642f1a11741240d0029f96ac3b2d7a8bb44d398da SHA512 6900a84c7764034331fb6f00801841a7a3e667ac39813c35ceb3db983b33a5bf6addbbc8539c39a0c0be9e10204c79d6236886a9d50ce901a56275b53619ec73
 EBUILD cmake-3.13.5.ebuild 6215 BLAKE2B cfb13f69a7987ff65183910288f70cb3b0a10532af213fc9567ddf722f9aa5042235daa2fe093610b55b6b8f0c94937e452894edb7c54a2ddbe55ae053003238 SHA512 dddf1c391c2c9787f731acbc894e907118b83fcc1cffbb943338bb56a035b9220c7b4316ffb5bd4c411f6d0ac2b2631ed940a0760b0c7a5419fd49dfc8c58427
 EBUILD cmake-3.14.3.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
-EBUILD cmake-3.14.6.ebuild 6253 BLAKE2B 2b5c8c7939544f51c6b6b472e86c6e7b795b49ab9d862ebe379dbc8244903eb6821170b08e8b8bbfbf7638fda656580a2344b5acd3898aa9c4f7dd8d3fb58e33 SHA512 7a63955cd353be5138ebc8bc5ef360ecae494f0811c17dc77bf621f28f7594cc8c6619916f5d5d0f24250d891104d72521107a0beb4c35b392ef6c912d5f1066
+EBUILD cmake-3.14.6.ebuild 6242 BLAKE2B f60aecf31afb3a1d18dcc73eb49a725692bbd2429398b05f9b241d82f9842b93aeece44624a50b8406355ff82bf2484bbae55ec863987b82d1e27d04e58b1d58 SHA512 22317c7a34fb11df8eedf9251520db7a956eb44306aa5c7c2d950de1aa0b2844043a84ede7122ea38fe144fea2f52760ac097b84063b1f2f5b8885c858d29c81
 EBUILD cmake-3.15.0.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
+EBUILD cmake-3.15.1.ebuild 6253 BLAKE2B 4dc2e38854b99aa6b8aa80b8a044fa1e02211b9a7fb50c8f8f9161220e2313c4bc7af5d2af47f9c166ae85101313898f39603fa3bc73ad1159cda1398e012704 SHA512 9916b5c93b0a80ca38731d40a9d8d1538c4ec37563e8dcb2e9eea3ca622c09bbe119ec51a44ed3e74cc7c9d8bf27e1e46c7b0d49a2a15decf7d3ea4aa0ea010f
 MISC metadata.xml 372 BLAKE2B de2835a1f98bccd88e343ab7c058b40df0e9aa4afe938770d67a6e764ac85926b369b6d9ac4851d5deec3954436d3cb8a112b5543ac1debf74205f05641ed2ee SHA512 6c457abaf6c174d6d14b77af47c4fb65b26873cbb7a5a4fbafc558ff4c5c7c6cb0200c0f69e7a492007af4b402baeaf54177f6755c3e6da0ace149eb9bcfe69a
diff --git a/dev-util/cmake/cmake-3.14.6.ebuild b/dev-util/cmake/cmake-3.14.6.ebuild
index b04b6c2e4330..01f4a37c8333 100644
--- a/dev-util/cmake/cmake-3.14.6.ebuild
+++ b/dev-util/cmake/cmake-3.14.6.ebuild
@@ -16,7 +16,7 @@ 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"
+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="
diff --git a/dev-util/cmake/cmake-3.15.1.ebuild b/dev-util/cmake/cmake-3.15.1.ebuild
new file mode 100644
index 000000000000..06184a6bfe5f
--- /dev/null
+++ b/dev-util/cmake/cmake-3.15.1.ebuild
@@ -0,0 +1,226 @@
+# 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.15.0_rc2-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:^#_cmake_modify_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
+	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
+	#        it can't find a deb package that owns libc
+	#    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_(DEB|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 4e9c559ed5e0..c2ed88e1dbe6 100644
--- a/dev-util/cmocka/Manifest
+++ b/dev-util/cmocka/Manifest
@@ -1,7 +1,3 @@
-AUX cmocka-1.1.3-examples.patch 1323 BLAKE2B 1e500f2b7d3f767f3a2dcd64c6eaa07906c6e47e670e91d9f7bd1472f7b0da824abcbf5e565bdfd78503ec0db91471883a35d42836def8541c44d72624db710f SHA512 2e8cffb329c5a20b96e104b810773051f5b17ed447543989da01ea43ea5fa4935bc8a978f929fbabeb5f2d12fa5d58859896939e24e33b569ed0ec608e8d793d
-AUX cmocka-1.1.3-fix-doxygen.patch 1138 BLAKE2B 44ded90b04bcc9eae14f7332a840713767106039d6916479c8d0cfe502ccff60c08011be1c711dcdb827a391deb7976706d37c2ed3d3b3941370fa6b6481cc24 SHA512 63c00e774c3078ba784685887cd46790375b37bb957800951ecd1a82f5d2f29ec7c0fe77da8f4c7e9ff0a7860e801598b9dd231d43adcd460ca1d1c68a7a3f05
-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 1078 BLAKE2B 0f7ff8e03038b24f2251b61b77d6979179bfe17cc39e9461200c8ca1db974c413bc4c82ddb2d54dd041ce345d4a5830e704267e80295d1a88103aeb37e0b0e13 SHA512 cbe2eb812839c7007d0f9a75204029b135a2a9e41ca922070ae5ade48967c6b927a977bbc2d0515cfc7250395f89f4a9a1b64d8df34702516d096fbb6e724df8
+EBUILD cmocka-1.1.5.ebuild 1077 BLAKE2B a4652b1e7ed6b908c56f7f1a294d6727252461474cc0386bcc06724b0f06b0f28855cb701009ded4219e53cca33e77a19f36c718f9619cba235094f6b58f62c2 SHA512 bd95ff6a720238bc68b74de56d12516b352c616c3e930e2c814a70bd4857d06ae281dd2568b002da863b4a5832e4fc66fc83b40dc509ca8d3d4e6c1523261b0d
 MISC metadata.xml 378 BLAKE2B 45998331c3a8c91f6f4a59e075b5c89b462fd304c27d87efc5e312fd7403464e874ff71c21adb44feb5727aa6daf766f469da5d22fff02fe4d15d2c3459187aa SHA512 210dcc099911d24e9918e244a76020da52df9384983d3941c2e4b61449e3c1fa780d6ebc42e38c963b714b61c8284ad58cdf52c85269a342d30d5f2e4b605ff6
diff --git a/dev-util/cmocka/cmocka-1.1.3.ebuild b/dev-util/cmocka/cmocka-1.1.3.ebuild
deleted file mode 100644
index 59978fb7fdf0..000000000000
--- a/dev-util/cmocka/cmocka-1.1.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Unit testing framework for C"
-HOMEPAGE="https://cmocka.org/"
-SRC_URI="https://cmocka.org/files/1.1/${P}.tar.xz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples static-libs test"
-
-BDEPEND="
-	doc? ( app-doc/doxygen[dot] )
-"
-
-DOCS=( AUTHORS ChangeLog README.md )
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-doxygen.patch" # bug 671404
-	"${FILESDIR}/${P}-examples.patch"
-)
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DWITH_EXAMPLES=$(usex examples)
-		-DWITH_STATIC_LIB=$(usex static-libs)
-		-DUNIT_TESTING=$(usex test)
-		$(multilib_is_native_abi && cmake-utils_use_find_package doc Doxygen \
-			|| echo -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON)
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	multilib_is_native_abi && use doc && cmake-utils_src_compile docs
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi && use doc; then
-		local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	fi
-
-	cmake-utils_src_install
-}
diff --git a/dev-util/cmocka/cmocka-1.1.5.ebuild b/dev-util/cmocka/cmocka-1.1.5.ebuild
index 0e7a9f96a010..d547545d0bc9 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/cmocka/files/cmocka-1.1.3-examples.patch b/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
deleted file mode 100644
index 3d5fcc8098f0..000000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-examples.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ee264da1aa222b354cee36184ab48c2072f62243 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 23 Jan 2019 11:20:31 +0100
-Subject: [PATCH] cmake: Add WITH_EXAMPLES options
-
-This is turned on by default, but you can disable it, if you just
-package cmocka for an opterating system.
-
-Fixes #14
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt      | 4 +++-
- DefineOptions.cmake | 1 +
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7778039..702be97 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -60,7 +60,9 @@ if (UNIT_TESTING)
-     add_subdirectory(tests)
- endif (UNIT_TESTING)
- 
--add_subdirectory(example)
-+if (WITH_EXAMPLES)
-+    add_subdirectory(example)
-+endif ()
- 
- # pkg-config file
- configure_file(cmocka.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cmocka.pc)
-diff --git a/DefineOptions.cmake b/DefineOptions.cmake
-index 5bc1ef3..911ff1d 100644
---- a/DefineOptions.cmake
-+++ b/DefineOptions.cmake
-@@ -1,5 +1,6 @@
- option(WITH_STATIC_LIB "Build with a static library" OFF)
- option(WITH_CMOCKERY_SUPPORT "Install a cmockery header" OFF)
-+option(WITH_EXAMPLES "Build examples" ON)
- option(UNIT_TESTING "Build with unit testing" OFF)
- option(PICKY_DEVELOPER "Build with picky developer flags" OFF)
- 
--- 
-2.18.1
-
diff --git a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch b/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
deleted file mode 100644
index c093021aa824..000000000000
--- a/dev-util/cmocka/files/cmocka-1.1.3-fix-doxygen.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 1abfea55df24e83c2ea321b5f2b75e1a58963bc6 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@cryptomilk.org>
-Date: Wed, 24 Oct 2018 16:33:39 +0200
-Subject: cmake: Fix doxygen generation
-
-Fixes #12
-
-Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
----
- CMakeLists.txt     | 2 +-
- doc/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 88408a9..7778039 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -51,9 +51,9 @@ if (MINGW)
- endif (MINGW)
- 
- # check subdirectories
--add_subdirectory(doc)
- add_subdirectory(include)
- add_subdirectory(src)
-+add_subdirectory(doc)
- 
- include(AddCMockaTest)
- if (UNIT_TESTING)
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index a7bc65e..6ac7494 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -38,7 +38,7 @@ if (DOXYGEN_FOUND)
- 
-     doxygen_add_docs(docs
-                      ${cmocka-library_SOURCE_DIR}
--                     ${cmocka-headers_SOURCE_DIR}
-+                     ${cmocka-header_SOURCE_DIR}
-                      ${CMAKE_CURRENT_SOURCE_DIR})
- endif(DOXYGEN_FOUND)
- 
--- 
-cgit v1.2.1
diff --git a/dev-util/conf2struct/Manifest b/dev-util/conf2struct/Manifest
index 0a195ff4ebc7..62ba9a16e864 100644
--- a/dev-util/conf2struct/Manifest
+++ b/dev-util/conf2struct/Manifest
@@ -4,6 +4,6 @@ AUX conf2struct-0_pre0-destdir.patch 1351 BLAKE2B 5c4665b981a146d52fcc04762efac2
 AUX conf2struct-0_pre0-install-and-uninstall.patch 777 BLAKE2B 3d2ba3033a69c15ded7125c5351b188f00599a2b313405fed5dcf5d637daa9ad309524fa75736e5a6267cfa40169a6fb3c1b5b6ac54ce0d4af51f920a04fe08f SHA512 6b2f80bc05a384146c3382eddfe169484f251afde790cf37aa65f6d745e78aa7255f01e3af302dafb1377a9bc7e79ce094abc30d4d48e84f96f8104215e06689
 AUX conf2struct-0_pre0-install-not-run-all.patch 599 BLAKE2B 47d6ba694800d4fbd1b13ddbb09b544fda9e4f1f3b9b0d55b5fac38ead760effae165b7a35ec436a200fb2a891744818fdc139f792deb066c30c595de95d5755 SHA512 17defb200110299a4bdb7f28ad20520ec152edad306212875fcd179e4aaa644196c9b7a166dbcd8eae69a88aec8b4548b272798f078377b22427f5df68376a39
 DIST conf2struct-0_pre0.tar.gz 50851 BLAKE2B 21db6cca56ba18a48c65395fbf3def5de6190515be46ca2e7113c17c9b874cdcc7fb72b06b586c57a1803e98b56df5decd10ea1dd6dcc4144a78d6a0ff6bf9dd SHA512 e0eb1d43ec1375e65796197c16246a2cc38e0a4d078c4028e8675cc1ff6ef08c7802ec18f57232d91f2d4133573129f7a2b05a9f1d8b74bbddd072550f846b1d
-EBUILD conf2struct-0_pre0-r1.ebuild 1174 BLAKE2B c2a0db9faa37bfb8da2e8e322a00f03d7d339fae837094c2545d32526d53ec7e9a33abb5c85596a35022b12a0a59486f7b942b806b53fa14fede6eabf2bfcb19 SHA512 497488f2cbb718086c900cb49a9b979c4a60122f39d14d3752a47d6c0d11a3d3072bfe12bf61050d278a4933801a78c6dcdae38f152e7fdc1cd6c17bdd747b3d
+EBUILD conf2struct-0_pre0-r1.ebuild 1179 BLAKE2B db6d315e1528ec47f709bae67a85ed5c9006535f63fb0ad7d90c8524f61b85a6ea4c0e62e1a5e43afcc0d4635c9bf56b46d0675006153a9bf5512d8722570a78 SHA512 3e30072b2ad4826e398c7fed63231f116c035d3b8d872f36bdf02fceaf4016f751eddeee1e58d5138dc9da60fd63a7f1208a1a5bd67476273174f691d26c39d8
 EBUILD conf2struct-9999.ebuild 746 BLAKE2B 3dea47468f3f014786e4afc60197ef9f9d2bc6940a779031043f7d222acc160423b6bb9b72ef38cdec5651c77077ca8b6b15e0adbe09c0914fc9f2778cbabf05 SHA512 9cc596eb33f72f9983021252e335fef30e38db9cdf565c70adcaa8efee40e1b9fe0e4109a39a0c621d5c8a844906c18689fefbc9894f69bbc30544cf00c60d77
 MISC metadata.xml 334 BLAKE2B 8a441ec6c49f135a517821de0933e09c01861a135a0a16cad200acb2a695cb04bdc5d4d6ab076b95d7f547a8771984ee3cfca0c074ad1c41db3df5cee2876f60 SHA512 db25be9a745a1ebef49e8e477e24d715453cfe0bb698dc8e42ccf3ef8d8aac3cc9693e3f2873f28b3096016741bbf3c32841f025a06bcee61e9138ac2f6ee8b7
diff --git a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
index b31468b61ccd..631e635694cf 100644
--- a/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
+++ b/dev-util/conf2struct/conf2struct-0_pre0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/yrutschle/conf2struct.git"
 	inherit git-r3
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm"
 	GIT_COMMIT="10ea3356b65e712fb000f4d37f00e1dc09c1e722"
 	SRC_URI="https://github.com/yrutschle/conf2struct/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${PN}-${GIT_COMMIT}"
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index c0e810fc7ad8..45d81e5d0e0e 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -6,7 +6,7 @@ AUX cppcheck-9999-tinyxml2.patch 2491 BLAKE2B df8130302d06dde1c7f21cb4aa49daf0b1
 DIST cppcheck-1.86.tar.gz 2184186 BLAKE2B 8b488ec72d0998d6b037de2b1204373c8b3de475ad165bf108bb331399356cb0d1e20a7bc6f368f1a038ec886ad7a84ad694172d0a96a203a6877f3838c21001 SHA512 59cec55b8408e8f2e2e7172bce69350c248bc3185a0938b523c44a58f98b344e11aef957ec1b7a7b2bc7a876660b2683e51f54b76f0b550f9549497c29453655
 DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba8254cbe7c1c19c3c1b16cd38adf9c773de6aaefe70af08b9c1dca8b0b0b5e9939323368a2f81491fd6981ff18139 SHA512 b0149002b40260c1488904929296403722a66b84263b41d0097c3caed28265332766c114f0d1f378ea6c7e73ab973ea71ab89c6744f6cc818f22de08933e6766
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
-EBUILD cppcheck-1.86.ebuild 2314 BLAKE2B de0698614f2f1790971fe198662fd235e5456a1f9a046f10d628889517bc5809fac6c76222ca7a5b0d7909c7842d77244c81c9606812450118e61c476492f08b SHA512 8d8502abb416704964aacb1267c2814e5cf50fe02c4a245bbb217a4cadbffa6efc1f288a94143b36f739d6f89e5f75133b1aa691565c76ac92a49cb0984d0c1e
+EBUILD cppcheck-1.86.ebuild 2313 BLAKE2B 21b365c6c4f30089e251c0916e51fa8b6499b164226f844343c7aefca88740d2475ff2d2215eb0ce3ebbe171898458dd3caf419d06ec79c975c647dffe99de94 SHA512 810093dc13abc5742428b043b587265c1670c4df23651b1e73ca3b67b0443c74d02ea34c6b5ad35b51a632e376f4db4f375dfe892fd5dd9d78bcecbb98d4a205
 EBUILD cppcheck-1.87.ebuild 2328 BLAKE2B 0472eb40d75e394e37b3ce4d5089978619164875bd5fb722c0d622f2a0891520de4102b2a5f8c020f8b3dd8b3f571b4b1c5ea088cfffef6bf96d1a8d260fc329 SHA512 7f0672ae4560ae3bc9abaa575dbfa0e0835f3e2081ba4b3f80f9e8b0e8faf59a97ded20c68e68def32e9807d0eeb805945260e3a5d7120fe31857b4f5eb877bd
 EBUILD cppcheck-1.88.ebuild 2328 BLAKE2B 59e8ad03e399ef45c478ab60332f4191871d4f8114e904d438b8b87b6fe414c566bd2c893b6d36836c22f5f86de91b3ded3d1084b5003b4b47b8b1c6c87b8c61 SHA512 d385be61ae7c1e37dbe739818f900deb6222791f49431c3afe15ed11b4824359e644d4a44e39ea4cc08c0d632961eecd419ebfd28577b279af43e412fa4145f6
 EBUILD cppcheck-9999.ebuild 2222 BLAKE2B abd4fb4a91ac18e5e3c7280e1d180039f2a251bcf63d3e436fea917e79343cb84034eae35e42ec101f5fca91dd8a1334141991afd4d0c0a1ad66da30b6511d77 SHA512 fc2c2565d1979f5cd43222a22fd1df2c8d9eebfe8906acb0092d3ee6ddbc54d221651e156c35fa791a0cab8146e84cbfc6daa8d51df384f6a59c647244c15490
diff --git a/dev-util/cppcheck/cppcheck-1.86.ebuild b/dev-util/cppcheck/cppcheck-1.86.ebuild
index cb394ed32bb2..e5e40d68d207 100644
--- a/dev-util/cppcheck/cppcheck-1.86.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.86.ebuild
@@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 042474592b94..dc0ec82c0d69 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,8 +1,4 @@
 AUX ctags-20161028-automagic-deps.patch 2079 BLAKE2B 25950330e80d81baefa4be9d2cdf9fec5d147ba667522667fb7833f4dba37d91c83cc5033967d2d544b66562ea26634a8b8c2f292f23536ed7690b8d0f3d22ea SHA512 cb9639f7d17bcaedc720774ece7386608b39a91e44cc0aa9cd4359894a5fb06ae29a03b21bc913a110864161f8df623b82477e0d23265bdee88d13aba6c88535
-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 1725 BLAKE2B f905914dba482790da1a5e5a940389e66b79eff95497440a507ee239830172f67221606639fa280edf6a3dd3f5a369cea627a4f04218e59bad82b3891bc7e80b SHA512 d982daeef17a03be793a29e09b37d52a309609820765bcc142e59904035669672b94c2c76d7725192c64fcf3de523fd239e22a288ae5d76ad09d4a35313eae71
-EBUILD ctags-20170704.ebuild 1862 BLAKE2B 84fae77b0b5267b68cc01e8b64c922a1b5d864662b34f139251911303d0cb8adf53831dc228a384eb29d0110485aacaef1ab42a4aa1f3d632a7985a7e4d9817a SHA512 05e556c94810b7a2681a0e4182ed2a752f441bbf692af6dec6106e56d5a270db98e5f382d5903b950c9067c481b28f78213a4f3ce026815d0ff45542ed7df648
 EBUILD ctags-20190331.ebuild 1848 BLAKE2B d2b01ed973651e1dcdbfae252345e8c409d9b4da5b18c2897120f4157ec81ab2e7d1ab92a529d4cf9d78a522aba1dcedc42e55da95c76e3a3c81f3284441c253 SHA512 13369b78c8a18599b36b49ce9e880a978d8336641fe20bf591bd9fc3c36f67e8de2d3fe90d903ec2cf81e2a6a9205c99e674856b4af38f7a67661ef54fca75d6
 MISC metadata.xml 583 BLAKE2B 32e6225369d82b7aae04a238a314eb77911a38c2d670d4058260b75ced482199b343d1b5d7496bc3a6711b71a429b7205057ab66ed8369083b2533be5a7e0648 SHA512 df8ae31fbbb4546f21c3c06110bc6630f392cbbd937e2ccc3c504e08835e56ac2e7d8156686755217140906cc806001a18627778af0e09d753e50c9a47de28b5
diff --git a/dev-util/ctags/ctags-20161028.ebuild b/dev-util/ctags/ctags-20161028.ebuild
deleted file mode 100644
index 64b0e6eb1489..000000000000
--- a/dev-util/ctags/ctags-20161028.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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+"
-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"
-
-COMMON_DEPEND="
-	json? ( dev-libs/jansson )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-eselect/eselect-ctags
-"
-DEPEND="
-	${COMMON_DEPEND}
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}"/${P}-automagic-deps.patch )
-
-src_prepare() {
-	default
-	./autogen.sh || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20170704.ebuild b/dev-util/ctags/ctags-20170704.ebuild
deleted file mode 100644
index 2b2fbbbe1bb4..000000000000
--- a/dev-util/ctags/ctags-20170704.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-COMMITHASH="0645b2c833e4ca956970cc96fab32a1b04c0c55c"
-
-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+"
-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"
-
-CDEPEND="
-	json? ( dev-libs/jansson )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )
-"
-
-RDEPEND="
-	${CDEPEND}
-	app-eselect/eselect-ctags
-"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${COMMITHASH}"
-
-src_prepare() {
-	default
-	./misc/dist-test-cases > makefiles/test-cases.mak || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 49b3e3f9ac4e..b5e22aa384d4 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
 DIST debhelper_12.1.1.tar.xz 483732 BLAKE2B 39938f9ec0793154da6405c1b0ef2a8a10a10753475b09f8fbc6e7411457713eb7bc035dfc21f9b7b9f82ec276674802c0cd7599252956cf455cc8d203070a9c SHA512 ab006450258c6c3d5c89bddb8bc5a87d61d80e8232cbbd2f15a32d1045d1fa9f1858df536d8cf813048f4e755a8e5bca765f1da7800ebf8f1237096e659d9ddd
-DIST debhelper_12.1.tar.xz 483568 BLAKE2B 3ffefced2759224fbc9f00c05be03379bf34f8f954be871700b0467629f2437c890ea5f334fc1cdb47baf9ec0e19c886cbbc881cbda39733374a4e09bba3e413 SHA512 557db22d6aac8953cdc41fb6fcb0c06566154ac30aeade4df6c100534505c79d9c34d1f8cc3b41e83740cbe90eb2bf18b21fc0fe49cdbee6d709949c7689ebfb
+DIST debhelper_12.2.3.tar.xz 492468 BLAKE2B 2771364f0f531b29d676ea5dd3a7bb0a138b6fea3b11fc92d4c5dc19748e3b029d6d620e650cd997d3b164913be992868727c8f37e3194d7d89e8bd846a811aa SHA512 83acc2961dd964cfc0cda67b523fe5b41385e35f3884b6cf02ae6fc57c00e5b0633a0a5a57feb0fbd1898cb7028271102f291c761e58006449c2b278191c0af3
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
 EBUILD debhelper-12.1.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
-EBUILD debhelper-12.1.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
+EBUILD debhelper-12.2.3.ebuild 1507 BLAKE2B 882a198a4acf7e2aa8d448c8f335aaed2aea5e40340f8b33770f1010b76f78e4aa1153b4ef856d69d8e4ccf4c2e957b2b9e6811b00de6256102b47a44c79a299 SHA512 81e7fc214748408fd50f40d5db281bc103379cc5ce04f2c4bfc69709ce357389f0c5800ac8e12c8901eb06c1fe2d809b0fa8e4800e34acf55fa6b73c966c8408
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-12.1.ebuild b/dev-util/debhelper/debhelper-12.2.3.ebuild
index e546013a4fd6..e546013a4fd6 100644
--- a/dev-util/debhelper/debhelper-12.1.ebuild
+++ b/dev-util/debhelper/debhelper-12.2.3.ebuild
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 258a4fd180e4..13b7b803daa2 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,5 @@
 AUX debugedit-4.14.2-no-reorder.patch 2225 BLAKE2B 03bac95d316855a9a8e2b78cb7530c5de746b462a32a4fb0887bddf039b371198ea77a0b85b69b6501504e9583832a7f7b055b3c22e3e3b309ecaf995fb164d6 SHA512 7f665c8c985d622e52e87996f1719900131fa7d6455e548cb2cd00b2223231b54b4fc9c24ed3079c93dd5e3c287c03f37aa17072e2e1e5d4f0cd8ee695bf08bc
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
 EBUILD debugedit-4.14.2-r1.ebuild 1862 BLAKE2B 7298cef549ff97777f748cb871d01d959ed5b680cf693e4c42b0a7826c13d42df121243788f7c965cf56ef2297a00119dcab40a5914315cb1353bf587eb6971f SHA512 951edb87d4e6c55d73d3837140747ce098562787333198ee0cb35c06418b75d4f4e82b54bb6f23c01a0c98cb6999b402ec307fc35e7d78720713dc25d6df919a
-EBUILD debugedit-4.14.2-r2.ebuild 1730 BLAKE2B 565a44267c996a0b9473c5406e5466ab66563f289a75540bc97a1cf80c2ef02f02c21d8a39b810e43a58cfe6aaaa0fe856a66729aa0ec3bc2896f2e305dcfd24 SHA512 a5e08e54e6a406da008cadaed1e5a6f600da1947b3f413aa6ad8700a2c3c6f696504f1231ca3121e280f39469a641f838ea5f8624c63d8923c422aab8949a854
+EBUILD debugedit-4.14.2-r2.ebuild 1725 BLAKE2B 7897371964b247c6076d629b6ae6f01473c41d71356c1447bd6f991449320ccda71b6f86b42a3c82c491efec20d2ebf2e4ad559940ce748f4e40f3cd4dac86d9 SHA512 4e36e020e4aada2c378466818763c5b49d888f76627692bf40074ac154678225e77921627ccb2b398026603dfef403548657c1f0068508e309207f41ab097f79
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r2.ebuild b/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
index f14f43e3c56b..99c6e92c4582 100644
--- a/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
+++ b/dev-util/debugedit/debugedit-4.14.2-r2.ebuild
@@ -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/desktop-file-utils/Manifest b/dev-util/desktop-file-utils/Manifest
index dc63fbff50c2..ddf6c2c00657 100644
--- a/dev-util/desktop-file-utils/Manifest
+++ b/dev-util/desktop-file-utils/Manifest
@@ -1,4 +1,6 @@
 AUX 50desktop-file-utils-gentoo.el 250 BLAKE2B 6778fd6faecc6afe376598cdab5d890364edc33f0a55983b9a1ae76bcaf78a784fae92eaa66dc24c270ecf160f747e848872fa17e9c331dce7ad2deb498492b1 SHA512 5fc03fb9c9eea7d4c19c9b263413fb4f7f247b6bd40a7452b26f7e175646dc9b3af945d25cafc42a01a8d95059324652c56baa4bb5768b62dbd58f3ae4f05fe3
 DIST desktop-file-utils-0.23.tar.xz 132000 BLAKE2B 95273125dd8332db7438c3a4a7a5ecc4566d552c1fc9ff94a68fdf13f5fca74f943e02a10b1fb4417494f9fd44daa9f80c519215982cee8e082648027a010e7b SHA512 66a8ddfbb2be8edc14e16427e0dafa6fb1ef7491c816f19221fb5d5782e964cdcc3ae89807339f1c565af828aa83403cc56edeb2d03b3f93e013f3c5e9e6fe6a
+DIST desktop-file-utils-0.24.tar.xz 137424 BLAKE2B 3cce27caa14782ef10886fdc0602c0378c1bad0d49a4b99077436a9951f13ccdb539fdc2b9d27b54430fce94fb0ee0268746b216cc5d6c1b9ba517e1af81b4ce SHA512 b19d700d4403c8757c62e49bb7650e0138a85e799f79de07b0d0099a52398a3ead90c8125ccc883df6e2a3f8f5f97696009ebb7452dc7acc25afeef20e06fde0
 EBUILD desktop-file-utils-0.23.ebuild 1293 BLAKE2B 2ba978bf08a86fe0fba730f2fcbace91bb7759ddbc30e40a8bf441e74dfe4e0b87c3afd945133227f87c08d3dfae686f37f3286d2845e194f8e7dc9d139f759d SHA512 22b8e108ee0e9f8e127648b9fb285585c55154cb6c73fd8201072582830e3d8d84954461687259e6d370b762ba949c9226e3c13088b50a397feb7de856c8a802
+EBUILD desktop-file-utils-0.24.ebuild 1309 BLAKE2B 609df4aebad904f4f2d6f634abe4d0ccfd304f272aaea1167f44b3adb72089e13817450b5b687a8259c0f38b754e2880b28fb42a9cf9f6b7e039cdb543b2f896 SHA512 d515e7eb089887d2193a3ba6e677521c7fbd522b2cd1201e873f64645c44133b46fb557926678aa9bcd2d3fb31d3d592515ee2dda271373cf68c830ea9ebc019
 MISC metadata.xml 224 BLAKE2B 50a08713f8b792454787823dd56f1dcc1a1970ded78fa6ddffc6fb7301e0de75018e1e7a8c7ed890b4910f2716d2588ad21c7ae88ad8013b51cab7ba401c46c9 SHA512 12da46d8052565f62c482e6bcc714d8c00cac256f85dc1602579c8d61e0b61af95da149d1a446e56b2eba918ab9d78b556f77c6fe034a2e578f57a9dbe62fc44
diff --git a/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
new file mode 100644
index 000000000000..ea5cfbc8ebf8
--- /dev/null
+++ b/dev-util/desktop-file-utils/desktop-file-utils-0.24.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit elisp-common
+
+DESCRIPTION="Command line utilities to work with desktop menu entries"
+HOMEPAGE="https://freedesktop.org/wiki/Software/desktop-file-utils"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=dev-libs/glib-2.12:2
+	emacs? ( virtual/emacs )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/xz-utils
+	virtual/pkgconfig
+"
+
+SITEFILE=50${PN}-gentoo.el
+
+DOCS=( AUTHORS ChangeLog HACKING NEWS README )
+
+src_prepare() {
+	default
+	sed -i -e '/SUBDIRS =/s:misc::' Makefile.in || die
+}
+
+src_configure() {
+	econf "$(use_with emacs lispdir "${SITELISP}"/${PN})"
+}
+
+src_compile() {
+	default
+	use emacs && elisp-compile misc/desktop-entry-mode.el
+}
+
+src_install() {
+	default
+	if use emacs; then
+		elisp-install ${PN} misc/*.el misc/*.elc || die
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE} || die
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/dialog/Manifest b/dev-util/dialog/Manifest
index fbc819a52fca..63e3d3cce52a 100644
--- a/dev-util/dialog/Manifest
+++ b/dev-util/dialog/Manifest
@@ -1,9 +1,7 @@
 DIST dialog-1.3-20170131.tgz 507783 BLAKE2B a98c436eabc8d06619bd64a8b1d647a0712630f0f89565253636ef2f38333ca6926177aa0c2001305b0c06fc7a1f576cda87da493183402ef9ec3cdc3fa8be23 SHA512 818b4e9d0d5ee55377b78ccceacf59a78e5e6d6fbc09e24a19e62b4988ff8de32f3364132b9ee88c86e126114eda45c82d86397d5f26fae81a6bda91be979786
-DIST dialog-1.3-20181022.tgz 531815 BLAKE2B c6a34010eb991683356338009998964fde60bcae4181d8b07e6d5b9f0d0e9a61d3f0b112fad02c151b1774380e18b87f93f43fdfe35e0fba86914c029eaa274c SHA512 5d7891086ab6d2f4a815538513b09754a56368bbb0ec3bd107346fd2ed6ae10fa858173447fa609cce28a91e234ed8067d9439efeb973593fff2df1e811a8925
-DIST dialog-1.3-20181107.tgz 531872 BLAKE2B 7724d66bbb953ff118baf5f135810f40fca30bde6a4a340306da322e9adb4b40e105376c316945b7f70ee2be2698f1bee88bd040c22b5662685448145ccff0a8 SHA512 69cb367bc9a1d6dcd69b74f7eae9b4318f0bfd9c0eae48144da119df10f7f81ed4c215a8882d72dfbbd9ff41c5e591c80b168b9552e014454cc80c9aa37dca55
 DIST dialog-1.3-20190211.tar.gz 534749 BLAKE2B 3b721cf98b961c60a97975b7720722d4a46a47d7b861fb7c27de2db2fc3fa704d249b40bf28a6845f68cffabf41b66d77d5f1acf49a342e38cb83a24907e9379 SHA512 247639190c97c1baa6aa2cc75bc17593a0e33fcfcfd6dbc4a1903b55709f8f102c965de03f0620c48463f018525eb77f9b62b39db8331b811a227bbf39b254c4
+DIST dialog-1.3-20190724.tar.gz 534551 BLAKE2B 184865abfc98a509fbb2746e8476433c53b08157a53b9786066d7c48c94f3c2e50785c3546a963516f66af382903a33778188d0bfca85ef1f513165157c18196 SHA512 85dbec30bbd5bf5f3e40c8cf2af54236050fe3f96ca66c22d21e0447c2b851d7529b3d155d76b946e9360262959a44bf436b7f7fcf49040b38cc3f6c106c4b81
 EBUILD dialog-1.3.20170131.ebuild 1277 BLAKE2B 1cd46769259be314020f8f638ede023ae62f8c0c6c0d007baf8f364f018f00619301026e17bc956b53c291a2a22afacb70188e7a6946cc975a795aa9d9fa40f5 SHA512 9f72fa481b62e1ca43aee9cbc5856e139fad8c3b0d02f75fd33b8708437051eecc82c926fcc3a30f65e1829f232f92e3057fc25fe28794bf144a76535bcf8ada
-EBUILD dialog-1.3.20181022.ebuild 1273 BLAKE2B 3bd67bec0a3e3b0bf763ac1b0e1b700d2a948037a2adee40500df18b5fc1b2300a328ab74e584c514d8bb12c172f65dace7a9656a4e76f745fcd0a34ad62d86a SHA512 b8ee4727dab3adb822e3b317ecfb6ef783ec153eff025b31319c2d342ac6979037e2d0e47eea84fb8f02c685a74fcfdcf575b4880807ed61d5b3addcb7f74c53
-EBUILD dialog-1.3.20181107.ebuild 1273 BLAKE2B 3bd67bec0a3e3b0bf763ac1b0e1b700d2a948037a2adee40500df18b5fc1b2300a328ab74e584c514d8bb12c172f65dace7a9656a4e76f745fcd0a34ad62d86a SHA512 b8ee4727dab3adb822e3b317ecfb6ef783ec153eff025b31319c2d342ac6979037e2d0e47eea84fb8f02c685a74fcfdcf575b4880807ed61d5b3addcb7f74c53
 EBUILD dialog-1.3.20190211.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
+EBUILD dialog-1.3.20190724.ebuild 1276 BLAKE2B 1cbe7f171a6536cbd9fb454dec409e023b1d9b2bfb788cdf63cfaf779f718944f2a6f16c87e7fb3f8882afa5a39f556e6a64b8d661835482d26281eab7997a1e SHA512 bee75c253b382b622db52b32e762685314b35fbe9b0af4b43a7ba4ba7a7ae8ccaf7d72909fcc0efb7c856f89319c59fec8010c7cf12095ac7c9f132648d01d09
 MISC metadata.xml 341 BLAKE2B 84cb58bb0ffe236825ae28f7f277c172eb8e8ec279aec915cdac1078342272a180aceb72400817be94b01568c24c4588d6423baa2be02c70a9971840a7e62650 SHA512 b194bfc5daa545724eaa7ec7dcc5618ec87249158d5e8fcb01a76375960b2d9dd012e596c0fc8e0d9c94eb39175a6b4424257cf0828cc73956c7a68ff4749da8
diff --git a/dev-util/dialog/dialog-1.3.20181107.ebuild b/dev-util/dialog/dialog-1.3.20181107.ebuild
deleted file mode 100644
index 1d1adc032578..000000000000
--- a/dev-util/dialog/dialog-1.3.20181107.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils multilib versionator
-
-DIA_P="${PN}-$(replace_version_separator 2 '-')"
-DESCRIPTION="tool to display dialog boxes from a shell"
-HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/15"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples minimal nls static-libs unicode"
-
-RDEPEND="
-	>=sys-libs/ncurses-5.2-r5:=[unicode?]
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	!minimal? ( sys-devel/libtool )
-	!<=sys-freebsd/freebsd-contrib-8.9999
-"
-S=${WORKDIR}/${DIA_P}
-
-src_prepare() {
-	default
-	sed -i -e '/LIB_CREATE=/s:${CC}:& ${LDFLAGS}:g' configure || die
-	sed -i '/$(LIBTOOL_COMPILE)/s:$: $(LIBTOOL_OPTS):' makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--disable-rpath-hack \
-		$(use_enable nls) \
-		$(use_with !minimal libtool) \
-		--with-libtool-opts=$(usex static-libs '' '-shared') \
-		--with-ncurses$(usex unicode w '')
-}
-
-src_install() {
-	use minimal && default || emake DESTDIR="${D}" install-full
-
-	use examples && dodoc -r samples
-
-	dodoc CHANGES README
-
-	prune_libtool_files
-}
diff --git a/dev-util/dialog/dialog-1.3.20181022.ebuild b/dev-util/dialog/dialog-1.3.20190724.ebuild
index 1d1adc032578..021642f25719 100644
--- a/dev-util/dialog/dialog-1.3.20181022.ebuild
+++ b/dev-util/dialog/dialog-1.3.20190724.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
@@ -7,7 +7,7 @@ inherit eutils multilib versionator
 DIA_P="${PN}-$(replace_version_separator 2 '-')"
 DESCRIPTION="tool to display dialog boxes from a shell"
 HOMEPAGE="https://invisible-island.net/dialog/"
-SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tgz"
+SRC_URI="https://dev.gentoo.org/~jer/${DIA_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0/15"
diff --git a/dev-util/drone-cli/Manifest b/dev-util/drone-cli/Manifest
index 586f23816655..c4788b6f26ac 100644
--- a/dev-util/drone-cli/Manifest
+++ b/dev-util/drone-cli/Manifest
@@ -2,8 +2,12 @@ DIST drone-cli-0.8.6.tar.gz 1778122 BLAKE2B 040c93386330990a5f4e38f6ca353226145a
 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
 DIST drone-cli-1.1.1.tar.gz 2840804 BLAKE2B 393e4f0cabc30c322dd31b5d3c7bdd846a3960eaab532669020e55a7b83ca7884125a0c47c5a1540101b0ad6dbc3f147470e18164cbe4f79dbc93dc033081abe SHA512 bc75683a6aea1d11c22a635a4386c3c0ead17f15f0b59ebc692fa0a5a346e90b3e6d1b16bdc21f807c91080f3c969d254db2cefb07113b3e4b3409425eebacc3
+DIST drone-cli-1.1.3.tar.gz 2841895 BLAKE2B 8e44ed377064d7e08184f56457390caef7861bb1ab5512e4ec679cd6e9a0ca018311b2d8abe0df2323eaa9ceada89323517d5c934781093905121c3f6eb52123 SHA512 423c0907499119137fea014b4f6d51154f98b82f4fadf69852bbb0722ae29d9a8e62ff49aa19f92dfcaa676385acc03ef3fd2a51553369d607473dd29b1453cc
+DIST drone-cli-1.1.4.tar.gz 2843182 BLAKE2B 395501216d09f907897d3d5f7a64e93956786030a354365400e8ec73e2ecb361958f7f9468c3819a77908251450954c91db7369f803516ff2fbeb2050ad6efe7 SHA512 6a0df849f4086913137e36248925fea70e106b95225708bfd37b9a23199d4bed35c6fa18757311cfe23e8c8eef5d66acde207827a7220cec868ffe515539471f
 EBUILD drone-cli-0.8.6.ebuild 776 BLAKE2B 9981eebf320806719fb5eea97f679234a4b3c1972a7af8b529c26ea93232c444bd191f4be6911ed12b61c9df066edfe78944c2a37fa8a767374bdd3463449b53 SHA512 24cebe2e31938083b61b49d4d3357bd53e109d17a55e91a993bc902024625a4f9a6f4ada010264e8c76f01e92935f447d249a63b608c0a587d3ace08140e00d2
 EBUILD drone-cli-1.0.8.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 EBUILD drone-cli-1.1.0.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 EBUILD drone-cli-1.1.1.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-1.1.3.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
+EBUILD drone-cli-1.1.4.ebuild 699 BLAKE2B 42aef9c805cbf3b79e903679114600a332aa171347cdacdb0ec33380ef7ba66b0d81f61b9defe44936e1c8727cf0859f82dbad472399bfc6dc134a1107402c12 SHA512 83e906f96be44e0f327666652f2152629ef8273749b43764bde64dff50ed8df6809c25376dd81e080f7f0417e28b8f2d1422e1097fb398a51d5546f40303c0b9
 MISC metadata.xml 325 BLAKE2B 0e7da145abc83905a490d331ac2c8644e8c59e28914cb6624d0cb4b36da345806e945ecae3b12a122a099241849701856ced8b4be04b9cba5a569b0bbc0d7ee7 SHA512 b4c00a840f5fed22888fb462dc5131e710a5065a1801eb0dfefe1979012d4ad9beff279bc2ecb98f2c0595e1b1d1d020830c123ad0be3a31cc3c7753242823fc
diff --git a/dev-util/drone-cli/drone-cli-1.1.3.ebuild b/dev-util/drone-cli/drone-cli-1.1.3.ebuild
new file mode 100644
index 000000000000..ca7f0b0fdc7f
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.1.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/drone-cli/drone-cli-1.1.4.ebuild b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
new file mode 100644
index 000000000000..ca7f0b0fdc7f
--- /dev/null
+++ b/dev-util/drone-cli/drone-cli-1.1.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/drone/drone-cli"
+
+inherit golang-build golang-vcs-snapshot
+
+ARCHIVE_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Command-line interface for Drone"
+HOMEPAGE="https://github.com/drone/drone-cli"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RESTRICT="test"
+
+RDEPEND="!!<dev-util/drone-0.7"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${WORKDIR}/${P}"\
+		go install -ldflags "-X main.version=${PV}" ${EGO_PN}/drone || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/drone
+	dodoc src/${EGO_PN}/README.md
+}
diff --git a/dev-util/edi/Manifest b/dev-util/edi/Manifest
index 8a27b57741d9..d98efda43b64 100644
--- a/dev-util/edi/Manifest
+++ b/dev-util/edi/Manifest
@@ -1,3 +1,3 @@
 DIST edi-0.7.1.tar.gz 736103 BLAKE2B f4c82246d66d2620cccf71bfd2b623d1ce95f28d2afb1f1077b53580eec6303748287a5332472c45a911ad83d573ffaadfd08bc0827e3b77909f1a041e0f0750 SHA512 5e7e88e547f2e8fc631d48999aa76e814735dc254381d3965f64f7c1d3006becb90f32305471cd54c4eec5f8b66a1e8595220f302bcebe25eb54e9b56c31767c
 EBUILD edi-0.7.1.ebuild 1269 BLAKE2B e16c7a3d18d92d1661575146ef4d9c93a259d84ccdf59f6d367401318e79892ce4277906b0cc1757271458141f5d780f8c22a5b8ca2ff56cddce29bd2ca802ca SHA512 4185d2aded7c8b946ce1ae988a85f491dd80a0fd120289b5150c33f6dd608cb1a7fe8398ab061d89c51803dbe29830dea6e71d896221fbc7fb610e9279769550
-MISC metadata.xml 499 BLAKE2B b79205914bede4f3e03ebb98fe231cef58336fd21d5d1b4884b61929af724f6758e8d0aeb1f4099ec9b2fbd4f00f52499272007ed10741e8e21b3a121ce840a5 SHA512 548df114fdb3d83fc0794e745ebdfc8e835a11a75826eb27b4e5da7bfb2fbd790a033905055799b81392b23f3aed41f20900a43331af205875507331e57cf86c
+MISC metadata.xml 409 BLAKE2B 7a44e226411a90d7104f1413fbb30bf85c2e99b2ee19bece2b4d61d93427e17d0a235a88beb874f117a016299b8bdf1d1897daa4d36fcc4e2e7b9d5e45d83873 SHA512 4e1748940fb40bf5ef343f82a57794d42d9d3733d544a122d3ad8200118869902e241a4adfb38c481c69842dba2915d6b30ec96713b35019ef4615fd1298a70b
diff --git a/dev-util/edi/metadata.xml b/dev-util/edi/metadata.xml
index 8b902f0f90c5..9fbd2808478f 100644
--- a/dev-util/edi/metadata.xml
+++ b/dev-util/edi/metadata.xml
@@ -2,11 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person">
-    <email>juippis@gmail.com</email>
-  </maintainer>
-  <maintainer type="project">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
   </maintainer>
   <use>
     <flag name="clang">
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index 04673a6a47e3..6155ffea48ca 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -2,37 +2,16 @@ AUX electron-1.7.15-v8-crankshaft-rce-fix.patch 1581 BLAKE2B a78c4bccca8ca37957d
 AUX toolchain/BUILD.gn 799 BLAKE2B c1a088f005100fe77846bde9405ff8e68b65ce8798c4f746609575afdcbefe402e8d10ca55ecc195080752db9c48489ec66aaa658045e32337b9fb599b4d9b36 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d
 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee
 DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7
-DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9
-DIST chromium-58.0.3029.110.tar.xz 518167664 BLAKE2B dc9b4eee10236b892c82c6c12f649aed30454124496794485430e6119ee83e420564b2f2fbd21a3d1525cfb3de3524210c50770cbf74b2dbfdb18b35445a740a SHA512 412dc94e23d6699b959f23956f5f82f4c600050649a8a2e694bb2c6e166245e3670f4549ee1c08a0df05b4e361f040d1739515180b8631adbfac9c907af8d93f
 DIST chromium-61.0.3163.100.tar.xz 556305252 BLAKE2B 88b9dc05d626ec33c2044cd8bb5a5bd2e36c4ba5c231230b5b6529d62cc100874099d17633ca320a0c668b130797d6b222107d2efcd6f80b5b0b460d378f4454 SHA512 4dfd3a493ceb7c605eeab6f387541273d529e8b935a6104927e34836469aedcfcbb4a1154591585621d5c2e842e68701d32328acba842f840a20498822165f78
-DIST electron-1.6.18.tar.gz 4965032 BLAKE2B ecb085a75717fb472740583dbd31634bd8b4be8365fdaf3334e558a8076577d3a973ba78c87136bdf42be14a8fcbe0b7816f49a1eccc162c62941485a2bb09fb SHA512 bd10d34e9a91350671a8c1af807fd01d7379bd7c9eca7c3f096349a5dbefaa78e063ee6a27fa5029a19daec0ca70fbe45f9964e27945a5f47ac83416540aacda
-DIST electron-1.7.16.tar.gz 5174554 BLAKE2B 421fde393533c4af26a046a3a1a6ef067306ac6990fe9b7f74436b00e939b85d07f39bb7b9f02547288105adfd069f2640238e83cf444a3a99723441da0556f9 SHA512 84815598f14330916dc65f1326a841e73a8c1551c4b9ba21667562f6c67eb770529b3049d53951e91b07356e4d7cfc3ed3a5e3722305d7282adfc871c3195a35
-DIST electron-2.0.10.tar.gz 3012289 BLAKE2B 3d4f2560e754917c7e72e6450ccf9d6d5f8a7741fb5c426d6db9cad01780be5531671bea55eb9033f5de288617d8cc366a17b1a77eac5bd32440ff8e9ee53a5e SHA512 5663e9b018a51bf7f7c87a8c5b51cf631a91980bf01fdcb207f2054da2bfaffdebfe027bd8c27dfa0af523fd09ec1c52076a7f6de9c5bf9a0ffbb898d1797b59
 DIST electron-2.0.17.tar.gz 3015019 BLAKE2B 314d155e772492d81ca2b092b9ee264a82feffdfc85c05a4f18e4f9c3b151afb8012bdab2e1edbc8889db0433c04d6124b539ed7cc974dc23a43286c058a19a6 SHA512 8ecf9786b4b77483f1c3b77789a91b997254645343fff9a30cf846715a2eba53f338eb2de2eee2dd1164424c07697ffe3d21931c56f373e70e77f8e0a96bee0a
 DIST electron-breakpad-67f738b7adb47dc1e3b272fb99062f4192fa6651.tar.gz 5168487 BLAKE2B 41583e3297c2e8a612720f2087720cb7bc4ebf0aaaf5481029bd65458b26e5e824da283f474cf70d8933f80538e9f6c4b8a5843f27a6448b727ec9f12578b526 SHA512 303d1545dbe8e5fdece0fcd90c2ad09fab24483b176df1491580b9b382a607c0a814681cd58bcb7166b9cfc5af882a2b0d2fcc175d23f747b37c921040b68310
-DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333
-DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127
 DIST electron-chromium-breakpad-82f0452e6b687b3c1e14e08d172b2f3fb79ae91a.tar.gz 1141359 BLAKE2B 7145fc178dcb62e9f14123da03e98f5e37c29f3a58799e675b3638eb0694771d1320de8bc70d97daa5c8c21db548efa3aa3c86d2018d6cea95f288b39cae4020 SHA512 4c8353a34061f4e061bb9e23945c0fb7a56f1b9f249b323cd3315cafcecdaca5c1f63940e2334ded03413cf26f5aa4a5bd8f1720fb2ba422a97d70f121d7d3d4
-DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10
 DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86
-DIST electron-libchromiumcontent-4a4acde5522c21fe2f0a21f5ca29f99e90b03adc.tar.gz 73046 BLAKE2B 051b69473c5a97746aa2f18fc94d4909ad52e0a0edc638ba3950d70b46fb798523da0d62f4a7f427187f80406f8efc3c9e04039f90567521c4f29adb0ab82fbf SHA512 960f8b27adcf0df459bae024092971e8c10f1dfa933e3374303d7fd0ecaf2cf201674c474dfce6500609d229f1b4441968dfbc46a2d6220723b7ceebec277dba
-DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09
-DIST electron-libchromiumcontent-cbd04c0dccc7655cd42f02baee3a622d5170ac08.tar.gz 161487 BLAKE2B de2f7f708aafc2f9033fb0dbee50880f9441196c81ba355bae966a1ffbb0c2f30c86cbb30021af599ac3abf071431f99c07a7a51b45db41901624148e1988369 SHA512 f207fdddecda879ff3c83e1503af0e919c1f6fe2e3666ac9d40c9fc21dfb3a679e1f0ab3ce7b89057a412934c5a9c96ed846761c669875ee0c3a1955308be184
 DIST electron-libchromiumcontent-daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987.tar.gz 168368 BLAKE2B f915cb7e0f6be5f64c3bca64a121c1acf39d0a11cd67c4113d29757f7f44827d5807058c4b29e04c0ae8ab053e42aa66ba3da57b0a9b9bd4c7f22e7f56b91aae SHA512 6d4ca21f463540eec825dfe5075770b341de606c1726ce443b72cdf09c7153e201dbc7c2a4bacdcd926634e9b3795e59b3f1b27f017c7bc0a7507c9a4b6f5ce5
 DIST electron-native-mate-6a3d238b7e1e3742f2bb495336a84021d927a24f.tar.gz 24130 BLAKE2B b807a13d01ccd07a3310d8551cafee69a111bb342ee9e15bc0a20243c6f98638e3f18ddd716389fcabace064d4b98acbe50ff6eed862d8d46d152c8bd6f562b2 SHA512 c9ca33f7f96f52aae132f0e4cbd141fe28cea96b9e2c9fadcac40e3bd09d417469fac2851ad1c49790a4533174df0bec9d5ad45203a1358b3d4a2c0df49903fa
-DIST electron-native-mate-7d9c1a80f025f4c46f7da8ea73246fe0f1968579.tar.gz 24066 BLAKE2B 622d0ee16fd35a98c154bad7cd271350b6d0c2da0d1df1b0effde6ddb52eea3530921a746c96eed2130ae403c3ef00dac8a86a8a896afcc9b4e74d03a17fb727 SHA512 99a6e67469852a84a7a4b1585a1ff9d32491f9bab511a3853c630ac30bf1c703d0b1c0f8830a546f2665dfe87f1f582860dfabb332909f6973e64dff2ed4b5f4
-DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac
 DIST electron-node-51abeb37cad3f2098c0f0fffdff739f4ac2393e8.tar.gz 50344964 BLAKE2B 36f91e8ae7d1ae4e99c44128398589e015224c664c86d3869327a4c433fdf8efdb758d4462ec3d8997399bf6d62cfe63f91ae8ee4886aab7817b1654c94592a2 SHA512 8f31577a4ef836b5535ec69d8a020c06e92c01667a0d4b857fcb6789025a6903d42ba3f9b51fd0828d39e88dd7ba44a07cfb3a59023b04c4f5cb89e1a27874bc
-DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4
-DIST electron-node-a992f2ff412b85606ec1d4c1eb00ad832fa1e640.tar.gz 46772284 BLAKE2B 453ade1d1540f099d7225f3c758fc1455dcae3a6b8ada00c20b85519bfd61beb3fc3beb083f063de2ce52c5b2e83eb67acea23f2605e201031b42552747e522b SHA512 532bc27e026fd032e8747150bac885277ae2e6cede3053e61690b846e380d664daa0b49e843c44d937a5f84f902f149323b8dc873dcfcf8ddc27b6feb1df750d
-DIST electron-patches-b04011d68866c1159eb35b1a5260d519172cc05b.tar.gz 92135 BLAKE2B f8b1bb5523021734901e0e1a8a01e565e2f826a1f861a7e38e19f92b214035e2fe4f3ac27d411ff129597ceaaac5fee43a6981158adbf4f4f3711424bfe7dae0 SHA512 fff7172ed830a948a70bedb9fbd34f22fa9cc7c995b1ce852ffa75ed4e69d9867b399864857f958334e857616c297e7f8cb0a5e49d263b6d1958ce22fd71ef3d
-DIST electron-patches-f0fb7725cfe73704dce84ec51bdccc024dc7ceff.tar.gz 88340 BLAKE2B 759f8da023fae94ac0639387ace26694b2ff9dfd978f783cae2f1ccaaf749200ec2cdcfb771fbd3dc8a605521886c8e3383b7ed565eb250f753d238fd30ad6ef SHA512 c542d8fcf95123dc4ebced608ae0d1d9bc04db67f89c50f219bdf4ed8e916059333d1e3571387bf2992b46c3b0a02692f7ec2531920f693db30c7ed401bb73d4
-DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e
+DIST electron-patches-26715595f4fe3658a73adb0d2fb338f62c79e492.tar.gz 115022 BLAKE2B 04f0982d9ac63068fd9e83f53341e43fec8f375d9591777dbcb6612213ecf0473be6d38883cdf0f99fe412f65b494d8765818260ecefd9e77dbd503d5459d9be SHA512 8d05f21d2ab4242cd896f58d1608ccee5ba3b65dae73cacb2261458e2f163e216176276d036cf8fe3375c06a94d08f7a04af79e92eb3d4312d975acd870103d8
 DIST electron-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
-DIST electron-pdf-viewer-beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf.tar.gz 38752 BLAKE2B 0fa9e928d64d31fec04c542cb4a4277497d42c621a500cbcb77783bdd20f6251ac075f779229a1f43645f8181734b8a213fa77dc2b906b7846f725978996b488 SHA512 76f996b4a14290f1c3d061c9c2bb3d5869c53c1ef0e395b8faa6dd3470787dd2c6f492d5dcba18d805c0ccc1c6e2a3a602bf873876075d160f69a899a79d953d
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
-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-r1.ebuild 28664 BLAKE2B d4bcca9e6b9653681bed01a701e9a0dce2a63e83a70dea868e93c7fb25a575faa8e0a73d31ec97883d588f2fdff5a6eacdb52ca8fe6850e2e68db695ddca8825 SHA512 4617ad52c1df75835dd66a5f0d1d89eaa193b2788cf136073739ccca1056ac8d274805ffc404b4147fec28e052147d3163545aa17e11f48ed022b0f259515b2d
-MISC metadata.xml 1361 BLAKE2B 58a37a5943813a7a526f98309ab79ba0c5148323a2b7a02aceee65282b1ab34d8451ed0e2e41110187014051bcbe33d2ecfc559490e51a66c047cd512c11295a SHA512 f2a2cb8e1093c5a5ac01a64f0213132213aa92307877c0b32e1946c513c7715b04d8a910f847c835533909dac9f52c11cb30e9793248dacc4965ea273bc8f732
+EBUILD electron-2.0.17-r2.ebuild 28910 BLAKE2B d869e797c36fcc0c33009568cdeaaa411f2afccc6a473d54a66c887cd4684466c9b649e2aaf749251e4f05d41ead30a3524392a333bd4d0f4a55860df0865042 SHA512 5bbc2f20157a2a66a9ea0cb14140ebec0b5c174941b6a1a8dfe1ea3131a745047dba9bb6b00b81e50f262b2f8b8171436be8b18c0cc4bc8206a56b5d6b077017
+MISC metadata.xml 1388 BLAKE2B eb16eead177e1e0fdcd51e5e95a9d6e76d605f41a0e9ed51b6e4c8cb212eb8536399f4850a69d7c841760181b784bd2bc9910826a2dc1908f17b0052e2eb5d78 SHA512 162c5d3d1f6cc7f6585908a87a81a627fe59b8d7bb514b1bc6d4a5f7e1c1a009ed96c16f68333ff69453e573b2a89140b13cf083cb73e30a82043478dbd06df2
diff --git a/dev-util/electron/electron-1.6.18.ebuild b/dev-util/electron/electron-1.6.18.ebuild
deleted file mode 100644
index fc39f787b71a..000000000000
--- a/dev-util/electron/electron-1.6.18.ebuild
+++ /dev/null
@@ -1,883 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
-	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	virtualx xdg-utils
-
-# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="56.0.2924.87"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/brightray
-BRIGHTRAY_COMMIT="909c49265493bd095c27cefd999567be2107899a"
-# Keep this in sync with vendor/node
-NODE_COMMIT="9b1683e7000481ec6214eafa3eef7ac4594eb410"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="a050a339cfeabcfb5f07c313161d2ee27b6c3a39"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with script/lib/config.py:LIBCHROMIUMCONTENT_COMMIT
-LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
-
-PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
-	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
-	https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> electron-${BRIGHTRAY_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
-	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-BRIGHTRAY_S="${S}/vendor/brightray"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gnome gnome-keyring kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	>=app-eselect/eselect-electron-2.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/icu-58:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	media-libs/libexif:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/libvpx:=[svc]
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	media-libs/flac:=
-	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	x11-libs/gtk+:2
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	net-libs/nodejs
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
-			# bugs: #535730, #525374, #518668, #600288
-			die "At least gcc 4.9 is required"
-		fi
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				"limit to be no less than ${lto_n_rlimit_min}."
-			eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="7G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		CHECKREQS_MEMORY="16G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/"
-	local path
-	local relpath
-	local out
-
-	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
-	| while read -r path; do
-		relpath="$(dirname ${path})"
-		out="${_s}/__${relpath////_}_$(basename ${path})"
-		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
-			"${_s}/${path}" > "${out}" || die
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
-	local myarch="$(tc-arch)"
-	local target_arch
-
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	echo -n "${target_arch}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BREAKPAD_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
-	rm -r "${BREAKPAD_SRC_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
-	rm -r "${BRIGHTRAY_S}" &&
-		mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${PDF_VIEWER_S}" &&
-		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
-	rm -r "${GRIT_S}" &&
-		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
-		"${S}/node_modules/" || die
-	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
-
-	# node patches
-	cd "${NODE_S}" || die
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s "${CHROMIUM_S}/v8" deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" \
-		deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
-		deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
-	python_fix_shebang "${S}/tools/"
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen
-	# https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Apply libcc Chromium patches.
-	cd "${CHROMIUM_S}" || die
-	_unnest_patches "${LIBCC_S}/patches"
-	eapply "${LIBCC_S}/patches"
-
-	# Apply Gentoo patches
-	cd "${S}" || die
-	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
-	eapply "${WORKDIR}/${PATCHES_P}/${PV}"
-
-	# Merge chromiumcontent component into chromium source tree.
-	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/numerics
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/murmurhash
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libusb
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/openh264
-		third_party/openmax_dl
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libjpeg
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/zlib_v128
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/smhasher
-		third_party/sqlite
-		third_party/tcmalloc
-		third_party/usrsctp
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/x86inc
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg )
-	fi
-
-	cd "${CHROMIUM_S}" || die
-
-	# Remove most bundled libraries. Some are still needed.
-	ebegin "Unbundling libraries"
-	build/linux/unbundle/remove_bundled_libraries.py \
-		"${keeplibs[@]}" --do-remove || die
-	eend
-
-	cd "${S}" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf_gn=""
-	local myconf_gyp=""
-
-	cd "${CHROMIUM_S}" || die
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# 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
-	local gn_system_libraries=(
-		flac
-		harfbuzz-ng
-		icu
-		libjpeg
-		libpng
-		libvpx
-		libwebp
-		libxml
-		libxslt
-		re2
-		snappy
-		yasm
-		zlib)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg )
-	fi
-	build/linux/unbundle/replace_gn_files.py \
-		--system-libraries ${gn_system_libraries[@]} || die
-
-	# Optional dependencies.
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=$(usex gnome true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_gtk3=false"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local target_arch=$(_get_target_arch)
-	local ffmpeg_target_arch="${target_arch}"
-
-	if [[ ${ffmpeg_target_arch} = arm ]]; then
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		filter-flags "-Wl,--as-needed"
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	myconf_gn+=" icu_use_data_file=false"
-
-	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd "${S}/vendor/node" > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --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 --without-npm \
-		--with-intl=system-icu --without-dtrace \
-		--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
-	myconf_gn+=" is_electron_build = true"
-	myconf_gn+=" is_component_build = false"
-
-	einfo "Configuring chromiumcontent..."
-	# TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox.
-	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn} use_allocator=\"none\"" || die
-	# Remove the glibc allocator shim so that it doesn't get picked up
-	# by Electron's build_libs script.
-	rm out/Release/obj/base/allocator/unified_allocator_shim/allocator_shim_default_dispatch_to_glibc.o || die
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-	out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
-	cd "${S}" || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local compile_target="${S}/out/R"
-	local myconf_gyp=""
-	local chromium_target="${CHROMIUM_S}/out/Release"
-	local libcc_path="${S}/vendor/brightray/vendor/libchromiumcontent"
-	local libcc_dist_path="${libcc_path}/dist/main"
-	local libcc_dist_static_path="${libcc_dist_path}/static_library"
-	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
-	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
-	local libcc_output_shared="${libcc_output}-shared"
-	local target_arch=$(_get_target_arch)
-	local l=""
-	local create_dist_args=""
-
-	tc-export AR CC CXX NM
-
-	mkdir -p "${compile_target}" || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C "${chromium_target}" mksnapshot || die
-	pax-mark m "${chromium_target}/mksnapshot"
-	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
-	# Build chromedriver.
-	eninja -C "${chromium_target}" chromedriver
-	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
-	# Build libchromiumcontent components.
-	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
-	cd "${S}" || die
-
-	# Gather and prepare built components of libchromiumcontent.
-	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
-	create_dist_args+=" --no_zip"
-	create_dist_args+=" --system-icu"
-	CHROMIUM_BUILD_DIR="${chromium_target}" \
-	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
-	# v8 is built as a shared library, so copy it manually
-	# for generate_filenames_gypi to find.
-	mkdir -p "${libcc_dist_shared_path}" || die
-	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
-	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
-		"${libcc_dist_path}/filenames.gypi" \
-		"${CHROMIUM_S}" \
-		"${libcc_dist_shared_path}" \
-		"${libcc_dist_static_path}"
-
-	# Configure electron.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gnome use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use lto)"
-
-	myconf_gyp+=" -Duse_system_icu=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-	else
-		myconf_gyp+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-	myconf_gyp+=" -Dpython=${EPYTHON}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	myconf_gyp+=" -Dicu_use_data_file_flag=0"
-	myconf_gyp+=" -Dgenerate_character_data=0"
-
-	myconf_gyp+=" -Dlibchromiumcontent_component=0"
-	myconf_gyp+=" -Dcomponent=static_library"
-	myconf_gyp+=" -Dlibrary=static_library"
-	myconf_gyp+=" -Icommon.gypi electron.gyp"
-
-	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
-		egyp_chromium ${myconf_gyp} || die
-
-	mkdir -p "${compile_target}/lib/" || die
-	# Copy libv8 and snapshot files so the node binary can find them.
-	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
-	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
-	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
-	# Copy generated shim headers.
-	mkdir -p "${compile_target}/gen" || die
-	cp -r "${chromium_target}/gen/shim_headers" \
-		"${compile_target}/gen" || die
-
-	# Build the Node binary and pax-mark it.
-	eninja -C ${compile_target} nodebin
-	pax-mark m ${compile_target}/nodebin
-
-	# Finally, build Electron.
-	eninja -C ${compile_target} electron
-	pax-mark m ${compile_target}/electron
-
-	echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doexe out/R/chromedriver
-	doexe out/R/mksnapshot
-	doins out/R/libv8.so
-	fperms +x "${install_dir}/libv8.so"
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libnode.so"
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	doins out/R/blink_image_resources_200_percent.pak
-	doins out/R/content_resources_200_percent.pak
-	doins out/R/content_shell.pak
-	doins out/R/pdf_viewer_resources.pak
-	doins out/R/ui_resources_200_percent.pak
-	doins out/R/views_resources_200_percent.pak
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	doins out/R/version
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	electron-config update
-}
-
-pkg_postrm() {
-	electron-config update
-}
diff --git a/dev-util/electron/electron-1.7.16.ebuild b/dev-util/electron/electron-1.7.16.ebuild
deleted file mode 100644
index 3f5ca3af95df..000000000000
--- a/dev-util/electron/electron-1.7.16.ebuild
+++ /dev/null
@@ -1,889 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
-	multiprocessing pax-utils portability python-any-r1 toolchain-funcs \
-	virtualx xdg-utils
-
-# Keep this in sync with vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="58.0.3029.110"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="c566c50d81f7b1edeaee9f11f5d07bda858d6b64"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="e35167de7516448fcc2bf687ad580b9d8b6aedc2"
-# Keep this in sync with vendor/node
-NODE_COMMIT="a992f2ff412b85606ec1d4c1eb00ad832fa1e640"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="7d9c1a80f025f4c46f7da8ea73246fe0f1968579"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="beb36874a6b61d7a18b92bf7dcd1f0661e4c59cf"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="4a4acde5522c21fe2f0a21f5ca29f99e90b03adc"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-NINJA_VERSION="1.8.2"
-GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
-
-PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
-	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
-	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
-	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${S}/vendor/libchromiumcontent"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64"
-IUSE="cups custom-cflags gconf gnome-keyring gtk3 kerberos lto neon pic
-	  +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	>=app-eselect/eselect-electron-2.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	>=dev-libs/elfutils-0.149
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/icu-58:=
-	>=dev-libs/jsoncpp-0.5.0-r1:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gconf? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.3.1:=[icu(+)]
-	media-libs/libexif:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	>=media-libs/libvpx-1.7.0:=[postproc,svc]
-	media-libs/speex:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? ( >=media-video/ffmpeg-3:= )
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	>=sys-libs/libcap-2.22:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXinerama:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	!gtk3? ( x11-libs/gtk+:2 )
-	gtk3? ( x11-libs/gtk+:3[X] )
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-perl/JSON
-	>=dev-util/gperf-3.0.3
-	dev-util/ninja
-	net-libs/nodejs
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	x11-libs/gtk+:2
-	x11-libs/gtk+:3
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
-			# bugs: #535730, #525374, #518668, #600288
-			die "At least gcc 4.9 is required"
-		fi
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				"limit to be no less than ${lto_n_rlimit_min}."
-			eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="7G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		CHECKREQS_MEMORY="16G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/"
-	local path
-	local relpath
-	local out
-
-	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
-	| while read -r path; do
-		relpath="$(dirname ${path})"
-		out="${_s}/__${relpath////_}_$(basename ${path})"
-		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
-			"${_s}/${path}" > "${out}" || die
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
-	local myarch="$(tc-arch)"
-	local target_arch
-
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	echo -n "${target_arch}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BREAKPAD_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
-	rm -r "${BREAKPAD_SRC_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${PDF_VIEWER_S}" &&
-		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
-	rm -r "${GRIT_S}" &&
-		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
-		"${S}/node_modules/" || die
-	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
-
-	# node patches
-	cd "${NODE_S}" || die
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s "${CHROMIUM_S}/v8" deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" \
-		deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
-		deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	python_fix_shebang "${CHROMIUM_S}/chrome/browser"
-	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
-	python_fix_shebang "${S}/tools/"
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen
-	# https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Fix broken patch
-	cd "${LIBCC_S}" || die
-	eapply "${FILESDIR}/${PN}-1.7.15-v8-crankshaft-rce-fix.patch"
-
-	# Apply libcc Chromium patches.
-	cd "${CHROMIUM_S}" || die
-	_unnest_patches "${LIBCC_S}/patches"
-	eapply "${LIBCC_S}/patches"
-
-	# Apply Gentoo patches
-	cd "${S}" || die
-	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}"
-	eapply "${WORKDIR}/${PATCHES_P}/${PV}"
-
-	# Merge chromiumcontent component into chromium source tree.
-	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
-	if use gtk3; then
-		sed -i -e 's/gtk2/gtk3/g' "${CHROMIUM_S}/chromiumcontent/BUILD.gn" \
-		|| die
-	fi
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/numerics
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/murmurhash
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libusb
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/vulcanize/third_party/UglifyJS2
-		third_party/openh264
-		third_party/openmax_dl
-		third_party/opus
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libjpeg
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/zlib_v128
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/smhasher
-		third_party/sqlite
-		third_party/tcmalloc
-		third_party/usrsctp
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/x86inc
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg )
-	fi
-
-	cd "${CHROMIUM_S}" || die
-
-	# Remove most bundled libraries. Some are still needed.
-	ebegin "Unbundling libraries"
-	build/linux/unbundle/remove_bundled_libraries.py \
-		"${keeplibs[@]}" --do-remove || die
-	eend
-
-	cd "${S}" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf_gn=""
-	local myconf_gyp=""
-
-	cd "${CHROMIUM_S}" || die
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_libusb (http://crbug.com/266149).
-	# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
-	# 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
-	local gn_system_libraries=(
-		flac
-		harfbuzz-ng
-		icu
-		libjpeg
-		libpng
-		libvpx
-		libwebp
-		libxml
-		libxslt
-		re2
-		snappy
-		yasm
-		zlib)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg )
-	fi
-	build/linux/unbundle/replace_gn_files.py \
-		--system-libraries ${gn_system_libraries[@]} || die
-
-	# Optional dependencies.
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=$(usex gconf true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_gtk3=$(usex gtk3 true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local target_arch=$(_get_target_arch)
-	local ffmpeg_target_arch="${target_arch}"
-
-	if [[ ${ffmpeg_target_arch} = arm ]]; then
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		filter-flags "-Wl,--as-needed"
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	myconf_gn+=" icu_use_data_file=false"
-
-	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd "${S}/vendor/node" > /dev/null || die
-	# Make sure gyp_node does not run
-	echo '#!/usr/bin/env python' > tools/gyp_node.py || die
-	# --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 --without-npm \
-		--with-intl=system-icu --without-dtrace \
-		--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
-	myconf_gn+=" is_electron_build = true"
-	myconf_gn+=" is_component_build = false"
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	einfo "Configuring chromiumcontent..."
-	tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "${myconf_gn}" || die
-	out/Release/gn gen --args="${myconf_gn}" out/Release || die
-
-	cd "${S}" || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local compile_target="${S}/out/R"
-	local myconf_gyp=""
-	local chromium_target="${CHROMIUM_S}/out/Release"
-	local libcc_path="${S}/vendor/libchromiumcontent"
-	local libcc_dist_path="${libcc_path}/dist/main"
-	local libcc_dist_static_path="${libcc_dist_path}/static_library"
-	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
-	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
-	local libcc_output_shared="${libcc_output}-shared"
-	local target_arch=$(_get_target_arch)
-	local l=""
-	local create_dist_args=""
-
-	tc-export AR CC CXX NM
-
-	mkdir -p "${compile_target}" || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C "${chromium_target}" mksnapshot || die
-	pax-mark m "${chromium_target}/mksnapshot"
-	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
-	# Build chromedriver.
-	eninja -C "${chromium_target}" chromedriver
-	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
-	# Build libchromiumcontent components.
-	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-
-	cd "${S}" || die
-
-	# Gather and prepare built components of libchromiumcontent.
-	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
-	create_dist_args+=" --no_zip"
-	create_dist_args+=" --system-icu"
-	CHROMIUM_BUILD_DIR="${chromium_target}" \
-	PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
-	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
-	# v8 is built as a shared library, so copy it manually
-	# for generate_filenames_gypi to find.
-	mkdir -p "${libcc_dist_shared_path}" || die
-	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
-	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
-		"${libcc_dist_path}/filenames.gypi" \
-		"${CHROMIUM_S}" \
-		"${libcc_dist_shared_path}" \
-		"${libcc_dist_static_path}"
-
-	# Configure electron.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gconf use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use gtk3)
-		$(gyp_use lto)"
-
-	myconf_gyp+=" -Duse_system_icu=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-	else
-		myconf_gyp+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-	myconf_gyp+=" -Dpython=${EPYTHON}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	myconf_gyp+=" -Dicu_use_data_file_flag=0"
-	myconf_gyp+=" -Dgenerate_character_data=0"
-
-	myconf_gyp+=" -Dlibchromiumcontent_component=0"
-	myconf_gyp+=" -Dcomponent=static_library"
-	myconf_gyp+=" -Dlibrary=static_library"
-	myconf_gyp+=" -Icommon.gypi electron.gyp"
-
-	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
-		egyp_chromium ${myconf_gyp} || die
-
-	mkdir -p "${compile_target}/lib/" || die
-	# Copy libv8 and snapshot files so the node binary can find them.
-	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
-	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
-	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
-	# Copy generated shim headers.
-	mkdir -p "${compile_target}/gen" || die
-	cp -r "${chromium_target}/gen/shim_headers" \
-		"${compile_target}/gen" || die
-
-	# Build the Node binary and pax-mark it.
-	eninja -C ${compile_target} nodebin
-	pax-mark m ${compile_target}/nodebin
-
-	# Finally, build Electron.
-	eninja -C ${compile_target} electron
-	pax-mark m ${compile_target}/electron
-
-	echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doexe out/R/chromedriver
-	doexe out/R/mksnapshot
-	doins out/R/libv8.so
-	fperms +x "${install_dir}/libv8.so"
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libnode.so"
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	doins out/R/blink_image_resources_200_percent.pak
-	doins out/R/content_resources_200_percent.pak
-	doins out/R/content_shell.pak
-	doins out/R/pdf_viewer_resources.pak
-	doins out/R/ui_resources_200_percent.pak
-	doins out/R/views_resources_200_percent.pak
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	doins out/R/version
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	electron-config update
-}
-
-pkg_postrm() {
-	electron-config update
-}
diff --git a/dev-util/electron/electron-2.0.10.ebuild b/dev-util/electron/electron-2.0.10.ebuild
deleted file mode 100644
index 0742d0910c41..000000000000
--- a/dev-util/electron/electron-2.0.10.ebuild
+++ /dev/null
@@ -1,908 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eapi7-ver gnome2-utils flag-o-matic multilib \
-	multiprocessing ninja-utils pax-utils portability python-any-r1 \
-	toolchain-funcs virtualx xdg-utils
-
-# Keep this in sync with vendor/libchromiumcontent/VERSION
-CHROMIUM_VERSION="61.0.3163.100"
-# Keep this in sync with vendor/breakpad
-BREAKPAD_COMMIT="82f0452e6b687b3c1e14e08d172b2f3fb79ae91a"
-# Keep this in sync with vendor/breakpad/src (and find the corresponding
-# commit in https://github.com/google/breakpad/)
-BREAKPAD_SRC_COMMIT="67f738b7adb47dc1e3b272fb99062f4192fa6651"
-# Keep this in sync with vendor/node
-NODE_COMMIT="51abeb37cad3f2098c0f0fffdff739f4ac2393e8"
-# Keep this in sync with vendor/native_mate
-NATIVE_MATE_COMMIT="6a3d238b7e1e3742f2bb495336a84021d927a24f"
-# Keep this in sync with vendor/pdf_viewer
-PDF_VIEWER_COMMIT="a5251e497fb52e699b28f627e3cbb6d8cefb62df"
-# Keep this in sync with vendor/pdf_viewer/vendor/grit
-GRIT_COMMIT="9536fb6429147d27ef1563088341825db0a893cd"
-# Keep this in sync with vendor/libchromiumcontent
-LIBCHROMIUMCONTENT_COMMIT="cbd04c0dccc7655cd42f02baee3a622d5170ac08"
-# Keep this in sync with package.json#devDependencies
-ASAR_VERSION="0.13.0"
-BROWSERIFY_VERSION="14.0.0"
-NINJA_VERSION="1.8.2"
-GENTOO_PATCHES_VERSION="f0fb7725cfe73704dce84ec51bdccc024dc7ceff"
-
-PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
-CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
-BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}"
-BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}"
-NODE_P="node-${NODE_COMMIT}"
-NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}"
-PDF_VIEWER_P="pdf-viewer-${PDF_VIEWER_COMMIT}"
-GRIT_P="grit-${GRIT_COMMIT}"
-LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}"
-ASAR_P="asar-${ASAR_VERSION}"
-BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}"
-
-DESCRIPTION="Cross platform application development framework based on web technologies"
-HOMEPAGE="https://electronjs.org/"
-SRC_URI="
-	https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz
-	https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/electron/chromium-breakpad/archive/${BREAKPAD_COMMIT}.tar.gz -> electron-${BREAKPAD_P}.tar.gz
-	https://github.com/google/breakpad/archive/${BREAKPAD_SRC_COMMIT}.tar.gz -> electron-${BREAKPAD_SRC_P}.tar.gz
-	https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz
-	https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> electron-${NATIVE_MATE_P}.tar.gz
-	https://github.com/electron/pdf-viewer/archive/${PDF_VIEWER_COMMIT}.tar.gz -> electron-${PDF_VIEWER_P}.tar.gz
-	https://github.com/elprans/grit/archive/${GRIT_COMMIT}.tar.gz -> electron-${GRIT_P}.tar.gz
-	https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz
-	https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz
-	https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz
-	https://github.com/elprans/gentoo-electron-patches/archive/${GENTOO_PATCHES_VERSION}.tar.gz -> electron-patches-${GENTOO_PATCHES_VERSION}.tar.gz
-	https://github.com/ninja-build/ninja/archive/v${NINJA_VERSION}.tar.gz -> ninja-${NINJA_VERSION}.tar.gz
-"
-
-S="${WORKDIR}/${P}"
-CHROMIUM_S="${S}/chromium"
-NODE_S="${S}/vendor/node"
-BREAKPAD_S="${S}/vendor/breakpad"
-BREAKPAD_SRC_S="${BREAKPAD_S}/src"
-NATIVE_MATE_S="${S}/vendor/native_mate"
-PDF_VIEWER_S="${S}/vendor/pdf_viewer"
-GRIT_S="${PDF_VIEWER_S}/vendor/grit"
-LIBCC_S="${S}/vendor/libchromiumcontent"
-
-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"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-# Native Client binaries are compiled with different set of flags, bug #452066.
-QA_FLAGS_IGNORED=".*\.nexe"
-
-# Native Client binaries may be stripped by the build system, which uses the
-# right tools for it, bug #469144 .
-QA_PRESTRIPPED=".*\.nexe"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	>=app-eselect/eselect-electron-2.0
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	>=dev-libs/icu-58:=
-	dev-libs/libxml2:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gconf? ( >=gnome-base/gconf-2.24.0:= )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.4.2:=[icu(+)]
-	media-libs/libexif:=
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	>=media-libs/libvpx-1.7.0:=[postproc,svc]
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12-r0
-		media-libs/opus:=
-	)
-	>=net-dns/c-ares-1.13.0:=
-	>=net-libs/nghttp2-1.32.0:=
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libdrm
-	x11-libs/libnotify:=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!<dev-util/electron-0.36.12-r4
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	dev-util/gn
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-4.6.1
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! ver_test "$(clang-fullversion)" -ge 3.9.1; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 4.9; then
-			# bugs: #535730, #525374, #518668, #600288
-			die "At least gcc 4.9 is required"
-		fi
-	fi
-
-	# LTO pass requires more file descriptors
-	if use lto; then
-		local lto_n_rlimit_min="16384"
-		local maxfiles=$(ulimit -n -H)
-		if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then
-			eerror ""
-			eerror "Building with USE=\"lto\" requires file descriptor" \
-				"limit to be no less than ${lto_n_rlimit_min}."
-			eerror "The current limit for portage is ${maxfiles}."
-			eerror "Please add the following to /etc/security/limits.conf:"
-			eerror ""
-			eerror "   root hard    nofile  ${lto_n_rlimit_min}"
-			eerror "   root soft    nofile  ${lto_n_rlimit_min}"
-			eerror ""
-			die
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	use lto && CHECKREQS_MEMORY="7G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		CHECKREQS_MEMORY="16G"
-	fi
-	eshopts_pop
-	check-reqs_pkg_pretend
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	# Make sure the build system will use the right python, bug #344367.
-	python-any-r1_pkg_setup
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-_unnest_patches() {
-	local _s="${1%/}/"
-	local path
-	local relpath
-	local out
-
-	(find "${_s}" -mindepth 2 -name '*.patch' -printf "%P\n" || die) \
-	| while read -r path; do
-		relpath="$(dirname ${path})"
-		out="${_s}/__${relpath////_}_$(basename ${path})"
-		sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \
-			"${_s}/${path}" > "${out}" || die
-	done
-}
-
-_get_install_suffix() {
-	local c=(${SLOT//\// })
-	local slot=${c[0]}
-	local suffix
-
-	if [[ "${slot}" == "0" ]]; then
-		suffix=""
-	else
-		suffix="-${slot}"
-	fi
-
-	echo -n "${suffix}"
-}
-
-_get_install_dir() {
-	echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)"
-}
-
-_get_target_arch() {
-	local myarch="$(tc-arch)"
-	local target_arch
-
-	if [[ $myarch = amd64 ]] ; then
-		target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		target_arch=arm
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	echo -n "${target_arch}"
-}
-
-src_prepare() {
-	mv "${WORKDIR}/${CHROMIUM_P}" "${CHROMIUM_S}" || die
-	rm -r "${NODE_S}" &&
-		mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die
-	rm -r "${BREAKPAD_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_P}" "${BREAKPAD_S}" || die
-	rm -r "${BREAKPAD_SRC_S}" &&
-		mv "${WORKDIR}/${BREAKPAD_SRC_P}/src" "${BREAKPAD_SRC_S}" || die
-	rm -r "${NATIVE_MATE_S}" &&
-		mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die
-	rm -r "${PDF_VIEWER_S}" &&
-		mv "${WORKDIR}/${PDF_VIEWER_P}" "${PDF_VIEWER_S}" || die
-	rm -r "${GRIT_S}" &&
-		mv "${WORKDIR}/${GRIT_P}" "${GRIT_S}" || die
-	rm -r "${LIBCC_S}" &&
-		mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die
-	rsync -a "${WORKDIR}/${ASAR_P}/node_modules/" \
-		"${S}/node_modules/" || die
-	rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \
-        "${S}/node_modules/" || die
-
-	# node patches
-	cd "${NODE_S}" || die
-	# make sure node uses the correct version of v8
-	rm -r deps/v8 || die
-	ln -s "${CHROMIUM_S}/v8" deps/ || die
-
-	# make sure we use python2.* while using gyp
-	sed -i -e "s/python/${EPYTHON}/" \
-		deps/npm/node_modules/node-gyp/gyp/gyp || die
-	sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" \
-		deps/npm/node_modules/node-gyp/lib/configure.js || die
-
-	python_fix_shebang "${CHROMIUM_S}/chrome/browser"
-	python_fix_shebang "${CHROMIUM_S}/build/gyp_chromium"
-	python_fix_shebang "${S}/tools/"
-
-	# less verbose install output (stating the same as portage, basically)
-	sed -i -e "/print/d" tools/install.py || die
-
-	# proper libdir, hat tip @ryanpcmcquen
-	# https://github.com/iojs/io.js/issues/504
-	local LIBDIR=$(get_libdir)
-	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
-	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die
-	sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die
-
-	# Apply Gentoo patches for Electron itself.
-	cd "${S}" || die
-	_unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
-	eapply "${WORKDIR}/${PATCHES_P}/${PV}/electron/"
-
-	# Apply Chromium patches from libchromiumcontent.
-	cd "${CHROMIUM_S}" || die
-	_unnest_patches "${LIBCC_S}/patches"
-	eapply "${LIBCC_S}/patches"
-
-	# Finally, apply Gentoo patches for Chromium.
-	eapply "${WORKDIR}/${PATCHES_P}/${PV}/chromium/"
-
-	# Merge chromiumcontent component into chromium source tree.
-	mkdir -p "${CHROMIUM_S}/chromiumcontent" || die
-	cp -a "${LIBCC_S}/chromiumcontent" "${CHROMIUM_S}/" || die
-	cp -a "${LIBCC_S}/tools/linux/" "${CHROMIUM_S}/tools/" || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		breakpad/src/third_party/curl
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/murmurhash
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/boringssl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/py_vulcanize
-		third_party/catapult/third_party/py_vulcanize/third_party/rcssmin
-		third_party/catapult/third_party/py_vulcanize/third_party/rjsmin
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/ced
-		third_party/cld_2
-		third_party/cld_3
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/vulcanize/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms2-2.6
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	cd "${CHROMIUM_S}" || die
-
-	# Remove most bundled libraries. Some are still needed.
-	ebegin "Unbundling libraries"
-	build/linux/unbundle/remove_bundled_libraries.py \
-		"${keeplibs[@]}" --do-remove || die
-	eend
-
-	cd "${S}" || die
-
-	eapply_user
-}
-
-src_configure() {
-	local myconf_gn=""
-	local myconf_gyp=""
-
-	cd "${CHROMIUM_S}" || die
-
-	# GN needs explicit config for Debug/Release as opposed to
-	# inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# 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
-	local gn_system_libraries=(
-		flac
-		harfbuzz-ng
-		icu
-		libdrm
-		libjpeg
-		libpng
-		libvpx
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( libvpx ffmpeg opus )
-	fi
-	build/linux/unbundle/replace_gn_files.py \
-		--system-libraries ${gn_system_libraries[@]} || die
-
-	# Optional dependencies.
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=$(usex gconf true false)"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_base_path=\"/usr\" clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local target_arch=$(_get_target_arch)
-	local ffmpeg_target_arch="${target_arch}"
-
-	if [[ ${ffmpeg_target_arch} = arm ]]; then
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		filter-flags "-Wl,--as-needed"
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"${FILESDIR}/toolchain:host\""
-	else
-		myconf_gn+=" host_toolchain=\"${FILESDIR}/toolchain:default\""
-	fi
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	myconf_gn+=" icu_use_data_file=false"
-
-	use lto && myconf_gn+=" allow_posix_link_time_opt=true"
-
-	# Tools for building programs to be executed on the build system, bug #410883.
-	if tc-is-cross-compiler; then
-		export AR_host=$(tc-getBUILD_AR)
-		export CC_host=$(tc-getBUILD_CC)
-		export CXX_host=$(tc-getBUILD_CXX)
-		export NM_host=$(tc-getBUILD_NM)
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	third_party/libaddressinput/chromium/tools/update-strings.py || die
-
-	touch chrome/test/data/webui/i18n_process_css_test.html || die
-
-	einfo "Configuring bundled nodejs..."
-	pushd "${S}/vendor/node" > /dev/null || die
-	# --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 \
-		--shared-nghttp2 --shared-cares \
-		--without-npm --with-intl=system-icu --without-dtrace \
-		--dest-cpu=${target_arch} --prefix="" || die
-	popd > /dev/null || die
-
-	# libchromiumcontent configuration
-	myconf_gn+=" root_extra_deps = [\"//chromiumcontent:chromiumcontent\"]"
-	myconf_gn+=" is_electron_build = true"
-	myconf_gn+=" is_component_build = false"
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	einfo "Configuring chromiumcontent..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-
-	cd "${S}" || die
-}
-
-eninja() {
-	if [[ -z ${NINJAOPTS+set} ]]; then
-		local jobs=$(makeopts_jobs)
-		local loadavg=$(makeopts_loadavg)
-
-		if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then
-			NINJAOPTS+=" -j ${jobs}"
-		fi
-		if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then
-			NINJAOPTS+=" -l ${loadavg}"
-		fi
-	fi
-	set -- ninja -v ${NINJAOPTS} "$@"
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	local compile_target="${S}/out/R"
-	local myconf_gyp=""
-	local chromium_target="${CHROMIUM_S}/out/Release"
-	local libcc_path="${S}/vendor/libchromiumcontent"
-	local libcc_dist_path="${libcc_path}/dist/main"
-	local libcc_dist_static_path="${libcc_dist_path}/static_library"
-	local libcc_dist_shared_path="${libcc_dist_path}/shared_library"
-	local libcc_output="${CHROMIUM_S}/out/Release/obj/chromiumcontent"
-	local libcc_output_shared="${libcc_output}-shared"
-	local target_arch=$(_get_target_arch)
-	local l=""
-	local create_dist_args=""
-
-	tc-export AR CC CXX NM
-
-	mkdir -p "${compile_target}" || die
-
-	cd "${CHROMIUM_S}" || die
-
-	# Build mksnapshot and pax-mark it.
-	eninja -C "${chromium_target}" mksnapshot || die
-	pax-mark m "${chromium_target}/mksnapshot"
-	cp -a "${chromium_target}/mksnapshot" "${compile_target}/" || die
-
-	# Build chromedriver.
-	eninja -C "${chromium_target}" chromedriver
-	cp -a "${chromium_target}/chromedriver" "${compile_target}/" || die
-
-	# Build libchromiumcontent components.
-	eninja -C "${chromium_target}" chromiumcontent:chromiumcontent
-	CHROMIUMCONTENT_2ND_PASS=1 \
-		eninja -C "${chromium_target}" chromiumcontent:libs
-
-	cd "${S}" || die
-
-	# Gather and prepare built components of libchromiumcontent.
-	create_dist_args+=" --target_arch=${target_arch} --component=static_library"
-	create_dist_args+=" --no_zip"
-	create_dist_args+=" --system-icu"
-	CHROMIUM_BUILD_DIR="${chromium_target}" \
-	PYTHONPATH="${WORKDIR}/ninja-${NINJA_VERSION}/misc" \
-	"${EPYTHON}" "${libcc_path}"/script/create-dist ${create_dist_args} || die
-
-	# v8 is built as a shared library, so copy it manually
-	# for generate_filenames_gypi to find.
-	mkdir -p "${libcc_dist_shared_path}" || die
-	cp "${chromium_target}/libv8.so" "${libcc_dist_shared_path}" || die
-
-	"${EPYTHON}" "${libcc_path}"/tools/generate_filenames_gypi.py \
-		"${libcc_dist_path}/filenames.gypi" \
-		"${CHROMIUM_S}" \
-		"${libcc_dist_shared_path}" \
-		"${libcc_dist_static_path}"
-
-	# Configure electron.
-	myconf_gyp+="
-		$(gyp_use cups)
-		$(gyp_use gconf use_gconf)
-		$(gyp_use gnome-keyring use_gnome_keyring)
-		$(gyp_use gnome-keyring linux_link_gnome_keyring)
-		$(gyp_use lto)"
-
-	myconf_gyp+=" -Duse_system_icu=1"
-
-	if [[ $(tc-getCC) == *clang* ]]; then
-		myconf_gyp+=" -Dclang=1"
-	else
-		myconf_gyp+=" -Dclang=0"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	myconf_gyp+="
-		-Dclang_use_chrome_plugins=0
-		-Dhost_clang=0
-		-Dlinux_use_bundled_binutils=0
-		-Dlinux_use_bundled_gold=0
-		-Dlinux_use_gold_flags=0
-		-Dsysroot="
-
-	myconf_gyp+=" -Dtarget_arch=${target_arch}"
-	myconf_gyp+=" -Dpython=${EPYTHON}"
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gyp+=" -Dwerror="
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gyp+=" -Ddisable_fatal_linker_warnings=1"
-
-	myconf_gyp+=" -Dicu_use_data_file_flag=0"
-	myconf_gyp+=" -Dgenerate_character_data=0"
-
-	myconf_gyp+=" -Dmas_build=0"
-	myconf_gyp+=" -Dlibchromiumcontent_component=0"
-	myconf_gyp+=" -Dcomponent=static_library"
-	myconf_gyp+=" -Dlibrary=static_library"
-	myconf_gyp+=" -Icommon.gypi electron.gyp"
-
-	EGYP_CHROMIUM_COMMAND="${CHROMIUM_S}/build/gyp_chromium" \
-		egyp_chromium ${myconf_gyp} || die
-
-	mkdir -p "${compile_target}/lib/" || die
-	# Copy libv8 and snapshot files so the node binary can find them.
-	cp "${chromium_target}/libv8.so" "${compile_target}/lib/" || die
-	cp "${chromium_target}/natives_blob.bin" "${compile_target}" || die
-	cp "${chromium_target}/snapshot_blob.bin" "${compile_target}" || die
-
-	# Copy generated shim headers.
-	mkdir -p "${compile_target}/gen" || die
-	cp -r "${chromium_target}/gen/shim_headers" \
-		"${compile_target}/gen" || die
-
-	# Build the Node binary and pax-mark it.
-	eninja -C ${compile_target} nodebin
-	pax-mark m ${compile_target}/nodebin
-
-	# Finally, build Electron.
-	eninja -C ${compile_target} electron
-	pax-mark m ${compile_target}/electron
-
-	echo "v${PV}" > ${compile_target}/version
-}
-
-src_install() {
-	local install_dir="$(_get_install_dir)"
-	local install_suffix="$(_get_install_suffix)"
-	local LIBDIR="${ED}/usr/$(get_libdir)"
-
-	pushd out/R/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd > /dev/null || die
-
-	# Install Electron
-	insinto "${install_dir}"
-	exeinto "${install_dir}"
-	newexe out/R/nodebin node
-	doexe out/R/electron
-	doexe out/R/chromedriver
-	doexe out/R/mksnapshot
-	doins out/R/libv8.so
-	fperms +x "${install_dir}/libv8.so"
-	doins out/R/libnode.so
-	fperms +x "${install_dir}/libnode.so"
-	doins out/R/natives_blob.bin
-	doins out/R/snapshot_blob.bin
-	doins out/R/blink_image_resources_200_percent.pak
-	doins out/R/content_resources_200_percent.pak
-	doins out/R/content_shell.pak
-	doins out/R/pdf_viewer_resources.pak
-	doins out/R/ui_resources_200_percent.pak
-	doins out/R/views_resources_200_percent.pak
-	doins -r out/R/resources
-	doins -r out/R/locales
-	dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}"
-
-	doins out/R/version
-
-	# Install Node headers
-	HEADERS_ONLY=1 \
-		"${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die
-	# set up a symlink structure that npm expects..
-	dodir /usr/include/node/deps/{v8,uv}
-	dosym . /usr/include/node/src
-	for var in deps/{uv,v8}/include; do
-		dosym ../.. /usr/include/node/${var}
-	done
-
-	dodir "/usr/include/electron${install_suffix}"
-	mv "${ED}/usr/include/node" \
-	   "${ED}/usr/include/electron${install_suffix}/node" || die
-}
-
-pkg_postinst() {
-	electron-config update
-}
-
-pkg_postrm() {
-	electron-config update
-}
diff --git a/dev-util/electron/electron-2.0.17-r1.ebuild b/dev-util/electron/electron-2.0.17-r2.ebuild
index 1671cd90af50..e367ebc4c075 100644
--- a/dev-util/electron/electron-2.0.17-r1.ebuild
+++ b/dev-util/electron/electron-2.0.17-r2.ebuild
@@ -33,7 +33,7 @@ LIBCHROMIUMCONTENT_COMMIT="daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987"
 ASAR_VERSION="0.13.0"
 BROWSERIFY_VERSION="14.0.0"
 NINJA_VERSION="1.8.2"
-GENTOO_PATCHES_VERSION="b04011d68866c1159eb35b1a5260d519172cc05b"
+GENTOO_PATCHES_VERSION="26715595f4fe3658a73adb0d2fb338f62c79e492"
 
 PATCHES_P="gentoo-electron-patches-${GENTOO_PATCHES_VERSION}"
 CHROMIUM_P="chromium-${CHROMIUM_VERSION}"
@@ -79,7 +79,8 @@ 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 +system-ssl +tcmalloc"
+	+proprietary-codecs pulseaudio selinux +system-ffmpeg +system-libvpx
+	+system-ssl +tcmalloc"
 RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
 
 # Native Client binaries are compiled with different set of flags, bug #452066.
@@ -100,7 +101,7 @@ COMMON_DEPEND="
 	dev-libs/libxslt:=
 	dev-libs/nspr:=
 	>=dev-libs/nss-3.14.3:=
-	system-ssl? ( <dev-libs/openssl-1.1:0= )
+	system-ssl? ( <dev-libs/openssl-1.1:= )
 	>=dev-libs/re2-0.2016.05.01:=
 	gconf? ( >=gnome-base/gconf-2.24.0:= )
 	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
@@ -111,7 +112,9 @@ COMMON_DEPEND="
 	media-libs/libexif:=
 	media-libs/libjpeg-turbo:=
 	media-libs/libpng:=
-	>=media-libs/libvpx-1.7.0:=[postproc,svc]
+	system-libvpx? (
+		=media-libs/libvpx-1.7*:=[postproc,svc]
+	)
 	>=media-libs/openh264-1.6.0:=
 	pulseaudio? ( media-sound/pulseaudio:= )
 	system-ffmpeg? (
@@ -167,7 +170,7 @@ DEPEND="${COMMON_DEPEND}
 		dev-lang/yasm
 	)
 	dev-lang/perl
-	dev-util/gn
+	<dev-util/gn-0.1583
 	>=dev-util/gperf-3.0.3
 	>=dev-util/ninja-1.7.2
 	>=net-libs/nodejs-4.6.1
@@ -497,6 +500,10 @@ src_prepare() {
 	if ! use system-ffmpeg; then
 		keeplibs+=( third_party/ffmpeg third_party/opus )
 	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
 	if use tcmalloc; then
 		keeplibs+=( third_party/tcmalloc )
 	fi
@@ -555,6 +562,9 @@ src_configure() {
 	if use system-ffmpeg; then
 		gn_system_libraries+=( libvpx ffmpeg opus )
 	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
 	build/linux/unbundle/replace_gn_files.py \
 		--system-libraries ${gn_system_libraries[@]} || die
 
diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml
index c291dd2197e5..def1c51b38bc 100644
--- a/dev-util/electron/metadata.xml
+++ b/dev-util/electron/metadata.xml
@@ -12,11 +12,11 @@
 	<longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription>
 	<use>
 		<flag name="gconf">Use gnome-base/gconf</flag>
-		<flag name="gtk3">Use GTK+3 instead of GTK+2</flag>
 		<flag name="lto">Build with link time optimization enabled</flag>
 		<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-libvpx">Use system libvpx 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>
diff --git a/dev-util/ftjam/Manifest b/dev-util/ftjam/Manifest
index 7032bd0a3a11..0d205c93e8bd 100644
--- a/dev-util/ftjam/Manifest
+++ b/dev-util/ftjam/Manifest
@@ -4,5 +4,5 @@ AUX ftjam-2.5.3-i-hate-yacc.patch 1756 BLAKE2B 26aefb56b2125b765eee2b6dc9a55fd0d
 AUX ftjam-2.5.3-nostrip.patch 780 BLAKE2B 7299ec77c1ed3ccbc87669850ee54d6d61534983793f076e56d95ea83e9c8617c80ec08d84bad24bbf45f11b6e0275167f4454223366ef041a81a4360d1b1d09 SHA512 6d8b399f8a4047c34b1315a230cf47e8ab76c7fbad9089fd4c3c18b2ba7fbb2f3ecbcb2d3a1075f0d95d36e547490de345167ba55fed75221b2b8162796ccc25
 DIST ftjam-2.5.3rc2.tar.bz2 215963 BLAKE2B 77e92dba10dd2b99b53bea87dc47c7f1d5da2a39789cc938d8141debf3ba5d6e25ab4092e1a3b69266b3353866c76e72706d13d3751a321e42bc5aafdf87e8cd SHA512 18a40c6741493adf293f032d9c7a9ab419402505a37993fa859e36e7a1655ec9d3d07662e6ee242487b143aa7e0f6c46f253bc7e23c3162c7381aaced001bfcd
 EBUILD ftjam-2.5.3_rc2-r1.ebuild 1120 BLAKE2B 9e492d187622a734ad37d59613ba99bfcd063d7625a636eb11b56bb2063919c477cc556f6fa00af63e2244cdaeb8e4bdbf60374801e20c3bf24eeaa6c9bdbd26 SHA512 fbd5d795bded29338f0bac374717c20a7153436fff55c50164eab245c4fa518c52173321c633506501b4570da1531e06f63b78a9b7b9f08028fe0b0bcaba75c9
-EBUILD ftjam-2.5.3_rc2-r2.ebuild 821 BLAKE2B fe208ca4a0a27b8ebf4197813f61c9803635fa9fbbcccf537b112c6ef7680b96113ddf328afa35ed21ae4d485c500f8eb7dd50a2515e1ab50ba402d725c99235 SHA512 02790a77d3946b9d19f5b086f9bb4677dde7344a6d6a0509e9ac4512dae60a8a7a85b33525eb38cf6ace5df48aaa0464a34f8363882c023e44d1db1b71b68855
+EBUILD ftjam-2.5.3_rc2-r2.ebuild 820 BLAKE2B 827b71923e06e10a237dddcef36c6b32b0b825045b0cfd2b15c005b652b780b00e76d72bf806033a5936bb41b8148e5a48d294fa249800a9f2c5d788ca066e3d SHA512 002d9e21ecc3413d75fd227203da2553852202659a9846db6b60ba09478330b22022fbaead7ff0e3ce8efd7ea7139acd73f89b500c9d9360b550f058237d4b22
 MISC metadata.xml 243 BLAKE2B 08246d6c76c2720c2feb89cba6d9c817718a9910f19ae5b0e90da4c8bfe7fb25616e02b46c860fe81b93ce71a78c341093062cfcfddd449bdaba1aa4497fd9ab SHA512 2e71aa0db138811dd97cc5d3e5fcadc54dd877ee5adb9d8988c30680e55e764e1391b0628e8a298fb2679bee30061d7a0f9a4678d29ce248183d5b9a25f8a343
diff --git a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
index 201c0927571c..80f5119ad4c6 100644
--- a/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
+++ b/dev-util/ftjam/ftjam-2.5.3_rc2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://david.freetype.org/jam/ftjam-${MY_PV}.tar.bz2"
 
 LICENSE="perforce GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm64 hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 BDEPEND="sys-devel/bison"
 
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 02a2a273bbb5..82e08e0cef0d 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -1,5 +1,7 @@
 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.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
+DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 EBUILD gdbus-codegen-2.58.3.ebuild 2122 BLAKE2B 7a07be31d76197c0d4472e5e36a141944df7a6f0aa28bef8e41e8324821eec7ec8b4279be123532ffbe4b46b65f7fbfbde1638c623ba10fe535739c5bc64ef60 SHA512 3d3b02b4fdbcd3000e7778a37bc6d1c647fbb9dba7a4b097b4d921472af379bea326aff1f3c0bf21711d9cd9c9cf5e9cba1f60a4a3c2840ba38eaeb3ee494ac1
+EBUILD gdbus-codegen-2.60.6.ebuild 2054 BLAKE2B 98c1af744514e90c1d868cca51bb8bfee22f0b42075836614ef148ed15a0ea83da32c9f1b98cbd252e094e1f59156c5e13411f446af19ff9daa5ef52be5723c3 SHA512 afa27bc27c59b4e355f1c7c8aef4045b68c7ef26b47cceec89366cde559db3771c0844d37de5306843b6d70eb8202bea520278ecab46f5e31e1c9f9580d3e821
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
new file mode 100644
index 000000000000..04ecd71de65e
--- /dev/null
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.60.6.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GNOME_ORG_MODULE="glib"
+PYTHON_COMPAT=( python{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 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+S="${WORKDIR}/glib-${PV}/gio/gdbus-2.0/codegen"
+
+python_prepare_all() {
+	PATCHES=(
+		"${FILESDIR}/${PN}-2.56.1-sitedir.patch"
+	)
+	distutils-r1_python_prepare_all
+
+	sed -e 's:@PYTHON@:python:' gdbus-codegen.in > gdbus-codegen || die
+	sed -e "s:@VERSION@:${PV}:" config.py.in > config.py || die
+	cp "${FILESDIR}/setup.py-2.32.4" setup.py || die "cp failed"
+	sed -e "s/@PV@/${PV}/" -i setup.py || die "sed setup.py failed"
+}
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/glib-utils)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	do_xsltproc_command "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.xml" "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
+
+src_test() {
+	einfo "Skipping tests. This package is tested by dev-libs/glib"
+	einfo "when merged with FEATURES=test"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all # no-op, but prevents QA warning
+	doman "${WORKDIR}/glib-${PV}/docs/reference/gio/gdbus-codegen.1"
+}
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index d51cc8f3482c..b2cd91790d84 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -1,4 +1,6 @@
 AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c524d3c7953d722b3b03d57ad68297fee6757330c1a2d90f36bcfe52d1d9ef4d95b81eeb19109bc8957f671ac40d31573 SHA512 cc9aec06f6acdfdf538de7043f9f753768e0e4c26fa9eef7e52b4e42aa6fd3836185c18ffd51abfc2aa3e6f5b2472e68914112230d2b8856e8a3c61e9d865ecf
 DIST glade-3.20.4.tar.xz 3534860 BLAKE2B f502e863f9acbd6580c043ff82dffb84ea8fdb833c0b6fdb8bbeeb7a7056a79416f1140472d23e0cdb14ed3bd06e17fca93ea663af690451001909aa4abfe478 SHA512 3da7781f74fa80e21336e49b9b36cf73b88ec9cf6f66a5c0e5d48ebc3382d87f5eb981b924704f04dfa4931e5691928a20c7cc73cca5b5f3a32e2348d6b87802
+DIST glade-3.22.1.tar.xz 3592952 BLAKE2B 53f769198a093ff5d4dc98bb4ea98c6e5195933caf24247a99db980312ae3398fca3abbd640d08c02e8fb5f8647ee3e4b18e65073b1500e9017ee0586993a331 SHA512 e1bdc49b89bc5010c0abf6357dbae05c921182655b2ee5a4b161af6adfd596cfbcd495c9851ba956abbf3d6156616a6c0e94640cd72cee11551ca388674ac908
 EBUILD glade-3.20.4.ebuild 2386 BLAKE2B 8f4d42898dfe18c870f0ea90442c0ab98d43ea75299ce210a80b7527157a0f8e1bda0527c22f51c4832f6c42b6539e5294e112f822a2a94b156ac089313384fe SHA512 3cccd8c8e69e26ea881565673ed6883a68f00d11d5aa72386ca123f0c982ecac4af509359c1512517457b54c52aa5b58caac09116b6fc1c7592833ce34b348b9
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
+EBUILD glade-3.22.1.ebuild 2334 BLAKE2B e7309513a932bbcbbb039e45e9afca7cd15871132dc73ad8aa006b88d699b3d7830641c5b6c535968cfe08eeec6c542182e278be6ca1e001c8c1eff96ee91114 SHA512 ec1856591b08f2bf06840e0bdcccfe745097476f78c5b5d740d97651997c41714357b6a6e1acbb53c3618102938af4581dc6ac65f92d842f00e3d102628bf76d
+MISC metadata.xml 358 BLAKE2B 33f3b46ab877b311931205095fb2b357fe7fe2da8820944d32e8a16f2dbcf99033f95a17f4cefa4aa6d0f731c72d0f65683a8cc3b947ebf09d084f92e796f887 SHA512 8840ebde12f26a2caf856e75f3f706e3c9a7a7a771d0deeae99ca6b16f4bbeaf119bae7776a8a0bef8b7422f52ebd6498a8b5e862af4548886249386dcb44480
diff --git a/dev-util/glade/glade-3.22.1.ebuild b/dev-util/glade/glade-3.22.1.ebuild
new file mode 100644
index 000000000000..0106822b04d0
--- /dev/null
+++ b/dev-util/glade/glade-3.22.1.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1 virtualx
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="https://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3.10/6" # subslot = suffix of libgladeui-2.so
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+
+IUSE="debug +introspection python webkit"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-libs/atk[introspection?]
+	>=dev-libs/glib-2.53.2:2
+	>=dev-libs/libxml2-2.4.0:2
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2[introspection?]
+	>=x11-libs/gtk+-3.20.0:3[introspection?]
+	x11-libs/pango[introspection?]
+	introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] )
+	webkit? ( >=net-libs/webkit-gtk-2.12.0:4 )
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools
+	dev-libs/libxslt
+	>=dev-util/gtk-doc-am-1.13
+	>=dev-util/intltool-0.41.0
+	dev-util/itstool
+	virtual/pkgconfig
+
+	dev-libs/gobject-introspection-common
+	gnome-base/gnome-common
+"
+# eautoreconf requires:
+#	dev-libs/gobject-introspection-common
+#	gnome-base/gnome-common
+
+RESTRICT="test" # https://gitlab.gnome.org/GNOME/glade/issues/333
+
+PATCHES=(
+	# To avoid file collison with other slots, rename help module.
+	# Prevent the UI from loading glade:3's gladeui devhelp documentation.
+	"${FILESDIR}"/${PN}-3.14.1-doc-version.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--enable-gladeui \
+		--enable-libtool-lock \
+		$(usex debug --enable-debug ' ') \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		$(use_enable webkit webkit2gtk)
+}
+
+src_test() {
+	virtx emake check
+}
+
+src_install() {
+	# modify name in .devhelp2 file to avoid shadowing with glade:3 docs
+	sed -e 's:name="gladeui":name="gladeui-2":' \
+		-i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
+	gnome2_src_install
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	if ! has_version dev-util/devhelp ; then
+		elog "You may want to install dev-util/devhelp for integration API"
+		elog "documentation support."
+	fi
+}
diff --git a/dev-util/glade/metadata.xml b/dev-util/glade/metadata.xml
index 39980802b1da..64de49b2607a 100644
--- a/dev-util/glade/metadata.xml
+++ b/dev-util/glade/metadata.xml
@@ -5,4 +5,7 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
+<use>
+	<flag name="webkit">Build catalog support for <pkg>net-libs/webkit-gtk</pkg>:4 widgets.</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index 0d3cd8ca7bc2..854b144fc104 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -1,3 +1,5 @@
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
+DIST glib-2.60.6.tar.xz 4589516 BLAKE2B 33546aea288dee4aa8c04bda610a65ce75705c0e2b98284e787d42576c61eccbd33788084b092e030fe26c50ff08e398782227d1f2ac39ef9754b91af1ab1aa1 SHA512 2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9
 EBUILD glib-utils-2.58.3.ebuild 2407 BLAKE2B df14fadeb6dece6527b3c6fcc9a851dc662b2ff59842c83c3ca57007575575e80176bb42b6d6e0f02e9dc4598c7c0605c5bc0855427bb48dfd8417b9c2847582 SHA512 4d57615eee2d86c75b33f4c8be6a8076ca0be894dea5e5e3f2858346b87ad4c2545fc9c639f8f8f68c4816bf147ec73e1c38a243588c9a4cf72c5cc3db0fc880
+EBUILD glib-utils-2.60.6.ebuild 2429 BLAKE2B 43565d10ebccf632edfb09b0ede6aef02b3f4330d12d415c72b54e88d11d9f2e524c1bc4c92b0bb9565700159f477baebfd8f15c10f3d5f1f849f68fb0f449b7 SHA512 d75f3ac2ca4dfe56482fe602b47c9eb300500d31563f05d74c8fa5c8e5724e6d96e5ab3232785cdf3940ccaa01a191ee79fdebc8edae10c79f2ad00d46f06339
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.60.6.ebuild b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
new file mode 100644
index 000000000000..d181aae83011
--- /dev/null
+++ b/dev-util/glib-utils/glib-utils-2.60.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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 ~riscv ~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}"
+BDEPEND="
+	dev-libs/libxslt
+	app-text/docbook-xsl-stylesheets
+"
+
+src_configure() { :; }
+
+do_xsltproc_command() {
+	# Taken from meson.build for manual manpage building - keep in sync (also copied to dev-util/gdbus-codegen)
+	xsltproc \
+		--nonet \
+		--stringparam man.output.quietly 1 \
+		--stringparam funcsynopsis.style ansi \
+		--stringparam man.th.extra1.suppress 1 \
+		--stringparam man.authors.section.enabled 0 \
+		--stringparam man.copyright.section.enabled 0 \
+		-o "${2}" \
+		http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
+		"${1}" || die "manpage generation failed"
+}
+
+src_compile() {
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-genmarshal.in > gobject/glib-genmarshal || die
+	sed -e "s:@VERSION@:${PV}:g;s:@PYTHON@:python:g" gobject/glib-mkenums.in > gobject/glib-mkenums || die
+	sed -e "s:@GLIB_VERSION@:${PV}:g;s:@PYTHON@:python:g" glib/gtester-report.in > glib/gtester-report || die
+	do_xsltproc_command docs/reference/gobject/glib-genmarshal.xml docs/reference/gobject/glib-genmarshal.1
+	do_xsltproc_command docs/reference/gobject/glib-mkenums.xml docs/reference/gobject/glib-mkenums.1
+	do_xsltproc_command docs/reference/glib/gtester-report.xml docs/reference/glib/gtester-report.1
+}
+
+src_install() {
+	python_fix_shebang gobject/glib-genmarshal
+	python_fix_shebang gobject/glib-mkenums
+	python_fix_shebang glib/gtester-report
+	exeinto /usr/bin
+	doexe gobject/glib-genmarshal
+	doexe gobject/glib-mkenums
+	doexe glib/gtester-report
+	doman docs/reference/gobject/glib-genmarshal.1
+	doman docs/reference/gobject/glib-mkenums.1
+	doman docs/reference/glib/gtester-report.1
+}
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index a305b7500c55..85a26a83a39d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,9 +1,6 @@
-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 496 BLAKE2B a818291aca9b006b09a27db33ea18982c6671d65e9a77e7b33d9d5e245d95af169bad49026a7874d5b181a625d7a2d1d8c8604d12d937f7ef953e346a9c48be7 SHA512 00f62ef18c3505d94def1d251e2a86f6eca157826cfcc95fce135b98badeb7fbfcdef9b13827084bce0960b21c4c9d0cddfe73e0395de304d8c0bee078967dfd
 EBUILD glslang-7.11.3114_pre20190415-r1.ebuild 556 BLAKE2B 77fea586cb6202d0c9ae2edbd398bfec0f5b8aff7db0bf405e8954be09cdc82cf393a1d0da6ecd67dd7c7e4448c89b6bf9e6504d85561f604336d750e2d0919a SHA512 c0994b38b8984c98ded133636e2c2d3d0502e7581f799b39e11487aeb52f26b7cdf57cb0a2923135493b81eafd21f2c7bdf8bbc32a164486318c3a72fd8e06f1
-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 415 BLAKE2B 7c9fbc60b1bcdab2c19f01abc3dd83000cab76cf25509bb3efc24a1fd51b26b9f78fba4b03d8d5012b2f63217b10da174e14cdc452579dcd9fbc2775fb2685ce SHA512 e3ddff0a117d4f75b493bf4a0fc0c5c8dfdf43a9b89f53dc292199629ac871a6b234f6f6b52d0812bf2fa05f596fc01f6d89ea828c626333159ea90a0fb924db
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-7.10.2984.ebuild b/dev-util/glslang/glslang-7.10.2984.ebuild
deleted file mode 100644
index 6d4c55f1d566..000000000000
--- a/dev-util/glslang/glslang-7.10.2984.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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="7.10.2984"
-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/glslang/glslang-7.11.3114_pre20190415.ebuild b/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild
deleted file mode 100644
index 93f0e5a48055..000000000000
--- a/dev-util/glslang/glslang-7.11.3114_pre20190415.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 0e996d80bb92..751943a415c9 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,9 +1,5 @@
-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 952 BLAKE2B 4233d8df548b6223fbabd12051fec2eb069e22e67eba583b143bd4ee1afddbfb521b3c6e7f1e5eb0574837a7e9606fcf591bad03edb449de2ac733beda93d7b8 SHA512 cc5c5783d8f50a7cd6010f51452fce072534c45dc36e72f9e27a8eab5b6ac5cabd172f26f9edde014e76e9c0f393396196a75683553fbb97c51e9bf3bd78d70b
-EBUILD gtk-update-icon-cache-3.24.7.ebuild 929 BLAKE2B a2e06e40a204b23ba64c05971f0bcea7c40f118ae3ef0ed33b4bd58aab7308cc28e84c93281076eaa5471cb4eda3197656966fed436f8f0e857ebb03cbc90f3c SHA512 343d66080958ca27964b3f6a2795865fb8e080535293182f53e967f91dac4164bf9af9b65463cb79d85402ae9949f417bcdb1269ebac22967be813b9424fea07
 EBUILD gtk-update-icon-cache-3.24.8.ebuild 919 BLAKE2B fe57fbaeb1e1743ffaa96d1b00a47fed3e81bd2998f5ca6e1fabdf8e328d1e317c720d89781d753a6532c79d614a7708a0607f85f9c5554337b46ae0a26b2342 SHA512 bb3f02313debac171f7912fd979045c9560fc507690dede1a773b249e1ff6fa8cde887a3881deadfa7bb15c9d2c7bc14a36d8e65261d640b091f33f5d3d667ee
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
deleted file mode 100644
index 8c43e5d5b902..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="GTK update icon cache"
-HOMEPAGE="https://www.gtk.org/ https://github.com/EvaSDK/gtk-update-icon-cache"
-SRC_URI="https://dev.gentoo.org/~leio/distfiles/${PN}/${P}.tar.xz"
-
-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"
-
-# man page was previously installed by gtk+:3 ebuild
-RDEPEND="
-	>=dev-libs/glib-2.49.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}
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_configure() {
-	# man pages are shipped in tarball
-	gnome2_src_configure --disable-man
-}
-
-src_install() {
-	gnome2_src_install
-	doman docs/${PN}.1
-}
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild
deleted file mode 100644
index 8187209413d5..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# 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/kernelshark/Manifest b/dev-util/kernelshark/Manifest
new file mode 100644
index 000000000000..65db3afc6528
--- /dev/null
+++ b/dev-util/kernelshark/Manifest
@@ -0,0 +1,6 @@
+AUX kernelshark-1.0-build.patch 1288 BLAKE2B 4d79cb34c04186edf9a4787463eede7971177ccfa64988e931345ce66b86003482f1cdb6bb2609f3a7696a18f644204d61b85ad10988347c0db6ee23335ef873 SHA512 f257b73da9494297a44363a5126528dd03e018050464d12b414c4eb0a157da550318a430f40df17db0cf4e0b49feb904c071be42685c3cf64bf455ff9c2d0779
+AUX kernelshark-1.0-desktop-version.patch 313 BLAKE2B 64663bb60499910061328169e726f75e10f843c2dcf036f31954307ffeae863bedaca259ef8d6f1bb653f14c45ffd4a83d2687ed053263526001d8aa175ecaec SHA512 33f6c02a5c8328af71f12a452fa3e5efba1300977397a1382b1e4c04cc5e49fc6c50f95555a294b57ede4616e04bc10c7b8849010ca2a63cc8c1eb266fdb13af
+DIST kernelshark-1.0.tar.gz 4238163 BLAKE2B edae4bcaf646a8c430e64205cd5d137d8df7eb839075b4bb5da459852e1bb887eaa98de51afd1884cfd27833d3513fc26995fba6964220eb8b95a317d3e4e057 SHA512 ff9f0846ba7105813742bb56887870eff8af4f525864ab75d37dcb2dd6c2222fbd500fd08140d605c3f0021d88991c114e0ffeb7da9ada979bdd78defaa1c266
+EBUILD kernelshark-1.0.ebuild 1310 BLAKE2B 881d75f265abb22d9c7e8355e251031b8e3036e8c05e8a0c08a1898bbee895f94a1866f7fa4a176b793266b828c0c4f501199b1e1cee424ede90fe3638af2c3e SHA512 bd8295660c90ab229596eadfd548e4f3410e0c0d0de2360744cb83cb810d1efbffebf822908cfc00b7c1956376088da9248401fe0c442ba7577f98310ba4439a
+EBUILD kernelshark-9999.ebuild 1310 BLAKE2B 881d75f265abb22d9c7e8355e251031b8e3036e8c05e8a0c08a1898bbee895f94a1866f7fa4a176b793266b828c0c4f501199b1e1cee424ede90fe3638af2c3e SHA512 bd8295660c90ab229596eadfd548e4f3410e0c0d0de2360744cb83cb810d1efbffebf822908cfc00b7c1956376088da9248401fe0c442ba7577f98310ba4439a
+MISC metadata.xml 409 BLAKE2B a224422be52a292645aeafbd692638a1f07b1cce88debff7f3a25b9cccd02674ac1e448cb9ac329be6b8f3ff869c0aeb2d205d0930d9d5828eef88dbd295204e SHA512 2e9b3fb0033679637107c2c317fd98c0bd06ec7f8afc3fd2b7b3feef4a7188e818f3f82c6dfa704770b5c71b823e611b3d1445f22bb27ee42c2fd41c368f1708
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-build.patch b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
new file mode 100644
index 000000000000..411d4235a215
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.0-build.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/kernel-shark/CMakeLists.txt
+index 45c6f23..e2394d9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,11 +63,11 @@ set(KS_LOGO_LABEL  KS_logo_horizontal.svg)
+ 
+ set(CMAKE_INSTALL_RPATH "${_INSTALL_PREFIX}/lib/${KS_APP_NAME}/")
+ 
+-if (CMAKE_BUILD_TYPE MATCHES Package)
++if (NOT CMAKE_BUILD_TYPE MATCHES Package)
+ 
+     set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ 
+-else (CMAKE_BUILD_TYPE MATCHES Package)
++else (CMAKE_BUILD_TYPE MATCHES Gentoo)
+ 
+     set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ 
+diff --git a/build/FindTraceCmd.cmake b/kernel-shark/build/FindTraceCmd.cmake
+index 2da4eee..c454ce6 100644
+--- a/build/FindTraceCmd.cmake
++++ b/build/FindTraceCmd.cmake
+@@ -40,8 +40,8 @@ find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.a
+ # search was successful "find_path" will do nothing this time.
+ find_program(TRACECMD_EXECUTABLE   NAMES  trace-cmd)
+ find_path(TRACECMD_INCLUDE_DIR  NAMES  trace-cmd/trace-cmd.h)
+-find_library(TRACECMD_LIBRARY   NAMES  trace-cmd/libtracecmd.so)
+-find_library(TRACEEVENT_LIBRARY NAMES  traceevent/libtraceevent.so)
++find_library(TRACECMD_LIBRARY   NAMES  libtracecmd.so)
++find_library(TRACEEVENT_LIBRARY NAMES  libtraceevent.so)
+ 
+ IF (TRACECMD_INCLUDE_DIR AND TRACECMD_LIBRARY AND TRACECMD_EXECUTABLE)
+ 
diff --git a/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
new file mode 100644
index 000000000000..2b9b444958dc
--- /dev/null
+++ b/dev-util/kernelshark/files/kernelshark-1.0-desktop-version.patch
@@ -0,0 +1,11 @@
+diff --git a/kernel-shark/build/ks.desktop.cmake b/kernel-shark/build/ks.desktop.cmake
+index 2b02c0d..34c02ea 100644
+--- a/build/ks.desktop.cmake
++++ b/build/ks.desktop.cmake
+@@ -1,5 +1,5 @@
+ [Desktop Entry]
+-Version=@KS_VERSION_STRING@
++Version=1.1
+ Type=Application
+ Name=Kernel Shark
+ GenericName=Kernel Shark
diff --git a/dev-util/kernelshark/kernelshark-1.0.ebuild b/dev-util/kernelshark/kernelshark-1.0.ebuild
new file mode 100644
index 000000000000..44d6447fb0ee
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-1.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake-utils
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="http://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
+
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND=">=dev-util/trace-cmd-2.8.3:=
+	dev-libs/json-c:=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:=
+	dev-qt/qtcore:5=
+	dev-qt/qtwidgets:5=
+	dev-qt/qtnetwork:5=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-util/cmake-2.8.11
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/kernelshark-1.0-build.patch"
+	"${FILESDIR}/kernelshark-1.0-desktop-version.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
+		-D_DOXYGEN_DOC="$(usex doc)"
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake-utils_src_configure
+}
diff --git a/dev-util/kernelshark/kernelshark-9999.ebuild b/dev-util/kernelshark/kernelshark-9999.ebuild
new file mode 100644
index 000000000000..44d6447fb0ee
--- /dev/null
+++ b/dev-util/kernelshark/kernelshark-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic cmake-utils
+
+DESCRIPTION="Graphical reader for trace-cmd output"
+HOMEPAGE="http://kernelshark.org/"
+
+if [[ ${PV} =~ [9]{4,} ]]; then
+	EGIT_REPO_URI="https://github.com/rostedt/trace-cmd.git"
+	inherit git-r3
+	S="${WORKDIR}/${P}/kernel-shark"
+
+else
+	MY_P="${PN}-v${PV}"
+	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/trace-cmd-${MY_P}/kernel-shark"
+
+fi
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+IUSE="custom-optimization doc"
+
+DEPEND=">=dev-util/trace-cmd-2.8.3:=
+	dev-libs/json-c:=
+	>=media-libs/freeglut-3.0.0:=
+	x11-libs/libXmu:=
+	x11-libs/libXi:=
+	dev-qt/qtcore:5=
+	dev-qt/qtwidgets:5=
+	dev-qt/qtnetwork:5=
+"
+RDEPEND="${DEPEND}"
+BDEPEND=">=dev-util/cmake-2.8.11
+	doc? (
+		media-gfx/graphviz
+		app-doc/doxygen
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/kernelshark-1.0-build.patch"
+	"${FILESDIR}/kernelshark-1.0-desktop-version.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-D_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DTRACECMD_INCLUDE_DIR="${EPREFIX}/usr/include/trace-cmd"
+		-D_DOXYGEN_DOC="$(usex doc)"
+	)
+	use custom-optimization || replace-flags -O? -O3
+	cmake-utils_src_configure
+}
diff --git a/dev-util/kernelshark/metadata.xml b/dev-util/kernelshark/metadata.xml
new file mode 100644
index 000000000000..8de31ac92c9a
--- /dev/null
+++ b/dev-util/kernelshark/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
+  <use>
+    <flag name="custom-optimization">Build with user-specified compiler optimizations
+      (-Os, -O0, -O1, -O2, -O3) from CFLAGS</flag>
+  </use>
+</pkgmetadata>
diff --git a/dev-util/lcov/Manifest b/dev-util/lcov/Manifest
index 487edf2e1033..1333b10d8f55 100644
--- a/dev-util/lcov/Manifest
+++ b/dev-util/lcov/Manifest
@@ -4,9 +4,9 @@ DIST lcov-1.11.tar.gz 155906 BLAKE2B eb31119d9fa5b83a6671125c1899dbd10d26eecb0fd
 DIST lcov-1.13.tar.gz 156709 BLAKE2B d0f2635a6e6c29d29bd15d15c7f6c22ff80052b12deb4e88c77a9331d6d151aa2718ad4e4af1aa192757c1fc3189cc0d1688fc5086e5552c74078206cf27e1df SHA512 54033c0f99dbf7b332fcd70730df8672713ffc36c010809353dfd83a73fcc4f504b6a68e3b5010002d6992da5fa940a7d5f4e03dc3fe6930ab713a7b980dff9e
 DIST lcov-1.14.tar.gz 177359 BLAKE2B 17069d38bf607217b8ff59f573fc02badf56afe65965d2a359a14835af57e2b6c512bff06fac3dbf4e94cd35701216edb8026d333b2baa8772d0ef551de37af1 SHA512 2d60c3a63e300dda96171c432fe304840acc76bf6275f60934d08e80765f9f85671e8b77bfed758fc45842a80156586dc0d67c42c9f215f4f163840fc5cf65bc
 DIST lcov-1.9.tar.gz 140035 BLAKE2B 5d432bcef695c0016f7d4bea57cd3c0caf8fda54eb4acac0f957c93bde714dc4dd221c3a9e98cff4a329fced75e658fd943d8db0c0fc4d32da15af158434287d SHA512 518f068d5eb4a805985863e7b755ae16b1b2ebb9e42cc57c5cda20a60f22e170c1e2957692086e5eeabe12ddbcf39132494aa2ea7ce33411e8abeddc759852ee
-EBUILD lcov-1.11.ebuild 570 BLAKE2B cb9e8c6a2bb8403b53b209d1b3de4f5976edc5db2839726d62b90d3774c6206b40704a91989a2ec8d6ca92472672120e07c0715a856793bad9c32ced47ab1756 SHA512 b53f801cb6260d5aff9c09326bbc6579b3c9e41ecddd6f8dd86abb662d387d585b40077693f9f8852b845ea9a57cfdde073e940dd5ca5a612cd31bb5e3806d03
+EBUILD lcov-1.11.ebuild 580 BLAKE2B 0ed1313c916479ad65f78326e2eb32a7380c700359717faeffe4c74a3f0c46c26cf785b0e17409d1df1200e9420fe0a50b106bb98adc748b60fc892bd9011eb0 SHA512 bc53dbc22fe8cc80b019434d961b17f2b56b60b4f3257dff2eef196991886a27cee898f666354e6bdbe183deff1fa127966be3fb8a60c803b1b6fdc40c8dda48
 EBUILD lcov-1.13-r2.ebuild 875 BLAKE2B 498056b0e0cc168cd73b11215677eb133e275b6c43f4f7a2764cd61b404fbfdc7fae118c85a124d90439cdd1bf6ac2f417d7e06a8e417a610567e8e8e9fe1402 SHA512 0d41f7863cff19f2f2502637091a0e8c387712bac88a6a5d9a43e6c952f2860e4a5f6e81b1e8f4f56368ad9bb66f2b020538455335fc5b22622961ccf733b010
 EBUILD lcov-1.14.ebuild 825 BLAKE2B ad1c93c3934a96d2770094f84f5c80b6221e276da61a4f31051c646d04b4d91cca47ced68b2647ae9398cb8aa3717c3bdc65855b7ee09c31cc09912a15c126bd SHA512 28b0849fcd0af2961024d601f4bdeea2ca6a3810e2e574467c48185a2c9aa8064df905e1ca01625f02162fdcba206a409126265bd85e51e2a85ed3f5f5a423a1
-EBUILD lcov-1.9-r1.ebuild 591 BLAKE2B 33ef4b968b902c0b9433949ebda11cf354ffedb796d418d8e85d540082e9e7b9331eaab53de3408bf4e38ec00770bcbc16e675abc594101a8768b68e5d41dacd SHA512 43ceb5cd12d882924ad03decc31afbc0e8c620fd2cc04483ef013abbad658f7bf8682d1118761b60ae81a32f20a5f339258edfa7c7c9ffb1fb4aaf9356efac18
+EBUILD lcov-1.9-r1.ebuild 594 BLAKE2B 8666da2ce96f3246753bce1ac0c1a93d41703ef9f2a670e5bdac20b5fcd56ff70a54e64c50e6045824714853eece9d6a7d26592664b48859985a3a1eefee450e SHA512 f6d824e2fae383bd0acdb63f14887a40d28fd3175f1520c58fd9f015779a56a2875858c4bdd11cd9f112017aa96eace796c242bbfdb41835f5ac07d52628f246
 EBUILD lcov-9999.ebuild 862 BLAKE2B 9dc955663b19754562a0d83dc061a73be71d4135f9fe6faf1517ba12af3008207b5a443128071c6fedd4db9d3d2af835e10ff3d6dac879a53982b5addbb6bd1f SHA512 a4997018d74ee18e3d9aa9a4ce2b17e5e2012f111021497835a5667f51e98c4d481e37b2d834a8c4b7abfb94b5bcbf120160a2fa9f0c92748c3dc98e3da01bdf
 MISC metadata.xml 545 BLAKE2B 04986c839db27a72dd78580642dc394723107ae8bd5790fcd0017db1f3324faf27ce0bfca537504a882ae8fdd12b8c451bcd8014d078309a5dad9b01c3457753 SHA512 e5753b7dc704699d98540483ec24632095c63cc8eb39cd8b20d91420ea96f79f4de95787bc7e7547fe2b1078d0c1f694e52a69065e1bccd4e18a1e86a3999289
diff --git a/dev-util/lcov/lcov-1.11.ebuild b/dev-util/lcov/lcov-1.11.ebuild
index cb9b990b3e67..2914b905e0b4 100644
--- a/dev-util/lcov/lcov-1.11.ebuild
+++ b/dev-util/lcov/lcov-1.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 ~s390 ~sh sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/lcov/lcov-1.9-r1.ebuild b/dev-util/lcov/lcov-1.9-r1.ebuild
index b1a3a8e89060..b8e716831cd0 100644
--- a/dev-util/lcov/lcov-1.9-r1.ebuild
+++ b/dev-util/lcov/lcov-1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/ltp/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86 ~x86-linux ~x64-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 851d7221fbfe..17be11f2bb28 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,9 +1,12 @@
 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 lldb-8.0.1.src.tar.xz 19586288 BLAKE2B afb20a8303dcbdaf76ef1d78aa3165f87713f1c16121905d7a5f71e770ceafdff40d9d19e0a983d9290da2d4eb3acd0987d50607bea17efdb7dc0127d7f5cf8a SHA512 eb031985ad4d08226ec47a90fe32c1e6d070948971ca5235fd431cf7d5b7ea20f5d5131237bf83a6419773d18c339590bf9672e7b4f884304497e63c1030988f
 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
+DIST llvm-8.0.1.src.tar.xz 30477608 BLAKE2B 4319c837b36111401e3b0f9659b8d875c89463bcc7816df1aefe1e3ff989860bbaa92504718f8e15416cfd9f3491c13777cd5cb661877b237b342b0e515b93f5 SHA512 82e120be5cabdfd5111aebbea68a663fe229c8861d73802d6ab09a3bf48f60de333e07e61f8fb61beaa14ac2bea24fcd74fa6f761acaf62469f536b79fcb1e16
+EBUILD lldb-10.0.0.9999.ebuild 2680 BLAKE2B 8e16fd098feb205ad2b27e88d2f88263b6b532791f48cf6c4ececcccd09f1d0d591c167f56f0c0cd3dac1f355f05da699e966eb43f0f5288b1366e6c9613a122 SHA512 2e35c35d7e2fbb18ed8e607f3b5da09e678246f3459e3423f1997fe7419f87c8bf127dd75a256bfbc22a22f4e85fddaee5a1247ad90b72aa2003c2fe4d81de89
 EBUILD lldb-7.1.0.ebuild 3088 BLAKE2B 246fc131cd7b629ffe3e541c8f108f3f0ef63b28e68c887c503b2bf55987ccd4ec8dfc4a13763ff42a0a237487d2aee58cba7a72471d2f55359c0514e9f24cdf SHA512 52de6ecdfe24cea6f24f78f7d279ccce295189209b1d99a8bf6fb656f7f2a4c8284a03745f0bdf18bb061bd7eea82afe20d93b926e819b2bbd2f64f89e636db0
 EBUILD lldb-8.0.0.ebuild 3011 BLAKE2B c4d28d2f72f001ccfeb108732d073e6c8c52db8dcf7988f4ac282981bc7317c723cd6e4afa695fb072cb321b976a05869f03a8a9062bb06f80e4ebac11bc892a SHA512 86fbe8fb7402865ffb8410751325bcd71fa0d830c562855042fb2029da24026879df77b2f974139a2e3b49bf539a1ab789becaa8342b94f70038f5c60be92e4e
-EBUILD lldb-8.0.9999.ebuild 2979 BLAKE2B 1d326097cba41690f29b2a709331915589030836d858dc61c4df834225742b56c9dbff3f253fdb5b5e3d50c124bab36358eeb0525769944ad8bbdcfe5bc408db SHA512 7ddd2db9997696bc32eb5d906cf409ac34c25f1b970a9c75e8e3e6a92fd8ddd1088d0b24a9ecda286a874dd79a916c93c73bb841a4604aa61fc54c295c3cf248
-EBUILD lldb-9999.ebuild 2933 BLAKE2B d9990b5ef013aa2954b4026b0cfa716bf1ad198f097fd5dfa89f121b423e234e361c7ab075d4db4195723ed508142b7cd7a51bfbe2cf92813b757e41c900906e SHA512 2aa9be404ca8246cf72d0a09ddc7cbf07cdbca4d6396db76ccbe3387c4b98f840b3250a8f89435ced72f4c1cb253cee2f25a762b91d2b9cd625af801145b4f8a
+EBUILD lldb-8.0.1.ebuild 3077 BLAKE2B af58b86667a4d76c8838a083d30af8f2fb77cfc0c2907067a56bc4253be96ee44e3748e7c9bf7c20914163cc78b86614dba045ef3284cf55c44511815627c980 SHA512 d2db4b4e6598f46230120b76b5e384b89f5ef346e385b723903023eff6ed97942c4588be3d0fc70ca1bbb7af6c981da1115fb9f2314fb5f01b0a58436db1a7dd
+EBUILD lldb-9.0.0.9999.ebuild 2705 BLAKE2B bd43de17ada2d47b3ca3f46b70eaa32bc2a2a4feba482ad4f4be396863d0eb295f5a903c2b79f48b6fd399753239eb034b4900eaf582879bf96ba33a4da3b813 SHA512 ccffe78a028560f402428b514dc707ca5b6b72e4dbb60f779e184912cbd40345484b2ba8f2739bd8c904622366554d1894e2f83db3bd4a102d0c0f4c23705903
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.9999.ebuild b/dev-util/lldb/lldb-10.0.0.9999.ebuild
index 42ab87c3fa40..b28959dc3c26 100644
--- a/dev-util/lldb/lldb-8.0.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.0.9999.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
 	toolchain-funcs
@@ -16,7 +16,6 @@ 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_80"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
@@ -99,6 +98,7 @@ src_configure() {
 }
 
 src_test() {
+	local -x LIT_PRESERVES_TMP=1
 	cmake-utils_src_make check-lldb-lit
 	use python && cmake-utils_src_make check-lldb
 }
@@ -106,15 +106,5 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
+	use python && python_optimize
 }
diff --git a/dev-util/lldb/lldb-8.0.1.ebuild b/dev-util/lldb/lldb-8.0.1.ebuild
new file mode 100644
index 000000000000..4b8d996e1767
--- /dev/null
+++ b/dev-util/lldb/lldb-8.0.1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
+# (needed due to CMAKE_BUILD_TYPE != Gentoo)
+CMAKE_MIN_VERSION=3.7.0-r1
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils llvm multiprocessing python-single-r1 \
+	toolchain-funcs
+
+MY_P=${P/_/}.src
+LLVM_P=llvm-${PV/_/}.src
+
+DESCRIPTION="The LLVM debugger"
+HOMEPAGE="https://llvm.org/"
+SRC_URI="https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${MY_P}.tar.xz
+	test? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-${PV}/${LLVM_P}.tar.xz )"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="libedit ncurses +python test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	libedit? ( dev-libs/libedit:0= )
+	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
+	python? ( dev-python/six[${PYTHON_USEDEP}]
+		${PYTHON_DEPS} )
+	~sys-devel/clang-${PV}[xml]
+	~sys-devel/llvm-${PV}
+	!<sys-devel/llvm-4.0"
+DEPEND="${RDEPEND}
+	python? ( >=dev-lang/swig-3.0.11 )
+	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
+	${PYTHON_DEPS}"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+S=${WORKDIR}/${MY_P}
+
+# least intrusive of all
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	einfo "Unpacking ${MY_P}.tar.xz ..."
+	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
+
+	if use test; then
+		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
+		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
+			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
+		mv "${LLVM_P}" llvm || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
+		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
+		-DLLDB_DISABLE_PYTHON=$(usex !python)
+		-DLLDB_USE_SYSTEM_SIX=1
+		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
+
+		-DLLDB_INCLUDE_TESTS=$(usex test)
+
+		# TODO: fix upstream to detect this properly
+		-DHAVE_LIBDL=ON
+		-DHAVE_LIBPTHREAD=ON
+
+		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
+		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
+		# ncurses with complete library set (including autodetection
+		# of -ltinfo)
+		-DCURSES_NEED_NCURSES=ON
+	)
+	use test && mycmakeargs+=(
+		-DLLVM_BUILD_TESTS=$(usex test)
+		# compilers for lit tests
+		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
+		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
+
+		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
+		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
+		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	cmake-utils_src_make check-lldb-lit
+	use python && cmake-utils_src_make check-lldb
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# oh my...
+	if use python; then
+		# remove custom readline.so for now
+		# TODO: figure out how to deal with it
+		# upstream is basically building a custom readline.so with -ledit
+		# to avoid symbol collisions between readline and libedit...
+		rm "${D}$(python_get_sitedir)/readline.so" || die
+
+		# byte-compile the modules
+		python_optimize
+	fi
+}
diff --git a/dev-util/lldb/lldb-9999.ebuild b/dev-util/lldb/lldb-9.0.0.9999.ebuild
index 3f43283685fb..6c729010c452 100644
--- a/dev-util/lldb/lldb-9999.ebuild
+++ b/dev-util/lldb/lldb-9.0.0.9999.ebuild
@@ -1,12 +1,12 @@
-# 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
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
 # (needed due to CMAKE_BUILD_TYPE != Gentoo)
 CMAKE_MIN_VERSION=3.7.0-r1
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit cmake-utils git-r3 llvm multiprocessing python-single-r1 \
 	toolchain-funcs
@@ -16,6 +16,7 @@ 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_90"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
@@ -44,7 +45,7 @@ REQUIRED_USE=${PYTHON_REQUIRED_USE}
 CMAKE_BUILD_TYPE=RelWithDebInfo
 
 pkg_setup() {
-	llvm_pkg_setup
+	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
 	python-single-r1_pkg_setup
 }
 
@@ -98,6 +99,7 @@ src_configure() {
 }
 
 src_test() {
+	local -x LIT_PRESERVES_TMP=1
 	cmake-utils_src_make check-lldb-lit
 	use python && cmake-utils_src_make check-lldb
 }
@@ -105,15 +107,5 @@ src_test() {
 src_install() {
 	cmake-utils_src_install
 
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
+	use python && python_optimize
 }
diff --git a/dev-util/makepp/Manifest b/dev-util/makepp/Manifest
index e29b528a4938..52d502fdd088 100644
--- a/dev-util/makepp/Manifest
+++ b/dev-util/makepp/Manifest
@@ -1,6 +1,8 @@
 AUX makepp-1.18-install.patch 2499 BLAKE2B 51d127a82a662563aac996a0d1efef5a68bf9eb36ddc4496a7307121b4abf0a1bdd66351d663308dfb208180dc7d00f631b685d3cbd327e9f6fa46d4a9f7b6dc SHA512 fe1dc50fde876e95fcf3bdfcd619faf8cef2a519cbf9512f32d715b6ad946d2e6a0f4cafe24aa6a1319d61662726b5c7e958ef2a3e5583079dd4ac409edd074b
 DIST makepp-1.18.tar.gz 236990 BLAKE2B 4f2c894a706fd188eeeae4422ac828cd99cccb2e8f6b7280a2be55363b99f4fff011932f3dfd550062e932f5c90ddc7f41fd56cb5e765c694b7296ac7f7beb1c SHA512 e6d4fe2d8136bbbbec00401761bf5a4bf5ff15357e75080b942188a613b8156c67eac63f46ce89f1e521997ca620f22924dd0b9055dcb66e30801142dab4e0a9
 DIST makepp-2.0.99.1.txz 532784 BLAKE2B e69495f0ffece81e7b15b668eea8bf4f9a26a36332bd1644594d697dd2301bea4bb2340fcd2805a33c44824113149fc617db610e6624900ec9d0d77054658d8c SHA512 457d64a2e9d2860dc2f7ad1bd4ef7df9fcd1563878dcd7b63e6f1d3fd6c03cdb89aab68faa018b3ef6b3009733a365fadbb49ad6c8a03ffe6eafcf867b765213
+DIST makepp-2.0.99.2.txz 528968 BLAKE2B e39c5fa515a1579ef5a568385550e8baf9176eac4a1871cdb7971ca8d3f92bfda73e5f27f4cf00c148a2c5c9622dd8253ebba0f555c6d46ce8c3581678bf8e68 SHA512 5aa8d255e545705802fec6ca304b2c672dfb9c59f7a064a5e9c4ef98f52d7dd5628023fe2a2449126ac1f9cc6ba7bac98233e3e4f07dd8a0559fd8aea7fd24a4
 EBUILD makepp-1.18.ebuild 912 BLAKE2B f9d6509e66bc3e4a1acc4b701d789f7b69174362cdf1ab9076500913cc9098bedf741181ff5b9538ec6add4b6d941905a83d03f6d0e91f96b700c48389a44e1c SHA512 6705554e3809102e768fc571a7a6c14fc79236ae42ad7d470ade34be10f376ccd8936a222b8b4d076fe08ce3735eb6c71973de437daa0c59a2aa13e687178bbc
 EBUILD makepp-2.0.99.1.ebuild 956 BLAKE2B 271c4ab70048e97b3af955bae431aaa1887ed2e085c9f30d5ae5638a6e230d0665c59fc28401c282f33225d27627f87f9e3d1d0028332b51d73f1bd172006eb6 SHA512 3de74875fa845a954a481850ab32015affdac1f9ca6764dbfd1143ef9435db3845731953f586b9c6cedc3e50acacf6730117495d776dd73510136e08f09da670
+EBUILD makepp-2.0.99.2.ebuild 1018 BLAKE2B 131975a8dcbe6b7ea2e514765c1d46ce61c58f70071aaa38d73bca6e3d8b23b4821a620be37dbb0a821fecc3ce8930453797476a225cb017ee2c8ffa010f9c9c SHA512 4d8c3b7f521fe3f0b0a2c8049852372545f4ff3f1413bab752ee974f43c0f6a0910a351ddb88a81a93b817c7fddc8161256d23bba635ecd370c9e5be017e982c
 MISC metadata.xml 333 BLAKE2B 58a25c0c361e93a28731379d14b028724a0fc6bb06087f34cef9aa0aa657a5de28af68287034d0c6dcb50312f264f607fe727992d15ab503cc245d31d35443d4 SHA512 a4d44741093e730e73c16da4aef90a745a8f4a3e3f844e0b68e168788d934126faf29d598a17dc1c185a97d8a9611525e7ae0f1bab17ed20e25aa7f0e466ea41
diff --git a/dev-util/makepp/makepp-2.0.99.2.ebuild b/dev-util/makepp/makepp-2.0.99.2.ebuild
new file mode 100644
index 000000000000..38db184f93fb
--- /dev/null
+++ b/dev-util/makepp/makepp-2.0.99.2.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PV=${PV/_}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="GNU make replacement"
+HOMEPAGE="http://makepp.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/2.1/${MY_P}.txz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-linux ~ppc-macos"
+IUSE=""
+
+DEPEND="dev-lang/perl:="
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# default "all" rule is to run tests :x
+	sed -i '/^all:/s:test::' config.pl || die
+	sed -i 's/^  my $gzip =.*/  my $gzip = "";/' install.pl || die
+	default
+}
+
+src_configure() {
+	# not an autoconf configure script
+	./configure \
+		--prefix="${EPREFIX}"/usr \
+		--bindir="${EPREFIX}"/usr/bin \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--datadir="${EPREFIX}"/usr/share/makepp \
+		|| die "configure failed"
+}
+
+src_test() {
+	# work around https://bugzilla.samba.org/show_bug.cgi?id=8728
+	export CCACHE_UNIFY=1
+	ROOT= default
+}
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 3a5c1e1ecc10..f0904ecc1968 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -2,7 +2,7 @@ AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca119
 AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121fed73e7dcbffdf730e1623d0e7b7d0748f06c07433d73a73a7b4729ce32a6742125c8baac946db62a856149b468173 SHA512 0cd8c83f1a354a97871bb0d9bd7662d73765639f3ec4dcd6b922574062e2f1b33c259c322ff6e60c4c9f55e0c581c022b7546a05e0b551ad11123bb1a9dc7b53
 DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
 DIST mdds-1.4.3.tar.bz2 334515 BLAKE2B 3a42b7858346b2907040b8e42b1fae56626fc0881737ed04e20ffe4f9a23d2a2459c45e4244ac77745d2b1c7e3ff1642fe883b16def36e56c5c3d15077445793 SHA512 fd54a93fde89bff74a5ccf84ce5e2e002114297b165ded56a1bae92b28d70864775add140e165c7750f7dbe8ca1bfe83179cd9a835e53312c2e893c9e1f4434c
-EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
-EBUILD mdds-1.4.3.ebuild 945 BLAKE2B ef24394d78c10c8e903af0bb7a8ccc21114abc4cd72aa48d841f0353a3a75169102c54bb92a9b5ef93dbf078413b8a8da1253df4a105f7a65e2f63b943f95cc8 SHA512 69424da62003d364164bac5d17f02ace168a188a02e3693e2b53ac154b9b40e6749d1df6064420673c7911487a3fc944703c7e2bd3de1f99d9bdae66565c2a51
+EBUILD mdds-1.3.1.ebuild 977 BLAKE2B 64845034c53e9357dc66ac7cddb6724863df6d946797c72f1bd99e0ee1300d01cb8dedd0cffbe72ad7fb65e3bf3435ce500e0d2ec6504d9e40862950830f46bb SHA512 99373e8ad499222f9937661a5689e81f8b658733cbacd10d963dac46fbbdf1ef1b44c6c5bf209fb074009ff42760cd9cd0363e4ce583844151c964de5b4e5ee2
+EBUILD mdds-1.4.3.ebuild 944 BLAKE2B c3b0165e5f6c8448f8a4290c89e44fec9cb29aa5dcc27ea9f7a8882096e92b7d581fff7c648cd9451b4e96672508c29e757c9591ea1b0f55fd4395508b1c8b1c SHA512 686065fb349ab4a5ecd908ecb02ee1d6bd6d034168b46ecb30071f9bfdc68117de482daaa7dca20954e6eaf3afd21b7149285790cf1cf0b036e6e0583a17382c
 EBUILD mdds-9999.ebuild 954 BLAKE2B 46fcd2e4458f073a7142bdbe1df979ea80b9f6b341b5cf0ca7b493652a83763bdd2c9616a2be9a7cb1fbaac94f578af48e5f5520752ee1237d0bb8391152c002 SHA512 b8df297d8988d5310d218737adea9d98c2353dacb541f605fd99dde7cafacb7cd6a148592d6670b5ce6b14f7869a360309dcc7586d4357d0fb03996d499c5c4f
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/mdds-1.3.1.ebuild b/dev-util/mdds/mdds-1.3.1.ebuild
index 1473b988ea99..d2a33d885ee0 100644
--- a/dev-util/mdds/mdds-1.3.1.ebuild
+++ b/dev-util/mdds/mdds-1.3.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=6
@@ -17,7 +17,7 @@ SLOT="1/1.2"
 IUSE="valgrind"
 
 [[ ${PV} == 9999 ]] || \
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="dev-libs/boost:="
 DEPEND="${RDEPEND}
diff --git a/dev-util/mdds/mdds-1.4.3.ebuild b/dev-util/mdds/mdds-1.4.3.ebuild
index a11365752489..430a753bcf46 100644
--- a/dev-util/mdds/mdds-1.4.3.ebuild
+++ b/dev-util/mdds/mdds-1.4.3.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://kohei.us/files/${PN}/src/${P}.tar.bz2"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 fi
 inherit autotools toolchain-funcs
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index a969ee0fe6c8..c2db450b7710 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,7 +5,7 @@ DIST meson-0.50.1.tar.gz 1402160 BLAKE2B 051e9949f3a216c1074ec826c6a232124a3d261
 DIST meson-0.51.1.tar.gz 1451234 BLAKE2B 8a925bfa3d622f75eb180226311a6531cde435a5a6573663f44ba67dbefa63f76b8bd17eb23d291594fe66a379ebc8aef5f1e680973a59b0b52c41fe09e4cdcf SHA512 535fb7c73a7e721a25ce4a0b9771bbb2c07fcd8f7b8f43542a093663291761370044f99b9109853b19201189881e64db1ba5a67c724ecff21000b22ca79f182c
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B eb62b3cb156cd4c686bc9da4b5e69a4ab21dbcf61ca48740724e3fb88468c479f23c9e524825d18c528cc38f4aba067c8f5144530911fac94b0b1344d26ad57f SHA512 161336944be7a6bbe552f63d2712f24aaabe634b73a0bf5631bb73c5001164755f6488c1cf6590e5ef060cc7bd02af35863d147ea753f2ac4a090898030519a0
 EBUILD meson-0.49.2.ebuild 1764 BLAKE2B 897dc3089b7a4e645dafe38e407a02723e182f53102b6a0a953eac810124bfbf34c6495638dee835fd940957bd69dbc3887c67dfe81490282c839dc0fdeebfad SHA512 490420403cc9c56b6d652beba7f89964020dbdae40781b83385160a09d3ee797a9c2589fff2fc359fb9f955d0575b58d30b3e9ae9dd8b3b6c480665d0efe1667
-EBUILD meson-0.50.1.ebuild 1720 BLAKE2B 7643229af5c479515572d0da370f77967dbf193f57158b1b4af204008a9e31887d5e52710471430bcadb6108488c60e89900529d6a929b5c7de9bff0112cbc56 SHA512 e4acb1c0236e77607df5c7b2858246781e43d18a504a09f4513d6401a912247a5879ae750a99b35344ad1d7ccb535424cff3bac860f210ec1d967cbeb6b20e04
+EBUILD meson-0.50.1.ebuild 1717 BLAKE2B fef0e6f1b04e505a25759907af4a0839241a0e3334ee08525f1e91f2ec47dcc36f08ec29cfc80a9b28e0863550724b19590dea1c182c079871a432b36b06a63d SHA512 81d3c76ca483b5ab174a5ba1b1b3b61dff1a03405668f0ee03ba265049684da03c3abe02241135d48d5ca957d7b94095e1749684eba258b88cb7d854239a507b
 EBUILD meson-0.51.1.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0
 EBUILD meson-9999.ebuild 1730 BLAKE2B 768a89b9e09b19ccb667d701d4bd7ac3c33a98aa75857c474d5044dbcd7b95050d1918309ec82e0eff5edd9271fa1aef03b1c9645a8f759fa30cd96cf9177de3 SHA512 578b995135b68899d65eac8710eeab1c58f1f89be03710c38386e5d1c6bc0b6e50fca920421e322692cc7543b42dc17e642f8cab0d1726b8e4fc7917ce4a70a0
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.50.1.ebuild b/dev-util/meson/meson-0.50.1.ebuild
index 2dd5277193f7..d124d341dd71 100644
--- a/dev-util/meson/meson-0.50.1.ebuild
+++ b/dev-util/meson/meson-0.50.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index c53ae35f4f50..3bf0f5315fa8 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 704 BLAKE2B 127aa49ecdbbfee4cfd40bf5dba8d53c58cf6f64c26b826a5470fe6ce8c3fb7bc1ee16cb94fe6748aa55e0b74c64cfb7a72165d60d102c4eda4846d0cd8719e6 SHA512 f9a64ca494d8f1271a05b22ccd0969f2db9bd914eab1e3bcbf858d125412ef17042dd614e1fabb40857ba0c4484c6596df425c672561ec606a246e43d68e0960
+EBUILD netsurf-buildsystem-1.7-r1.ebuild 703 BLAKE2B e899d1dabcffcb2de57ebfc6cf9cc3881293eb6ec8f326ecd0bb2cbb67cfaa259f5f5b0e2171a87cafb3028618053066b4b377b947f8c16e17625ea6658d44da SHA512 0c3ae21fed977aec71868fbcf65592d07e53d54ceceaf0403be67da250c1579aebd1180cfdaebabeeaa2034b5ad3612ef5ae68c41402daecc431ae30da00e9ba
 EBUILD netsurf-buildsystem-1.7.ebuild 666 BLAKE2B 7e640a421bb041b10a220cad42afa9b6835b65fe0b39b8cdfc63c8e99129c6396bb8247e7f8a280c62276d41b041892e2162126412aad6c35f3ac39fbe7971b2 SHA512 0818bb0dd1f2eac87fcb5da10128d392fdfe274d9594c910a1bfe14f8221716193bff0fbf514dbe9b8cb10117347f04f63dcfad4772074bca4971e28a9af0af9
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
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 501f05fcff97..dfe114ef3c0f 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 ~arm64 ~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/patchelf/Manifest b/dev-util/patchelf/Manifest
index 5c33a9d91b6e..6994b8f7bb84 100644
--- a/dev-util/patchelf/Manifest
+++ b/dev-util/patchelf/Manifest
@@ -2,5 +2,5 @@ AUX patchelf-0.8-dash.patch 1060 BLAKE2B 37361c4221be04e4a8e672578e8414bde1d03e3
 DIST patchelf-0.10.tar.bz2 158604 BLAKE2B 6aed9c2e7f37ff0330ca517a9491c46a93212140367b720bf94da4e4ec29a4978c920b53ce306ec333b3f7ac0216ff59637048c6997cfea4a34a87f2a0448796 SHA512 647ad13b7d45b3c5d20683ef8fe9760cb7f213e879231b6c5780bf32771adfbf7c5e5ce694c08e5681dceda63857d7d8a2d53efb60f799d3e7290cebc02ab501
 DIST patchelf-0.8.tar.bz2 119369 BLAKE2B bfe7dceea9a79845c61bc7490faad5cd4d5e83bc0be4ec7e3b19fbed91ecb7d15e0a0688d4914731b94f0522c80ea9f940b6a8ad5595931df8826ef43f2fd209 SHA512 819ace0ee032612e8bef56f230ea470be9d44bc03ef561f98ffac84f2555e419f87309280df6d265a8ae56452e54d46fc90be13a449847e93e4e7b413dc8605a
 EBUILD patchelf-0.10.ebuild 612 BLAKE2B 2bee5de87f750cc21a0f590270f10e78c35f1f6098f0df696bbeeac48a75bda3d8bb7b425a8551f70b9b746c61519a258efeb61e69da24a459bf40d476a5c2b4 SHA512 c321104e677c145cdb8079e7cde3a05ec58ae026d0e418356e79e29b30f71b6c6b90cefe7cddaf9d44315fae4216152b6d0afad8ded06dc3ad9599ca39518f05
-EBUILD patchelf-0.8.ebuild 852 BLAKE2B c08b543d4734772d5dfcde6615baff90bc712a61e2554b3dfb2f5eec62fd19397e27e10e82fd845b57f4b0bfe36b22b3d2aff3e40d501194ce60a069f668c7db SHA512 a4356803dcbe4142887896d0315709cab75e5ea103c8bfc7eef5c1d0fa607abd9d9c67a0a3e169ce439c1b0427c9f693de02a06cde8f00d9782d201bebe3f8b2
+EBUILD patchelf-0.8.ebuild 858 BLAKE2B 448a57c5e53e6f1520ab07ab9c018b2027b0c6a4f1ac3f532a8dfd6859e4fa272ff5e00d396f58e26c802eb2b56583f5e3d333c593e78f182e642d0ac0ffccf4 SHA512 24528d15b688872f635ded7d0de4697e48bd82b9bd10dc937a00e01ef2fb42dc88cfbaaebeba2a2b885151a04061c0c515dac078b1193783dcfb781c5717c41a
 MISC metadata.xml 220 BLAKE2B 65b0d9db11c166b2887e1a22962830e288eb917a7f15d0ffcecb3c86a1845491cbcbf4ebc7e661ac7041443a8144b218123b4db7a962191a9e9f894ac086a4ed SHA512 512eee7a953300d5e721b64bade8be9bd1b62984e543552b58a7a72b42cb90973c8c6d557ecfe08c2355cab45f640c88dcd31ab8d116815bc01680a65c7a132c
diff --git a/dev-util/patchelf/patchelf-0.8.ebuild b/dev-util/patchelf/patchelf-0.8.ebuild
index 369a698a0395..3a3ffaccefd4 100644
--- a/dev-util/patchelf/patchelf-0.8.ebuild
+++ b/dev-util/patchelf/patchelf-0.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="http://nixos.org/patchelf.html"
 SRC_URI="http://releases.nixos.org/${PN}/${P}/${P}.tar.bz2"
 
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
 LICENSE="GPL-3"
 IUSE=""
 
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 539148514ddf..685ef582535c 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 1329 BLAKE2B 06d0c18872ff72005cf1f613d3dbace72cab4378e1ea60747e18fa665e4314671c235d8a999beed28cd8957097fcc3cb5099e023042f1fcc8ff87f90a5410d3c SHA512 91fbef02f96fb1c3110f9b58d3ba47dcefe9fa0b0b1b434ffdb5b6f44a7336431816392b0fa38a47393e41ab22fe8d141bf184e45fe9e32dd8c36140e2c31223
-EBUILD pkgcheck-9999.ebuild 1237 BLAKE2B 8db4fb82b419297cba762607febcdc2b2e1b4a8817873f91e3bbcc7e1bfb116314980291ff25171b9a363e2ab46ba879953d873a2f3fd46960e4d98d78031824 SHA512 7e0ca6ec6e6e3dbb066ea94e58a747ae2366d42e191ba847896df5528732371823802b8a0e53848f4c829d049d8284b12fc38957e5f820a4bffc811f59e074db
+EBUILD pkgcheck-9999.ebuild 1277 BLAKE2B a51bd3b1a5edf2635fa804a1bc8ae49488d3e5a9dc22e40741e879d44f27409474872a89d5501f39e73eb1379372f1646255a03aa6ac9b3817dddc9c3f1beb1d SHA512 beae01defca87158c5a00cad2e4f22a7e537c1fb96412e023ff6e581bdbe555ef5b67f6dd6f9a582b7aa57a98d98b8d0daa3b5d03acfe0373466626f41a3dfd1
 MISC metadata.xml 337 BLAKE2B 515d4c48bd17aa665f445ee52a54bef10f3ea5c35ca4ca51e7d4389fe99d86685b9bafbab38f390a4b6fbb0df5d504a1468888d3fec5383e686ff19345658f86 SHA512 e2f31f9cc7fe4296758b15b222f7f14ff04a78d28850bc48f67af0fba4a561f6da63191ebaba73fc6623d12296ad6137ec84b74a5eb9b6b76c929d7029468a71
diff --git a/dev-util/pkgcheck/pkgcheck-9999.ebuild b/dev-util/pkgcheck/pkgcheck-9999.ebuild
index 22550d50d55e..75dc351a4f38 100644
--- a/dev-util/pkgcheck/pkgcheck-9999.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-9999.ebuild
@@ -30,7 +30,10 @@ else
 		>=dev-python/snakeoil-0.8.0[${PYTHON_USEDEP}]
 		>=sys-apps/pkgcore-0.10.0[${PYTHON_USEDEP}]"
 fi
-RDEPEND+=" dev-python/lxml[${PYTHON_USEDEP}]"
+RDEPEND+="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
 DEPEND="${RDEPEND}
 	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 5062181cf38e..423cceea6b91 100644
--- a/dev-util/pkgconf/Manifest
+++ b/dev-util/pkgconf/Manifest
@@ -1,6 +1,6 @@
-DIST pkgconf-1.3.7.tar.xz 271840 BLAKE2B f4bb44e92ef2903a5962c85e0d4a939adf035c5e92fbd1d8a50d4022507d1f442e459849b537cc2b648c7a1bb5eac33aabf8a46d8b0df8794514596adee9888d SHA512 6c06afc4fe64c94a833db98d4dc7881192d38cc28eb1fb86345f4ce065489930ac953aa9f6b2df172127244cb1cbab1c85a042aa0f6be4fa18bf9dcd83173960
 DIST pkgconf-1.5.4.tar.xz 290380 BLAKE2B 8353901e9fe86f05abc82c5906b24ec902086f5c9a08ffdc9f6d53ecdebcf7c52eb9bbaef019285332182ca8f489cfe872f25bfe110e280031a553331df09bcb SHA512 795a67f8f98b7598c0af8e70c830851561f090a96cb66b75149e5faf633f06c1b098fa3cec76cde35160a9809556536da6a2a95af8ff954c9b28536d15b79f93
-EBUILD pkgconf-1.3.7.ebuild 1286 BLAKE2B c0da3d4043a5a8f01ab9cb2c2a89afcf72e810f3e930b37aeb29ad7ec2249e58adc3d57c11a78201ef88bff7d98768b8d569d4022fe55ac4158adeb5da20d3c6 SHA512 a77dc6e3abafd00b9b39861684e145b8a2257029abff868ed08b959aa9d85144718862a8913a784b9d61e959a6ff2afc2ada117df7072df1bb6df36cf4755b4f
+DIST pkgconf-1.6.3.tar.xz 291216 BLAKE2B 04bf58590e2f0b37bac7b24b3d595ad08680e85647548cbd642495398d95706f9f738af5c6f9b9ad8801567caa20ade85d4c4d74179f08313420683cb1b34263 SHA512 437c5a5c9866e2047e62e0592639930b2420d4afd41d98cef51f3475165418a39e916477860025314828a6ee0a4eefc10fdf26bda66f80c291f324d9674fa5c1
 EBUILD pkgconf-1.5.4.ebuild 1393 BLAKE2B 07808f0e52d9fe36b5a3a54758d956e1fc726bcad1110cc17c0b065afd8fc3727b293682d590ab6d3bf3af35ed3112c1aad3485f37a0520e0d041056f1e19b55 SHA512 0da4bc185049ad5387261fb80979ced945f3c5f8b75d3d310f6a282bf5323035e06b345fb3c92f56cf58cdbfc9dc8b3513bf4d587c98a5265bc6df9775698105
-EBUILD pkgconf-9999.ebuild 1438 BLAKE2B a3c1785865b579242a0b4a95f5298718410bc24af2ef3687847e91510df0ecfa7f294e69e498c027c9fd7298d8e85ce5702e04a6850d37415d7745536f6645ba SHA512 5cedca7911702ec8fac036fa5e7660bdb7368ad126aeb022baf883a7e6091691bded229085518d4d6acae3666bf1594a4df3128806fbc8011323c7035e72d6ba
-MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
+EBUILD pkgconf-1.6.3.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+EBUILD pkgconf-9999.ebuild 1676 BLAKE2B e002af8ed8e0fd66befdc63c6da948f317814cca96a9a05b621152f7275f602bdf51675c6efb42298d281bebb89fc40c547831a3831b2a82c79d1d9e5808d0ed SHA512 a34a92898fd598e3eadd092c63750fcba010d64aaa366a231f790a6323a462c54416c02a7d7002dfe0439ab2e1192b60a099051a7fbffed2779c8e79c11a95f6
+MISC metadata.xml 605 BLAKE2B 316f82c4daabf91792e48e82973daaf0b0af972f7760636990e64c94e5e68b41b7cf65fa5d15387ce81a25926a5ffea19519ffe29a1ae487046d973708495b75 SHA512 68a71f55636e987c721da3c54451c75068e3261a0b462189fed45309bb4c286d0ec00a8a29962969b54ac8e31a13a34167cfc3fd44f5da8b84e4ce36eb5b4b10
diff --git a/dev-util/pkgconf/metadata.xml b/dev-util/pkgconf/metadata.xml
index f6730b8bcc6e..8447141053d6 100644
--- a/dev-util/pkgconf/metadata.xml
+++ b/dev-util/pkgconf/metadata.xml
@@ -5,6 +5,10 @@
 		<email>floppym@gentoo.org</email>
 		<name>Mike Gilbert</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<slots>
 		<subslots>SONAME version of libpkgconf</subslots>
 	</slots>
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
index 98f940c603c9..5f58337eda71 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.6.3.ebuild
@@ -1,29 +1,30 @@
 # Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
-inherit ltprune multilib-minimal
-
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
+HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
 
 LICENSE="ISC"
-SLOT="0"
+SLOT="0/3"
 IUSE="+pkg-config test"
 
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-libs/atf
 		dev-util/kyua
@@ -53,7 +54,13 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
+	local ECONF_SOURCE="${S}"
+	econf
+}
+
+multilib_src_test() {
+	unset PKG_CONFIG_LIBDIR PKG_CONFIG_PATH
+	default
 }
 
 multilib_src_install() {
@@ -61,12 +68,16 @@ multilib_src_install() {
 
 	if use pkg-config; then
 		dosym pkgconf /usr/bin/pkg-config
+		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+		rmdir "${ED}"/usr/share/aclocal || die
+		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+		rmdir "${ED}"/usr/share/man/man7 || die
 	fi
 }
 
 multilib_src_install_all() {
-	prune_libtool_files
 	einstalldocs
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 780b57975a03..5f58337eda71 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,20 +1,21 @@
 # Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
+inherit multilib-minimal
 
 if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	#EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	EGIT_REPO_URI="https://git.dereferenced.org/${PN}/${PN}.git"
 	inherit autotools git-r3
 else
 	SRC_URI="http://distfiles.dereferenced.org/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
-inherit multilib-minimal
-
 DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"
-HOMEPAGE="https://github.com/pkgconf/pkgconf"
+HOMEPAGE="https://git.dereferenced.org/pkgconf/pkgconf/"
 
 LICENSE="ISC"
 SLOT="0/3"
@@ -23,7 +24,7 @@ IUSE="+pkg-config test"
 # tests require 'kyua'
 RESTRICT="!test? ( test )"
 
-DEPEND="
+BDEPEND="
 	test? (
 		dev-libs/atf
 		dev-util/kyua
@@ -53,7 +54,8 @@ src_prepare() {
 }
 
 multilib_src_configure() {
-	ECONF_SOURCE=${S} econf
+	local ECONF_SOURCE="${S}"
+	econf
 }
 
 multilib_src_test() {
@@ -68,11 +70,14 @@ multilib_src_install() {
 		dosym pkgconf /usr/bin/pkg-config
 		dosym pkgconf.1 /usr/share/man/man1/pkg-config.1
 	else
-		rm "${ED%/}"/usr/share/aclocal/pkg.m4 || die
+		rm "${ED}"/usr/share/aclocal/pkg.m4 || die
+		rmdir "${ED}"/usr/share/aclocal || die
+		rm "${ED}"/usr/share/man/man7/pkg.m4.7 || die
+		rmdir "${ED}"/usr/share/man/man7 || die
 	fi
 }
 
 multilib_src_install_all() {
 	einstalldocs
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 15a2321cfdb2..a641429ff06f 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2019.1.1.tar.gz 332489780 BLAKE2B 2cc7dcbab5fa321e423991622b4e7c9e41c184312a4b3c3a8b900b1ea2436d9f6009e26ffca12f3335be8bb520941c6ac6b579f3e6f2fc0f1b148a9a00ab1868 SHA512 28d7a3353bec271f0a57bea3c44fc788a5b3a5215dff737ba293c2ce73509d06b217ee1615901c91e5895d61a58a2b696c50ae760b6b3a88b472f3746f28bcbf
-DIST pycharm-community-2019.1.2.tar.gz 333983594 BLAKE2B f5dfa1986d88c7598cfbd5050c385a1b1b3374286e57fd513a94eb19bc42116b1ceef757d194ef1df66739b25f10663a74e374785b4c5584aec9b8900e67dd0c SHA512 48782960022efe48f37b2bdec0be1f15741f6dde2a2dcec686ecfb07c81996c3d6fc46cf3eda2fa4cc53a67f7ec47909e47ed57b2edbf973482ca37781067415
 DIST pycharm-community-2019.1.3.tar.gz 334018235 BLAKE2B 8e4c400685e69aaa53426dee848d5f14a0c40b88232ee8cb8c0c0f2f727c68b9212600dab7717ec77c1cd4b42666bad965fcbc217e3158d357b5a5edd6a94e26 SHA512 42627af39a8530931442c8419ebee4d999faad40a203519fc8564e4b8b14d2476e8426e9976e487c92e4398db8efb15c5e2d28536b1c7b374898f9dc0021acbe
-EBUILD pycharm-community-2019.1.1.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
-EBUILD pycharm-community-2019.1.2.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
-EBUILD pycharm-community-2019.1.3.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
+DIST pycharm-community-2019.2.tar.gz 359295798 BLAKE2B 9a1b19e93d0d2cba6c7dd2c059d511e4d193b6bd9e5f1900c3aadd6ff322891c834947360715c8f41e5112f7a71d3b5b09ed7e23dcf3dd8c6c4de9c4eaf16b5b SHA512 490925de309bcb0ef052593e517f3d701ae1d82b05d4ea38bb7bb5eef86e9df21472e395fadbb21906fa1024358ae599285fba8fdb72b0ddb7f1e8f7f26ac046
+EBUILD pycharm-community-2019.1.3.ebuild 1081 BLAKE2B 67dcc04b86db58f962198ff8209e602ecfb355f59b465d343071f1ee55894561c0ec19c3e58a8512d4812f4c28f8506bf5266ecd536dc2ebfeb023228acb45b8 SHA512 f3c51c3027b8c0975ed94d3b25a2ba5d1bdd512e9d0b2236b534ad88776aeccfb4c9313bcb616eafb06bacde6d6845a5b9fa01e7998f5828141b06af23ca31d3
+EBUILD pycharm-community-2019.2.ebuild 1083 BLAKE2B f2c2ec95fd92da8e5fd64406cc2383e1debf43622b09ff827f7f6297615063743bea010787c81d02f8528f5e13d4a46f7ae9e9e340fd8b5ee15d0694c8812af5 SHA512 e0849f4780b1a50af59a3e5195e28654d6d0bc589022c59430d37666bc1aa7579223a312e82638d5d76051b8aebe6f52459d224dd0dd386ec2105b06801af722
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
deleted file mode 100644
index 92e344b69eaa..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2019.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
index 3bd1b2cb4101..92e344b69eaa 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-community/pycharm-community-2019.1.2.ebuild b/dev-util/pycharm-community/pycharm-community-2019.2.ebuild
index 3bd1b2cb4101..3bd1b2cb4101 100644
--- a/dev-util/pycharm-community/pycharm-community-2019.1.2.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2019.2.ebuild
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index ec6ad06490b5..98728c3ac483 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,8 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2019.1.1.tar.gz 433810320 BLAKE2B baba76f893ca92990241de495f0a00029a135b890aeca067fdb699ffc6f4e7042487ada452f7fb793731b0ec303f0e73baf2c76da8e0821edcf195c210958b74 SHA512 d4419fbef02e3c8a6c3820da56f089a5630ac2c94dc701854f0ea03a5797f7489db6613a8426cf89a4c6c5259b44d589846b04e36051e44641845a32d81b368e
-DIST pycharm-professional-2019.1.2.tar.gz 436256239 BLAKE2B 3253c74b7308dbef8dfd78fbb525af104d11d5ea4c66c48882685dc40011258a6f9d912a9402818f219c7c968cda61e4723544607b71a1a5e7ee0e1bf743ae86 SHA512 ee7bcf292f780ed2fe12c432b546eb470b2f556337e2b9c22905797f5f99899a2b5d80bee032cac45427f5480f8f2b3512e32cd4d1a0b6ae6b355f8dd0674b51
 DIST pycharm-professional-2019.1.3.tar.gz 436604810 BLAKE2B 1fcf742b119dd8d9e9eeaa08f803f2742f388c711da446ae00e5718e09c231d926a04146fdcfb9ed18e2a44d43049598ef63c527e8994077987a127fedd630cd SHA512 2a26279944408cf5e6436d28ec15e2e6fcca234535fb69f4e7391a230d4bf39a523e6d2262d8cd5036d4f40b0629cd33866c5b839f82a82ae1d4271c89901cad
-EBUILD pycharm-professional-2019.1.1.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
-EBUILD pycharm-professional-2019.1.2.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
-EBUILD pycharm-professional-2019.1.3.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
+DIST pycharm-professional-2019.2.tar.gz 478100459 BLAKE2B a4bf01fcca96866e40fc43b1d429a5dfccd8572d97bb68a0e2f40367563b17c7e26c8801d637325b3352caefaf19eab8d2269b23b0849b6649624ac1bd155bcf SHA512 7e42bf72ab5ed318475506c2a07e12ebe6ee1f33c47e329da0bdf807e288a57681607be4353f5d1510352689537d2cfc67a3f43f0b752c8c8a76d66e83688b8a
+EBUILD pycharm-professional-2019.1.3.ebuild 1225 BLAKE2B bffb2416b7700db9acedd379c865121ee37ca5c7452fa64968f8aed6351646d904e0d3e148ca66381f02e3fdb0892e7b9401c59df24813a29c15d7bd95f8ef49 SHA512 d040e96a09e91f41db9ada5372166721831b03ddb6068f45ee068c6ad5613a818487cd4274986ff4003624641a6c5634301b6e1f9b38641ffee05c75cf7a086e
+EBUILD pycharm-professional-2019.2.ebuild 1227 BLAKE2B dd334c694c3c63674c201433681e3479933eadf1cd820caad7517d1537a48a9946be51008df2e7706b3555bfd37e1f8c098fb602e61e0158fb5c2a5b0c5138a1 SHA512 e7a78b065d06590bd0e7cf3b569984016c8f28e0758b61805fc151582faf70d85085876e2917cf09eec16a642f08168cdf9284283c01b74bde6fcd8172b7cd35
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
deleted file mode 100644
index 0f418726afde..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND=">=virtual/jre-1.8
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
index 9196130c9fd9..0f418726afde 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	dev-libs/libdbusmenu
diff --git a/dev-util/pycharm-professional/pycharm-professional-2019.1.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild
index 9196130c9fd9..9196130c9fd9 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2019.1.2.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2019.2.ebuild
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 3bb8e53f4820..90aca59f0c77 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,8 @@
 DIST redo-0.31.tar.gz 105335 BLAKE2B 76171a4e7112c7478fcfe8d6f19ffb27660fa8566be3c2dded0026a993224731cdeb43c5cd7226b5537f69dc9de982e0dc9a95ade49809c93c81474879de8590 SHA512 c049a2eac7385813fe7ee8fb15f7b7de1fe1572071de91c8ebaca868d7b4ceec73d6433f1ba37b129ce7eda577c5823a5483ba69bf457cc3295d7fb9c23f42b2
 DIST redo-0.41.tar.gz 140177 BLAKE2B 13a73843064fc9fb4607426c1d4d6358b688ba30671d4b5e60428481489ff59060b2bb0b1473f0926702100d311fcaeb846a5898209e07f0d0867766fb951a93 SHA512 c7826e82776a323243dafe5b8011ac619dc0376c2b36524aa1ad23bac54f9d946f395e12a4ea943ee065847db4817afbc5101a703d59e1f90b812a6ef028427b
+DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
 EBUILD redo-0.31.ebuild 918 BLAKE2B ab6e9c3c0e9bb68bb23cd6171fdbb9f34787e7f648529c9f96ba8753cea215999620707a34236a80bc9c78de2bb61aa17a28991a28267e621aec84c5508fae99 SHA512 c7c652dabd307403f8748639dd4b6542b784c258964a9247c3e7a7b20ef91913ce32ed275c4981f385861182e0511edf7e7d54ae467407716bb1cd0091605055
 EBUILD redo-0.41.ebuild 923 BLAKE2B f6e13631931a38c159cf0e8341a422dd865878a5ac2abd4be9363ea1e3940972bd88d1fd26f12fbe4089e1a9b0c4cc0a57fcc50523a327ee1bdf3c1841d392ea SHA512 0b2fc82c7831774fa11ff3cf5f4425baf7e0fd3a711ac6d058901a9f1c7db0e71084c03308893d3fe01a1706461bba3dd3739b159bf40267c3a107ff8e0eb38f
-EBUILD redo-99999.ebuild 915 BLAKE2B d337e9cce4c1e67a435b6cac2d6832954c51186aae6186f919d95756246b5a764c9f1850897976f4dd70e78a06507580c4a91c1340f0c4ab6c46fa86963566ab SHA512 e8e181a1694d8a2ad554d9e16041e7f5788b85418ff511c65fccd82c3f7ed8981c3c2b875b67ab7b5ce389a5467b0afa48a81c6920c21305899ba7387c691faf
+EBUILD redo-0.42.ebuild 947 BLAKE2B bab1b15e50c95163ca5c432db9c2b3f7d870a4532ad4851ce0f26b2c9a0fd427b53fe280fa251c16a3b10242ed1a16840a70fc36b10e3d0fbdd099eb9c2825a9 SHA512 999edc3ca620511e093aaf5e1bc7aeea571635a2f029c5f35d9fca232d7c59701e82212223e096bee61271ae7280c089b5192f310976e94b795160f87ea00bf0
+EBUILD redo-99999.ebuild 939 BLAKE2B 0f9c797263d37eb08332246d5d921e62cb165ad93cb7c39092490c52d2ff04fc8133ada02a065c8a0b5c38e98170e5662be8c0b351d90220c1021826a7dc20a4 SHA512 0c6acaed30f6afaa4362488ff3143ce7dbb51d80bc789845aaebe777d4057802e9bd257f341c8b73cab0c9924cd7cc474f307c3e48aada8c56d3de5d70f13678
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.42.ebuild b/dev-util/redo/redo-0.42.ebuild
new file mode 100644
index 000000000000..9524b8fa26f6
--- /dev/null
+++ b/dev-util/redo/redo-0.42.ebuild
@@ -0,0 +1,45 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+BDEPEND="
+	dev-python/beautifulsoup[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+"
+RDEPEND="
+	${BDEPEND}
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_compile() {
+	./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+	./do -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/usr/$(get_libdir)/${PN}" \
+	./do -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+}
diff --git a/dev-util/redo/redo-99999.ebuild b/dev-util/redo/redo-99999.ebuild
index 32b61a02d268..a5f8adf6f549 100644
--- a/dev-util/redo/redo-99999.ebuild
+++ b/dev-util/redo/redo-99999.ebuild
@@ -17,6 +17,9 @@ BDEPEND="
 	dev-python/beautifulsoup[${PYTHON_USEDEP}]
 	dev-python/markdown[${PYTHON_USEDEP}]
 "
+RDEPEND="
+	${BDEPEND}
+"
 
 src_compile() {
 	./do -j$(makeopts_jobs) build || die
diff --git a/dev-util/scanmem/Manifest b/dev-util/scanmem/Manifest
index 87683116b844..d7451b336ec4 100644
--- a/dev-util/scanmem/Manifest
+++ b/dev-util/scanmem/Manifest
@@ -1,3 +1,5 @@
 DIST scanmem-0.16.1.tar.gz 202133 BLAKE2B bb07234aaf1f93dba5f7feb0af0efcdadb7cd7cabfce2d62f19da01ba947cf9f4ba91024db2379e218b91953679a77080a4fa711ceaca659ac7b3f01645e3f93 SHA512 5e0a97e020a8a392aed75e2654cc6bcfad68590b9caab43444e57c3180be45ce1269f5acb02355bee57ff8bb5b9349b4f65e0fe96655206a812ea645796b153b
+DIST scanmem-0.17.tar.gz 220489 BLAKE2B b1ae07f96fd736e9ca6a5d55ad2d6b06b7d0dc4828915e0f2adaa2d58b053d9734ccd7425fb5391289249f838773cf3f9a81dbe76bacd42f41203d27dcffed05 SHA512 6d74f3d1d3492d41cabc342cfd1189815536dcbd57857d8a92e05c5dcaebcb9b1df886aee706c56eaf3344737070ea0fe852eef164ef3fe7907f66c626d8523e
 EBUILD scanmem-0.16.1.ebuild 984 BLAKE2B c069e8b0389b74d19120d7646fc686b4eb91d487a5f44e24f3d5d7a09048a7135b27992171d804cc092941f93342531d7ccab0ef4f20c614e554c62ce0c012c9 SHA512 621af86f741b3e24a0a6db83380909b246973c12ed1c2ec1fa565edcc371fc72a581f8f8f7fbbf76112f64631b8f204a420e6fe12f4f4809a0893637b261de3e
+EBUILD scanmem-0.17.ebuild 1085 BLAKE2B 6845287ac7ac73c9325552fb4d7d103b287a80c1c16fc6c43d263e00bb0f6c79cd19530204408a1124a7196603503c6c0752eec0c9ed7fe6809a47413e270a86 SHA512 849fb77928c61c5b0faf2a04096df8df71543f2f66eab498ca002f8237947c143d40a25d5ea6ba2967a8eb4d546706c628e0bf88a3a06beb2e70d669ad26295d
 MISC metadata.xml 317 BLAKE2B 6d3e5903daa28fe65c109b4a75c8e143a90b7a99095353bc440d41566e9f942f0e415b5561b220bf23fd8e1e0b658d298a6d49d8a442b66042b129c6ee60057f SHA512 44f1ccb76808c4bd5c2bdade165d0f32d68ca07fbec73b2c074ff5b486cb69df2b23cb619d590b5a15d1adfe2f444f2b91aad3f238b29c752aaad97b3a5616b0
diff --git a/dev-util/scanmem/scanmem-0.17.ebuild b/dev-util/scanmem/scanmem-0.17.ebuild
new file mode 100644
index 000000000000..542361fbb188
--- /dev/null
+++ b/dev-util/scanmem/scanmem-0.17.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit autotools eutils python-single-r1
+
+DESCRIPTION="Locate and modify variables in executing processes"
+HOMEPAGE="https://github.com/scanmem/scanmem"
+SRC_URI="https://github.com/scanmem/scanmem/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gui static-libs"
+
+DEPEND="sys-libs/readline:0="
+RDEPEND="${DEPEND}
+	gui? (
+		${PYTHON_DEPS}
+		dev-python/pygobject:3
+		sys-auth/polkit
+	)"
+
+REQUIRED_USE="gui? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use gui && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	sed -i "/CFLAGS/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-readline
+		$(use_enable gui)
+		$(use_enable static-libs static)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use gui ; then
+		docinto gui
+		dodoc gui/{README,TODO}
+		python_fix_shebang "${ED}"
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 43ba8ec63af5..109971816ed7 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -1,8 +1,12 @@
 AUX logrotated 171 BLAKE2B c97738eba7f311d563476eb462b05facd41b53b87f7918bc543b4b87f1b1cdd6f61a39661748f8e098752c0337b392c5924db10d1bba87df65dd966a8d278a14 SHA512 d5b0cc5e60626b29f9e7385fe4b37d59108f042a24bfd1edeb9a994de68496b4802029ca48d59a7e45276e18e97943a4a21ea0d7521171207f7b29781fa881aa
 AUX scheduler.confd 768 BLAKE2B d5d6f1a1fa7883e858bbc81891e27d0e519af590dfee0295f39d7005a4eb8af7f7626a880ddc2658080e2d92c8b973031c1ee0cabf351e3984f25148bb2755c2 SHA512 6893d3b01939a289e02f21397c9d522ef924987c6fd16bb56a91f4a0bb37bf1d0878c98225da0fe7ba13bbbc4340afbb9303665e32d66b5d652110bd7020bae2
+AUX scheduler.confd-r1 438 BLAKE2B 3e047418c6953dc5e21f1caa4770f1c95d58f59dae58938d4d4440dcc149c352967ed25ff2a196cb7b26e871ba6271ccf29b887ecf906faac6ad081f45d1686c SHA512 256cb811d69ffb148bc01e06cc69cd406d4309606c71cc4d8595b3ee140037b882cdb513871c32278b4e58fab8f2778ded202dd1c2d297797a393069f8f6b2ca
 AUX scheduler.initd 592 BLAKE2B 5ca446d0b30655562292b37c2bdb238abfb0390d7b59ff2740925c58f3cb7d66cc9b867e5260efde51bbcb0ade24fc19cccd20e255bc3b9ca349fc0cc3217c12 SHA512 9b383ab8f07eb75b38f40d9db4c70c6342a399cd0e6ce2f3c48b5bb41d1590209932247c0c735264cb5f5129131ec8af23aa0e4d007e0adc33517fba2d7b48cc
+AUX scheduler.initd-r1 525 BLAKE2B e16d7481ebaaa1a769fdae08600f82a2e485393eefa29333b15c79e9379ac95c3cab10233be66fa8412d83a665e2ab840ae349cfe43ebf3939d2d0cc5279c084 SHA512 85d431fece43cd9aaf39b1514825d56bea050fb9dbd2461ecd82c498d7624b7fd6c98f59fbc71e4ecca532a095b902841fb94ec19d74e6da38b17bb6ca4712a0
 AUX server.confd 750 BLAKE2B c4e44555c40d7dfd691f3fc3def3daf49965fbb946e8cd08f2b6bfc3dec38f85a68af0bb99ca071c1de7bb5a5f444977cb830fe74bb237077817636652293f02 SHA512 397d39a7464e6b8caab6d908b3e7a101c3d5bf3b532ab764417fc37f00cb3a18ef3a2f9bd6abd532d9e4120bd86d54ed68fc86b7c25dc3ee52a581869127e483
+AUX server.confd-r1 420 BLAKE2B 0cdb51dbf3c7d06285d02dfaa39e92a480e0d9ba1ed27473ee6df876c5d60ff5a0ce0ce61c0e60790bda901fe955315665c44fafa207aa94ea7baed0b9ab19d5 SHA512 74be100f820aa89df203097f92c82370c02386980763a47248ffd3c6a3d8ada313ea2e9989e224eb0ffcbd728ba41cc76eebd233c9eedcc8784b8fef78aa8ae5
 AUX server.initd 558 BLAKE2B c218d37dab6aa517a48d19516a0ac4183e3b46db8cf8b98624c720be14f7e3a3a641e6c4d48809a0ff9cb7144b9770653c8f172199bc1f20d24788471c7be48b SHA512 3e8e5a8e8ff804c2b283277d0480821645871ffff9ec36f4bd18022410ca5b1135d7c75e333aa8b3f95310a85353211e014a14e49af794d59b4fd97ed375f0da
+AUX server.initd-r1 564 BLAKE2B f7a06b16a509f3ca14971cb07aba7cbae1e161e3d7b639e2806b923dab3530f630b9bb2847a463cd523c93bae66038c1153693ad447629fe906e55a3f24ec7a5 SHA512 baf151c87de37decb1780888188467c11f42e653123db9b09f73591fe87e0b5094663f88dcdeeead113ed0620e8529f5759840c01fced34a1814188ef659cf55
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
@@ -53,7 +57,9 @@ DIST dtoa-0.4.3.crate 14456 BLAKE2B e310c71454a3ebe77e9b3f479b45b8dc15b988823eee
 DIST either-1.5.0.crate 10900 BLAKE2B 5db7e6758a91dbb7ea7c9f49b17d03e98463894e9fb95914e519542367f9f87986358b4ce0f34e261b31c204af532ed962b2ddee2e6fee9ab001e7f372371711 SHA512 9dc046f2c27bf12f57413443586171cb1d7574e5de76e02af892f9027bc66c2cab840180ad85af3833aee61d5fec033c77a15809492e8c2a78b541addbc81df0
 DIST encoding_rs-0.8.10.crate 1244099 BLAKE2B 855a2af8075d8ac81e24978b6d03017db408319e8fe485b372af06addfd9930df0841d99f986edc7c16bc9822bdac72bf7af56582a3ca441e66f4cf0266f213c SHA512 b6ad406bb549c0a0e7aeaf11961eb45f640ce0f83baadc54408827db04d69a70e490f8bff54dd01a0457a9fe717ae42b9d5c59d89f8246219fe640f77a4208bc
 DIST env_logger-0.5.13.crate 25275 BLAKE2B 02d13c40bafa9e403ba1e3582e296d132061ef020183d39a071f9ab4606a8f45cd211708ab8757d6dd9c04bf4b79b429c0db4bc293a8dbce0506b643d1a6aba5 SHA512 46739cbdcfb34e56b65c7839a5d62ec0f285359dd415bcdcbd2de5ad8e8015aee5a31e92c202c94da5d75235dee4f49ad8585fb852be1f8b2852438922ed4a99
+DIST error-chain-0.11.0.crate 27207 BLAKE2B e50c4e2d6a173e9866311bb81adbde4bddd64d529bfcc919ecade60926112b537cff491a4ba8e84586b3dc63e87e2b3c0695452c165ddf202d6901b2d6247f2c SHA512 a7c06be660a554b4c50deacaf6ef0699cf6e8cf234d9610324c70dac0cffeff1540dfbf10efd41427858551b095c998d670f1287c9459c35217bd78d8887c60b
 DIST error-chain-0.12.0.crate 27056 BLAKE2B a6d699ae63838d3b0d40a63977642fc464558fd45a46c2da9c7a57889450f7ce183c43dddfbe325c8cf6db2775c1a41f547bfd3802cda5b46d4a09f6e0a91aa5 SHA512 7e9fd94de9f0f8e61039766953d85b3cc5f87be2b8c37016295031ea3234dbcbccd111f521ddaaf97dab7f8ff8c30828b8949958014ef1e13a02544b6143b9e4
+DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
 DIST escargot-0.3.1.crate 12708 BLAKE2B b6beb0243d791576070ed0662e39944c28204aed3345d63be96d2e43851840e6bad084e5d38aad2e775169c25661aded27fa866048b4725e5c2d654e7db55411 SHA512 4d7b28c08aba0cb8d61c0df4ad1fec2c2e940495384160dc16dafaaa0f65a603d9acd4b53ce6c87fd55f255ff28aa78265c17254bea8489c7b6b9b27f9f7c92f
 DIST failure-0.1.3.crate 34107 BLAKE2B 6ed7b1f978bc88b5a8c3e6b30854cf0718ec7882c88834f7464bdf2864a784026a90034239c09ae433b4938293be7fe8034bc32b295350db1bf38e76f140a47d SHA512 b77170bb749da6a8af01cb9bbd42c5e75ff72ed74886d8ae1223bf6a7c2089c0bd37420e9e2eb5fa74c58214e49c0d00ff632008d7f6d6c831ede92db8de7e64
 DIST failure_derive-0.1.3.crate 4349 BLAKE2B 1e5b282737425c0ce9c6bbfa3ee47748c65ad5914fe253ead5dd684770078bee4748418510080e47e4b6c6b7be60e99cf214b42055bcedf2653c3668c9c6ece0 SHA512 22e75f72a5bb739003a65e6d8d0f8a8b4f02b605829bc1c4e5b1f87a45e5e46b0a6dd4ddce0d3b3bb029fa5d177a2e01de510e29103e24038c795d4354c76eb4
@@ -102,6 +108,7 @@ DIST lock_api-0.1.5.crate 16967 BLAKE2B c44ebe24fa6074394d0719b293d447ab67a9a237
 DIST log-0.3.9.crate 16686 BLAKE2B 543a8a2425c88bd3cf00d4cd2b4790ef344f9743b61776d65f1d8aaaa1ee1069933e33aec114a2dcaada5cf698bbd983fb22354aa50bca58b161a36b2f1efc47 SHA512 1d49a0dcff0a17c1238aba6a6cbc485a61986e8c4768805ded912c5014d0fba6ca38c9bd038f3f53900a6309d41fc0216682f137362e63715878195453d2de6f
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST lru-disk-cache-0.2.0.crate 10160 BLAKE2B 2a5e9316f72446c7d43893ceadf463e5081f04372565045fdea17cc0fb7ef501e1a3fcb54ae22c75278c49384e4aaac61bc1b312b74a1a8f98d6935c925bec8c SHA512 ec21cf5c66151b14cb0330d4c240a88856016a4235060b2b58f184d2da175900f2a3a16e0bd03f4fb66e164c81e7d55f5603df911022ee528a10b6d6822593c9
+DIST lru-disk-cache-0.3.0.crate 10560 BLAKE2B b027b7b84a553e47cbe46520d0271025bbb9067e9f0f5a0539b01cded949f0b32e3dec390b84211a603efc92e729059801a6d675e01fb798f9be4e7c0592a268 SHA512 d8aac241e43140984500c443ae61f30ce33a1532b6200d63f122a3b2aed9aad8c9a790f6387644947df2accafcd060b5bc75a0fa9c19e14b1f99dd86d870e50d
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST md5-0.3.8.crate 6177 BLAKE2B ccfe37b9ec1284e5b7a1532d521ac2a96f3a77488166a71b5e57ac5d848db6db9a3b43cda0a5f8d2ec35f353b0576f4c16f50a6fb5041844c668462f0afcd05a SHA512 3cff7965ac287077803a1cae6e808f8157ed182ab282c948fae6f936692b08ce904ecdf53d37b83989aaf57dceaf1e82984c749ca27a2ca83f8eed2945f36398
 DIST memcached-rs-0.3.0.crate 19015 BLAKE2B e50bfe0f85ad0706fc90aa46c1f36f6291377e5d4ce0da1e242a050420ac35e53cd5f5dbe21659ea69b0077bfc248ad2b9ae8bff05ae7bbf54d5760f31a0c8c0 SHA512 bdba069d806d7d032eec08c0328f9bf8a388746d1072e7a654b9c4ca2fce34f164ad1ffd1d91239eaf8e34c821b83bfe6a46ec5c81f7768874627a26183b24f5
@@ -176,6 +183,7 @@ DIST reqwest-0.8.8.crate 55825 BLAKE2B b4bbde5f4229f1ebf797d47a4447fb9e882067f0b
 DIST reqwest-0.9.5.crate 63819 BLAKE2B f8f2a524cd542b234966712a07d7178ff24d57fe2fe809c9830f08e91f994575f7f6cb3accaf9e12188033ab9becd384b7c1b654862409cb42b65928d6e2d9dc SHA512 c63ee8937bc91427e6a40539cace7d91722660e517ee789e57584be49efe299f0a7e3ff7a8addcd74109fb69d8ec4cc0697508bda577a94eea6b471815a00de8
 DIST retry-0.4.0.crate 3875 BLAKE2B 2484122c3aeb1cbeb5b6152a2c3e9d329945530d3c7f01a8d4b9b83bcb7466ced9b0052acd523872192f7ce63c9b4f9d01dc7b86739c1e2ed0e44fab609397bc SHA512 e7581bf4b3d6217246a9fad57a3af5225c3cd0ef7916ab9cc4b4cd78b040ba5e708d04b0315237a7cbc61f644c5435e24006346f43016cedf1affded1b839be2
 DIST ring-0.13.2.crate 5422395 BLAKE2B ec0b8f53e63447d7702c359c260cfbfd201ae3c9773c62ccfe64d24675f5ac41a05aa650c7d0e6be64e9e4222b439ec7db133df542161cbb55b5d9a131b37718 SHA512 0b2fa741bb9c3b085c74ca0daab3f89814178934e9bd4bb1522b8f2fd3bbccf70909667cc22d03d8ad113e714ccf04aa695231bb8c890b20ec72a9ad9252ef86
+DIST ring-0.13.5.crate 5419321 BLAKE2B 8f81b3fd2ef84574ec7763d40c1f37d7d8c324c8d00f49d181f152412ca084b0f765abfb09f5c380c6fd2b116eb9706acd96c724030d71f7950368a902ce1de4 SHA512 18c2bfa44fdbdd8006b114dc97b66979dd24bde852d793f67b8107c3a2fc73934a3817d4911d5e1dc9d0bf70053c7467c657fa87577d9608d10a4b7a9e63ba6c
 DIST rouille-2.2.0.crate 71003 BLAKE2B d6ab434e666e471f019533ca394bfe66a1c4e23ea3c66dbefc7f5e8c37d9651ad013c0bc25d8f8c0742819b28fae028606a666ba741e0b424062acbe3d549c42 SHA512 b9b105d59f24773f9a29ddd293be671b8544790cacf83e6e53601d186c7f8b14f5f52556fc5424c1d060e54ba1c8dc1ec492f6a9b698404d7a4c41839bb6ca56
 DIST rust-crypto-0.2.36.crate 857879 BLAKE2B c486a2e43eb9ac9d2558bb39a249dcd689e86eef51d9a7613a3964baa633cebec824d5a490254dc06eca7a5faa471126de92452d62c522a3dbf494b9940a13e1 SHA512 0fac026d8799ecde523f20e7b34b9486343e48b95e79cd76bb6c8bfaeaebed550e45d59d85d8a3a58595f10c02a4a5e55691da15c203a4336a9bdb5480cd2e90
 DIST rustc-demangle-0.1.9.crate 11463 BLAKE2B 3f03fab938d2778f4a74c101da6adec0eed5033bf06e724a5978de16cabf0341790df5da9c68376ba1d85a048575ff644e14297767950ef15d68c337a5d865b8 SHA512 7047907a0246384eb672bb8fd69a201a205b18460bab857e481606d1b9e25c2629c2898118edd72391da1d1f83b6caf4fb2a78eda19edb6dc7025eadebcc13f1
@@ -186,6 +194,7 @@ DIST safemem-0.2.0.crate 6450 BLAKE2B 44598e47fa6185ec0890b4ba6d0e7b5f52f8892875
 DIST safemem-0.3.0.crate 6947 BLAKE2B 1f3e86944eda42c890a5f5792b7e0a50fe6574b1cbb077b7f08aca7dfd33e26deb0fccb3aa96056de3d637d014658b682aa47b523f0efb1f8145af7bf34ce3a7 SHA512 c7d56204b29e9c0fcf925ccc43a2c910f6cd74d232c500b61996559a783ced3938cefa058128d72759e94edea683bb8922ac5ea631d16e31b58de093d6650b0f
 DIST same-file-0.1.3.crate 7078 BLAKE2B 175390d4c7cbe5b98b27b6d23adcef78beda50277f0035eb58d630591023fff92756e928d2089e915e166c5da6a8b1d5b3184e82576eab5145c1681d46b4e953 SHA512 2d3d03ab0dd4add93cd32e7ca43041d541bee41000fd8d98575a58cbd192fe4498234ab80baa3c4791de9f3d4214feae90f628fd655e3510ede61f757be3a82c
 DIST sccache-0.2.8.tar.gz 229658 BLAKE2B 95a9f7f3adf72dfc49e344de10e374e80e09d0d0ec91fa913da06f8c068a3e4632aecf30a3349ae02ebaa5d3984d5342258842656133fac77db33e0aaae7f75b SHA512 3469a50339892ca2495f5655a1bd9fcb21a60bd01384c6851789e806902d95d605a941b1a09e0172eef663bddbc7d32fba3afc9ec76bd2a27f32acb1b7b0a35f
+DIST sccache-0.2.9.tar.gz 239624 BLAKE2B a8b91e71512cf37c4d51fcfab8339345c8c4c6ab542422228f0b573220b2b5256d54c8347e36c54cbe39b6c3b5f7ecea3606b52564dc21af0a143bb2cf49f7aa SHA512 289109338913c935752e9bbcd45b7bf4ef48be03b5a7d92c93ac220b98f04338ff562030cf126f80bda8db41e83b1103e6c2bd55caaeef4d7804157f4f685080
 DIST schannel-0.1.14.crate 38833 BLAKE2B 8825f6325f65c5aa4031a2260c4c54ad2a65634d2ce349bf6c31fc10a76f539dfe58d4de1e04fe6e48e885fabf5f720f5b4e4625f4a511e96c7cfe9837c901fa SHA512 550623a87f01c3c6181dad44d44397f172aa07c1b262a78d6eb38ca0676d68bcb8f231970c4eac87e93286225e17acae09551b07128c43b576ea77caae18c0b7
 DIST scoped-tls-0.1.2.crate 9079 BLAKE2B 35e15480e05c48d5b886bf94f2fc58f79e7b5f6132c8e81ca8f37140f58d21e8a30dab56de35cc395b1878083f9e7b187af7e580bc61f8f38975b2e1193abb57 SHA512 9e1a517994f06dcdafa05f3ebe67958ed5bc751e6180cff6c891f48fbc143f3279aa841e6109be2c403b492162bdd90b23cf74aeb2154a34748c5d495789fd73
 DIST scopeguard-0.3.3.crate 9605 BLAKE2B 2379e45123c1c6ef456001cccbcec3298d6d32a5197ee9ac51e0233522cc24e8dff1900f1a70fe4d8a7889348b0c668e8e5c8956ec0add0898c719ae8e2a0a5d SHA512 57ce8e32dbe342040a63ec65fbef3680d66d439f0f704c5d485670041505905cfc602e7e3580748b4b4a55ce892d17a453e6d2f853cf0de4c6a2082f0fe95719
@@ -215,6 +224,7 @@ DIST syn-0.11.11.crate 63309 BLAKE2B ee33d3f02af356faafd0c03539d1c86ade1f46db8bc
 DIST syn-0.15.21.crate 146845 BLAKE2B 843c3d7a4853c50be188f7c67a329220cf8e65a467e9a63b3a28ad88fe89063bbde3873f10bbf81357cc5f192756c0c4b43162fe4412471edf914d7e5d0509e8 SHA512 606ffd4bcd74920e7023b2fc83a83087f4a559a9dec0a4a0d5fb6667b9887f98c413191a84b81ddba68e869dfc9fa7d31a3018f90eaed0ad96a039fc46074391
 DIST synom-0.11.3.crate 17120 BLAKE2B 30c6bdaff48eb2f3c28a348f737ad4b9ebf4b385de75ec2510aa9fef3b426a8a00041d0dd1649d11a9ba39cd4b9363e0e3f7d808cd0b2d588a38edb395be86d5 SHA512 a9c75d667be94c82c7f545e0569bb5858afd1bfca6e045fd52f4ae18ec4fd440e7d374ef45dafc97bda6c749cd4b4e185d8192b833661657323229803ef4a28e
 DIST synstructure-0.10.1.crate 17836 BLAKE2B d80745963f581c02a3b9587d45586e2098632a4c21de22547ae97531bbc4f30a1b02989306999c67584c507a5b07978a48f65ad5e00ff55f39e8e0bb4fdbfa8e SHA512 5830eea0eab15c7ed737bfa14c7bbfc73f28af6964ce3148542066fb9760a80dbba82fd9a55078426346ba757e0aaba9addecadb1d0f75eac4f029a6e4c7cc19
+DIST syslog-4.0.1.crate 7131 BLAKE2B a6555d6eed6a0701cca7d58554f2ee612a5d18975dc1979414ac536128e0e7d4a67dde0ad2e40b5ffec823f7edd55dc45d646097fcd457fa6124de95411b4c55 SHA512 faff2117fbf377343149e30a4b338fdd799fb7e4bf425962c2523423f8322aae75f180e4a4c42f1497239400cc60a49cfcf65c00c48433ac956ff17e52063341
 DIST tar-0.4.20.crate 45525 BLAKE2B 43e29895b6c22b919ce1178ec763fedbf6565d88156630507099da7def5b61352aa0b988265c39d235dcf791098ae8c4a05405a1dd22a1cc0f32221c583871ff SHA512 0786f88e54f88ad99131450e55d5840832dac11d7a7f7d9a2e8bb69695ea2e98a568bf263a3ea5af08013c9da2b768a36698391cb52f9c8b84cdee5ae98bc13a
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST tempfile-3.0.4.crate 21125 BLAKE2B 27781b6755ef3ea66e31f42e89931e9d5439dc71456da95c399c00b1e5dd5037b17a7f5901fb8cfb33284b2bfc506b6dc5890704722f4154947ee413777f2564 SHA512 54890e6632f7fe81914b013fb63951eb651f7c833c6857db7dc701ca719108131acf97dfd5af4c821d32902618bd9e256ec4dd39edaa42f57f9f459a246b2770
@@ -287,4 +297,5 @@ DIST ws2_32-sys-0.2.1.crate 4697 BLAKE2B 52a7a3f57bcd73156730ada4d78fe12a54a498c
 DIST xattr-0.2.2.crate 11750 BLAKE2B a5fc393d16935411a89e152e7afe9622f5b78cc207c1f3980c65f26adbe177efaa6c93e0c6ecac4ee0687609a932c957efb11678c9176d44010eebee651fc84c SHA512 a89d34313c35ab02d6ea25675c99f9c9650dee40a76223d62941edda43b3d2db83ed223bada129625b3cf8487c293646ce9980afc6dba8888fa078d5aa035cab
 DIST zip-0.4.2.crate 25852 BLAKE2B ea5e0e32ec66bc0b5bc0f3cfec4c81aa1c8c9dbf714ba024b9d609c2fe9b2cb0b11f9f788e74eb03a1764cf819c51cff6a637ab0580b52031841c00785b9d010 SHA512 84bf51fb83db91d0f6151e7ed4fe59cfcac5dacaa4da58ab09e226a48b14287275f121cf6302b29c693dbcb16e720fbccce7d6d986364ad5d403715235ed98e4
 EBUILD sccache-0.2.8-r2.ebuild 6419 BLAKE2B 9c0405202cc4146003c4852188b365689d25a2c23703131d9114bd2f83817d83d925c384916bce0c49077b0442ecf010f793dd48c1305f79cea49937f47b8c94 SHA512 3e1ab2fc36197abffed8a8e9d646055fe1e459e3659efa2954c82516fb4a3ddf2dc5ff6a6517f7c127a4d63189f96d424f9d2ea4e7f7edbd204d0e3103037acf
+EBUILD sccache-0.2.9.ebuild 6393 BLAKE2B d71659395cb9313b4c7ec1b1402b963b4950ed9d29fba63f99095d344fdf5d5474618c2165831660c19437a98b4e518b548de27bd34cec59f82cde6597a5286c SHA512 2d13edf303a22d84b6480008a099c15e5058d2e53a20b448dea1b06b2d9f2ccb57564035079765bb98b0919b5f05fa650cdbeef75c0a6803b47d8165b4ac0648
 MISC metadata.xml 1054 BLAKE2B 13d8f1062d23ea96ec26e52b27c8a3b4a47b3e3f48e06b2b4ae39bb068604556ecb76f3319fc2578babc10cd235ed0ab5a28722b9cbb0a776b8a35d60dead4ea SHA512 2f8a4161a99a060d4651f195eb459173f0e02bf3dd72371611b94408c8cb2f8e7537004a0b9d90cae461cc0ba8e1531a80823db6734cb8241ad57737fd50b5a5
diff --git a/dev-util/sccache/files/scheduler.confd-r1 b/dev-util/sccache/files/scheduler.confd-r1
new file mode 100644
index 000000000000..5cb8299fd37b
--- /dev/null
+++ b/dev-util/sccache/files/scheduler.confd-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/sccache-scheduler: config file for /etc/init.d/sccache-scheduler
+#
+
+# Full path to config file. /etc/sccache/scheduler.conf is default if not set.
+#SCCACHE_SCHEDULER_CONF="/etc/sccache/scheduler.conf"
+
+# logging is off by default, possible values are: error warn info debug trace
+#SCCACHE_SCHEDULER_LOGLEVEL=info
+
+# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
+#SSD_NICELEVEL=15
+#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/scheduler.initd b/dev-util/sccache/files/scheduler.initd
index fd4d616a6bd6..fd4d616a6bd6 100755..100644
--- a/dev-util/sccache/files/scheduler.initd
+++ b/dev-util/sccache/files/scheduler.initd
diff --git a/dev-util/sccache/files/scheduler.initd-r1 b/dev-util/sccache/files/scheduler.initd-r1
new file mode 100644
index 000000000000..ae9f60bff8b2
--- /dev/null
+++ b/dev-util/sccache/files/scheduler.initd-r1
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SCCACHE_SCHEDULER_CONF="${SCCACHE_SCHEDULER_CONF:-/etc/sccache/scheduler.conf}"
+
+depend() {
+	need localmount
+	use net
+}
+
+description="Starts sccache build scheduler server"
+
+command="/usr/bin/sccache-dist"
+command_args="--config ${SCCACHE_SCHEDULER_CONF} ${SCCACHE_SCHEDULER_LOGLEVEL:+--syslog ${SCCACHE_SCHEDULER_LOGLEVEL}}"
+procname="${command} scheduler"
+required_files="${SCCACHE_SCHEDULER_CONF}"
diff --git a/dev-util/sccache/files/server.confd-r1 b/dev-util/sccache/files/server.confd-r1
new file mode 100644
index 000000000000..4413f0c9bca2
--- /dev/null
+++ b/dev-util/sccache/files/server.confd-r1
@@ -0,0 +1,12 @@
+# /etc/conf.d/sccache-server: config file for /etc/init.d/sccache-server
+#
+
+# Full path to config file. /etc/sccache/server.conf is default if not set.
+#SCCACHE_SERVER_CONF="/etc/sccache/server.conf"
+
+# logging is off by default, possible values are: error warn info debug trace
+#SCCACHE_SERVER_LOGLEVEL=info
+
+# no limits set by default, see IONICE(1), NICE(1), START-STOP-DAEMON(8)
+#SSD_NICELEVEL=15
+#SSD_IONICELEVEL=3
diff --git a/dev-util/sccache/files/server.initd b/dev-util/sccache/files/server.initd
index 0c37ee400b05..0c37ee400b05 100755..100644
--- a/dev-util/sccache/files/server.initd
+++ b/dev-util/sccache/files/server.initd
diff --git a/dev-util/sccache/files/server.initd-r1 b/dev-util/sccache/files/server.initd-r1
new file mode 100644
index 000000000000..19656cc6a058
--- /dev/null
+++ b/dev-util/sccache/files/server.initd-r1
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+SCCACHE_SERVER_CONF="${SCCACHE_SERVER_CONF:-/etc/sccache/server.conf}"
+
+depend() {
+        need localmount
+        use net
+}
+
+description="Starts sccache build server"
+
+command="/usr/bin/sccache-dist"
+command_args="--config ${SCCACHE_SERVER_CONF} ${SCCACHE_SERVER_LOGLEVEL:+--syslog ${SCCACHE_SERVER_LOGLEVEL}}"
+command_background="true"
+pidfile="/run/${RC_SVCNAME}.pid"
+procname="${command} server"
+required_files="${SCCACHE_SERVER_CONF}"
diff --git a/dev-util/sccache/sccache-0.2.9.ebuild b/dev-util/sccache/sccache-0.2.9.ebuild
new file mode 100644
index 000000000000..d1941557a46d
--- /dev/null
+++ b/dev-util/sccache/sccache-0.2.9.ebuild
@@ -0,0 +1,358 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# needs itoa-0.3.4 for tests
+CRATES="
+adler32-1.0.3
+aho-corasick-0.6.9
+ansi_term-0.11.0
+ar-0.6.1
+arc-swap-0.3.6
+arraydeque-0.4.3
+arrayvec-0.4.7
+ascii-0.8.7
+ascii-0.9.1
+assert_cmd-0.9.1
+atty-0.2.11
+backtrace-0.3.9
+backtrace-sys-0.1.24
+base64-0.9.3
+bincode-0.8.0
+bincode-1.0.1
+bitflags-0.9.1
+bitflags-1.0.4
+buf_redux-0.6.3
+bufstream-0.1.4
+build_const-0.2.1
+byteorder-1.2.7
+bytes-0.4.11
+case-0.1.0
+cc-1.0.25
+cfg-if-0.1.6
+chrono-0.4.6
+chunked_transfer-0.3.1
+clap-2.32.0
+cloudabi-0.0.3
+combine-3.6.3
+conhash-0.4.0
+core-foundation-0.2.3
+core-foundation-0.5.1
+core-foundation-sys-0.2.3
+core-foundation-sys-0.5.1
+counted-array-0.1.2
+crc-1.8.1
+crossbeam-deque-0.6.2
+crossbeam-epoch-0.6.1
+crossbeam-utils-0.5.0
+crossbeam-utils-0.6.1
+daemonize-0.3.0
+derive-error-0.0.3
+difference-2.0.0
+directories-1.0.2
+dtoa-0.4.3
+either-1.5.0
+encoding_rs-0.8.10
+env_logger-0.5.13
+error-chain-0.11.0
+error-chain-0.12.1
+escargot-0.3.1
+failure-0.1.3
+failure_derive-0.1.3
+filetime-0.1.15
+filetime-0.2.4
+flate2-1.0.5
+flate2-crc-0.1.1
+float-cmp-0.4.0
+fnv-1.0.6
+foreign-types-0.3.2
+foreign-types-shared-0.1.1
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+futures-0.1.25
+futures-cpupool-0.1.8
+gcc-0.3.55
+getopts-0.2.18
+h2-0.1.13
+http-0.1.14
+httparse-1.3.3
+humantime-1.1.1
+hyper-0.11.27
+hyper-0.12.16
+hyper-tls-0.1.4
+hyper-tls-0.3.1
+hyperx-0.12.0
+idna-0.1.5
+indexmap-1.0.2
+iovec-0.1.2
+itertools-0.7.9
+itoa-0.3.4
+itoa-0.4.3
+jobserver-0.1.11
+jsonwebtoken-5.0.1
+kernel32-sys-0.2.2
+language-tags-0.2.2
+lazy_static-0.2.11
+lazy_static-1.2.0
+lazycell-1.2.0
+libc-0.2.44
+libflate-0.1.18
+libmount-0.1.11
+linked-hash-map-0.2.1
+local-encoding-0.2.0
+lock_api-0.1.5
+log-0.3.9
+log-0.4.6
+lru-disk-cache-0.3.0
+matches-0.1.8
+md5-0.3.8
+memcached-rs-0.3.0
+memchr-1.0.2
+memchr-2.1.1
+memoffset-0.2.1
+mime-0.2.6
+mime-0.3.12
+mime_guess-1.8.6
+mime_guess-2.0.0-alpha.6
+miniz_oxide-0.2.0
+miniz_oxide_c_api-0.2.0
+mio-0.6.16
+mio-named-pipes-0.1.6
+mio-uds-0.6.7
+miow-0.2.1
+miow-0.3.3
+msdos_time-0.1.6
+multipart-0.13.6
+native-tls-0.1.5
+native-tls-0.2.2
+net2-0.2.33
+nix-0.11.0
+nodrop-0.1.13
+normalize-line-endings-0.2.2
+num-integer-0.1.39
+num-traits-0.1.43
+num-traits-0.2.6
+num_cpus-1.8.0
+number_prefix-0.2.8
+openssl-0.10.15
+openssl-0.9.24
+openssl-probe-0.1.2
+openssl-sys-0.9.39
+owning_ref-0.4.0
+parking_lot-0.6.4
+parking_lot_core-0.3.1
+percent-encoding-1.0.1
+phf-0.7.23
+phf_codegen-0.7.23
+phf_generator-0.7.23
+phf_shared-0.7.23
+pkg-config-0.3.14
+podio-0.1.6
+predicates-0.9.1
+predicates-core-0.9.0
+predicates-tree-0.9.0
+proc-macro2-0.4.24
+pulldown-cmark-0.0.3
+quick-error-1.2.2
+quote-0.3.15
+quote-0.6.10
+rand-0.3.22
+rand-0.4.3
+rand-0.5.5
+rand-0.6.1
+rand_chacha-0.1.0
+rand_core-0.2.2
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.0
+rand_pcg-0.1.1
+rand_xorshift-0.1.0
+redis-0.9.1
+redox_syscall-0.1.42
+redox_termios-0.1.1
+regex-1.0.6
+regex-syntax-0.6.3
+relay-0.1.1
+remove_dir_all-0.5.1
+reqwest-0.8.8
+reqwest-0.9.5
+retry-0.4.0
+ring-0.13.5
+rouille-2.2.0
+rust-crypto-0.2.36
+rustc-demangle-0.1.9
+rustc-serialize-0.3.24
+rustc_version-0.2.3
+ryu-0.2.7
+safemem-0.2.0
+safemem-0.3.0
+same-file-0.1.3
+schannel-0.1.14
+scoped-tls-0.1.2
+scopeguard-0.3.3
+security-framework-0.1.16
+security-framework-0.2.1
+security-framework-sys-0.1.16
+security-framework-sys-0.2.1
+selenium-rs-0.1.1
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.80
+serde_derive-1.0.80
+serde_json-1.0.33
+serde_urlencoded-0.5.4
+sha1-0.6.0
+signal-hook-0.1.6
+siphasher-0.2.3
+skeptic-0.4.0
+slab-0.4.1
+smallvec-0.6.6
+socket2-0.3.8
+stable_deref_trait-1.1.1
+string-0.1.2
+strip-ansi-escapes-0.1.0
+strsim-0.7.0
+syn-0.11.11
+syn-0.15.21
+synom-0.11.3
+synstructure-0.10.1
+syslog-4.0.1
+tar-0.4.20
+tempdir-0.3.7
+tempfile-3.0.4
+term-0.5.1
+termcolor-1.0.4
+termion-1.5.1
+textwrap-0.10.0
+thread_local-0.3.6
+threadpool-1.7.1
+time-0.1.40
+tiny_http-0.6.2
+tokio-0.1.13
+tokio-codec-0.1.1
+tokio-core-0.1.17
+tokio-current-thread-0.1.4
+tokio-executor-0.1.5
+tokio-fs-0.1.4
+tokio-io-0.1.10
+tokio-named-pipes-0.1.0
+tokio-process-0.2.3
+tokio-reactor-0.1.7
+tokio-serde-0.1.0
+tokio-serde-bincode-0.1.1
+tokio-service-0.1.0
+tokio-signal-0.2.7
+tokio-tcp-0.1.2
+tokio-threadpool-0.1.9
+tokio-timer-0.2.8
+tokio-tls-0.1.4
+tokio-udp-0.1.3
+tokio-uds-0.2.4
+toml-0.4.9
+treeline-0.1.0
+try-lock-0.1.0
+try-lock-0.2.2
+twoway-0.1.8
+ucd-util-0.1.3
+unicase-1.4.2
+unicase-2.2.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.7
+unicode-width-0.1.5
+unicode-xid-0.0.4
+unicode-xid-0.1.0
+unix_socket-0.5.0
+unreachable-1.0.0
+untrusted-0.6.2
+url-1.7.2
+utf8-ranges-1.0.2
+utf8parse-0.1.1
+uuid-0.6.5
+uuid-0.7.1
+vcpkg-0.2.6
+vec_map-0.8.1
+version_check-0.1.5
+void-1.0.2
+vte-0.3.3
+walkdir-1.0.7
+want-0.0.4
+want-0.0.6
+which-2.0.0
+winapi-0.2.8
+winapi-0.3.6
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.1
+winapi-x86_64-pc-windows-gnu-0.4.0
+wincolor-1.0.1
+ws2_32-sys-0.2.1
+xattr-0.2.2
+zip-0.4.2
+"
+
+inherit cargo eutils
+
+DESCRIPTION="ccache/distcc like tool with support for rust and cloud storage"
+HOMEPAGE="https://github.com/mozilla/sccache/"
+SRC_URI="https://github.com/mozilla/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="azure dist-client dist-server gcs memcached redis s3"
+
+DEPEND="
+	dist-server? ( dev-libs/openssl:0= )
+	gcs? ( dev-libs/openssl:0= )
+"
+
+RDEPEND="${DEPEND}
+	dist-server? ( sys-apps/bubblewrap )
+"
+
+QA_FLAGS_IGNORED="usr/bin/sccache*"
+
+src_configure() {
+	myfeatures=(
+		$(usev azure)
+		$(usev dist-client)
+		$(usev dist-server)
+		$(usev gcs)
+		$(usev memcached)
+		$(usev redis)
+		$(usev s3)
+	)
+}
+
+src_compile(){
+	cargo_src_compile ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+src_install() {
+	cargo_src_install --path=. ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+
+	keepdir /etc/sccache
+
+	einstalldocs
+	dodoc -r docs/.
+
+	if use dist-server; then
+		newinitd "${FILESDIR}"/server.initd-r1 sccache-server
+		newconfd "${FILESDIR}"/server.confd-r1 sccache-server
+
+		newinitd "${FILESDIR}"/scheduler.initd-r1 sccache-scheduler
+		newconfd "${FILESDIR}"/scheduler.confd-r1 sccache-scheduler
+	fi
+}
+
+src_test() {
+	cargo_src_test ${myfeatures:+--features "${myfeatures[*]}"} --no-default-features
+}
+
+pkg_postinst() {
+	ewarn "${PN} is experimental, please use with care"
+	use memcached && optfeature "memcached backend support" net-misc/memcached
+	use redis && optfeature "redis backend support" dev-db/redis
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 9c93fb97843f..7a4cd8b7b224 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -14,8 +14,13 @@ DIST scons-3.0.5-user.html 1130793 BLAKE2B 24bf6d5d566fe3c06879b797a77df5eda7382
 DIST scons-3.0.5-user.pdf 2562305 BLAKE2B 48c206386f163a2779b27ede1b77783067a695e7f59255473343ddd3a19c4d39ceb7c7e5ccf819f76eda9282f5fb8d36bd0250a4a18f5e9d1a65fd3148276173 SHA512 443855ecddd1bc56f06b150da5d7b276a4dfe5ff8c5376b3c35b73f8281a89583308ddd138e120e33f67afa2cdd1b9a1366a533306ba4dfa460f439e4a2f33b4
 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
+DIST scons-3.1.0-user.html 1133694 BLAKE2B b7a208668db2303e873f5e7f09b9ad92d5197801a63ff392b086e0dbf1baa9c19d8208a6d9718aa7869e320d85cf3fcd5f24c5fe41dfded9f4a8d21d4bbb9b63 SHA512 731308886a660770aeb7b17020e99cbeb736a0bad8e138ff2363ea5297866445325daa4802ee051e0c01720aa73856163fb9da2fe5fb11077b9a2197e0c24323
+DIST scons-3.1.0-user.pdf 2564059 BLAKE2B 989469fd21e8989acf8e7ca2cf2c72dc584a3e708743e357fc2bd55173dbf64d9e2795706bc585975e8d86c754e1e44947feedf5156fb2b66c9f5402a9a015c6 SHA512 a92c4590a06ef2f4872e06db6d20bad333c5983b43d258574847d36976522888d6424781f43142b44abf4f8abc6f501b9894c476a9d1497b260d42efd48d8e8b
+DIST scons-3.1.0.gh.tar.gz 5528270 BLAKE2B d56d02f7d4550af8df42b5c5f8fda02a92ad6aedabb44e69bd46cb4ecf0f0de6b86a8f1ea65e9c4e5e57430f47c9ec7f354d366e60569b4c414bb15d4e52cc84 SHA512 3894d17bca02b9aa5426c70d894b8ecfcf3db2b20254b848209c31d8413a8cd1c2a7b2a87ef9bcfe5555980beb2815f62cdbe185098a64ae8b3506c41c867463
+DIST scons-3.1.0.tar.gz 661528 BLAKE2B deb3b8b4d22ec705674be3e2f84bb35b4726d5f7c082a341d2319d471a3302fc89bfdadc7545f0f4cc0c321c67301b364bdb5723a1d10374eee636b486197092 SHA512 b2d61e364bcff29027a7ba70e2a74186ab136b00f147ff358701aaf68f47134e18e24c2a9cb1ff9ec0fb4fb73ffa21e04043157f2b5cd975aca7fc91c69385ee
 EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
 EBUILD scons-3.0.4.ebuild 2115 BLAKE2B 87f1ed75b61212eb76233c2f3b91903a9e40c8214d164a0b2c72a86d32c80cfea76681176b333738ba577c4c73edd0d1474e1e10125caa85ddd19c070351b850 SHA512 71fe9496eebdf581b1b4ae793da2a3987ac900dfb50f62bf7e68bb1a3cc1f3539f4d226222e7b541be87fd661a0afb981c6ca65cb6c3e73c9ac34eba6294ec21
 EBUILD scons-3.0.5-r1.ebuild 2934 BLAKE2B da024a78f8779bb9acd0def27c39285145745553902af6df29ee0b88e9d70b164fc129cb548bab7ef0f6bad1b832c037bf26866f0af36941071756626e7a1d8d SHA512 09364d9f64c8003c7b363859f0bd99c1f1d084ba3c2b96ce6d973017f5b9a9e77c07529c66d5aaa29027bf4ae990a3c2451b5df3453923a3df0f05f063c24415
-EBUILD scons-3.0.5.ebuild 2114 BLAKE2B 5738f74cf6b37e5e6608a530701fff253f16c51eeb6d33552617c0ada4be08a50be7dac0068ca29c4526294cd10a62c307ec75c8c0925db4270d523afa257677 SHA512 42de8f6acd2be063f7574e925c3ae390d2703da2f16a13a84026fd1e1cc1a3d9a12ddacdbcca5b4fd2e6790a0c2dfa50aeafbc37d516e9a6116b97bc07ae1232
+EBUILD scons-3.0.5.ebuild 2112 BLAKE2B 17dc37551614e235adbf199ea6a7a1400f2fb2e5b6f0597598c898aab63d03ec45ca30d30d2efd163819c6d9f4f7dda7c0a9414752c7711728a47f4ada631c3f SHA512 e47023c29074d2dc3f3cd028be53a5e579274d607aceb6fd1060b5a4d9f595f662b2369d794763077025f2d69832c3fadd3f4bb348bb5fa01b5185ba50459fb0
+EBUILD scons-3.1.0.ebuild 2665 BLAKE2B 75bd542ba1d21f0bbeda322629e3d74b05e79c9862ebf61f138477952b0ffc7b1d43b5d49dce093c637b70417f4dd4644a3c233e4ec76ac9a0e005a1c034e54c SHA512 9773d952644741b475883a202482d54d2716d035bf3f2c440188af6bba6035c3ba5783d07b0ea1c1381d6149423819667922159a9c8acfb490ad5802896bce07
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/scons-3.0.5.ebuild b/dev-util/scons/scons-3.0.5.ebuild
index a4ed53868172..fcf6539d3a57 100644
--- a/dev-util/scons/scons-3.0.5.ebuild
+++ b/dev-util/scons/scons-3.0.5.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~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"
 # unresolved & unpredictable test failures
 RESTRICT="test"
diff --git a/dev-util/scons/scons-3.1.0.ebuild b/dev-util/scons/scons-3.1.0.ebuild
new file mode 100644
index 000000000000..4da9718eabcf
--- /dev/null
+++ b/dev-util/scons/scons-3.1.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Extensible Python-based build utility"
+HOMEPAGE="http://www.scons.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+	doc? (
+		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
+		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
+	)
+	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.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"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/libxml2[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+
+S=${WORKDIR}/${P}/src
+
+PATCHES=(
+	# support env passthrough for Gentoo ebuilds
+	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
+	# respect CC, CXX, C*FLAGS, LDFLAGS by default
+	"${FILESDIR}"/scons-3.0.3-respect-cc-etc-r1.patch
+)
+
+src_unpack() {
+	# use the git directory structure, but put pregenerated release
+	# inside src/ subdirectory to make our life easier
+	if use test; then
+		unpack "${P}.gh.tar.gz"
+	else
+		mkdir -p "${P}"/src || die
+	fi
+
+	tar -C "${P}"/src --strip-components=1 -xzf "${DISTDIR}/${P}.tar.gz" || die
+}
+
+src_prepare() {
+	# apply patches relatively to top directory
+	cd "${WORKDIR}/${P}" || die
+	distutils-r1_src_prepare
+
+	# remove half-broken, useless custom commands
+	# and fix manpage install location
+	sed -i -e '/cmdclass/,/},$/d' \
+		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
+}
+
+python_test() {
+	# set variable from escons() of scons-util.eclass to make env-passthrough patch work within test env
+	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
+	# unset some env variables to pass appropriate tests
+	unset AR AS ASFLAGS CC CXX CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
+	cd "${WORKDIR}/${P}" || die
+	"${EPYTHON}" runtest.py -a --passed \
+		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
+		--builddir "${BUILD_DIR}/lib"
+
+	# runtest.py script returns "0" if all tests are passed
+	# and returns "2" if there are any tests with "no result"
+	# (i.e. in case if some tools are not installed or it's Windows specific tests)
+	[[ ${?} == [02] ]] || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( {CHANGES,README,RELEASE}.txt )
+	distutils-r1_python_install_all
+	rm "${ED}/usr/bin/scons.bat" || die
+
+	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
+}
diff --git a/dev-util/shellcheck-bin/Manifest b/dev-util/shellcheck-bin/Manifest
index dd965b167f36..2286f17c3a11 100644
--- a/dev-util/shellcheck-bin/Manifest
+++ b/dev-util/shellcheck-bin/Manifest
@@ -1,4 +1,7 @@
 DIST shellcheck-v0.6.0.linux.armv6hf.tar.xz 2488420 BLAKE2B 5b5265845c596d82938d7bc7009d0e5736cf380b9686fc3f900130f859122bb4fb6e2ad9eba7ac2a06d32a0065cf97bed473af085712b9c1da5c57d46df5daa1 SHA512 ac60323430e7febfeaaf5f8b6e3c5500e173871757e46643f1a944eea67f6918bbc49869a63fb7089329a2090307d8364dbeabb390a5e42c094147f530589f81
 DIST shellcheck-v0.6.0.linux.x86_64.tar.xz 1484496 BLAKE2B 2f0d40b53a59dea15ae6bd972387071aea4e1d0f44bc1b7f74180d8744befd539a2e7e7aa4d5b78b65c82f8b94dc224b0730a9351a4fb1db1988c024fd85feac SHA512 6335d8888848a6fd351867c4f9732446b33c6b5e46343aebdbf1efa14ae99804d1e5af5b186b6ceba161d23b221b53d2a12e3a695231f8ac8f9ef46e2db9182b
+DIST shellcheck-v0.7.0.linux.armv6hf.tar.xz 2502980 BLAKE2B 5e8281a9a8bd7105bb852f917cb2fb252b7d5abdda26da8fc8a5d9aca2a3543fcaf88707ae3aae277578a4fcf973d66e1d457c1769ca4838e3131a1928b56437 SHA512 3cb41d339b0da7790b8451b9fb8c6e6d52444ab0f3115871049dbe04968ce88868b305d2be267af627991949f346ee1a8eb95dce4cb0e46c81a24b01d4f18f74
+DIST shellcheck-v0.7.0.linux.x86_64.tar.xz 1545588 BLAKE2B 30f4cfacdf9024a4f4c8233842f40a6027069e81cf5529f2441b22856773abcd716ee92d2303ad3cda5eaeecac3161e5980c0eedeb4ffa077d5c15c7f356512e SHA512 84e06bee3c8b8c25f46906350fb32708f4b661636c04e55bd19cdd1071265112d84906055372149678d37f09a1667019488c62a0561b81fe6a6b45ad4fae4ac0
 EBUILD shellcheck-bin-0.6.0.ebuild 633 BLAKE2B f822a45382a505abcd59572d39a0d6296cec646035b14291a15f13da4e4c0d64eb022992f5fe4dd7adaa4d08af8bcb0a90c55439f09da4680a566a0367695428 SHA512 66e316ed5eea9c11dfdd951bcd5dfa42ba2be60d3d34581fed1fd684beedd381b4f31f463f83412e70340ea2894defe0bf0762e5d62ab115e614567a69150b1c
+EBUILD shellcheck-bin-0.7.0.ebuild 634 BLAKE2B 44203d313988c05afd88316c3811b28ee53f30a8b62434a2e6e5ee5ea815effa72b3f9c7e0067bbc4315dde9dd0c7b48fb2b2fb5d094915c1f32a5f6c6734874 SHA512 437cdaaf0450eadcf69d94be971e576824c83797522c6481f403160bb3f5a2d9b5bd22c5427aff44a34ce72a8da470f345c6e537a850f3a324044d83ce6d8a28
 MISC metadata.xml 469 BLAKE2B 639f0079f57c613dff06b282358be8cdd287fbf2d361b053ebc62ede4efa2f4c17d9b27f420e97cde73f085446ded30d488e6f7efdec2584384688d68781ff34 SHA512 296cd96c77ffd3e87877ca773954954a08723d274ef91e7a292fc95f0b5a8d10f1d981a9c9ba2ed7c239347e3cd8eb47df2984071a58274a452e10abc2a58ad2
diff --git a/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
new file mode 100644
index 000000000000..8b6f2c39aa76
--- /dev/null
+++ b/dev-util/shellcheck-bin/shellcheck-bin-0.7.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=${PN/-bin/}
+
+DESCRIPTION="Shell script analysis tool (binary package)"
+HOMEPAGE="https://www.shellcheck.net/"
+SRC_URI="
+	amd64? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.x86_64.tar.xz )
+	arm? ( https://storage.googleapis.com/${MY_PN}/${MY_PN}-v${PV}.linux.armv6hf.tar.xz )
+"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+
+DEPEND="!dev-util/shellcheck"
+RDEPEND="${DEPEND}"
+
+QA_PREBUILT="/usr/bin/shellcheck"
+S="${WORKDIR}/${MY_PN}-v${PV}"
+
+src_install() {
+	dobin shellcheck
+	einstalldocs
+}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index 562b881799fe..8632f2230c28 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,11 +1,4 @@
-AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7166fdc9d80c207a8f086ac086ddef03c2697025215a1497d07dad28ac9cd7b9c269c4a8e74d684d10550b1f9858afafa3212a08261a52 SHA512 9386f1e5535df5eb1f30dbc053bf047a52f39b5a79c0a8c7c65add87128665e718a97b796f5ca8cdf1fcbeb51f713acb9d63d3ba7015619b20d15b7cddb48822
-DIST spirv-headers-1.3.1_pre20180710.tar.gz 281382 BLAKE2B 9e38c7779af97cae27c595f816d1e1cc99eb29e086dd4b6cb76cb4696f73f1e05f92f022b77639f5a80f517df75996fdbd10d7bb11cc6eccad8144a7b8b776d5 SHA512 5f0c174ea07dccefdd10242f5122e10b11f8975d2fb36f77975497050b10841fcb4a7f19d90c9ef5853a81dabc8d93b91621d07175a1cf3ab8ba7f6c16fe51fe
-DIST spirv-headers-1.3.4_pre20180917.tar.gz 283733 BLAKE2B 6bf0f5c00ae827f8a4b560dcbbe4c42d810cebefe0beecd3e7a022dc1f04bc2ed77f03ec2c0d0e6bf141ab1e4f058362f307c672cf92d83a8d1ceac2a200e659 SHA512 1fab471d07c9e85e75a3de08dccdd4ff7296ffd2cb265cb6cf7038e654c9d2afd8a2ee923eacfd2c47e02c5b139ab49271e489ce1b94f719b063be8910274598
 DIST spirv-headers-1.3.4_pre20190302.tar.gz 333676 BLAKE2B 7ac46ed9d369164d187564e12438001ebc77c912385b4ef8a5de4ff26942f27ce88486f980b69111e804c6aad5a7f4724913833f0dfd6246bf070dc5023df7df SHA512 d1e6ce59764ad03228cc12fedb1e16fca8c3ab5827882e1f3dec9c3d735125dddbd06fa4955ac3358bec2de8211164511e2d16205f175484e070b2bd87262c51
-DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
-EBUILD spirv-headers-1.3.1_pre20180710.ebuild 498 BLAKE2B 991fb177a5dfc150428d0dbaa50ef27a41aebbf445dc9aa9702b9976377f7ee40437999f1786561414c2b8c2a1436348cb1e82d7a6ae05bb371a35255a711af6 SHA512 e43a9fc792aff6fa5a1f07fff4c940d7829d31d80b3a9447a2da3e6a47157dd8d4777a51afbc8dd060c9b76e426fe4154cdf49d19e5a634935ac6ba7f6494d4f
-EBUILD spirv-headers-1.3.4_pre20180917.ebuild 494 BLAKE2B 5eb9e3ae23acbf4a9f3ab2564b383e0178129db9a0c96f20373e39aae677f11c3a52fc9aa0569c29cdfa3a335ce8c47fd9b2a4696371648c058cc29f23674cbd SHA512 b3dfe8c08c5de84569d3fc7f4b8855202f92168edca11a7aa3dbc825f61d25137875464eb0fa5763471f90dfff3bd9e5466198b60c31704ea38a668d57e9713b
 EBUILD spirv-headers-1.3.4_pre20190302.ebuild 493 BLAKE2B 855f966aa9be178e9c388a89d6cb7dddd27e398736013a3614c8b2737c3f6261afcf679c1288e92b67b3aef06d35ebb8ca08e455168056dc6b31f41d04e5c693 SHA512 d5a29abfd52149e6e07527055aaad89b879eb91b82c2333ee0b0f05da31c229893487d0de07a012dd487f370de45c34a410db328408e67b039ba4e5071e37fda
-EBUILD spirv-headers-1.3.ebuild 562 BLAKE2B b304f69a8b7445e00fb41e162b84256601db218f3a7efd1ea1938d3ee39738a011de48d5fb099b5b8bbabf05cebab6248f3ac33064535da32520d321b8eab8a1 SHA512 0239f7a19a7b9040c33f9b1d4641f7c2fa866c2e5673da98ed20981a8b79b8af3c061c21c2e127a83a58367b2b487d0ad968352c93686df92d1a1c1c6aba8421
 EBUILD spirv-headers-9999.ebuild 358 BLAKE2B 0121eaa0ea8a1706435efeb1e29f81f471774582c4fe3879b3e2cc0e7e36ddaed830e37526660e976bab9710307e57454d460c8fcac1c4e8b19c91ceaffd00db SHA512 c7f16a3613efcd0c34208e7016696c87c7a6ee7761bf4c153e2ef3c0e8ffae98e4f044edc780b24c387eb8521703e2f9900d17c584b4078bd0e84bf119cd6de4
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch b/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
deleted file mode 100644
index b1581f5417b6..000000000000
--- a/dev-util/spirv-headers/files/spirv-headers-Get-rid-of-custom-target.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From c44560949ec78dd13fe1394bf2957e4fd5adec79 Mon Sep 17 00:00:00 2001
-From: Brian Evans <grknight@gentoo.org>
-Date: Wed, 14 Mar 2018 20:00:22 -0400
-Subject: [PATCH] Get rid of custom target
-
----
- CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a5bff17..bbc3ddc 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -45,7 +45,5 @@ project(SPIRV-Headers)
- #   3. cmake --build . install-headers
- 
- file(GLOB_RECURSE FILES include/spirv/*)
--add_custom_target(install-headers
--  COMMAND cmake -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/include/spirv ${CMAKE_INSTALL_PREFIX}/include/spirv)
--
-+INSTALL(DIRECTORY include/spirv/ DESTINATION include/spirv)
- add_subdirectory(example)
--- 
-2.16.2
-
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
deleted file mode 100644
index c3de1e2ba586..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.1_pre20180710.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="ff684ffc6a35d2a58f0f63108877d0064ea33feb"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
deleted file mode 100644
index 72a6122d8ce3..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.ebuild
deleted file mode 100644
index 4edaed9c09ae..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="02ffc719aa9f9c1dce5ce05743fb1afe6cbf17ea"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-PATCHES=( "${FILESDIR}"/${PN}-Get-rid-of-custom-target.patch )
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 5d35d5c95e48..a51347ff8f68 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -1,4 +1,6 @@
 AUX 3.30.2-elogind.patch 1055 BLAKE2B c25d6b83d75d8155ef09d1aa5cdd8dead79a1fe796028cec79166e24ae8a579af83c396c7f4e91948a56bb2215cb180657728c35d84ee8ed09134d4ee72a17cf SHA512 6ed6fcf43238378486f430bf653cc6f209f6bd42136e14f0888b8b190a63058bfcec8777a6df0f1f454b14ef91c6075d342585a8c339a11604ffc3e712057017
 DIST sysprof-3.30.2.tar.xz 393420 BLAKE2B 5e86a78c231d2d2c601198e066c463d8bec95ab1ae6d0f6678e6e80305b8a6d53c604ce54d9fc2a473e4679695cef709f0e1a9514f1091719f33a58b92c896eb SHA512 70c49f7c20742aad82c8d9b1e303d06ca5fd2d27a6868872d28affea22278d381bf3eb0d181cbd1bfa490bda2878c52748ac29273e9e608452e9bf4f29fd9e2a
+DIST sysprof-3.32.0.tar.xz 296052 BLAKE2B f409c64d40bd3451037e601683f270ff93ea2a60a2c104d22edc6bad5ff3f5c974f80137776b6329dae932852fa0871f2b7b9960a282147ddef5402ad840d9ef SHA512 7b9d84ac241d376a5e545082b1224e7db96af26ae0ee297d5f0b2d45abc4676e23009dbd560085e5d4879378a8dd79eefb4449df3961fbfd09238bd2056061d0
 EBUILD sysprof-3.30.2-r1.ebuild 2211 BLAKE2B 13b96d356dbb464c6f1ed74b7f6216d28fd5a8c54a2c9f1611712a49215a9a7b0c32a7f63c949ac270ca1c12e66a49aed16ddf7b1f016175d3a4cc604de9d416 SHA512 5ccd0335b55be7357e57b82105eaecfd54e515c56ccdd63552fa78c7262d3021676a7fc983903e2819b801b56fef7c687670cd4bbbe199c33c87cb5502210c60
+EBUILD sysprof-3.32.0.ebuild 2225 BLAKE2B d51feca57cc2b24e366c1afdd7337fe92b9faee63586cdbc2dcf1c90f48dda54341bfff8428a04703be5ace41edcd411c3a91e135ee7f52e1acf26b5bfc6fd05 SHA512 688f3fdbc8b341d7d60b3536e55fbd94f7a748f393be5159fa8e9317d35b095cca59f4df2d54132230391699bb03c83177946e109b9489c87aab5748f959552d
 MISC metadata.xml 886 BLAKE2B 31416bfe6eb56d58ae1c1953d19cc59ee0cff0c0aa7d6c28f6b95b7b4c9038ea9a8af5025e64f29612b6b919953671eb4940ff60d6baf1c79b8d33bdfae2beff SHA512 5514125c6a2dcb55a06bc81e52bb6c94a804b0dc41ce7d7c83e9ee94f06ddcd585716c12887a6428e1afe3a9268cdc4cd0596d7a036de08f0e70ae3d6366f502
diff --git a/dev-util/sysprof/sysprof-3.32.0.ebuild b/dev-util/sysprof/sysprof-3.32.0.ebuild
new file mode 100644
index 000000000000..16e41d082136
--- /dev/null
+++ b/dev-util/sysprof/sysprof-3.32.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="System-wide Linux Profiler"
+HOMEPAGE="http://sysprof.com/"
+
+LICENSE="GPL-3+ GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="elogind gtk systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	sys-auth/polkit
+	gtk? ( >=x11-libs/gtk+-3.22.0:3 )
+	elogind? ( >=sys-auth/elogind-239.3 )
+	systemd? ( >=sys-apps/systemd-222:0= )
+"
+DEPEND="${RDEPEND}"
+# libxml2 required for glib-compile-resources; appstream-glib for appdata.xml developer_name tag translation
+BDEPEND="
+	dev-libs/appstream-glib
+	dev-libs/libxml2:2
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	>=sys-kernel/linux-headers-2.6.32
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}"/3.30.2-elogind.patch )
+
+src_configure() {
+	# -Dwith_sysprofd=host currently unavailable from ebuild
+	local emesonargs=(
+		$(meson_use gtk enable_gtk)
+		-Dwith_sysprofd=$(usex systemd bundled $(usex elogind bundled none))
+		-Dsystemdunitdir=$(systemd_get_systemunitdir)
+		# -Ddebugdir
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+
+	elog "On many systems, especially amd64, it is typical that with a modern"
+	elog "toolchain -fomit-frame-pointer for gcc is the default, because"
+	elog "debugging is still possible thanks to gcc4/gdb location list feature."
+	elog "However sysprof is not able to construct call trees if frame pointers"
+	elog "are not present. Therefore -fno-omit-frame-pointer CFLAGS is suggested"
+	elog "for the libraries and applications involved in the profiling. That"
+	elog "means a CPU register is used for the frame pointer instead of other"
+	elog "purposes, which means a very minimal performance loss when there is"
+	elog "register pressure."
+	if ! use systemd && ! use elogind; then
+		elog ""
+		elog "Without systemd or elogind, sysprof may not function when launched as a"
+		elog "regular user, thus suboptimal running from root account may be necessary."
+		if use gtk; then
+			elog "Under wayland, that limits the recording usage to sysprof-cli utility."
+		fi
+	fi
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 414e5ec23ca6..1fb8f64baee8 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,11 +1,7 @@
-AUX trace-cmd-2.7-makefile.patch 1162 BLAKE2B e53e6f5c93445cb4bfbe8dd15bcd01972968fb27d1ca6ed45944f383fabf08cc1850686ca5526fb1de78103e5a49dc756279da91fd75136c56d3cd55c59aa013 SHA512 af6c8c11b13737c6e4e8926bbcc250c19fae22268b05727b2d9cd4e853b43735106b6e4439ccea89f038641f8c4a93494428c41756adc411526030c74d8f3aad
-AUX trace-cmd-2.7-soname.patch 339 BLAKE2B b89d513caa361cfcab00d821e09ae47ce84527add57ce94199262f660f8df5ff436b8ca1d47707d5939c7df760cdfda71c6163d8c4e71ad983328aee5b6f2a20 SHA512 a64a8f6ec1745a1221380b35e779b22d9044df007798eaed5617ea81a391ed0e1baba1f74af9bed280805f748c829b7ca3cc0f7fb773adf791c33373dde3c662
 AUX trace-cmd-2.8-python-pkgconfig-name.patch 987 BLAKE2B b7fcb2f8813f924692647f16252c5b576ec1a25089e5f03f5ab5d4240f8d7cb8a8cec49cb674f1a75ee562dee0112d17fbe5527b27e72445d8c246a8f535869d SHA512 9677cb02d336accc136911240c16723ca676d5f245f34dc657d6662ff20df47db14f7370becd1bb2c118a38f83c80a13d062597a0e1a8af9dc96dc6d88804991
-AUX trace-cmd-2.8-python3-warnings.patch 3392 BLAKE2B 15cab32142d6196bc7fb310f27f82e7a892bb5ab0d911a9e2ba6ea7cd6367d811aef8fbdda01452a9f3a7adad118074c270229be05822d87b3380965e02e6b60 SHA512 3df7449b7f49c101770c342b44229602565af2c2f0f9e702cd9f496a0b4202c084149cd01d3103365480be7773a901a39f8011749459953bee6948ea799ac947
-AUX trace-cmd-2.8-soname.patch 374 BLAKE2B 0717fb54fcbb208cb5124a0954e2170d1104d83ec31d05ace74979c1ab5f98673737c833fc8a21b18f2fa76ef31e5a75bdcb67b703d3b16abbc1b7788341c11d SHA512 010459dc4a4f7406587c5314b1f47c320afbd0190501266fa04a0a20bf3f589cd831287b35877c6173803122b1c9a49c03944bf9e874617a797ade16e62b58a7
-DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
-DIST trace-cmd-v2.8.tar.gz 1996407 BLAKE2B 6a9a0b221418d448f5af5508bf8acf0baca08e0cdd8c1a835a06d26f5f729608d6988f7ed83ccdc9e117ade19893fa32c2400a61c2d396804cd042bc25cd498a SHA512 0675c057e78878a0f56ee69edfe7ab4b771fd5346920fcd3ad4af777180fae311cc369dc3faa6cd49d30664401497d20e45a0cf1914805139116e3be8587e0a7
-EBUILD trace-cmd-2.7-r2.ebuild 1777 BLAKE2B a77c5ae330fa91888f0140184012f7c52220fff7c09f15a533d972c5c95c6c690085f7a9fab6c7a0d3a97b80ec24a9816baff058a12bd7e048dd614f7d25eb70 SHA512 3c4bf7a879bb2a8efa5cb7077927bf996b6fa2590b2decfacbf1f2f6a0c69a03805324f82238048874835854fb52d2ddaa1a58e3e07cafa5faa79edde8bf992a
-EBUILD trace-cmd-2.8.ebuild 2453 BLAKE2B 13204ca5ff52a5b956306010bd836fabdaf0b00e515ce1f207e102b6d6d1df8a370fc8e31b78647d46e5387feb65242fa93634dd16296a4ffda8eaffb7fe1a08 SHA512 94a545505925fd92f3302af42a8f2a1bae39a0c8f7488281215a7a1b5b44c9aac5fa253f7ccd29cd501d88055fb5d49bc7e40f43b1628d4bcf16335fd31a4a84
-EBUILD trace-cmd-9999.ebuild 2453 BLAKE2B 13204ca5ff52a5b956306010bd836fabdaf0b00e515ce1f207e102b6d6d1df8a370fc8e31b78647d46e5387feb65242fa93634dd16296a4ffda8eaffb7fe1a08 SHA512 94a545505925fd92f3302af42a8f2a1bae39a0c8f7488281215a7a1b5b44c9aac5fa253f7ccd29cd501d88055fb5d49bc7e40f43b1628d4bcf16335fd31a4a84
+AUX trace-cmd-2.8.3-python3-warnings.patch 1281 BLAKE2B 66540f016d1ca3a7f5a803bd0753ac9c458fcee43056ec05e420fbeaee8b21cd0c4d38e67286d86ddeb6e478fa1e82d45203f538921bd066aa4ef2ad1222e4d7 SHA512 5446a13e82c9be3c6ed2bdc17b91495499b9f28eaa4045869bbf847ca14953cf36411e86136133b22bba05dae46325b522c00939c33943d5135c17e845fad94a
+AUX trace-cmd-2.8.3-soname.patch 392 BLAKE2B 334e2289dd1132798b1b704b071868715b38ad9308e1ab13abc7417ef55d06f9c07dd62fa3380e55d07020ffafe7d1adea10be6013b731c46583ed21d2cc1f33 SHA512 37096da570d3a926f06ef08731ff4adecc5cdaa2d3035668aa62d813db9facaa5b78189a2a7c9066c4291a90460978886e7f24759a865514335cd3ba1680b6f2
+DIST trace-cmd-v2.8.3.tar.gz 1996617 BLAKE2B 0ab77649af90a0a9368ff118dc94e6fd003b18ceb2065ae3a4559a1d2cfa93be44d87bfb97e2e2f06898508699ff5ce18face4edefd7e40b3b9cca405a626cff SHA512 51166c4276abda209a099cc6fe9081ad6d403cbfd9d4a53bc5bb068392327e88fe647e9324a527e68730d73d1a5f7f74126718547f94c652bb12e51c7518a58b
+EBUILD trace-cmd-2.8.3.ebuild 2473 BLAKE2B 6c68ed92d821004814532e05052e8a2b883b03177d649460a22f1b9d703a893d0b2fca0fccd9d394d176857050edbc6c35098411719d6d23f3bce382f46414ee SHA512 0604c47e022cb8f24bb23cddf9844f06d354a14aaabc1ef6298af83d0640bacefdd76d586a4a78def495da7ee35efe8702b7e8712690138f1e41ed28095fe9f6
+EBUILD trace-cmd-9999.ebuild 2226 BLAKE2B f45c9cde1aeda622e0c6786a65bd8c92f4c2372e2b73cbb9518467e0a7b90b15e41f7df71bbd2ed8f2246d8eaed684db5af9236ccb102e9a3d2d15b5ae6ca1fe SHA512 51e521dcc22ffca22d9f348d2ff9f14ac5473302200cf526d7eff092dd0ec39e2fed52bb6f654aa3615b1b295c527e6089122930216249eaa4848bc96ecbdc53
 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
deleted file mode 100644
index a9d7584dc625..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-makefile.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
--python_dir = $(libdir)/trace-cmd/python
-+python_dir ?= $(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -119,8 +119,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)
- 
-+ifndef NO_UDIS86
- # have udis86 disassembler library?
--udis86-flags := $(call test-build,\#include <udis86.h>,-DHAVE_UDIS86 -ludis86)
-+udis86-flags := -DHAVE_UDIS86
-+udis86-ldflags := -ludis86
-+else
-+udis86-flags := -UHAVE_UDIS86
-+endif # NO_UDIS86
- 
- define BLK_TC_FLUSH_SOURCE
- #include <linux/blktrace_api.h>
-@@ -276,6 +281,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ) $(VAR_DIR)
- override CFLAGS += $(udis86-flags) $(blk-flags)
-+override LDFLAGS += $(udis86-ldflags)
- 
- ifeq ($(VERBOSE),1)
-   Q =
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
deleted file mode 100644
index 937f0617a4a4..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index a5d2c38..588809e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -308,7 +308,7 @@ do_app_build =						\
- 
- do_compile_shared_library =			\
- 	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ -o $@)
-+	$(CC) --shared $^ -Wl,-soname,$@ -o $@)
- 
- do_compile_plugin_obj =				\
- 	($(print_plugin_obj_compile)		\
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
deleted file mode 100644
index d66ee35accf9..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-python3-warnings.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
-index e725ad8..196b825 100644
---- a/plugins/plugin_python.c
-+++ b/plugins/plugin_python.c
-@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
- 	} else
- 		Py_DECREF(res);
- 
--	str = PyString_FromString("pevent");
-+	str = PyUnicode_FromString("pevent");
- 	if (!str)
- 		return -ENOMEM;
- 
-diff --git a/python/ctracecmd.i b/python/ctracecmd.i
-index 65a3d51..031e462 100644
---- a/python/ctracecmd.i
-+++ b/python/ctracecmd.i
-@@ -16,6 +16,7 @@
- %{
- #include "trace-cmd.h"
- #include "event-utils.h"
-+#include <Python.h>
- %}
- 
- 
-@@ -108,7 +109,7 @@ static PyObject *py_field_get_stack(struct tep_handle *pevent,
- 		    ((int)addr == -1))
- 			break;
- 		func = tep_find_function(event->tep, addr);
--		if (PyList_Append(list, PyString_FromString(func))) {
-+		if (PyList_Append(list, PyUnicode_FromString(func))) {
- 			Py_DECREF(list);
- 			return NULL;
- 		}
-@@ -137,10 +138,10 @@ static PyObject *py_field_get_data(struct tep_format_field *f, struct tep_record
- 		offset = val & 0xffff;
- 		len = val >> 16;
- 
--		return PyBuffer_FromMemory((char *)r->data + offset, len);
-+		return PyMemoryView_FromMemory((char *)r->data + offset, len, PyBUF_READ);
- 	}
- 
--	return PyBuffer_FromMemory((char *)r->data + f->offset, f->size);
-+	return PyMemoryView_FromMemory((char *)r->data + f->offset, f->size, PyBUF_READ);
- }
- 
- static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record *r)
-@@ -162,10 +163,10 @@ static PyObject *py_field_get_str(struct tep_format_field *f, struct tep_record
- 		 */
- 		offset = val & 0xffff;
- 
--		return PyString_FromString((char *)r->data + offset);
-+		return PyUnicode_FromString((char *)r->data + offset);
- 	}
- 
--	return PyString_FromStringAndSize((char *)r->data + f->offset,
-+	return PyUnicode_FromStringAndSize((char *)r->data + f->offset,
- 				strnlen((char *)r->data + f->offset, f->size));
- }
- 
-@@ -177,7 +178,7 @@ static PyObject *py_format_get_keys(struct tep_event *ef)
- 	list = PyList_New(0);
- 
- 	for (f = ef->format.fields; f; f = f->next) {
--		if (PyList_Append(list, PyString_FromString(f->name))) {
-+		if (PyList_Append(list, PyUnicode_FromString(f->name))) {
- 			Py_DECREF(list);
- 			return NULL;
- 		}
-@@ -210,14 +211,14 @@ static int python_callback(struct trace_seq *s,
- 	result = PyEval_CallObject(context, arglist);
- 	Py_XDECREF(arglist);
- 	if (result && result != Py_None) {
--		if (!PyInt_Check(result)) {
-+		if (!PyLong_Check(result)) {
- 			PyErr_SetString(PyExc_TypeError,
- 					"callback must return int");
- 			PyErr_Print();
- 			Py_XDECREF(result);
- 			return 0;
- 		}
--		r = PyInt_AS_LONG(result);
-+		r = PyLong_AsLong(result);
- 	} else if (result == Py_None)
- 		r = 0;
- 	else
-diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i
-index 1dcdab0..8ca38f7 100644
---- a/python/ctracecmdgui.i
-+++ b/python/ctracecmdgui.i
-@@ -7,6 +7,7 @@
- #include <pygobject.h>
- #include <pyglib.h>
- #include <Python.h>
-+#include <memoryobject.h>
- 
- extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store);
- 
-@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype)
- 
- /* help swig cope with g* types */
- %typemap(in) gint {
--    $1 = PyInt_AsLong($input);
-+    $1 = PyLong_AsLong($input);
- }
- %typemap(out) gint {
--    $result = PyInt_FromLong($1);
-+    $result = PyLong_FromLong($1);
- }
- %typemap(in) guint {
-     $1 = PyLong_AsUnsignedLong($input);
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
new file mode 100644
index 000000000000..72dd3de64f90
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-python3-warnings.patch
@@ -0,0 +1,50 @@
+diff --git a/plugins/plugin_python.c b/plugins/plugin_python.c
+index e725ad8..196b825 100644
+--- a/plugins/plugin_python.c
++++ b/plugins/plugin_python.c
+@@ -81,7 +81,7 @@ int TEP_PLUGIN_LOADER(struct tep_handle *pevent)
+ 	} else
+ 		Py_DECREF(res);
+ 
+-	str = PyString_FromString("pevent");
++	str = PyUnicode_FromString("pevent");
+ 	if (!str)
+ 		return -ENOMEM;
+ 
+diff --git a/python/ctracecmd.i b/python/ctracecmd.i
+index 2601d39..01cd0d5 100644
+--- a/python/ctracecmd.i
++++ b/python/ctracecmd.i
+@@ -16,6 +16,7 @@
+ %{
+ #include "trace-cmd.h"
+ #include "event-utils.h"
++#include <Python.h>
+ %}
+ 
+ 
+diff --git a/python/ctracecmdgui.i b/python/ctracecmdgui.i
+index 1dcdab0..8ca38f7 100644
+--- a/python/ctracecmdgui.i
++++ b/python/ctracecmdgui.i
+@@ -7,6 +7,7 @@
+ #include <pygobject.h>
+ #include <pyglib.h>
+ #include <Python.h>
++#include <memoryobject.h>
+ 
+ extern GtkTreeModel *trace_view_store_as_gtk_tree_model(struct trace_view_store *store);
+ 
+@@ -37,10 +38,10 @@ pytype_from_gtype(GType gtype)
+ 
+ /* help swig cope with g* types */
+ %typemap(in) gint {
+-    $1 = PyInt_AsLong($input);
++    $1 = PyLong_AsLong($input);
+ }
+ %typemap(out) gint {
+-    $result = PyInt_FromLong($1);
++    $result = PyLong_FromLong($1);
+ }
+ %typemap(in) guint {
+     $1 = PyLong_AsUnsignedLong($input);
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
index 523f2d44467e..10aaf076161d 100644
--- a/dev-util/trace-cmd/files/trace-cmd-2.8-soname.patch
+++ b/dev-util/trace-cmd/files/trace-cmd-2.8.3-soname.patch
@@ -1,13 +1,13 @@
 diff --git a/scripts/utils.mk b/scripts/utils.mk
-index 260023a..9eb127d 100644
+index 9eb127d..98d7b3c 100644
 --- a/scripts/utils.mk
 +++ b/scripts/utils.mk
 @@ -54,7 +54,7 @@ do_build_static_lib =				\
  
  do_compile_shared_library =			\
  	($(print_shared_lib_compile)		\
--	$(CC) --shared $^ -o $@)
-+	$(CC) --shared $^ -Wl,-soname,$@ -o $@)
+-	$(CC) --shared $^ -Wl,-soname,$@ -o $@)
++	$(CC) --shared $^ -Wl,-soname,$(@F) -o $@)
  
  do_compile_plugin_obj =				\
  	($(print_plugin_obj_compile)		\
diff --git a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
deleted file mode 100644
index 27b25b7f1212..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=(python2_7)
-
-inherit linux-info python-single-r1 toolchain-funcs
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git/snapshot/${PN}-v${PV}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-v${PV}"
-fi
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-IUSE="+audit doc python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="audit? ( sys-process/audit )
-	python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-PATCHES=(
-	"${FILESDIR}"/trace-cmd-2.7-makefile.patch
-	"${FILESDIR}"/trace-cmd-2.7-soname.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	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
-		EMAKE_FLAGS+=(
-			"PYTHON_VERS=${EPYTHON//python/python-}"
-			"python_dir=$(python_get_sitedir)/${PN}"
-		)
-	else
-		EMAKE_FLAGS+=("NO_PYTHON=1")
-	fi
-}
-
-src_compile() {
-	emake "${EMAKE_FLAGS[@]}" all_cmd libs
-	use doc && emake doc
-
-}
-
-src_install() {
-	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-2.8.ebuild b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
index 33ae834f1ac4..81b74d429056 100644
--- a/dev-util/trace-cmd/trace-cmd-2.8.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.8.3.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="+audit doc python udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -42,9 +42,8 @@ CONFIG_CHECK="
 	~BLK_DEV_IO_TRACE"
 
 PATCHES=(
-	"${FILESDIR}/trace-cmd-2.7-makefile.patch"
 	"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
-	"${FILESDIR}/trace-cmd-2.8-soname.patch"
+	"${FILESDIR}/trace-cmd-2.8.3-soname.patch"
 )
 
 pkg_setup() {
@@ -53,8 +52,9 @@ pkg_setup() {
 
 src_configure() {
 	EMAKE_FLAGS=(
-		"prefix=/usr"
-		"libdir=/usr/$(get_libdir)"
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
 		"CC=$(tc-getCC)"
 		"AR=$(tc-getAR)"
 		$(usex audit '' '' '' 'NO_AUDIT=1')
@@ -65,7 +65,7 @@ src_configure() {
 
 src_compile() {
 	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd libs
+		trace-cmd
 
 	if use python; then
 		python_copy_sources
@@ -77,7 +77,7 @@ src_compile() {
 
 python_compile() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch"
+	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8.3-python3-warnings.patch"
 
 	emake "${EMAKE_FLAGS[@]}" \
 		PYTHON_VERS="${EPYTHON}" \
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
index 33ae834f1ac4..cd3944c250c3 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -8,10 +8,10 @@ DISTUTILS_OPTIONAL=1
 inherit linux-info python-r1 toolchain-funcs
 
 DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
+HOMEPAGE="http://trace-cmd.org/"
 
 if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git"
 	inherit git-r3
 else
 	SRC_URI="https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
+SLOT="0/${PV}"
 IUSE="+audit doc python udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
@@ -33,7 +33,6 @@ DEPEND="${RDEPEND}
 		virtual/pkgconfig
 		dev-lang/swig
 	)
-
 	doc? ( app-text/asciidoc )"
 
 CONFIG_CHECK="
@@ -41,20 +40,15 @@ CONFIG_CHECK="
 	~FTRACE
 	~BLK_DEV_IO_TRACE"
 
-PATCHES=(
-	"${FILESDIR}/trace-cmd-2.7-makefile.patch"
-	"${FILESDIR}/trace-cmd-2.8-python-pkgconfig-name.patch"
-	"${FILESDIR}/trace-cmd-2.8-soname.patch"
-)
-
 pkg_setup() {
 	linux-info_pkg_setup
 }
 
 src_configure() {
 	EMAKE_FLAGS=(
-		"prefix=/usr"
-		"libdir=/usr/$(get_libdir)"
+		BUILD_OUTPUT="${WORKDIR}/${P}_build"
+		"prefix=${EPREFIX}/usr"
+		"libdir=${EPREFIX}/usr/$(get_libdir)"
 		"CC=$(tc-getCC)"
 		"AR=$(tc-getAR)"
 		$(usex audit '' '' '' 'NO_AUDIT=1')
@@ -65,7 +59,7 @@ src_configure() {
 
 src_compile() {
 	emake "${EMAKE_FLAGS[@]}" NO_PYTHON=1 \
-		trace-cmd libs
+		trace-cmd
 
 	if use python; then
 		python_copy_sources
@@ -77,7 +71,6 @@ src_compile() {
 
 python_compile() {
 	pushd "${BUILD_DIR}" > /dev/null || die
-	python_is_python3 && eapply "${FILESDIR}/trace-cmd-2.8-python3-warnings.patch"
 
 	emake "${EMAKE_FLAGS[@]}" \
 		PYTHON_VERS="${EPYTHON}" \
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index 1de18c36f3ac..774076513013 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,3 +1,3 @@
-DIST uftrace-0.9.1.tar.gz 967083 BLAKE2B 2e381f5cda92fadd963fc7e0ccebaec6b6796acd75d8436b66f9b6ee4257141f704471832e224712bb65e7570fe4997f953458455b2b0f257ead7f4093140313 SHA512 a906664f883e08f19063229e7dd43aebc9115b08829d866fb887dd281a0375a5684332920c3f7307a4d62baa14e982cb7535bdfe454ab3ad5d8ec7fb5792402e
-EBUILD uftrace-0.9.1.ebuild 569 BLAKE2B 1cf7567d53eb11bbbc78fde2486090b4a6d99c24cf8f1165887c986efd40bf948bc3dd163b372bcbdef6c8ffd7d3a75aa29fa6c5cc8cabadeb8fe00f76b2e2b1 SHA512 b7f361630c453e0cbc1282f18bb2c97e7da54ab825f1b0437f134ffb39747da82fbde61e81c79bf845142aed1a7fd72138b3bf29d488af4837841755abe7d6ea
-MISC metadata.xml 248 BLAKE2B 839a984864aeb89b07996cf03470a078ae558a5b832690c25adea12868e54f82b950d52e391262da8649e40b97f400a7a45040d54365ee581743e5b61e85fa3d SHA512 047ffd8442624867a708f2a0473700fc91ddcf36aa9a0617308c7cdf956a63b8fc21e7d5a77779ca76ea6abafe89a9d8b7a1fba521f9ccb5b966ea1b5e716678
+DIST uftrace-0.9.3.tar.gz 1003880 BLAKE2B ae5e1c44412055ea59e85378877cf3c18f33e0c6ae3a904253b03587dae2c7cce4350f1480f499e645375b1b2502a51a8b8d44e9b7ff1ee588be7180c12b63f3 SHA512 671486a05da8c44400169f21426505266db89e94ef9483370dff8f465b673f70fba994174458f3033991ea0640225e13c639418380a6a580d24c302d42327382
+EBUILD uftrace-0.9.3.ebuild 712 BLAKE2B 836f16dd5694735c932701dde54e77fc8ddbff45fe0320058f4b5c9185b96b551c37f7549021d895a99ec71aef741d609972ad1565216bc5c233dfb58c2a2e51 SHA512 70b65c4cefec22afe141c3b9c70e9498a3e347a61ef5e42f321b224c72cf6bfcc5cddcac96ba6d275e7fef7324657b4a32865783e5acc517fa88d7357a584b19
+MISC metadata.xml 356 BLAKE2B cb0c4a184a36f1184494927f5cd72f945d9b7361cbf6ecde1d884197ec6b12c156566c8e61d635647637bb7924f9a3515d232cc6466b38bb463f13be769f88c4 SHA512 c9794b1bd56251df386da82b80d9d2979613f2f158cbb44fc478f8299da022193860cd7387d44f56ef5c14c747e5e276eb0f6db5864a6c78c8e689ddf5fe5643
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
index 9be2c3f269d6..0162146a7ba7 100644
--- a/dev-util/uftrace/metadata.xml
+++ b/dev-util/uftrace/metadata.xml
@@ -5,4 +5,7 @@
 	<upstream>
 		<remote-id type="github">namhyung/uftrace</remote-id>
 	</upstream>
+	<use>
+		<flag name="capstone">Use capstone to provide dynamic tracing without recompilation</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-util/uftrace/uftrace-0.9.1.ebuild b/dev-util/uftrace/uftrace-0.9.3.ebuild
index 60c4d3793442..9520ab25fb8c 100644
--- a/dev-util/uftrace/uftrace-0.9.1.ebuild
+++ b/dev-util/uftrace/uftrace-0.9.3.ebuild
@@ -1,8 +1,12 @@
-# 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=( python2_7 )
+
+inherit python-single-r1
+
 DESCRIPTION="Function (graph) tracer for user-space"
 HOMEPAGE="https://github.com/namhyung/uftrace"
 SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
@@ -10,15 +14,16 @@ SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+IUSE="capstone"
 
 RESTRICT="test"
 
 RDEPEND="
-	dev-lang/python:2.7
+	${PYTHON_DEPS}
 	sys-devel/gcc:*[cxx]
 	sys-libs/ncurses:=
 	virtual/libelf:=
+	capstone? ( dev-libs/capstone:0= )
 "
 DEPEND="${RDEPEND}"
 
@@ -26,3 +31,7 @@ src_prepare() {
 	default
 	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" Makefile || die
 }
+
+src_configure() {
+	econf $(use_with capstone)
+}
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 616106fced08..b391eecce123 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,12 +1,6 @@
-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.114.tar.gz 596033 BLAKE2B 707b820ab37e7de92540196c181dea7a0ef1461e15f2b39f4a8355f265ec8d422e69987f3e49f210b8e9f8ebe20f99a682805b2c9b94755f94d2a1b2213b67d5 SHA512 6da91d7207575437f4322ddcacda25f85910266012625a2485124d8dc7d91d88386cc8d93ae5ded4f9e7d862b7139573118df550022ec912a5b2685048cbc6ce
-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 724 BLAKE2B 3683a725d1bb5a655218b3828ee910e8a31e785fa5595dffd54588fc05a1ee4f963fa12ea424136131749c04d055ca7bf6aa7d18998f1b74910be196b229e40c SHA512 58b3e1ba5d73e167bbb9eb198acf89cacfb4eb9e1e40af46e29945d5bb05080775a452f52835db2c1127e6ec92f3897f4a4ca294340e886a6f91bc01891fcce5
 EBUILD vulkan-headers-1.1.106.ebuild 627 BLAKE2B 83919de68da20e7e0b92a594f8251e032a39ed7965b80d06b9020a7229b662131e152d547cd25d32c05b2707a7b6ed5de3bedc7fce388cf84e86b05e8432a9ac SHA512 a78ac1319f094b265b402a7dc415728c90ac8dce60517e65dc85f28651842c2ac89cb569eb98e95ba1ec1f4d22a6fbe748db73dae2c8369bfc09799884acc98d
 EBUILD vulkan-headers-1.1.114.ebuild 629 BLAKE2B 0c0d0708b5e5ff8750d0d6e442b90982de5bf5933ca46e4f74f353d3523384f68b300dfc41e356484fa1b9869b264584798bbce6a9a47d7b494cae3bc1e57cb3 SHA512 165d8cf84f656fe3194d2b0ebcbafa344f326313357965ff4513a2fe10c08e3787d524ad76af635159d2ecf37e7583bdb8677f45bd21a9b700844c1fa781acf9
-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
+EBUILD vulkan-headers-9999.ebuild 728 BLAKE2B 880211ab2cde0320426f6048c2b6743fd57c1e1169b809d8512fffe09a0e99aa5d991d93a6c2656a62db0af83252213223ef7cdab0aaa8c33a4a26e3382f19e4 SHA512 4c103ce4a085d44b77c411aea833bce8962d24a9c50b611d3fc0bed545021d7e9342f86db333671e21fe58bf22087cda88f6d69a3196be34eec921959cbd1225
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
deleted file mode 100644
index a563eae4f242..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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="8e2c4cd554b644592a6d904f2c8000ebbd4aa77f"
-	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"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
deleted file mode 100644
index 08976482e5ea..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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="c4e056d365472174471a243dfefbfe66a03564af"
-	KEYWORDS="~amd64"
-	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"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
deleted file mode 100644
index 990f33299dca..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.92.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# 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="114c3546e195819bd53a34b39f5194b2989a5b12"
-	KEYWORDS="amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Old packaging will cause file collisions
-RDEPEND="!<=media-libs/vulkan-loader-1.1.70.0-r999"
diff --git a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
index 0e2db9636138..06f98f73c88e 100644
--- a/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-9999.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
-	KEYWORDS="~amd64"
+	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
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 66d0366c0855..1388d2847cee 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,7 +1,4 @@
 DIST vulkan-tools-1.1.106.tar.gz 611700 BLAKE2B 510ec1f759ae9657a57f641f3a74c87d82c181f6c328a2b682c89cf3a676ae03c59e4be96747b64f29be9ff3f7c5e00eb9ce7cd59d49ab2c8c3bc5e52f1915f1 SHA512 7ce80fe42032058fc7cf2462d2afe49e843f58c412c39338862805b3bcfadf5abef85043e2b21df92662c619bcd34271e2dda5ec9ed8ff9a4dcd74deedfa4c82
-DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
-EBUILD vulkan-tools-1.1.106-r1.ebuild 2238 BLAKE2B 9ace21e7f1a360a1409200087e9206b330b538e84b5d633bb58eac03153190b2b0a0ead1e8fc2e0fa5a9684bfcda5c9c1fd8d8dcf3aa2a51f5cb3bf273ae2ca1 SHA512 a50ffccdb2057b7c3c4b712da5b5a9c60e561f170ca47cc6def18684c6a9c2b9ac92b13845f21d5c666603fa55f76f9dc932717f437aa25fc32242aa70534277
-EBUILD vulkan-tools-1.1.106.ebuild 2208 BLAKE2B 5a569bd1f034346163b0d5d7e37d1616b8b114ab5107c760187e6c36f49d2ce7808a8502c8210b6649c43f846a5f9cd899c359e741e5f5531a2904cb73592225 SHA512 890af6842861103a98401d84b9452be7f67102cf2ebf0e3bbb41a6f8fd0a896e94d0203408c9d6b17c02847368affd1f5e43e98d74ff410934f506c48f1d8e97
-EBUILD vulkan-tools-1.1.92.0.ebuild 2197 BLAKE2B f444cada3d7d3d3737059861433731d05eebc12330f26adee3aac7b704ac0c13bf966a036f19f2a26344ce0a667a4dc45d02855bd4ce0ff83ea08f4e67ae8726 SHA512 92933038ac146ec3b8dccbc55f194a99a622f94dd67e548319e44573d9800a1550886121b5d6bd01dd55e4b50c14ca2246d280448049c6b710cf50dd1decff93
-EBUILD vulkan-tools-9999.ebuild 2239 BLAKE2B 901c75fa405dd64903eae500f1619a87cde0ed1d75bd9933796815f072999458e8c0395465c14f0980af500b042469325c5eeae46c289ac5af25f712ad4f1e94 SHA512 5ae5762967013a5c9d68f7921a93ae125d912476ce80404bafad9e3f009c484054625172b575268ebe28f255a085fb68e4ac74a7860c941de5c849e4014ce8d8
+EBUILD vulkan-tools-1.1.106-r1.ebuild 2237 BLAKE2B 7fb55b694f9fe0fa8c6b2ba8978e06b05866a7f977382141b5ae13519050e816741f77825ed9100649d84581a22bf700b21c583758aeeffea8555576a3416b8f SHA512 cd1931161a4fa56c6e8ebbdab0fa4ccb04f22ed42a54e753c25a9e3daa3d8f898a897174604882d812a8ba69f9f916ea79a0c83472e8925af54c1f8e39e0276a
+EBUILD vulkan-tools-9999.ebuild 2240 BLAKE2B e092fb1d0a2553e1d45ce151df9b0d72e7430f8340f063c77a5e455cc9938cd25e51b48b18ccef56057790903eeef8dde7d33d2e3b64864ab00407638d789bb4 SHA512 11928348b83856cac67c825a76142cb107c95a42d1cd23cf4805d4b152c01cd47922174ef77de40d8de641b01b9457e1604ccd63e8ef7c9d17ae60f8b52c3208
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
index 8c9610536b66..4b5027533226 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.106-r1.ebuild
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
+IUSE="+cube +vulkaninfo +X wayland"
 COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
@@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}"
 
 # Vulkaninfo does not support wayland
 REQUIRED_USE="|| ( X wayland )
-			  vulkaninfo? ( X )"
+			vulkaninfo? ( X )"
 
 pkg_setup() {
 	MULTILIB_CHOST_TOOLS=()
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild
deleted file mode 100644
index ddc3a474aef8..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.106.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.92.0.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
deleted file mode 100644
index f3e214574ec9..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.92.0.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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="9bbdd552f0fd62741aa1f1e02ab3eafc45cf3c1e"
-	KEYWORDS="amd64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-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
-	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-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 2cac7708424a..574fee54f75e 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=7
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="+cube +vulkaninfo X wayland"
+IUSE="+cube +vulkaninfo +X wayland"
 COMMON_DEPEND="media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
@@ -37,7 +37,7 @@ RDEPEND="${COMMON_DEPEND}"
 
 # Vulkaninfo does not support wayland
 REQUIRED_USE="|| ( X wayland )
-			  vulkaninfo? ( X )"
+			vulkaninfo? ( X )"
 
 pkg_setup() {
 	MULTILIB_CHOST_TOOLS=()
diff --git a/dev-util/xxdi/Manifest b/dev-util/xxdi/Manifest
index 4ca595ae2b75..b2e9b1fe8829 100644
--- a/dev-util/xxdi/Manifest
+++ b/dev-util/xxdi/Manifest
@@ -1,3 +1,3 @@
 DIST xxdi-1.0.0.tar.gz 8039 BLAKE2B bc881ea566e5f34f03a9c9f2adb42294cf75fb5f663537491a14d393d5e55ba571afe211277bab2f5dfb3128f98b20832430295a71cce255b0196e2448a0b853 SHA512 ebf026f61f0b0a339e3dfa5c9dd6a819ef23f0d29948073cbf5f6ae9668e68a7dd903f695ab5a824494f8424dad8b79aace5742bc23484a25303a15aa32ab698
-EBUILD xxdi-1.0.0.ebuild 528 BLAKE2B 3aa5cf9a1d3169924fbf47d208975803111f949514d14eb603299fe22ab6bfc4b5f479c86ef7bec73e09b529158abdca4be3ede0a0787dbae668c928996657f6 SHA512 41c0b50fc8af228939ea9720a9a644370a2cc4c5a7ad2b8f8e9a5daf10cd5a9c841d1070c4f0aade736715fdcdb044708b7ca924571203ebb2466a82f202d4d0
+EBUILD xxdi-1.0.0.ebuild 527 BLAKE2B acd1c49ae21204e8f34b97c195edd11df5d54ab10100dd09c431fcf060be4c3f245eb0b661c7d9badcafa913e15d4482dedba897230a2eb23568966c0ba0f04c SHA512 fb58babcd0572587ae5f85fb7469bc28d1dcae114211b000800bd4376e2bf05c1ebbaffb8db5e15b58d1866f8bcf2f7e9f88b28e0669616a9840f5a4b721df03
 MISC metadata.xml 751 BLAKE2B 36a9a50f8b3911158309777eced175f3bfd4e530be22e6aa17b85e328a30a19e863a8027e4247b6ad159ae9fdb391d0c1d0bcb95dc627320f61ffdce733e7bc1 SHA512 825537b0eb106b24c4d0cd8383f54ccc708e12b3947256217ee099523420de81152586a75d2c4b69d4f04c1a4eec6b9686f37d75dfd7fb3db639b1fbcedbabd9
diff --git a/dev-util/xxdi/xxdi-1.0.0.ebuild b/dev-util/xxdi/xxdi-1.0.0.ebuild
index b67be9f6790e..2946a65edffa 100644
--- a/dev-util/xxdi/xxdi-1.0.0.ebuild
+++ b/dev-util/xxdi/xxdi-1.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/gregkh/xxdi/archive/v${MODULE_VERSION}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 x86"
+KEYWORDS="amd64 arm64 ppc ppc64 x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
author	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2019-08-02 19:14:55 +0100
commit	b24bd25253fe093f722ab576d29fdc41d04cb1ee (patch)
tree	0fcf2afd9f852c4d4c291cf8afaa2c244d598105 /dev-util
parent	121ed4eec41fbf03e1998d09eede1bf449da63b9 (diff)