gentoo resync : 19.03.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-03-19 11:37:34 +0000
commit: b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree: 9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-util
parent: 066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)
147 files changed, 2282 insertions, 2119 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 7ea4a84db30a..e3d0631b32e5 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 1b85fd8b7232..f8c3beb246e1 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,5 +1,10 @@
+AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f064c77da685cf75cc8c0ab0cad4d4b473f0eac0b1533ca8eb7e6159108d184d16db7a264b0ea9d30ccdc3d988d88bab28be7310d SHA512 6e5c20de22547410ffa566cb8226a47ee0e8c91183bc5b70eb22637a08fe55cfc96fde169ef3ab8d6e8d7c9e356c35e61b164b3ad675835d3ea8d5239a448979
+AUX bcc-0.9.0-system-libbpf.patch 3629 BLAKE2B e3fd70ccd29126bd2ac8582d8094ef0317dbc9dafc8924a05d994105573a6bd1bf382cbd3d6a0bb25390abc3b4ca3edc70293f4663337ccc203434ba380648dd SHA512 e7ca33a66ffbe4cb4b4bf169029d2325b4321018832803872a7fc7f1e99a75338e34bfe55a072f717d45f9759adf119ed5289f0febd45f81303c178999ef5dc7
 DIST bcc-0.6.0.tar.gz 1986593 BLAKE2B 514c2c781eb94d99560232d8050b5664ce3565622b236e78cd111be27b3482849965600a1d574f59243917672f00bb3cef65cab63103f6c4a5cf62024c683d9b SHA512 1a8edf6da22f3119a74cf43f03ec83b97ed2f6fc18828d750d8a695ac1451b6b3209e5d2cf48bc87f53fa9447e8813a018a58d31588d477e4aa364a2d0217e80
 DIST bcc-0.7.0.tar.gz 2009289 BLAKE2B 370b553521289d983d1165633e76a5e405250b9b09dbf3e78c127d232908e73facce06097ce4dbf0bbccda929b6715a9b7460affe123556087c8ca00b8d62c0b SHA512 ebe6c4cbecba2d587c69af71ddc8cb451b2b8e1d49ef887f291c813320c2c60d49357500fc2751d5b418df2be1d02763c385d89de6efa6e10f049c25acf01b4e
+DIST bcc-0.9.0-linux-5-bpf.patch.xz 28524 BLAKE2B f0369e50eabd7b1eb9a492b9652cd7647c7c7fda3b01db1e7f2bf716e76357d07d67193b31189b98309e26895ac3dd5c755d4cef6bc592e4674f40710c33539c SHA512 fc5b828a5826da2cf1e1a76758c635f5443d202aecbe3f269d78abcaa0117ad7658bea6c43e7b60e1ecc6bcc65bd19b100217758a1203d278ddb03c5837c43f1
+DIST bcc-0.9.0.tar.gz 2036984 BLAKE2B cebbeb57f06af90442d28be1633a54c198bf796786c4fcca3a83dea03bc76949f958dd24f7d85feb2e3402576410f965754f3d031076486b7d378493c56035e8 SHA512 373080181380ec3bcb13469e29ff1f792e924a2df00a614da4647ed54060ad216525dd0f49c5d0afba7946a6d2f4e3475af97250a33db825945af3d165294091
 EBUILD bcc-0.6.0.ebuild 1137 BLAKE2B d9c11470ea2fc096cbeaba592d0181652376d8c4774c1e69c4b9a0cf38ae8835824a4090b75dc6def4dace3b26be263aa12c52f1283912c86580dc9334ff6f82 SHA512 bdbf5614a9ab1fb148594cdcf9c2c53069d2909bc88a244f47395bfc4b9b4851d965feec460ec08ea2289b6f0198cec2d41d3ad22de0c02626577df9d8528605
 EBUILD bcc-0.7.0.ebuild 1136 BLAKE2B 12bdef1faaaed5755813cef01a381e08b5bac2119c85f7bdcff4af1584d8cd46722c35daac1ecfdfd07288a568e3e514e0f0ba01aca6ba3c3ded5a1dbde0a0b8 SHA512 525502acf9faedca72bf34ab12e7ca85830e7e4ad474196b4968ed18d3a44d6865e51fc190ef83985ff766104d712d6cf23d857c8b8e7345ab2c98154ab58472
-MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
+EBUILD bcc-0.9.0-r1.ebuild 1670 BLAKE2B 947df6d21a52d197fa05c307f02cd40bd34a98bd015036016837f46a081a842cab0a02bfb9a433f5f0180753f5b3de7f3af7c95071eceafe496adbb62aeb4464 SHA512 8ecfb0764de2ee7e53e2d64e81d6d9b2fd7e0d5c94dc523f06564977da28e26769d388658197238f6a8acbe0c189923a0208923a3e77997b30453e9e8859de34
+MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.9.0-r1.ebuild b/dev-util/bcc/bcc-0.9.0-r1.ebuild
new file mode 100644
index 000000000000..f23a490a9026
--- /dev/null
+++ b/dev-util/bcc/bcc-0.9.0-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit cmake-utils linux-info python-single-r1 python-utils-r1
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	mirror://gentoo/bcc-0.9.0-linux-5-bpf.patch.xz"
+RESTRICT="test"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+luajit"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="dev-libs/libbpf:=
+	>=sys-kernel/linux-headers-4.18
+	>=dev-libs/elfutils-0.166:=
+	sys-devel/clang:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-system-libbpf.patch"
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
+		~BPF_JIT ~BPF_EVENTS ~DEBUG_INFO ~FUNCTION_TRACER ~KALLSYMS_ALL
+		~KPROBES"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	# needs bpf.h from linux-5.0 to build
+	has_version '>=sys-kernel/linux-headers-5.0' || \
+		eapply "${WORKDIR}/bcc-0.9.0-linux-5-bpf.patch"
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DREVISION=${PV%%_*}
+		$(usex luajit '-DWITH_LUAJIT=1' '' '' '')
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	python_fix_shebang "${ED}"
+}
diff --git a/dev-util/bcc/files/bcc-0.9.0-no-luajit-automagic-dep.patch b/dev-util/bcc/files/bcc-0.9.0-no-luajit-automagic-dep.patch
new file mode 100644
index 000000000000..ee076efce926
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.9.0-no-luajit-automagic-dep.patch
@@ -0,0 +1,20 @@
+diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake
+index 5a2bcf85..7f6e07e4 100644
+--- a/cmake/FindLuaJIT.cmake
++++ b/cmake/FindLuaJIT.cmake
+@@ -28,6 +28,7 @@
+ # 2010 - modified for cronkite to find luajit instead of lua, as it was before.
+ #
+ 
++if(WITH_LUAJIT)
+ FIND_PATH(LUAJIT_INCLUDE_DIR lua.h
+   HINTS
+   $ENV{LUAJIT_DIR}
+@@ -58,6 +59,7 @@ FIND_LIBRARY(LUAJIT_LIBRARY
+   /opt/csw
+   /opt
+ )
++endif()
+ 
+ IF(LUAJIT_LIBRARY)
+   IF(UNIX AND NOT APPLE)
diff --git a/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch b/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch
new file mode 100644
index 000000000000..18868272dcbe
--- /dev/null
+++ b/dev-util/bcc/files/bcc-0.9.0-system-libbpf.patch
@@ -0,0 +1,100 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 94aac856..33492c27 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -61,6 +61,9 @@ FOREACH(DIR ${LLVM_INCLUDE_DIRS})
+   include_directories("${DIR}/../tools/clang/include")
+ ENDFOREACH()
+ 
++find_package(PkgConfig)
++pkg_check_modules(LIBBPF REQUIRED libbpf)
++
+ # Set to a string path if system places kernel lib directory in
+ # non-default location.
+ if(NOT DEFINED BCC_KERNEL_MODULES_DIR)
+diff --git a/introspection/CMakeLists.txt b/introspection/CMakeLists.txt
+index 88df6e84..a4033c02 100644
+--- a/introspection/CMakeLists.txt
++++ b/introspection/CMakeLists.txt
+@@ -8,6 +8,6 @@ include_directories(${CMAKE_SOURCE_DIR}/src/cc/libbpf/include/uapi)
+ option(INSTALL_INTROSPECTION "Install BPF introspection tools" ON)
+ 
+ add_executable(bps bps.c)
+-target_link_libraries(bps bpf-static)
++target_link_libraries(bps bpf-static ${LIBBPF_LIBRARIES})
+ 
+ install (TARGETS bps DESTINATION share/bcc/introspection)
+diff --git a/src/cc/CMakeLists.txt b/src/cc/CMakeLists.txt
+index 59a59856..2af70525 100644
+--- a/src/cc/CMakeLists.txt
++++ b/src/cc/CMakeLists.txt
+@@ -28,7 +28,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DLLVM_MAJOR_VERSION=${CMAKE_MATCH_1}")
+ 
+ include(static_libstdc++)
+ 
+-file(GLOB libbpf_sources "libbpf/src/*.c")
++#file(GLOB libbpf_sources "libbpf/src/*.c")
+ add_library(bpf-static STATIC libbpf.c perf_reader.c ${libbpf_sources})
+ set_target_properties(bpf-static PROPERTIES OUTPUT_NAME bpf)
+ add_library(bpf-shared SHARED libbpf.c perf_reader.c ${libbpf_sources})
+@@ -81,10 +81,10 @@ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${llvm_lib_exclude_f
+ # bcc_common_libs_for_s for shared libraries
+ set(bcc_common_libs_for_a b_frontend clang_frontend bpf-static
+   -Wl,--whole-archive ${clang_libs} ${llvm_libs} -Wl,--no-whole-archive
+-  ${LIBELF_LIBRARIES})
++  ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES})
+ set(bcc_common_libs_for_s ${bcc_common_libs_for_a})
+ set(bcc_common_libs_for_lua b_frontend clang_frontend bpf-static
+-  ${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES})
++	${clang_libs} ${llvm_libs} ${LIBELF_LIBRARIES} ${LIBBPF_LIBRARIES})
+ 
+ if(ENABLE_CPP_API)
+   add_subdirectory(api)
+@@ -115,4 +115,3 @@ install(DIRECTORY libbpf/include/uapi/linux/ DESTINATION include/bcc/compat/linu
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libbcc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ endif(ENABLE_CLANG_JIT)
+ install(FILES ${bcc_common_headers} DESTINATION include/bcc)
+-install(TARGETS bpf-shared LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/cc/bcc_btf.cc b/src/cc/bcc_btf.cc
+index 881959af..62f73f54 100644
+--- a/src/cc/bcc_btf.cc
++++ b/src/cc/bcc_btf.cc
+@@ -19,8 +19,8 @@
+ #include <string.h>
+ #include "linux/btf.h"
+ #include "libbpf.h"
+-#include "libbpf/src/libbpf.h"
+-#include "libbpf/src/btf.h"
++#include <bpf/libbpf.h>
++#include <bpf/btf.h>
+ #include <vector>
+ 
+ #define BCC_MAX_ERRNO       4095
+diff --git a/src/cc/bpf_module.cc b/src/cc/bpf_module.cc
+index cf6ea8f3..1be7b788 100644
+--- a/src/cc/bpf_module.cc
++++ b/src/cc/bpf_module.cc
+@@ -43,7 +43,7 @@
+ #include "exported_files.h"
+ #include "libbpf.h"
+ #include "bcc_btf.h"
+-#include "libbpf/src/bpf.h"
++#include <bpf/bpf.h>
+ 
+ namespace ebpf {
+ 
+diff --git a/src/cc/libbpf.c b/src/cc/libbpf.c
+index 9b0024dc..7b3eca4b 100644
+--- a/src/cc/libbpf.c
++++ b/src/cc/libbpf.c
+@@ -51,8 +51,8 @@
+ // TODO: Remove this when CentOS 6 support is not needed anymore
+ #include "setns.h"
+ 
+-#include "libbpf/src/bpf.h"
+-#include "libbpf/src/libbpf.h"
++#include <bpf/bpf.h>
++#include <bpf/libbpf.h>
+ 
+ // TODO: remove these defines when linux-libc-dev exports them properly
+ 
diff --git a/dev-util/bcc/metadata.xml b/dev-util/bcc/metadata.xml
index 43eb746c3b02..4611e0157556 100644
--- a/dev-util/bcc/metadata.xml
+++ b/dev-util/bcc/metadata.xml
@@ -4,6 +4,9 @@
   <maintainer type="person">
     <email>zmedico@gentoo.org</email>
   </maintainer>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+  </maintainer>
   <upstream>
     <remote-id type="github">iovisor/bcc</remote-id>
   </upstream>
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
new file mode 100644
index 000000000000..d0120253ffbf
--- /dev/null
+++ b/dev-util/bpftrace/Manifest
@@ -0,0 +1,6 @@
+AUX bpftrace-0.9_pre20190311-install-libs.patch 4453 BLAKE2B d8b552a04fa4815c8b2209c57ad9dbecb3938531ef3c6ad481d5ec034e8a8aff323f29acfa920f00d612a2f859b0b03272955384c06ee5051d7c8844163fdae6 SHA512 0fe1ea870b5a963ac040a7a636cd0255e60577bd7e9aa6080e40116c964c4a4bc1b5858290c2f381916433504bf28118f9b03089fb0baee32085aad104b1621c
+AUX bpftrace-mandir.patch 906 BLAKE2B d875e2523b7e719624d92c58a8f058cdd597da07bf6472d2e3dc05eb46be64718ed4056e15a93e4c22264fa35ceb6b79b428febade422ba435a2a2b9e17fb707 SHA512 11544e9e5892ae3657ff903fa2780e71223e380322b4059ddcea4a6edd80c5a7ab8d45188eb577127f64a6705a6ae41d53f3ba7e05bf450853b12a9ba3d84904
+DIST bpftrace-0.9.tar.gz 668655 BLAKE2B 650756ed7334cb92a64adc36a0bd86fff5c16c53fb94d57cc570dd3cd893d467e754da80c98da36c1ec1d14327fa6025b194d963e4a2d1bec99ebb868555b6bc SHA512 771c412a6b1ee7a7d5bba9e0910633056c6f5523e5d1efd9d7ccb5b9f9b462b7bda8d170c5ed0653f3c1bfd5cc77fce2fd552f12eb8222a8747620b3dc9b49f8
+EBUILD bpftrace-0.9.ebuild 1190 BLAKE2B 54b1634249e4594ea5115c87047e74e4f73c1b48e24f51292ed8dbb5f554cae84c8d18f70e1cd1c73b9f3120c670ecc94833f7d7f62c3efd4a43fa8c8b6bb783 SHA512 6a36f394710b5c027b0ae6b040c956e4891c17294cbb1e913152a592d46b1b694fa3dbf102ab8e555486b165764e0c7cf30fad79f8663be9b1d7cd3b1040ca3c
+EBUILD bpftrace-9999.ebuild 1233 BLAKE2B 493490aea8b690eb3d86ad875462602b40552a9ef4713ffcf733550bf30fd6b16f33b8847f670e26c3c2245b2a5f10d888bcfaa7869b868cb126d428994f6e88 SHA512 355f550827610fce8cf8a51561bdce9b56e5b00f5d49c5b0d31dabe93307be754011d93d1ad9cbe2f140950d51d9f9ec77a44ab9fa8130c863b598eb98e00e9b
+MISC metadata.xml 308 BLAKE2B 5440fafa478bdbdf6906c74d697a9542deb8b13b76527a380df723562759d914d597dff029f93ba4567ce4e0f4723fded5a13ea7d2032752253bad1906e753dc SHA512 c27c2ef4795e9167ea133e0c0e2c6d67425d6db754bd563d9cb7a791b4a155ebe855ad0e67c2b29235a9b9761f29dbb14958b124c95a1aaddb97801c763914ba
diff --git a/dev-util/bpftrace/bpftrace-0.9.ebuild b/dev-util/bpftrace/bpftrace-0.9.ebuild
new file mode 100644
index 000000000000..b483aed0116a
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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
+	SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="sys-devel/clang:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	>=dev-util/bcc-0.9.0:=
+	virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+	sys-devel/flex
+	sys-devel/bison"
+
+QA_DT_NEEDED="/usr/lib.*/libbpftraceresources.so"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
+	"${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+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/bpftrace/bpftrace-9999.ebuild b/dev-util/bpftrace/bpftrace-9999.ebuild
new file mode 100644
index 000000000000..1f874815e93c
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs 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
+	SRC_URI="mirror://gentoo/${P}.tar.xz"
+	#SRC_URI="https://github.com/iovisor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	BDEPEND="app-arch/xz-utils "
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="sys-devel/clang:=
+	>=sys-devel/llvm-3.7.1:=[llvm_targets_BPF(+)]
+	>=dev-util/bcc-0.9.0:=
+	virtual/libelf"
+DEPEND="${COMMON_DEPEND}
+	test? ( dev-cpp/gtest )"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND+="dev-util/cmake
+	sys-devel/flex
+	sys-devel/bison"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.9_pre20190311-bcc-0.9.patch"
+	"${FILESDIR}/bpftrace-0.9_pre20190311-install-libs.patch"
+	"${FILESDIR}/bpftrace-mandir.patch"
+)
+
+# lots of fixing needed
+RESTRICT="test"
+
+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/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch
new file mode 100644
index 000000000000..68bd82559443
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.9_pre20190311-install-libs.patch
@@ -0,0 +1,111 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ff6e1f..a276ba2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,9 +43,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ include(CheckSymbolExists)
+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index b8b0d96..0803c1e 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -1,6 +1,7 @@
+-add_library(resources headers.cpp)
++add_library(bpftraceresources headers.cpp)
+ 
+-target_include_directories(resources PUBLIC ../src)
++target_include_directories(bpftraceresources PUBLIC ../src)
++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ function(embed_headers output)
+   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index b47f66d..36de26b 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -27,7 +27,8 @@ endif(HAVE_BCC_CREATE_MAP)
+ if(HAVE_GET_CURRENT_CGROUP_ID)
+   target_compile_definitions(bpftrace PRIVATE HAVE_GET_CURRENT_CGROUP_ID)
+ endif(HAVE_GET_CURRENT_CGROUP_ID)
+-target_link_libraries(bpftrace arch ast parser resources)
++target_link_libraries(bpftrace bpftracearch bpftraceast bpftraceparser
++	bpftraceresources)
+ 
+ if (STATIC_LINKING)
+   target_link_libraries(bpftrace ${LIBBCC_LIBRARIES})
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index 425926e..13b5d31 100644
+--- a/src/arch/CMakeLists.txt
++++ b/src/arch/CMakeLists.txt
+@@ -1,5 +1,7 @@
+ if(CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-    add_library(arch aarch64.cpp)
++    add_library(bpftracearch aarch64.cpp)
+ else()
+-    add_library(arch x86_64.cpp)
++    add_library(bpftracearch x86_64.cpp)
+ endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 64db7b9..1a2eb6e 100644
+--- a/src/ast/CMakeLists.txt
++++ b/src/ast/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_library(ast
++add_library(bpftraceast
+   ast.cpp
+   codegen_llvm.cpp
+   irbuilderbpf.cpp
+@@ -6,12 +6,13 @@ add_library(ast
+   semantic_analyser.cpp
+ )
+ 
+-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src)
+-target_include_directories(ast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
+-target_include_directories(ast PUBLIC ${CMAKE_BINARY_DIR})
+-target_link_libraries(ast arch)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
++target_include_directories(bpftraceast PUBLIC ${CMAKE_BINARY_DIR})
++target_link_libraries(bpftraceast bpftracearch)
+ 
+-add_dependencies(ast parser)
++add_dependencies(bpftraceast bpftraceparser)
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ if (STATIC_LINKING)
+   set(clang_libs
+@@ -31,16 +32,16 @@ if (STATIC_LINKING)
+       clangSerialization
+       clangToolingCore)
+   llvm_map_components_to_libnames(llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
+-  target_link_libraries(ast ${clang_libs})
+-  target_link_libraries(ast ${llvm_libs})
++  target_link_libraries(bpftraceast ${clang_libs})
++  target_link_libraries(bpftraceast ${llvm_libs})
+ else()
+   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
+   if(found_LLVM)
+-    target_link_libraries(ast LLVM)
++    target_link_libraries(bpftraceast LLVM)
+   else()
+     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
+     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+-  target_link_libraries(ast libclang)
++  target_link_libraries(bpftraceast libclang)
+ endif()
diff --git a/dev-util/bpftrace/files/bpftrace-mandir.patch b/dev-util/bpftrace/files/bpftrace-mandir.patch
new file mode 100644
index 000000000000..d18c1e2f3210
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-mandir.patch
@@ -0,0 +1,22 @@
+diff --git a/man/man8/CMakeLists.txt b/man/man8/CMakeLists.txt
+index 45cfe5d..d13229e 100644
+--- a/man/man8/CMakeLists.txt
++++ b/man/man8/CMakeLists.txt
+@@ -1,12 +1,12 @@
+-find_program(GZIP gzip)
++find_program(CAT cat)
+ file(GLOB FILES *.8)
+ set(GZFILES "")
+ foreach(FIL ${FILES})
+   get_filename_component(NAME ${FIL} NAME)
+-  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
+-    COMMAND ${GZIP} -c ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz
++  add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
++    COMMAND ${CAT} ${FIL} > ${CMAKE_CURRENT_BINARY_DIR}/${NAME}
+     DEPENDS ${FIL})
+-  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.gz")
++  list(APPEND GZFILES "${CMAKE_CURRENT_BINARY_DIR}/${NAME}")
+ endforeach()
+ add_custom_target(man ALL DEPENDS ${GZFILES})
+-install(FILES ${GZFILES} DESTINATION man/man8)
++install(FILES ${GZFILES} DESTINATION share/man/man8)
diff --git a/dev-util/bpftrace/metadata.xml b/dev-util/bpftrace/metadata.xml
new file mode 100644
index 000000000000..777f99f832ca
--- /dev/null
+++ b/dev-util/bpftrace/metadata.xml
@@ -0,0 +1,10 @@
+<?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>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">iovisor/bpftrace</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-util/btyacc/Manifest b/dev-util/btyacc/Manifest
index f3c73764721e..228b2db2d966 100644
--- a/dev-util/btyacc/Manifest
+++ b/dev-util/btyacc/Manifest
@@ -1,6 +1,5 @@
 AUX btyacc-3.0-includes.patch 175 BLAKE2B a0da73e29099239e97d8fd67edf2743720fc3e97946834319c249e9bb0dd1949c70b492d3ec3fffed32d992dddc7ed2cadbf7cb2280b7cc24c26b1f00854b46f SHA512 c0ba2cf5ca3575862a6c683cf5a9461cc7008e7c8662732ef64ba68f041e810aceb8f0f1b75becc8cd910c87c60dc830e8823b15986fedf345319bedb50e3dd4
 AUX btyacc-3.0-makefile.patch 535 BLAKE2B f5c7f893dcbe98c17dc74efc6310924518447ea4d719af3dc700daea72d0106e5217d69cfb82b498a81392c8f0a447c92afcfa10954f4b7418efa76de3382dc9 SHA512 54df54a45147a7ca5c76d0c6665a46210af170671ba04762e8de80c0269b0a1aa947c1be049aa8660f8b96d4ec204e639f2a810130676d69fc54fb28c929a190
 DIST btyacc-3-0.tar.gz 74770 BLAKE2B 298d6ba020a47a8d894044c464c12efd3ed94b878cd152f4287a35fc0a8ec490186b7603909691cbf036f425fa96316c6cda8b8270b07e3c5c0cd11777d5e62b SHA512 55312e3de7cc783e1386ea98c97464d8d40bb496ce2ce36c84cc559e4c6982fbac730e76b8d44c4a44565f545ac50fb75f802bd8a1b4c926b1fc1af1a0058ef4
-EBUILD btyacc-3.0-r2.ebuild 914 BLAKE2B 54dcf06df457c361e1f6189bc922c7f4ca1a73ebd065ba3cb187712d2e469e8a5c575d1bba7683d5ac1c8f919c671c7f8686819da5b6866a449bc114b9d383de SHA512 402ed5b5c405b7dc1daf609fd2c34a5d2e384f37557b86d64493d523d2a16c05e015d5cc7956696abf906ac59f03fd8dbfb26171d619f5cadcfb155876212256
 EBUILD btyacc-3.0-r3.ebuild 928 BLAKE2B d3f7855ba2de20e9b8ae0990dac3faea827e83ad4defdb48a002a47c8d2a6e6d2df480ee1b36a9b4be3d7fd7ed8627e165802339324a9ac4638d5c3324d6e933 SHA512 c998dd46a55d4311dc082ba140a778da81f05070afdb6fded5d9df49f692951762016d44c4cd3fdc79bc072a4d3cbd521a87e1923c516303e78f458022c95469
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/dev-util/btyacc/btyacc-3.0-r2.ebuild b/dev-util/btyacc/btyacc-3.0-r2.ebuild
deleted file mode 100644
index bf06edcf5abb..000000000000
--- a/dev-util/btyacc/btyacc-3.0-r2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils toolchain-funcs
-
-MY_P=${P/./-}
-IUSE=""
-DESCRIPTION="Backtracking YACC - modified from Berkeley YACC"
-HOMEPAGE="http://www.siber.com/btyacc"
-SRC_URI="http://www.siber.com/btyacc/${MY_P}.tar.gz"
-
-LICENSE="freedist"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-fbsd ~x86-linux ~ppc-macos ~x86-macos"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	cp -av Makefile{,.orig}
-	epatch "${FILESDIR}/${P}-includes.patch"
-	epatch "${FILESDIR}/${P}-makefile.patch"
-	# fix memory issue/glibc corruption
-	sed -i -e "s|len + 13|len + 14|" main.c || die "Could not fix main.c"
-	# Darwin doesn't do static binaries
-	[[ ${CHOST} == *-darwin* ]] && sed -i -e 's/-static//' Makefile
-}
-
-src_compile() {
-	tc-export CC
-	emake || die
-}
-
-src_install() {
-	dobin btyacc
-	dodoc README README.BYACC
-	newman manpage btyacc.1
-}
diff --git a/dev-util/cargo/Manifest b/dev-util/cargo/Manifest
index 0b4d3de135a2..2402abb297bf 100644
--- a/dev-util/cargo/Manifest
+++ b/dev-util/cargo/Manifest
@@ -143,5 +143,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-util-0.1.1.crate 7635 BLAKE2B 2a8047d0da762379f8e66578bf95309a7968d52b636a7bb57d98ce827edffcf85b20cf0441487f4fcd91dccc6db9d005a4c3d78140f0d85dcc99534f3b7aacd4 SHA512 003244d94a887d870b8eab7569f6aee432350eb9f13b5b90a0836eb105b05ac83b7835efe90d9915437f295730653b2dafe6251ab9c46011f1d8492fd4ab8a06
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
-EBUILD cargo-0.30.0.ebuild 3764 BLAKE2B 967aa0ac695ca3868dbfd48ccb7c566a31f6d02d80e06203999bd4798eb7089a6866a25c6a4feb4d1b04a08070b66addced585f2371f9acbcd87006c848620cc SHA512 a712ff22a94a057f69e9abc731df401402f90567c75e82cc4a2fbac8d92b181319190126afd135d31124a4ce4e769c423fcbffc342e231f5c05b7c4b2a8a7cd5
+EBUILD cargo-0.30.0-r1.ebuild 3847 BLAKE2B 2c0ab6eb8b854419a6c645f04e1187c81e2b9f9d50c673a1e008a04aa8efe95406cf176f223ea2960fa61f8d8bbec214438e192b0b614c3f2e213a611b99ee1d SHA512 1cd0c5ca69985fc2c43d661d0b11f6b9e3870e8f6981b12d0e9b8e40e82a0cf6f34eadf13344a4d657c0ee8c2aef248a9c66f7a13d8ebbf8e71152820475985b
 MISC metadata.xml 334 BLAKE2B 492ad458d72b54f13c18357d77a28f82fefde1c581c34a19b5da9d6dc1c32ecf47675aa3198ccf8a934d25f494f9c6ba42bba0dd8d32d2c4f62e6411426ba3bf SHA512 7d50f6dfd848ac87a1411295bc5133289a7576d7cf3b82c88fdc3e17ba5371e25c4ccd5f2f404ca31ab81531d21e8d2023236f81608078a1ed32832d005653ab
diff --git a/dev-util/cargo/cargo-0.30.0.ebuild b/dev-util/cargo/cargo-0.30.0-r1.ebuild
index 3ab88c1f3331..a1a63f133892 100644
--- a/dev-util/cargo/cargo-0.30.0.ebuild
+++ b/dev-util/cargo/cargo-0.30.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -156,7 +156,8 @@ KEYWORDS="amd64 ~arm64 x86"
 
 IUSE="doc libressl"
 
-COMMON_DEPEND="sys-libs/zlib
+COMMON_DEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
+	sys-libs/zlib
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:0= )
 	net-libs/libssh2
@@ -200,3 +201,7 @@ src_install() {
 	doins src/etc/_cargo
 	doman src/etc/man/*
 }
+
+pkg_postrm() {
+	eselect rust update
+}
diff --git a/dev-util/cbindgen/Manifest b/dev-util/cbindgen/Manifest
index 23e8e814a1c7..d41794180823 100644
--- a/dev-util/cbindgen/Manifest
+++ b/dev-util/cbindgen/Manifest
@@ -1,45 +1,79 @@
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST atty-0.2.10.crate 5962 BLAKE2B 36a2fe57eb500124f20464a7d67f86bc6270c2143f8273683011599adee180ee71fb0ea565c38171b9d471479d63041e4bbba4f713dfb92239b7d298e9d89e7e SHA512 76cbf960475073101d617bdaf12ed1e93dfdd96e22182674e1ec04c955fb1de2e3aa132345c50a1bebc579932d43c74c9aac64ae64107e98648a0f1f6562285b
+DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
+DIST autocfg-0.1.2.crate 10444 BLAKE2B 1e37c97d6d309a5250552fc4c38066ba004674af6e6d091f08b24f47475c11b2db4b0967ce55d2208b9e2ba080e2bcb4b4226acd0da9d4c15dd844827ea6f0b4 SHA512 0f692f4062d22be01c32af2ceb6ed3887a7d65843e1a6ec696fbaa46517d02e62d573055efe5da3a63847f05bc37b254bf2dd750738b528774f63352eacdabe4
 DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
+DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
 DIST cbindgen-0.6.6.crate 82574 BLAKE2B ec3d2d03ea677acf89046d148447ea1108f4d0189878e9ffe4ceab273ea377cd489df27d9d6c589641dc614d0c8982fb19d2452d4ae88609adaa9a6aebf70baa SHA512 d51d17765d705424dead65e4240c52fe93da731d5ac1cc76fe79e2eb68a42c26a7de58b08149cccd6806ee5bb189df8c15c3a532a5f857a65c2fd69c656d7137
 DIST cbindgen-0.6.7.crate 84579 BLAKE2B 6307bc70346acd1340393c07460198666b7133d3cc21c0d02712a017458e3a228ff6dc6f3cfda8d560e5cc8eb6d9a15e52309099dc7deb151bf157ed6856ef6f SHA512 1a2a3f2055b0527b878b78834e6c802a171ed5f3494ff4819622f8244821d9a1b23d34d0c9370bee10a9f334cdbdfac43cb513f61bd49d57614f66825cd78030
 DIST cbindgen-0.7.1.crate 90623 BLAKE2B 4fa7e82ee15b89a7de678eedb6ff95c3ca36376aefc8496a6b728eddce075a2aff9076867adfc0b6104a3317fc1e205fa4399b773211944261f8495265eba574 SHA512 ee9856e07ea55c03f4a715497167a4714e3d1297c1f52da2fef507b44d93f258ca2eda8004befb3915a9cfd783b44e6768706de5efa3cac6f7a778bf8ccb4e76
+DIST cbindgen-0.8.2.crate 98747 BLAKE2B b400fa5df818760a48483883eae959de04433d1ec2d5f67bdba5c065e6bebc4f21424badd8c7598ad4aca5e1205230e79528ad9d0e1e736c2dd00745abdd058c SHA512 e4e6079170ba396f753603cd58c2a8c252e216e129cea6a0c4d82b399aea78f569d80345dbe69af509aadf207790b4d00b8f2edf500b36d54d9c095a65b9e792
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
+DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST clap-2.31.2.crate 194051 BLAKE2B 67ff210e200d387008fb5ddbb4b0a7961f568886a4df57b12b8aa1dd4c87b0408d11d9797980f3dadfbc9aa30bdf71586474a3d905d0d45eee13165692505bb8 SHA512 f43c3e2736a7fcd5c59ba4c80bcdb28fe436b85fe33ef74a53b76b7aab009d9315d2be007a52c1abdee2f754b118ab8132640e6e6954fd60017a17d0cc086127
+DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
 DIST dtoa-0.4.2.crate 14227 BLAKE2B 7edc0b203a58586aeea84326cce66105e21e3d7efcffab8b80fbd5576dc19a181304571d1edf932873ba05254a36f44bc81377fa4aa79d9bbfd6a90e75a33468 SHA512 a04410f8f67e846dbf3c72c0d15096e529c60174c6403931c9b8df67b41a59b8c06c675bc3222d0111f642d4153f7dd72c0631805d40386bded28695e38c7f0c
 DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
 DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
 DIST itoa-0.4.1.crate 10563 BLAKE2B dd8ba6399c4f9b307c296b83043cf4172463ab361c8edc11ec0486863ce0a7a1be968989e1676821a20de69c383c1aab55a9eb4a61d74d63710811e0463391d4 SHA512 f2efdad4fa250a1a453d3a956b478aebaa4cf0618f77da1f8206d3ef4e37b153a485de6a2873662acd0649fa9b8599cde8c99ed2096b7606166de90fb5ac77ee
+DIST itoa-0.4.3.crate 11061 BLAKE2B 76ab02d37c62453ddfee00788ed83805c3c57a66120fcd266401806c005bb55c00b90e074a39a0cdf99d8018181c5bd3f7c3a4fffcefcdc762e19191f0a362e6 SHA512 da1d1c988c2c81f37de8d048ca8f8fb8787c48c34e815dc64616368cb787990ae0255cf1a3259f87ad02964c9b3e1e20c759072442c18c7d32db1deac11b52c1
 DIST libc-0.2.41.crate 333728 BLAKE2B 4b6d8a3ddedfbd01114878b14dcd7f4cdb663ab19c3f325d1785d9fc0c752634a7efe7777b3b14cac77ac5a2a3b8ae70a9e413006dafdcfe268b6e3c30bec8ab SHA512 6666f28673f765817dc6c989876a53031b117d281a6b148976b900ddeaa220fcb04c0e2bfe8b07d46f7e1b212e9c2fd7273b3300be548a3af0d2c9025bef7b26
+DIST libc-0.2.47.crate 351491 BLAKE2B 10ff90405b911c40478793cadc9a1962e14eb4d7b4ff758554a225bb87340989bbd6089441eaa2638db93782de7d0faba20f77a7e3569a52cec40ba55eb56c06 SHA512 f0eddcbe456b1ee2da22963585ff689ad44f0f8d70af33d9bec41a1ec5a1b3dee26fbeaa29786792cd44d020fc56461b44bbb2da962662377552fa562b2694f6
 DIST log-0.4.1.crate 20731 BLAKE2B 5936919ddf0e218ca42d669b56271836e9eca61afa4145896a55970e5fb768196f18ac6f028caf8eaf505f5bb797700ca2f238970e1ad54edadea566efb6ca16 SHA512 a142f4d230cbe64a4efe2c46055722bf06e7af500c0f14d66f1d7d7fec99d552081ee9541d4a5b3aa5f46bc3be42f7702dff76132cc1eed7734234b2db37c0f0
+DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST proc-macro2-0.3.8.crate 24412 BLAKE2B 42895039c67122199619256b567ea66f6e0b6a45d688440ae1211c8bb45bfb87e7a599f978b04414ddf78384df3147ff8faadcea662bff647256567ea6be565b SHA512 df6d48a5d9c2b7c3f071de3336343ac00c61427c74675512c457ce23d30879350fc995809154289fe9c2d08b7bc39a9137898f651bed8c3646695abfb8368a9d
+DIST proc-macro2-0.4.25.crate 31557 BLAKE2B df36d9c0f4e020d289341ec9e26cc3b4c8a5a5221e936834bdc707426e02c675ca38d6cc5dfee1a42f501619bf00a7cbc2dbd140ac523d1e99f47574ece76ff2 SHA512 e6bf37c4b990a3cc1629171c812ff145db35f1d179a40c4204857766ec4a517a7cc4342decc63026c6b891e0ff321b5fa8b5242459b6f80a9358572afc2650e1
 DIST proc-macro2-0.4.4.crate 28564 BLAKE2B 56935ff3b80d9c94f198a253de77fd7c8650ec75e62df100114bbeee633941570e4525a5dabfc92c370a8770be375d1ae0a83ecc09df10c4cfad2adc55ad501f SHA512 13b74a69277bd7674554414039e79dd0ae14f6e998a46e6e587cc17b6f2c97a6dbcbc459c827888510e5aff3b79d48b11f840bc21a28ff16c0eee8a51b784a86
 DIST quote-0.5.2.crate 14982 BLAKE2B 5600742b8da27015c0a461c04414dd61be208cad10a3a1212e43d7a2aa3a8fde947b700ca230f79d9d8c13da1742a7caf70810d4b6ebd6669b020513be00974c SHA512 66c0469bf1970164e87a4960791932ca06726c79bc522fe0bdfbd41ed23428e32448aa01a0f02066169c165364465eacbd19cdde47e96b4dba017a491842e6ac
+DIST quote-0.6.10.crate 15795 BLAKE2B f81cf2cc13efb42bcf90f4c9cce832d94b2138428d133516d579a0eed157bacda9f5b29cd1c604a89261390ec011fe4825c31788486db007efd97fbb3de261f6 SHA512 92250a3664fe872175ee8c8aa7c4fec121ffe6fcec11a957646fab1297e9e946be03924ce1d7897125cdc0d4883400ac05774ed55a32f943a129fa8d48a1a162
 DIST quote-0.6.3.crate 14154 BLAKE2B 16a31875577eefec9568e3b990ed17b0afa5af6ec936f0b8d1f05303b7e1dae1737677a86089a048cf51b602c71f4b3c7802ee40fb9caadf2e13fc0e6df134a8 SHA512 f2ff3cd617c69007c4f60961728c73a7ac7a2eaeb1d6da51218d2fbc9e85c06baeaccc9b82771a304bace04024479a192b88336546f96e17c6446ba85df94a10
 DIST rand-0.5.5.crate 137359 BLAKE2B ca594d61b964b3511cc0c995dadf1aa270ea3f962367e2faab3d73ba5caef8557b5404756f7997aaeda0511184d3a8ec0f35197bbf7d3d507152f1f7c63825a1 SHA512 e135a9c97943662bcea9c4730f19ec6e01ea73303801101592c14e97b59adbbc3457ed7a3dd57843776f5febb6fa34890aad9d1c2c596ae89416e1a281062cc8
+DIST rand-0.6.4.crate 116260 BLAKE2B e16bde25b7493b0f77b897efb9281e31ff17636d0ce5c9c4bce47fd5cec79e6bd889880f371591f6eed9163ef49934ef4389c95d6a673172dc0f27c09e6abf1e SHA512 2b98ba7edce4b48833ca5d8c9cda25beb9f73fd22adb997afdfb10d5c59e9240537baebc2e7de1e0094716009f7fe2b657d1f4dcb4c778e492e49483a7e3ce8b
+DIST rand_chacha-0.1.1.crate 11703 BLAKE2B 125fbb623b5d829c48e5b492c36585037e7fc6f12eb9090f946d05343fe867ce65db8eac913762dc20b6af2a4856e957ff43916897f3e385cc22eae64911b0a2 SHA512 200d39362ffd6d91cfe80634e951c7323a5df8a382c91e3afcef1ecb143a16dc47a17db7f1a746b18e4ea8bfd36bc31ceaeff6d0116e166f8b34e4a8530b3c1b
 DIST rand_core-0.2.1.crate 19262 BLAKE2B 6ab239b11f08b79f5319e0d278ec56985f4c91406f938c206f017f706508d73aa78ed3ef799ca7f20a9bf3ab860f76c5527bf14fb2464db914af3dac55ac0b64 SHA512 5e919f4229ee2e7d00f47f8bbbb7fd27e11f34aa5bd85a9d9e34d45af1601bdbe2507d9b0182b5af7a6eb4d93da3004d2708729f7e864b6c66ce9b3274fe1c64
+DIST rand_core-0.3.0.crate 20581 BLAKE2B fe46ab0ef5fe8f5f5695906336683350abd7aca246a537e2e4bc9fcf10686d39aaac259584f17c022200ec1139e01e817f71caf33933ad3f353baa10e6cd11ab SHA512 a476510ef936571e3351f42e0f1c615530732b7c66f41975fef10dc6b8f4d8536a6d8166bb90d6da2bb997108ee3e87f4d80884264b239680e6ffd3494dcb748
+DIST rand_hc-0.1.0.crate 11644 BLAKE2B 24e9db27c6673ce657dd18e0bb5ac092c4340b818e79edf4a3ebfbd9a49759d3969c22f4357be5884192b6e6375528831683be54e1283112eb94097ff38d7d88 SHA512 808d8c167daa66a2608884d5d3f1444cdb21f8ca1c61e59fc9bdfb506a634ebb22c0143cfc0574e15313f82559fd2d117a46910eba3b4eb7e0052ec280f5cd2f
+DIST rand_isaac-0.1.1.crate 16020 BLAKE2B a720ac67770133f6051720afb6681623c1b3700be9ab8f663fa8ea852132a81c1404e34aed6829c197b92996007997cbc9105cea0e125e5ff3fc931306c55da4 SHA512 9e8f6c79abc53352c971f8182dcaa7979904d5649eec9008262bb0aaf0585b4c4817351cd80ffa8d07f172ff4c82d85a09ef2642a08f608fc6be3e246ed7f82e
+DIST rand_os-0.1.1.crate 18553 BLAKE2B 5b74bbce5ee3f20f7c92204c4b60f9450b3a19518356c70737c8dad9873da775c90b8786bc75f0fa166388f6bfc585240c56445a39603704df5e99a4c505e17a SHA512 a7ccc054fd4a60e868520af3fc15e6eb22e62411975923e4d968a4825a48cbf87238338cbf1336792d996da5cc2183ac465a6bf8094358f0e5fc56380ce16193
+DIST rand_pcg-0.1.1.crate 10881 BLAKE2B adafb2f28603e4c1ccced838b1946b4d0de94f7d11c85b1a0fdd69a1de3a7c3e1b3030af25b600441c08e2eb73595ff4bad195e5d2ef04f3fa2da5f9614e14f8 SHA512 5104d9a3352f631eb7775218fae6da430d0b26c500aa10a333baa0b1b3d4ff7ff6e8a0162cfe8f514382b0a9342a00e3d2ad6b0313047c5e0c324f3184cfa9e3
+DIST rand_xorshift-0.1.1.crate 8997 BLAKE2B 314192d23072fba2ac66130604d92150bf946c6f6cf88a4b337314c51777af36d8cb6189b92284e451ea078e0ca66e6a5b91a90c0c2b0ad2353ecd3e08667f68 SHA512 3205499ed2584467dedb4641a48f3ca8fedc263b1d9431d36a251af0bc4701d99ce4b5219d515b9b24210dd3ef2faace6efa886aa50f361e07f53dd0fb0841e5
+DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
+DIST redox_syscall-0.1.50.crate 15609 BLAKE2B 22c1542a025992694c37d426330a217e3936b95be5847b962151fe626975490434d463277056be53a128e815bc01a17e9f7b49718832fbee25648d5db6671743 SHA512 eb98bec77830bf2eeb0943bee2818f85881ace42e49122005195c65366596be3e886f592c3561288f253951b2768ac5b9e02f9f815961500a08176ba777b27a6
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
+DIST rustc_version-0.2.3.crate 10210 BLAKE2B 1f707d1c66d907c9b1d2ef6d0bc6bc9c89990a7b922a6dfc2041865940ff3854c4d0e1daf558279fd5871af5818d4000457a32c949104f46538312fbf730443b SHA512 01fa7a758dcaa4f15c18628a0d5ee5adde5ade96a8b7dde0908e39e27b290d1e9adb20d44e2adcd379341d2d4a0c34a80dc12553a3bb4efa4758988f28989779
+DIST ryu-0.2.7.crate 41382 BLAKE2B 267fc35f85a118384ff716f5e3d4045678f0addb74f1eb82e6d81bee2ecbb27472a8e31d9b279352496a622f040ad057ae2d132fba125be784d332d6bc818408 SHA512 94805952eabddc1c295b76e5b6d5b441748763b41d9371f3a2116c0bce6fa933767a3c1682a39d339d4430b86190c84e9421b5f3acd4d3274998d0d96bf229a4
+DIST semver-0.9.0.crate 17344 BLAKE2B ae782bc78f29e45577de8574ee58959c70b54bb0b6f45a5a7b09cc4d358d9a0a80bbefc6e0f2a330e2b55adfbbe5c1f64f4ec9bb94c4adf7bb3e4fc9c142db6c SHA512 03a2ea563456f812c301721c3572370fe4934a22db60079da0dd6ffa33fa789e5e2436ef09e62fc35e0b742b06fabc290992c74eed80419a353c9de9449928dc
+DIST semver-parser-0.7.0.crate 10268 BLAKE2B e46b7cf9d292f8fc54561fca4df8534dc96f6be920a5c869c405ddb31b9d1a18eab0799207113cf4910a52cc0df5017ab1bc1883a7c3787ebf2d60f09ac0ab4f SHA512 17320468ec6b9862d595f358d70c09ac6e09db7885fe0ead7a1e596f79350a6306e8bfde5bbd6512008a7c5454da1c7ae55fe1e3bc1c1ff02ac9df54c0a6121f
 DIST serde-1.0.64.crate 71347 BLAKE2B 97f9a8103865f1eb2645cac613a808169a0c36da5f16e23959a736824f783c895fd71eaa07e711995404e36adec9b7f19db6e80ebdd400ce14dacd13f5e343b6 SHA512 6494787064f50a0c39b8d5328ea8ff961a97d7f0e4ab123b0a1e3fb43735f0dbd9721f60942c5797d9abfb9f2e79347345e0816d3783d8fb9138bb7d141abdb1
+DIST serde-1.0.84.crate 71614 BLAKE2B 42c45764bd6eab963c778320c41fec9212d683e6faf4f2ac75506c0ca415177d4cb21ea7191daef30c07ddb1e1078a52f9d9dbb29fbe81b50939f81a08136f27 SHA512 0e5800fdc7a0f37eed8dce491a17490f8c6e879b893ef3dadea68d26a64d0fc11574f73e062d77d3b2b863df33c42a99c41c2384c17a97a3e26007d6e0ed72eb
 DIST serde_derive-1.0.58.crate 45146 BLAKE2B 69b230d33072d7d7e9ae17f62872560a4b919436b6e33111827597c06b380e0e43d02fa4ffafa9ed8128d008bf065165e876090c4652827ffc3dc1603a5db8a8 SHA512 6eaa57861ede4b9bbc1e0bfc561917afaa133613c4279fddc17529c291f0fb1122e0443267de9498ddd4e45ca9d13e38d88aef00864b0505a05e06ca65bb8d80
+DIST serde_derive-1.0.84.crate 47924 BLAKE2B bdc22e69da0b1c725a74966b1eb31e13475a479534e830bb1440f980e9462dc9c746470ac87e3653b171717c2e241d3005dbcd562abed7fa1f7949d36fe4c3ab SHA512 817ab7d764ef1f7781f0f01627b3c2c96797f64ce62830ec7c520e94db05b6b7efa4589a394f5375ee30cb85af6bd7a17c50b51e77d4d927ccb247c87c16b2f3
 DIST serde_json-1.0.19.crate 65039 BLAKE2B 86264040f32b0c94c1d43e55248612ec56b42406cf4501fb3288b80a5ed8a110eae47a1f2b053e2b497c92457c5bfee2ed0b5f86e9dbaabb1bd3953914dd06ec SHA512 03b760d0bfd8a49499107a4b43bb9f588b375c92cb85fd131642bd787734a8523a176dc10330329a3ad8c6d575c917a813fc513a4fb5890c11ade0d48c046165
+DIST serde_json-1.0.36.crate 68203 BLAKE2B ba6088de2f87af1f1685e0d037745ece9c4534043e748321644a111d9829034a7e972882270bc1cb8a78648a848c63e103cd7fad0c4ec618621d7ad9b970350e SHA512 08828b084d0b94c282c3e17a22f8882762f8e006bf41d5fb4a2a720eb3124f7fbd3d5c87b543bd8551813a40108105ff69824a420b4f6836d2bb9fd164100b9c
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
 DIST syn-0.13.11.crate 134240 BLAKE2B 6661d1ea3cb20a3bd4650b95324a201fbe143d31733eb8910ce126b0983043fb569d2250875996588831a6112fe45976d4a103e9ee6e373a1374644ac33fd420 SHA512 e14192e7bdc91d5bffbfc1e7091a46c340b4f5a9a6336b9cc12c78c328f9feaa432b4261346431fac1b5a11f93e122f1e902f1fae0927f9df6b5294e0abc3fa5
 DIST syn-0.14.1.crate 133459 BLAKE2B 303abdde61afa57594db2b8882c86237f64b15582ea38e681a9b9234b0ab18bed183862178bec132d5ceef5d40a63d37a2fd872f16a509d7f6043b3eb27ef8a3 SHA512 408c785e6c6f7f63134a22c383f54ed8ab45d0521e1ddaba9204b21d1e0e56242e153377bd3ff67467816d581c91ecf663cbb814b1d6549a961e01f20b331482
 DIST syn-0.15.23.crate 145369 BLAKE2B f66939982ee09090f2baf1cc4522615e6975d4350c7c65b3b0a3568cd3b3aef04231f6c23b818333107af784780366cafe7d726f03f346ed227c1db6cca522c1 SHA512 d447ec08199d36e289ea303ee8e871e13e002a4d67c396187ef56eb16b69cf21d64becd24fd8d2f7a1c826685f7b6df747903e7eb8cc5c334ee0528998597128
+DIST syn-0.15.26.crate 145493 BLAKE2B ede140e0184464e765413aa4875a07ab9329de60eba6aa46253d2880032b84a56348060396ffec8a5d81a2aa22c6a6eca73c425778ead21c1c55ffb657cf3718 SHA512 947d70dff83ffd33fda806597d54e572555b54c1600e357df919165fdc7141c6f9762b37f25f9b850e8a7775c33b6df3fc93f3eff12b36b059e696ad90619baa
 DIST tempfile-3.0.3.crate 20806 BLAKE2B 0eaabedcb1f68dddafa72a454f82e6b1de6f8cceb8af3cb52f459e8775e3df1ada5b51120ecd9f52bb6f6da3fc3e698da339bc7e39d12497fa9f7efc418b018e SHA512 2bcc90ba3eed8a830b33de169419e222c16f9e0209734cdcf919422fdb504b29fc75f30dff7243bf19eb81cca12c80c94b80a622be8bac7b847242a58595873a
+DIST tempfile-3.0.5.crate 23272 BLAKE2B 17cdc6f157fd246441f66fc46c7fbac8d3718144c69405577f9cfdf14333366330d75e62e033a7c91c2dfbb43700d5e59b96d6b011a26e95afb2f3996809cddc SHA512 f1055454383996de7a79a08f31c85b0d957f277e297a70d85b2faeb6a85e4c12348ca8ba7cae44ec1398d6d02b2d725dbd4eda68a064db66594024b407c6e306
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
+DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
+DIST toml-0.4.10.crate 47534 BLAKE2B 853aee7f7d9261d2d0daa755e6c158e2b3a173a6e9d8d96cd0d78d75f2ecb1eea341cb8be8b3df9ef1ec34129b77e4f45b4aa849e8c33e6a1f07a3f832993a4f SHA512 15bc40159478207d204e46ff2459dd3146d8f5508f07399f310ec8266190df8a1375e860fc8a7b3fb372b01e9d0f65eaecdc1b896ac2a921070ce76fde82f160
 DIST toml-0.4.6.crate 40203 BLAKE2B 7b26566bd7a94cfb7907867d84cf097ad44158fe59086af82e059b0eb3dea3934831d61db11bd3cd6b2fb8a909e02b6f369d93eeb09dfcc1cba4859a793c5907 SHA512 659a243957649c987a509ad3b410d37ff7b16fb8e0ca5a1de183ea017e5dd63b88dd2f9770f386b739486bea28250c9853020d29b194994a7c22c5b78490ae95
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST winapi-0.3.4.crate 905247 BLAKE2B a6dacb223c0f7743af4c16d4256eea6fdab49ef7f48b9d80bd3da8bc25d6c53e12e98d45e50eff17d08c20099fb92ebcf5ed50928ea2e0873df20461f30b9a5a SHA512 4636ceea813181de46c0bb2f837982936a69376e2b3a58d541a982a494ab4e5b52f3baf820f714a81a2e742def2bf07a2d8313e31b45e51dc7e4d350a5b24579
+DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD cbindgen-0.6.6.ebuild 952 BLAKE2B 5916e4bbb6e7d1b42be8d7488d1ed5a2ab078ff89a6449e0a0520f68bf3d05e30001b58a52080cd510b4cd0c75d48228bc47722c21188b2e7ea92eec3766a8ab SHA512 666ce07daa9f3e120fcedb67705a803ac43770d2f7c7915f7690f99c62fa8183ff16222b9ad58c0681c6fa86ab0689d02f2f615ef6fec10fde7e65a1fcd4a0bd
 EBUILD cbindgen-0.6.7.ebuild 952 BLAKE2B 25e4bdcde7e4b0987b0f03a838c4bb3d6c01b58b4438c856764bbed32ee8cf5057530551d6c4a857ae9ee8a9f316b43db7f35d7ab1a5f07daeb98d3b1c0961cf SHA512 cf11bac47b5c4313b5ce328f1229eb14b9dff879ac887be66f607ff3969797f46bb1eac60b69df7ccd50074251dbacf96e598dd939db69d623d74e6af27c5bc2
 EBUILD cbindgen-0.7.1.ebuild 987 BLAKE2B 91339558e85ad7f8eaa70e3c4889ef7a01ff2df2f53eb9384dd9446cb034916255f1afbce29a045553177daffe94597c6991dd30917f7a17ad86100e530121c1 SHA512 be4cae3e22bbe5f9ebd6e00627d626615a9e8a04118e080432d4415ca0fe201aa76b5553e6360fa3b429624bd6f3850540e9b348e6751b5a3ba8b58becb5fe75
+EBUILD cbindgen-0.8.2.ebuild 1126 BLAKE2B 8db73faae848c3ca588625c9f86416d053bcec19743dd49b11793a5b12cf67d61b69301ac397ca54d7f53bb1548134ce33c1490c559242e2061c9c24f7efefa6 SHA512 aae96c92797b4159c04ab4ff3dcc5d7363132cf9cefaae5a980b608eb89a587b6dec74353cd265e866f58a2d06af9f12eda22932b7452189214a567893172dfe
 MISC metadata.xml 334 BLAKE2B 5d7ffa9456ed3cca80fc3089f9bd508e652c600b8b013d03946b674409e45cd2ff52030e8c6a1dbc8fed2aef4caa9ab697c5a0a1b2fb4f0d8b44cf3c40d92f05 SHA512 a5e105a59463430347e5a44e36b8249faa1e84c73ae4e7fced96be371a7a59539d57accbf51065e9e5cf7e8108f69ab28d23f250182ba755e49a67991f4ff029
diff --git a/dev-util/cbindgen/cbindgen-0.8.2.ebuild b/dev-util/cbindgen/cbindgen-0.8.2.ebuild
new file mode 100644
index 000000000000..023a5a8dc20f
--- /dev/null
+++ b/dev-util/cbindgen/cbindgen-0.8.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 2017-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+CRATES="
+ansi_term-0.11.0
+atty-0.2.11
+autocfg-0.1.2
+bitflags-1.0.4
+cbindgen-0.8.2
+cfg-if-0.1.6
+clap-2.32.0
+cloudabi-0.0.3
+fuchsia-zircon-0.3.3
+fuchsia-zircon-sys-0.3.3
+itoa-0.4.3
+libc-0.2.47
+log-0.4.6
+proc-macro2-0.4.25
+quote-0.6.10
+rand-0.6.4
+rand_chacha-0.1.1
+rand_core-0.3.0
+rand_hc-0.1.0
+rand_isaac-0.1.1
+rand_os-0.1.1
+rand_pcg-0.1.1
+rand_xorshift-0.1.1
+rdrand-0.4.0
+redox_syscall-0.1.50
+redox_termios-0.1.1
+remove_dir_all-0.5.1
+rustc_version-0.2.3
+ryu-0.2.7
+semver-0.9.0
+semver-parser-0.7.0
+serde-1.0.84
+serde_derive-1.0.84
+serde_json-1.0.36
+strsim-0.7.0
+syn-0.15.26
+tempfile-3.0.5
+termion-1.5.1
+textwrap-0.10.0
+toml-0.4.10
+unicode-width-0.1.5
+unicode-xid-0.1.0
+vec_map-0.8.1
+winapi-0.3.6
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo
+
+DESCRIPTION="A tool for generating C bindings to Rust code"
+HOMEPAGE="https://github.com/eqrion/cbindgen/"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND=">=virtual/cargo-1.30.0"
diff --git a/dev-util/clazy/Manifest b/dev-util/clazy/Manifest
index 86fd252126d4..0a8f040c453d 100644
--- a/dev-util/clazy/Manifest
+++ b/dev-util/clazy/Manifest
@@ -1,5 +1,3 @@
-DIST clazy-1.4.tar.xz 339104 BLAKE2B 7740e85c8377f0757a545750d6d35d9b8b7207795a4b49f291a8c07a76e63e167fbd772f8689a1c83d66065a9a166f5dafa68a61923e46c17d6b6b4d74838106 SHA512 6458213a8db03c57dd5c80ecaa9403ce3fafb977e6f7433da728327af81ca52255b95aaceebfd90a43682c19ee63d4751bf23f6dbf343c59d616048f262c9e26
 DIST clazy-1.5.tar.xz 352344 BLAKE2B 0f7200900f1a8bcad3020cf98522e3ac9ba01dddc9b2200f08a8a86102e4389af7a4a86e1832ee4c0e750267948a908627032385a01af94d8d0ae5f438114b9e SHA512 863cb9609d02a2260b61bc6cb3e6d8a84975d3b4e4f1c94a82e8c600d95a28483c323f47ac39c39ecef24d0f51871b358055868c63a49b136cf8ee3060df5a52
-EBUILD clazy-1.4.ebuild 871 BLAKE2B 07a71b4988f8084fd5f785b8b2900b404111fe09512b5f6c003549c83cc2bfd2c66fd4ea26588b8e397e76ec944307c2e9ec4a456668ac6219c9536903a6883c SHA512 78d658aa42c04e97a3ddb28d75df858ae2971c305de2aeab38d7d77ce544e41cb4f327fe2bbfcd28f2c578197321b234c75cbde9f7d2283720da2afe27216edb
 EBUILD clazy-1.5.ebuild 866 BLAKE2B 2cb1ae38c156c3ada0852a031c3d1c68d82e085409691f5a326b9f90c34ee448591392c03496ea063d18814ed181839d45e2c8fee3e1503e58c1c095c5aee1b0 SHA512 6cdb84f1bcddd90b03d55865eca2648531d6d2e995ed4d0de8b3c5d7147b2ff96fe0096ac7a4cd5152f47f7a4db1102a138e536f7d3382cc6d0f376f47b03165
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/clazy/clazy-1.4.ebuild b/dev-util/clazy/clazy-1.4.ebuild
deleted file mode 100644
index a0fe3e5bc804..000000000000
--- a/dev-util/clazy/clazy-1.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Compiler plugin which allows clang to understand Qt semantics"
-HOMEPAGE="https://github.com/KDE/clazy/blob/master/README.md"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.8:=
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	sed -e '/install(FILES README.md COPYING-LGPL2.txt checks.json DESTINATION/d' \
-		-i CMakeLists.txt || die
-
-	sed -e 's|${MAN_INSTALL_DIR}|share/man/man1|' \
-		-i docs/man/CMakeLists.txt || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"/usr/share/doc/clazy/* "${D}"/usr/share/doc/${PF} || die
-	rmdir "${D}"/usr/share/doc/clazy || die
-}
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index bf7639576c3e..c5ea4b307cf8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -21,12 +21,12 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc3.tar.gz 8845905 BLAKE2B 496f478586b8db220364079e5e96cc27dc703879a9f28cc425047bcf6b62d09bda1077cdca5759793995d84258448ce2195cce6b41c0ad2ca401eeb5b20590d0 SHA512 2a783a21428c2e86ff081e35c0a3737b4594904cf560a14b84de11da9d85bd7ad0e1c03a2acbcd26c1e84cbbfbf6b5b273987f0196a121bfdbb94bbfcabd13ca
+DIST cmake-3.14.0.tar.gz 8846626 BLAKE2B 1bedae3909880c71bba6cc91459a58daf98287ba76c527669d227f0540283f3902d99fca2f6db2d0bde271ee274f7ce6612da2bcead611a00319996e382b0674 SHA512 a3b47f2b8d3436860e8cc06a8c0288124289560853d24f68dfbb49a2ff3f861ee385463376ad1dafa6d4a618c06d2e9049b20fcac1d2c147b29bb93479a8d400
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
 EBUILD cmake-3.13.4.ebuild 6207 BLAKE2B a2a7aaac70aa184f7da025954664f2a6a688a6f90bedbce965187953c3b8fedf984dcc7bf467171170857f1d1e6d350fb3a5dff2a53c90904ba262bb0c38ec6f SHA512 748e7e64d4a3dd96afe5ffe2981a79e5d4f380559fc9ef48a232360989a5cb01bde48aa014888a176042474c9d53c0eab9bd35adb03c04e28bfc990736de86b8
-EBUILD cmake-3.14.0_rc3.ebuild 6268 BLAKE2B 53bb585b3e89f1e1ca2d05cb1fd19799673a25b9bb8bafcbcd14869d0f9392f969d5fd4908bef5ba3d2fdb9054c40e17cc7d763d0fb64ef8d00cef375e9ea2d0 SHA512 b6c76a13362723a4155c2a46ac56492f0fe6f26fb3567dad4c71134423508b653e813fe683239ada1cf96bffe983fae62ba9d00a709d0c0af75e50d3dbb4ae67
+EBUILD cmake-3.14.0.ebuild 6268 BLAKE2B 53bb585b3e89f1e1ca2d05cb1fd19799673a25b9bb8bafcbcd14869d0f9392f969d5fd4908bef5ba3d2fdb9054c40e17cc7d763d0fb64ef8d00cef375e9ea2d0 SHA512 b6c76a13362723a4155c2a46ac56492f0fe6f26fb3567dad4c71134423508b653e813fe683239ada1cf96bffe983fae62ba9d00a709d0c0af75e50d3dbb4ae67
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.14.0_rc3.ebuild b/dev-util/cmake/cmake-3.14.0.ebuild
index ce96349c2144..ce96349c2144 100644
--- a/dev-util/cmake/cmake-3.14.0_rc3.ebuild
+++ b/dev-util/cmake/cmake-3.14.0.ebuild
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index 690267d327fc..ba2d900535ef 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,6 +1,8 @@
+AUX debugedit-4.14.2-no-reorder.patch 2225 BLAKE2B 03bac95d316855a9a8e2b78cb7530c5de746b462a32a4fb0887bddf039b371198ea77a0b85b69b6501504e9583832a7f7b055b3c22e3e3b309ecaf995fb164d6 SHA512 7f665c8c985d622e52e87996f1719900131fa7d6455e548cb2cd00b2223231b54b4fc9c24ed3079c93dd5e3c287c03f37aa17072e2e1e5d4f0cd8ee695bf08bc
 AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94cc4b0e737a6cb287f4741705b94782ef9bfd2a87e3284a63ddba20961d0a676823ac4145247edc328c46087d95842a2c SHA512 594bed4c2433e15c840316ca132619fc2b65ea5477cfe416ef851414d44932b3f8e75d006025eefbfc9c6cdcea956ff9ffc28dd4ef4fe5858a486ce5d08f43af
 DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
 DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
 EBUILD debugedit-0.5.3.5-r1.ebuild 937 BLAKE2B dc741f4fc4f880fffe5775067878d47e357a904acc79bdc69d9d5d7f2f95fcd41f5de34022cf73eb396e9a0d9813ddfe5245724830b069c1cc8d80ab6d462b83 SHA512 7553d4e2fa0ca9c2d65b52636af1ee775eba337bbd7313bb63f6392dd6db140fe81eb513d64b89a4bc07b04b7d80b2f3f24be13b76001f15dff057a7f62de407
+EBUILD debugedit-4.14.2-r1.ebuild 1870 BLAKE2B e38d970fd792a15663e3d0259cb7f9843bd469766a83ffd5da7497831e1189db1898556271fd6adf857481e1cd173a89c68562949625b7abfd6377c3e2615332 SHA512 791b4bcb8f0a4de331bb448489a80c090dbc3386c314903ed9b394be36ac7dab550232f81e3d1595dfeeac728d215d0577236a5c7bf1e2ae1fad9f2079911b85
 EBUILD debugedit-4.14.2.ebuild 1722 BLAKE2B fdbdd4ca1d9b85a1bc63de6eae867bddb873ef499190e7c3626af621cb1be6ddb333ac78f03c1745113f81b09cdd62461e4d313c121a81f6396aeb0a1f2f13ac SHA512 dc3854d27602108bb7db0fb25f3155b3bf52881a2a4991ac4ef24e680c871cc7bd7c56a161dbe9e419de0f5a0ad9379eb8ce66889df49ba14111a0769dfce7ea
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2-r1.ebuild b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
new file mode 100644
index 000000000000..0aabb6cf18db
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.14.2-r1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="http://www.rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/popt-1.7
+	dev-libs/elfutils
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	# do not reorder sections, ever; otherwise it breaks gcc
+	# https://bugs.gentoo.org/666954
+	eapply "${FILESDIR}"/debugedit-4.14.2-no-reorder.patch
+	eapply_user
+
+	# cheat it into believing we're bundling db
+	mkdir -p db/dist || die
+	touch db/dist/configure || die
+	chmod +x db/dist/configure || die
+	echo 'install:' > db3/Makefile || die
+
+	# TODO: why do we need to do this?
+	mkdir rpm || die
+	find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	local myconf=(
+		# force linking to static librpmio
+		--disable-shared
+
+		# disable linking compression libraries
+		ac_cv_header_bzlib_h=no
+		ac_cv_header_lzma_h=no
+		--disable-zstd
+
+		# fake some libraries we don't use
+		ac_cv_header_magic_h=yes
+		ac_cv_lib_magic_magic_open=yes
+
+		# use nss as crypto provider
+		--with-crypto=nss
+
+		# disable other stuff irrelevant to debugedit
+		--disable-nls
+		--disable-python
+		--without-acl
+		--without-archive
+		--without-cap
+		--without-external-db
+		--without-hackingdocs
+		--without-lua
+		--without-selinux
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -C misc
+	emake -C rpmio
+	emake debugedit
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch b/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch
new file mode 100644
index 000000000000..0c196a842b4c
--- /dev/null
+++ b/dev-util/debugedit/files/debugedit-4.14.2-no-reorder.patch
@@ -0,0 +1,57 @@
+From 0779d60cb5941610dd1f31632aa1655bf2cc447a Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 6 Oct 2018 17:56:00 +0100
+Subject: [PATCH] debugedit: don't reorder sections
+
+In https://bugs.gentoo.org/666954 debugedit processed
+crtbeginS.o from gcc-8.2.0 and turned into invalid ELF:
+
+```
+$ cp crtbeginS-ok-7.3.0.o.back crtbeginS-ok-7.3.0.o
+$ debugedit -i -b $(pwd) -d /usr/src/debug -l ./foo crtbeginS-ok-7.3.0.o
+$ export LANG=C
+$ readelf -a crtbeginS-ok-7.3.0.o.back >/dev/null && echo ok
+readelf: Warning: [ 9]: Info field (8) should index a relocatable section.
+ok
+
+$ readelf -a crtbeginS-ok-7.3.0.o >/dev/null && echo ok
+readelf: Warning: [ 9]: Info field (8) should index a relocatable section.
+readelf: Error:  bad symbol index: 54495f00 in reloc
+readelf: Error:  bad symbol index: 656c6261 in reloc
+readelf: Error:  bad symbol index: 62615465 in reloc
+readelf: Error:  bad symbol index: 69665f61 in reloc
+readelf: Warning: local symbol 11 found at index >= symtab's sh_info value of 11
+readelf: Warning: local symbol 14 found at index >= symtab's sh_info value of 11
+readelf: Warning: local symbol 15 found at index >= symtab's sh_info value of 11
+```
+
+Ths fix is not to reorder sections as debugedit does not
+account for offset change.
+
+debugedit already does it for final executables and shared libraries.
+
+Bug: https://bugs.gentoo.org/666954
+Closes: https://github.com/rpm-software-management/rpm/issues/423
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ tools/debugedit.c | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/tools/debugedit.c b/tools/debugedit.c
+index 84568dd29..a723283c0 100644
+--- a/tools/debugedit.c
++++ b/tools/debugedit.c
+@@ -2347,10 +2347,9 @@ fdopen_dso (int fd, const char *name)
+       goto error_out;
+     }
+ 
+-  /* If there are phdrs we want to maintain the layout of the
+-     allocated sections in the file.  */
+-  if (phnum != 0)
+-    elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
++  /* We maintain the layout of the allocated sections in the file:
++     https://github.com/rpm-software-management/rpm/issues/423  */
++  elf_flagelf (elf, ELF_C_SET, ELF_F_LAYOUT);
+ 
+   memset (dso, 0, sizeof(DSO));
+   dso->elf = elf;
diff --git a/dev-util/difffilter/Manifest b/dev-util/difffilter/Manifest
index b01d34f12b2f..e14be4d5c34c 100644
--- a/dev-util/difffilter/Manifest
+++ b/dev-util/difffilter/Manifest
@@ -1,5 +1,5 @@
 AUX difffilter-0.3.3.man1 7592 BLAKE2B 9df9c1d7c59f129d714820c3b102adec0dfef3d17c944aaf19bede55d1746a4112d75da118bd3b1b4e5c2b639e482dc0e76c39efe14c9a7df997d7160d77f457 SHA512 6fb0ee29cc6700a9cde54c46b526d8d944a5cacefb57b0f6f579055033b007250f476a3cb86fbe3ba0b500418cf6601dd4978d03dc898ffbf897e070e91dc0c9
 DIST difffilter-0.3.3.tar.bz2 291226 BLAKE2B 95a43e025668318c1d8e216ae4259e874983f899da8bff402b2fa60c7d8d1f7cb203854b76dfe12b2577f6e2ce8f86cedb93fe50b596c1782a436346069b5eb0 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8
-EBUILD difffilter-0.3.3-r1.ebuild 547 BLAKE2B ee771f3e7f090753ea4fec02153d79753d2ed5450050d366750136684133bc64b708b0d2d9fdc11eaa60eafeb6a8264ae5bf3b6be14f47d0f3542710d5c899ad SHA512 e3782c5c57b537d55a40cf3896e3998e0d5a824b78f54dcd1db073222815de549ac5a752e25aeff9d5adeb05ad0e20249d04737c38b863cb3ab48e47eabbbe96
+EBUILD difffilter-0.3.3-r1.ebuild 548 BLAKE2B 434d276ffafb939512a4c68582b476cea84b21abca23d934427605236bbced09ecfd38a6eb9faab78bef318ed2e572fe1e1f48576eed9e7e4eb40815fee5238d SHA512 fdb3ac8748e9b5b563f8fb48759081610a5f884aa3365e14d9639f80cbec6a3a1b5e0317e51c7bd89469f5ba1184fbd7d9e9cb860b65c2ee929eabf41b34a80f
 EBUILD difffilter-0.3.3.ebuild 627 BLAKE2B d5e374dfb6c47aaf1db7b0864a2b679272f1fd4757493642ca28af48a90a6f819ca3344bb2a89466ecc039e53653eeafc42a2e3dd9fc0d10c5ee394e521647f8 SHA512 f789e1b968d0d1f79e71ce8fad490e64104ce3f1cc5f67f3e841d78a426982aa2ec7bdc88b316f6701b25663370feb8221c53ad7c2473f0cf6ebe6783e9292b2
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
index 9a0c0387ec78..d8137bf00d12 100644
--- a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
+++ b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
 HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
-SRC_URI="ftp://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
+SRC_URI="http://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/dev-util/drone/Manifest b/dev-util/drone/Manifest
index 35e51d87063d..0e170c5d909f 100644
--- a/dev-util/drone/Manifest
+++ b/dev-util/drone/Manifest
@@ -2,8 +2,6 @@ AUX drone-agent.confd 390 BLAKE2B 2d26f961515a3e2e33090b0d6e9fcb1435831df94fe998
 AUX drone-agent.initd 440 BLAKE2B 2ba0de82e2b952fcede927aa9d3f796ddc3d3268c6aeb16ba05661e721f6f8cb4900d8ea2655d44b195f7cf686e10830cb27b50000aa5ac1e7728218f48a332d SHA512 ad1571951a4d75e0a9e69da20958a70ef6558d2e15d4dc625d4004c28036643d1ec1756ccb4404860b385cb54ece2fd8d14b7a457d3696d8e7d3fbf0b1082a91
 AUX drone-server.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
 AUX drone-server.initd 455 BLAKE2B 73d173c4fb2c53826d6f0f9395a18dfc9802c01f23c28517ed784fc0713e342f6684b13995a8f4404f51b7504f7515c8a652621f6884b9e0fe36ae6b9ed1269e SHA512 969a7a1947c791bb8788b1fa4d36df1ead66c1312c8f4188970178ef7cbca3b9a108bce955a012285330155be15eb270a1675aee7d317c2cff4cb4554d461a38
-AUX drone.confd 1238 BLAKE2B efa7a96761fb7f57ce2d34396dce7c3fafc12942e45603bd89334e16f99f81c35d9334a7db14de7f42bfcedca34577d0c60430cf8470c843cf736e77d1065e87 SHA512 bbe3944eca8d82afd3161f53d9359422b2fb8985e69facd781a81f1c55ec647e8647f0fffc284375dc091b15ab5d665669cd6a2818ff62f4afe255e0a22a21cc
-AUX drone.initd 472 BLAKE2B ad8966d5703fe092d3fb3b7e34344c092bf3a221945405f34329d936052c435d4f68537c1f6ec889e35d1b989dc5b395dc77bcdcf224d8159eabdb12d327782f SHA512 54b4ef6943a018c0d194658c267bda50c51b2594aaab1d25350d512e50ec5136eb5bc6249f22d1b3e055574848bd50025a6158b1e02bd89da8213611ac41a16d
 DIST drone-0.8.5.tar.gz 4766128 BLAKE2B 11c60896a8aced0aa6303ec049755192e473f742af45fcb6fe1509a3085cbdfd0c016e875a1822cedff9040abf08d238490430ac8f6b2136b31491207de1748a SHA512 a2be1082b6b923d432f4addaa12ec45a76f7edce0ac955c1d3eb812b3541c140919e6195bcee9ed218b92045a63b303759702ffb63831757177f44b2307be164
 DIST drone-0.8.6.tar.gz 4767466 BLAKE2B 708fbe2fb4e6a647e8fc370c39c71fdbdbd67abd28a18348985831c3bc8dee2880c64a2be01ce50c3dbe56d27ee89605ee2fef00e643a66c641a57f664867cf8 SHA512 2227bad9a0067e9c235c3a30677032b4b54488727e44c9caa6bd7dcd804338ed62d8f76879310499e7063d7e84d2b23a6b389f6a60a43f138ed2c83d8df07435
 DIST drone-0.8.7.tar.gz 4770079 BLAKE2B bc2a71c09fa7d1086899175bc7042e8bf57833088ec7d1edccf26385f4a6c16335d8ba56af471697c86d0e19a2ff838e69eaa9e082d64cb5b6029d7c84c6e425 SHA512 1451de48a9397b877a7ef668d15092ed1d0ee7c899bc025ff16fbbf9d78c2807d6989685a39bca03070f9b1188cd9ea23640dc2b7f2389d13228d178923dc7ed
diff --git a/dev-util/drone/files/drone.confd b/dev-util/drone/files/drone.confd
deleted file mode 100644
index 3d4fd461402d..000000000000
--- a/dev-util/drone/files/drone.confd
+++ /dev/null
@@ -1,47 +0,0 @@
-# arguments for drone
-# See also http://readme.drone.io/admin/installation-reference/
-#DRONE_SECRET=
-#DRONE_DEBUG=false
-#DRONE_SERVER_CERT=
-#DRONE_SERVER_KEY=
-#DRONE_ADMIN=
-#DRONE_ORGS=
-#DRONE_OPEN=false
-#DRONE_YAML=.drone.yml
-#DRONE_CACHE_TTY=15m
-DRONE_DATABASE_DRIVER=sqlite3
-DRONE_DATABASE_DATASOURCE="/var/lib/drone/drone.sqlite"
-DRONE_GITHUB=true
-#DRONE_GITHUB_URL=https://github.com
-#DRONE_GITHUB_CLIENT=
-#DRONE_GITHUB_SECRET=
-#DRONE_GITHUB_SCOPE=
-#DRONE_GITHUB_GIT_USERNAME=
-#DRONE_GITHUB_GIT_PASSWORD=
-#DRONE_GITHUB_PRIVATE_MODE=false
-#DRONE_GITHUB_MERGE_REF=true
-#DRONE_GITHUB_CONTEXT=continuous-integration/drone
-#DRONE_GITHUB_SKIP_VERIFY=false
-#DRONE_GOGS=false
-#DRONE_GOGS_URL=
-#DRONE_GOGS_GIT_USERNAME=
-#DRONE_GOGS_GIT_PASSWORD=
-#DRONE_GOGS_PRIVATE_MODE=
-#DRONE_GOGS_SKIP_VERIFY=false
-#DRONE_BITBUCKET=false
-#DRONE_BITBUCKET_CLIENT=
-#DRONE_BITBUCKET_SECRET=
-#DRONE_STASH=false
-#DRONE_STASH_URL=
-#DRONE_STASH_CONSUMER_KEY=
-#DRONE_STASH_CONSUMER_RSA=
-#DRONE_STASH_GIT_USERNAME=
-#DRONE_STASH_GIT_PASSWORD=
-#DRONE_GITLAB=false
-#DRONE_GITLAB_URL=https://gitlab.com
-#DRONE_GITLAB_CLIENT=
-#DRONE_GITLAB_SECRET=
-#DRONE_GITLAB_GIT_USERNAME=
-#DRONE_GITLAB_GIT_PASSWORD=
-#DRONE_GITLAB_SKIP_VERIFY=false
-#DRONE_GITLAB_PRIVATE_MODE=false
diff --git a/dev-util/drone/files/drone.initd b/dev-util/drone/files/drone.initd
deleted file mode 100644
index a7219c7d7612..000000000000
--- a/dev-util/drone/files/drone.initd
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Drone CI"
-pidfile=${pidfile:-"/run/${SVCNAME}/${SVCNAME}.pid"}
-user=${user:-${SVCNAME}}
-group=${group:-${SVCNAME}}
-
-command="/usr/bin/drone-server server"
-command_background="true"
-start_stop_daemon_args="--user ${user} --group ${group} \
-	--stdout /var/log/${SVCNAME}/${SVCNAME}.log \
-	--stderr /var/log/${SVCNAME}/${SVCNAME}.log"
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest
index 151953218b1d..b21aadec67b8 100644
--- a/dev-util/electron/Manifest
+++ b/dev-util/electron/Manifest
@@ -8,6 +8,7 @@ DIST chromium-61.0.3163.100.tar.xz 556305252 BLAKE2B 88b9dc05d626ec33c2044cd8bb5
 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
@@ -17,12 +18,14 @@ DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2
 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-pdf-viewer-a5251e497fb52e699b28f627e3cbb6d8cefb62df.tar.gz 42117 BLAKE2B afd5ca8897ff70cc8d1d51855c6b1cfdf9a6e1ffb667c740f323ef9e4e11ed22ecac7e8c0447dbaa6488e4b11ba4e8606e654f792bb42d0b4c805e7d4a32aab4 SHA512 2db9c756ebff5148c6011775b2740671b7ab6693242400b417893eace648720c51e709bd108d766910f24b543b88c60fd292ba9aa8aa88bff1ea40d43961ad5b
@@ -31,4 +34,5 @@ DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752ad
 EBUILD electron-1.6.18.ebuild 28186 BLAKE2B 746db1980065510845990dc5c426982f6de9ddd9c74f42503c91b84a04835550243eaa21804408068b143d0295a5bddf23457d811f836ad072d74e792018201e SHA512 0ea10454ec86607f2413d77af97ee9f8152b7f66792a7766723a4453f2c5b629e4d19ee3c57fb900dec888560b458493c3904d25c8cab9c7c32fa65add7e159c
 EBUILD electron-1.7.16.ebuild 28059 BLAKE2B 027bd8197783c279780f947483a95188609f5a8f138406e64eda10e033ede8b58939fad212a2a2bc24e2bdd4444645ab76c63cd89f513ff66fce6d5f2d6f98e1 SHA512 e9856a634e9cdf320e64296830db12968cafd2f22186b1f2d5d0d18f05998ff5ce2c0dd0775d83ee1af76c2586dec2c79989b41e5c8028f5090581df3db99adb
 EBUILD electron-2.0.10.ebuild 28636 BLAKE2B 9a1b85fe418e8088ba605bdd223d1c812cd9b77061f9b0ef0dd39a589f68fb65126f407256e6221763408b6eff0017410a27f04a4bd30bba3f8b69e060f65541 SHA512 a92a1178b6200236cf5d68a020ef3a6e54eb839b9077260163e5459237e5f0b3d9aa465fb6e6ce027667d740c7a855d4ea7708d05b38f6575058d0910fe2d584
+EBUILD electron-2.0.17.ebuild 28659 BLAKE2B e7d407b061a4c04c463ed6e9ad3f7742eccdce4cacf79956b0fec9b15623caa3555a8a194da5b60a02bb0dd0113ce0c195db0cae6225c1b66fa1e132869597d6 SHA512 76d8c0c1f3bf65501a487124cd203e7f6a9f83f45915465ed5add5c4291f35ec4f0a7915c0b039f3ef8c517a6e233afa15735dcaa1e322464f4b5294e0a09748
 MISC metadata.xml 1282 BLAKE2B 4d0e7a5542b8cab7a0124a12d74dea42fedf4404414225982d4868a1f806d7343907ea58658936ffb18c725ecbf9c809df7ce8fc41a78635989b13303978c2e8 SHA512 cf2da95e18f98bfb5282d6c330e57d973c592af000738e28cefabaa45154e5cf0f844bebbf745d70c2611c608ff14db1280e6fa783249d2edfba272faefcc760
diff --git a/dev-util/electron/electron-2.0.17.ebuild b/dev-util/electron/electron-2.0.17.ebuild
new file mode 100644
index 000000000000..1e3871596b70
--- /dev/null
+++ b/dev-util/electron/electron-2.0.17.ebuild
@@ -0,0 +1,909 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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="daf9bdcdfdfd6bad258b5e1e48b2e17d06c1a987"
+# 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="b04011d68866c1159eb35b1a5260d519172cc05b"
+
+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/openssl-1.1:0=
+	>=dev-libs/re2-0.2016.05.01:=
+	gconf? ( >=gnome-base/gconf-2.24.0:= )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=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-4:=
+		|| (
+			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/fix-la-relink-command/Manifest b/dev-util/fix-la-relink-command/Manifest
index 08588b0f5e8c..108b9abad5bc 100644
--- a/dev-util/fix-la-relink-command/Manifest
+++ b/dev-util/fix-la-relink-command/Manifest
@@ -1,3 +1,3 @@
 DIST fix-la-relink-command-0.1.1.tar.xz 5072 BLAKE2B 6307e92fe27612fab088d54ec74809450dc1cac6a6ed86a4779b758c0cbd058239c9bb9151579d408efa354b32b82e5b1dc4bfd65cdacc8abf1ad2bcb84eca26 SHA512 3b3f7f467f932d7737ec1d2cc7d2a71c65d34da4fde3451d6ac8d3545adf564cb2b5c352d89bc580f5f9c19352bfa8eccbecf2eb7bf8b968579d4e4e3bd901bd
 EBUILD fix-la-relink-command-0.1.1.ebuild 731 BLAKE2B d669d7075fee17e6709d18e951d9554cb5a47db302ea18aa544dda075e4991c7e7040944a39865cd3438e07da5b79038dededcef8a9db47072113358655b1b05 SHA512 9dc41b08fa2ea486de6162425b59c6fc4fd402db2effd5dfbbd59e1d1370d0ea69aa360648ab2d9c37fbdd3f226b2bb5b86a7659e4c4ec0de888a5de59aa2ebd
-MISC metadata.xml 358 BLAKE2B 28598e94d3b9d9fa327221a4284b6520e4e75540b176aec29e3415e5ff8414434a1c688da300dd66c1cc80c43935ce8da83970440eb4fcf59f6831a1829ed010 SHA512 f4636dab42e790ace26a3f7c3657ecf9c41a71f4c5d00e1d69c48856f99f7bce9c60478c79c85e53da36166402cb2f04e5d4d70747ee2a57d13dfdf00c120651
+MISC metadata.xml 247 BLAKE2B c244172cf21ef0085614acb7d2006a342cbb76f77b22de463ab9d9bd1fd8d034ca3c1c8c26aaa4277fecc17d3406d25fa4531d33b58c351ced84020f9df11588 SHA512 4263d2fe40531a2b7495e54d9bbd15557b1f8510a5926f07b1a5ad4446c6dd04f099b5f990483006e6327d7e673f752b4fe63cea60691ab7a3d8722e0f9a82c4
diff --git a/dev-util/fix-la-relink-command/metadata.xml b/dev-util/fix-la-relink-command/metadata.xml
index 70d3e0dcf1d4..c2d96dd59eec 100644
--- a/dev-util/fix-la-relink-command/metadata.xml
+++ b/dev-util/fix-la-relink-command/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>tetromino@gentoo.org</email>
-<name>Alexandre Rostovtsev</name>
-</maintainer>
 <maintainer type="project">
 <email>gnome@gentoo.org</email>
 <name>Gentoo GNOME Desktop</name>
diff --git a/dev-util/ftnchek/Manifest b/dev-util/ftnchek/Manifest
index 6f6afe144625..c0c8ec97f1ea 100644
--- a/dev-util/ftnchek/Manifest
+++ b/dev-util/ftnchek/Manifest
@@ -1,4 +1,3 @@
 DIST ftnchek-3.3.1.tar.gz 1048638 BLAKE2B 4d9e49a826a192ac8ce9ad443fcff3aba03173915130d1e197c4e78cc5c874b509c1772c28e4a3e5c4a911e77d562ae07fa44c728a94c9ac0c16b5e7d0bc174d SHA512 14c698a6d936ffcd1966822f3b307fc2a70ffd5d58dcff27e10a9491562cff12ef75d98c0e67a7053e106df4f6b4d920e8164950778c5e13e7c15543fa2ecc41
-EBUILD ftnchek-3.3.1-r1.ebuild 863 BLAKE2B 15ce7f950bafc528c4c80e44c4a4c69311e643b8c9110b1f0f5c7414552810dd3582b98f7119e50b8fbef7924444db61d432a8879c2724eef8da8d55f5a0dc55 SHA512 dfa049b79d60e81dc38bf8e695a5f36b96d4bc48d7f7f9c9cc763ba3c1c3a712d29de6a9a9f839aaaf307e79787dc0e91070eed3d893ad6ab277b2387128bc95
-EBUILD ftnchek-3.3.1-r2.ebuild 966 BLAKE2B 2fae737d96da25f6619434d74deac675c69a26dbadfa238716f201306f908df0318322e2b3b9c137b5a7fca9bd2000319d97aac52f3b1a3b71c06d56b0b9dded SHA512 ab7ee510a061a91cb6cd47ba0cc677f6f862e193890f04427dd4bddf20c189a8726dae1e6dcf471f4ca7bf2da138c9533a9a78ef61fcaa746ebab3ab7ab0b94d
+EBUILD ftnchek-3.3.1-r2.ebuild 965 BLAKE2B ba861ec579dc3f7740d789252d23fec139ac443f8cd2408679b27aebfc569c97778560d83bf6c268e38f967eeaf844821126cbb1650a622d6eaec70b539f1475 SHA512 35a38bf7e422315efc943cf78336b4ee20727acfa10bd6b7377d3e101da2aacc97a48346ed4950805d0c689b898092834c033041b5adf842ef4ed41de003d347
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
deleted file mode 100644
index 9ef2be707e2d..000000000000
--- a/dev-util/ftnchek/ftnchek-3.3.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit autotools
-
-DESCRIPTION="Static analyzer a la 'lint' for Fortran 77"
-HOMEPAGE="https://www.dsm.fordham.edu/~ftnchek/"
-SRC_URI="https://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-src_prepare() {
-	#1 Do not strip
-	#2 CFLAGS is used internally, so append to it
-	sed -i Makefile.in \
-		-e '/-$(STRIP)/d' \
-		-e 's|CFLAGS\([[:space:]]*\)=|CFLAGS\1+=|' \
-		|| die "sed Makefile.in"
-
-	#1 Respect CFLAGS
-	#2 Respect LDFLAGS
-	sed -i configure.in \
-		-e 's|OPT=".*"|OPT=""|g' \
-		-e '/^LDFLAGS=/d' \
-		|| die "sed configure.in"
-
-	eautoreconf
-}
-
-src_install() {
-	einstall || die
-	dodoc FAQ PATCHES README ToDo
-	dohtml html/*
-	dodir /usr/share/${PN}
-	cp -r test "${D}"/usr/share/${PN}
-}
diff --git a/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild b/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
index 8543e828e991..116df3b59ee1 100644
--- a/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
+++ b/dev-util/ftnchek/ftnchek-3.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.dsm.fordham.edu/~${PN}/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 src_prepare() {
 	default
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 3b1f13d8ff16..e26058ef3b4c 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -5,5 +5,5 @@ DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb7
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 EBUILD gdbus-codegen-2.56.4.ebuild 1306 BLAKE2B 0822701e68416ff599d2e5980ca176a10841b74a99f036bc4e4fb187cfcb865b99cbe312af75ba208e959d3a765d0d8beb7ad620475fead87087cfb6a5e51b56 SHA512 f671799d602017a6df349a00711edd80136021041e08c5349844ac94c2b6e759ea3160d2b72ed3a1cbc866d2549cc8fbbfe2bad3053804affd8276aaad225015
 EBUILD gdbus-codegen-2.58.2.ebuild 2130 BLAKE2B b58e9658ecdeaea3e5db2006133bf957993e3d74f98b66f18cd65ebfee45252f8e3bf2c357c44b7128f61da4b041716b42125fe5a50dad05d5d109ee73de9c62 SHA512 83cbd6cab6a158de848b9157a356fb0dc36a68dd4ad04605935a08b4254885e29f6099b858e26731d70173f7501382ce46f4aea9f18eabe0db0e89d79bea368c
-EBUILD gdbus-codegen-2.58.3.ebuild 2127 BLAKE2B a585cf0c6ee602214e6a0a88112eb8802871e07a8c760f68adfedeff29feb77ba77fea5115e8ceb20cbcabccbf35f101021ebd43d7128bdb6aa46ea0218bde2b SHA512 f5708d7f50cfc40a946b2e23fb5b3af3e64568538cedf4bdedf3c567a1c70ccf6fc5e21d96fafff203429933a57252b9b78d85ffade70c33432c161f4cb0ebb0
+EBUILD gdbus-codegen-2.58.3.ebuild 2125 BLAKE2B b6180ccf6ec81e1b9eed19a6e659619970aedc9b7f5c4c2c33706e8eda5e7a59a4681c268dc14b174af06b345bef355e1a00341589c8b7f9e59c80ed9cafc992 SHA512 281be33cae4ae62cf6238cf21d39f82dbff2e285b363f3a9d42584e42f9da55a6d3ada370ca7c21c6715cbc91df93d6b5dba5a39c964ef8d015bc5dadd4b5c6c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
index 36abdddc4907..bbf4635b9907 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.58.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.gtk.org/"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glib-utils/Manifest b/dev-util/glib-utils/Manifest
index fe9455876c41..6abb5ba65f3a 100644
--- a/dev-util/glib-utils/Manifest
+++ b/dev-util/glib-utils/Manifest
@@ -3,5 +3,5 @@ DIST glib-2.58.2.tar.xz 4862612 BLAKE2B e94d3dfc5d4b6d100c2425fda34c90fdf643fdb7
 DIST glib-2.58.3.tar.xz 4863648 BLAKE2B 4269bd6e80869f39d567917438f750561debb1b45d40ecea487d2e76e2468e07dc8d80a23678699f7b8f7778c2ed9d29e866ae5e33770f51ed00709dd5fe97eb SHA512 1e1cb5b607367dcbadb95563d463e81702cf396b28f1173f6d933707f4f3d5595a70225423e918807a05994a24f16fa3ac87d2ec67e4b670244ea99836634cce
 EBUILD glib-utils-2.56.4.ebuild 1409 BLAKE2B faac06d9c04b56b3566a3227a3b8cbe8170c3aced4cf1ab2fb2fde119e2423cf81fe6a06c5b147f4154f44ea17bf4d1b2149dc9e5580dfb4dc13b59e35ed0020 SHA512 8f6a3b9b1d9bd0f7d1b393122545a0922b699a7c5a43a3c4a1d14390b92e2a7bbd584eb4970f8554c38827585b1d6ae0220b7f67f712105cdaacf87f03d0472f
 EBUILD glib-utils-2.58.2.ebuild 2411 BLAKE2B 3b498ea0da25ed833915203ac8f4cfa736b46fd8d7d389fb9ca59369a23c1ff04638a50b5ca24fb5db2d7812e68a1051428df0829afa7464739685c7a0ce4558 SHA512 b505bcee6d11c9fba2c05db68959c38456c58d5cb30ee66849e484844f94f1b691d9933f9b702c1afc0610dc52bbec525b23116ae26460dfbf453010a3932305
-EBUILD glib-utils-2.58.3.ebuild 2408 BLAKE2B 40cb683ba6e55c9fed788d1bcb2cc71e26a69a35335875ce6c99aa1e1b41e164d9ca371676fe0b25f42c983b9db85232ab630033f84d079a9a177c991d1dcab4 SHA512 f77e2597850a027cf5a9e2ef46e7e10ce5220460c969b9775c0b531b8f4dd3c14e26c0334c0c70df740ab39d1613573391157398cd1e1b5a31558abbf8a43bbb
+EBUILD glib-utils-2.58.3.ebuild 2406 BLAKE2B 03cb75956a88fd798d1bdda0bf16f92ca7b9970160b5c76c6e6feb4e270fe2197a69a467e62890d7cb682f05cb4561bda6e7a6c5bf780ec17e98c8a27c03f0cf SHA512 481139996bedb794b6990ab6d84d57e3cda15adf1ac993d7cc705ba6c453f5682bc0f7482e13df4f38624779fb99b5ffcd2edb406b681c22a5f6cd0fdc8bdc7e
 MISC metadata.xml 332 BLAKE2B 1e3c081ae9a2c8ae53cee6c3ae133cbd5e8543a68c03d4a4f7e164437502d996ea9364789e93114687271e1f472bcf13a418cca5b74ecb95a51849f0a5f3dafa SHA512 f7680d9be4071b841f50ece99b5041dc492901d84ae05383c1ff05b6a73bab804b153a50eb70f5417137f6e2041230c5ba8eaede10f7a0bf8a899508642588c6
diff --git a/dev-util/glib-utils/glib-utils-2.58.3.ebuild b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
index 0ae8261c8091..8798d9d0acb2 100644
--- a/dev-util/glib-utils/glib-utils-2.58.3.ebuild
+++ b/dev-util/glib-utils/glib-utils-2.58.3.ebuild
@@ -15,7 +15,7 @@ SLOT="0" # /usr/bin utilities that can't be parallel installed by their nature
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="${PYTHON_DEPS}
 	!<dev-libs/glib-2.56.2:2
diff --git a/dev-util/gnome-devel-docs/Manifest b/dev-util/gnome-devel-docs/Manifest
index f66637273758..7357b6e95a7a 100644
--- a/dev-util/gnome-devel-docs/Manifest
+++ b/dev-util/gnome-devel-docs/Manifest
@@ -1,5 +1,5 @@
 DIST gnome-devel-docs-3.22.1.tar.xz 9298224 BLAKE2B 844f9ca5c9b9eb5a4cfdbca19b1cad9f8f21142c33c7810c64cbb8d9625f3f71d284d520a2c528983ba8fcaa170e41aca5e6ca2636608a4b2b988cf9d06a7325 SHA512 9d1c740fa2580ac4e5265d24463bd292df5db3e3bdf0ae57b55b0f71067bb88e28d4d51aa246e7e43f86fa77f73ac7c475cfaa688e009956d253117e650bb63f
-DIST gnome-devel-docs-3.30.1.tar.xz 10180956 BLAKE2B 65b0fec36fb13502567a0778affa301aecf52e236c5d06738087b883f3cb148548e0925b91ce15f0f20e78aadb5484ddd96b106d7e2ea3545792e8356454f282 SHA512 24d835defe34799d5236bc1d943ca1391c762fd1b722feaa5d2aa34313979a20177e41177269f805596e3dfdba7f9d08fb9fea25dc64b8da6e026ef634ddd549
+DIST gnome-devel-docs-3.30.2.tar.xz 10270272 BLAKE2B 762ffdb17b0538bbb93f7a8752c060a629437f685df8e4fcc1c296d0db4fbb33dfc7839504eac187237f50d9748b5d7ea45d0e55db74db8cef76daf01b5e997f SHA512 7479c999bffba72d7b815b6081142d0549e9e407939c9ff16b6f04cff2517231614c43050313d49894fec31e0e1777379505f66cbea2da5a2644a147dd95846d
 EBUILD gnome-devel-docs-3.22.1.ebuild 662 BLAKE2B 451d56f57437dc11de4fb8ee60ab39868fc8c19ca6434ea18490b88ebe097b8a19f003bbf0e54f6cfef728d1e223b0f76810669f159d16d964d7edfd197e428a SHA512 0a7a65213a2bc531187a5a8693c185be93f93dd314319e0922122a9e8a6ce68f0f368133e4ab759a26bd496f3bc0a5e1f1daeef88b689fc2b59004144b7733b9
-EBUILD gnome-devel-docs-3.30.1.ebuild 661 BLAKE2B 15a3bbff99de70cfc9e8ebe6d815fb4b9d8718cab806eee06d08382cac68d66598e5e30ba5dfadcd6d37312cd7884ce88eacdabe57c8b34247504064af0fd90e SHA512 96f6e947780ff15759b94c4dea3115ba32fc879486fba14497a137532025b25f45ae5dbdef21b52de01814a411deed54752d488119d287b1aea6c3c332bf045e
+EBUILD gnome-devel-docs-3.30.2.ebuild 658 BLAKE2B 88004ccb2ed8e4c847190ad9ed7e42efb815fd17470eac0514b5de326ad8e6939c6b58ee7fd49289aa08638246838baa36251d7e2d4cf1f36bf89a6c614c7b34 SHA512 ff970af29be42afdf140ab1930aee000cc9e8bb8fe89baf2a718c637a439bbbb38b7434ed39d9a8f2da2df7792f451a00cdc0ff515bb1a9859d6f8e9e6771e23
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.1.ebuild b/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.2.ebuild
index 68f3b8661a28..d24becc7675e 100644
--- a/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.1.ebuild
+++ b/dev-util/gnome-devel-docs/gnome-devel-docs-3.30.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,9 +15,9 @@ IUSE=""
 RDEPEND=""
 DEPEND="
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/docbook-xml-dtd:4.2
-	app-text/yelp-tools
+	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt
+	dev-util/itstool
 	sys-devel/gettext
 	virtual/pkgconfig
 "
diff --git a/dev-util/gtk-update-icon-cache/Manifest b/dev-util/gtk-update-icon-cache/Manifest
index 0bd1825ce482..927289f0b74b 100644
--- a/dev-util/gtk-update-icon-cache/Manifest
+++ b/dev-util/gtk-update-icon-cache/Manifest
@@ -1,7 +1,7 @@
-DIST gtk-update-icon-cache-3.22.19.tar.xz 367224 BLAKE2B be3fb3785776052eed0f102e9665628aec1bec93953de1cdb795af8db458cedd07fa717abee4dc9e6d8c4c8f45209371ac130fa29e8a77622290524b771b5c89 SHA512 3ca12d38781a716c1b3f8584089e2c038aa18584c5e1b4c41098173f73f839cabdbb0e8b25b1c69a8b9b9f016b9c3c8594c4b26c2463cea278754f13afb7c795
 DIST gtk-update-icon-cache-3.24.0.tar.xz 372708 BLAKE2B 2a6bffd4453c2201bbb78e4ba581f6bd6453f650ca32de7e8002cb88f5872c868ef25973587c96b58b28d2b74fbbac192dd608e72cd5bbbc0823486a9c55c46c SHA512 9dada697ace2ea5f3b5ab64c6063c1a9a792f9b9aa23d4c3888e3a487fda9b1c99a5d0793bb0f9e182dc66a1a5c7ff944f8b9f2ca2f4de7ecc24c048d7a55339
 DIST gtk-update-icon-cache-3.24.3.tar.xz 372612 BLAKE2B 6087334fdca3aa7f93b1b6c5a7195ede2376ec80d2618809f924f9b612de46a8d3e95f0a90030deb939f27949458f9ec72b11600c2bf8b1ae6089284324f2c9d SHA512 0e47977567314abc64419440cc0f276525286fb65acbfe7fff21d6cf548fbc072865f8a2ed18e3114508a7e8fa696453c26e1ad53e638ee11dab57b4a6cf75a5
-EBUILD gtk-update-icon-cache-3.22.19.ebuild 951 BLAKE2B 3dd1a146dcccdcf9d971e7a1380faa5b04f51774f2a10ca6c86075f7e6bd58afb77988c827f55fc492cc65eb5903776ec554ecc10daba761a3128bfdbb5f3c38 SHA512 1b98662032769d3773b9f5376282407dac9506163987ac780b66a9eef878ad768cbb621109125b755eb51f410d8f0eaed48097be95f4da5bceb6b473cc916eb5
+DIST gtk-update-icon-cache-3.24.7.tar.bz2 91098 BLAKE2B a97bf3e168238afd8c20c9adea281c9bb71764b5227e5e3c5f78b175568e5a8ea14ab7d2de6aa9e6d38b766cf5f7f1c5c0f646b6d2dd55c0747e43bad4c0a319 SHA512 2396034539628f74bee6539666d0c5eed85814044aa58b21272beb27f7fe47cbd6b5326e358cd1cbef0e1498fcef20b2aabed1bb831cfa1e528a011ce8312e7b
 EBUILD gtk-update-icon-cache-3.24.0.ebuild 952 BLAKE2B e6d8bde862c87e3d257a6c4ac52107e0a742e046fd21803a0429b6e1ad5dd8b1e748e03f4912d685d8cb479903efa86318ad3fb708bd21733f6f8a05d9d7a7cc SHA512 7ce0934ced37329c5b2040aa8370727803fa13a4188190afc3df1822f54557af89423857dae3e4e2867eb90e9bb96a299e33c0af986194619f3d2de097c6733c
 EBUILD gtk-update-icon-cache-3.24.3.ebuild 961 BLAKE2B 1abbab6e9de693e02d2ef284e29cbe32550703f4dde16226212f4049a9404cade3c8291b30f3646fed1419b49a843d2ade2d494da43dcc3c0517a5bb579477b9 SHA512 d9e6dc703493865e9546a0043f8fc371f4511eb8d8f22fdff942c9e980eac77b95524d1af26ba7226e5c1a6c58c7e55331f7d048956b33e222213822ce4933e1
+EBUILD gtk-update-icon-cache-3.24.7.ebuild 929 BLAKE2B a2e06e40a204b23ba64c05971f0bcea7c40f118ae3ef0ed33b4bd58aab7308cc28e84c93281076eaa5471cb4eda3197656966fed436f8f0e857ebb03cbc90f3c SHA512 343d66080958ca27964b3f6a2795865fb8e080535293182f53e967f91dac4164bf9af9b65463cb79d85402ae9949f417bcdb1269ebac22967be813b9424fea07
 MISC metadata.xml 647 BLAKE2B 2846e4ac0b5816fe7699b197958118535cac7092930d7b6ba63c23b126242102edd832d60b13baeed23bf8781babe1058f06fece732c4ecd58c9b01b621042ae SHA512 7301a9425528d65112ec9dd1eca7291473905493b1b550119c6984141b3b216c4f3825d3b2a395a8375aa8b481b29d841153bd279d593586d5ea7d77ce46d7d3
diff --git a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.ebuild
deleted file mode 100644
index 6802cc018378..000000000000
--- a/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.22.19.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/~eva/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
new file mode 100644
index 000000000000..8187209413d5
--- /dev/null
+++ b/dev-util/gtk-update-icon-cache/gtk-update-icon-cache-3.24.7.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit meson
+
+DESCRIPTION="GTK update icon cache"
+HOMEPAGE="https://www.gtk.org/ https://gitlab.gnome.org/Community/gentoo/gtk-update-icon-cache"
+SRC_URI="https://gitlab.gnome.org/Community/gentoo/${PN}/-/archive/${PV}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+IUSE=""
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# man page was previously installed by gtk+:3 ebuild
+RDEPEND="
+	>=dev-libs/glib-2.53.4:2
+	>=x11-libs/gdk-pixbuf-2.30:2
+	!<x11-libs/gtk+-2.24.28-r1:2
+	!<x11-libs/gtk+-3.22.2:3
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
diff --git a/dev-util/howdoi/Manifest b/dev-util/howdoi/Manifest
index ba08689b5457..426e006b9fcd 100644
--- a/dev-util/howdoi/Manifest
+++ b/dev-util/howdoi/Manifest
@@ -1,5 +1,3 @@
-DIST howdoi-1.1.12.tar.gz 8196 BLAKE2B de3b7560dac360102246c10e6076658fe6fdfbedd378f02e65928d2b83a3f05357b8a9aafd6ad22e402448dfcf96b72faaf5755774b83ed1656ae7cb81554c72 SHA512 c4f66941d608a3f1c2a441b81ec5b64d9ac4e53b70bf4bda08fd8fc68b1c34022abdddfa47e3812cdce063e5b3c440aa4b9ad39ea95bfad2f285b5ffa89d711b
 DIST howdoi-1.1.14.tar.gz 8421 BLAKE2B 40689f3ca1ce487fd5278406115b70e51d82ce2ff2f8b1e60c02fad6f92adfcb532c3ce73c4126027a0812e21b599bf5f9d20e8d3c23d6dc4e541a877e1ba52d SHA512 348125e666d42b657ee493a405207238aab12cb4815da52de2bc3d0635a85476e942ed73b6eb75e7ac51e744f01ebe987dd45ecc69b1774f264a6bd9c4a2826e
-EBUILD howdoi-1.1.12.ebuild 585 BLAKE2B 72315818c287c651e9f2d5e01aaa5f5e8631a755f0af650c3dfa7acbd1f7a466c1efeb34efd25d834a27c952a50b565f50bdcb740f6664bab7f7154a00ba53a9 SHA512 6ceb5ccbca17eda545787e77b1d2dacea24923102283837a2acc0c067e02e949940acfaa893bc1621e73ff96825a89eac1f5c93c267ac67ca0942e05cb0e3ac2
-EBUILD howdoi-1.1.14.ebuild 589 BLAKE2B d304dc8d4d818cd9f732a3d0eada2781d6ab53f0636f4af5e2efa0f03e953165f301526daac4c5266be009ab9ccdc4f50baf00905b7c272fa7bda4b2e9ec9901 SHA512 a98ffad3407c6646c3e17700f34c012300e29911c4abbaa35b06ce79b8b818f5885ce0d41bbbdb9ae66dff485e607757c54a843a4f945a328e71aac747e73177
+EBUILD howdoi-1.1.14.ebuild 587 BLAKE2B 7e5d3c964ad4516210b414ed59d2680deee1a400f91b29accfe9875e3c4b065e2894b61088784099fe9a2bd021985dbe0190525ce2159632b93c60b631c2cbce SHA512 933ec7bde90ad218f5fdea347fc111640ab8ed864ea75198caf0e013d06fb659c0ddc718da181df568e889bd8043957c6dd36f48ae62850da525c795dccbf992
 MISC metadata.xml 343 BLAKE2B 34cc8c4f7372fc0492d8b328ccae1b94946bc5593d20a181d6e32d3fc8e79471f517eea7509cf32172ef55092d898ed65350167d465b22bf127f62fbab6dc1c5 SHA512 f83f432490f25508a138dfbce3a67a120937fa12fee712cbdda9302d238805f3bd18034cc52d473d28b990221bb73748c9305f31cdc9912aed91a79f86386efa
diff --git a/dev-util/howdoi/howdoi-1.1.12.ebuild b/dev-util/howdoi/howdoi-1.1.12.ebuild
deleted file mode 100644
index 931649d5871c..000000000000
--- a/dev-util/howdoi/howdoi-1.1.12.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit distutils-r1
-
-DESCRIPTION="A code search tool"
-HOMEPAGE="https://pypi.org/project/howdoi/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pyquery[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/requests-cache[${PYTHON_USEDEP}]
-"
diff --git a/dev-util/howdoi/howdoi-1.1.14.ebuild b/dev-util/howdoi/howdoi-1.1.14.ebuild
index c9a1c1aa4a2e..c24bb930931a 100644
--- a/dev-util/howdoi/howdoi-1.1.14.ebuild
+++ b/dev-util/howdoi/howdoi-1.1.14.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 0d363e1c2f03..35100fa981c0 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -7,8 +7,10 @@ DIST jenkins-bin-2.150.2.war 75969613 BLAKE2B a86cffd210ee40ee01a1f4ee03c59b2c6c
 DIST jenkins-bin-2.150.3.war 75968662 BLAKE2B f57716fcd6ae6330f291810a947e13e1629c3d7f1fdcc7061862258895bb691c5d43379e5c59956b60557843492f5e096fe43aacae88ba4a1baf3cb67bb28782 SHA512 b2a5bf51b09b9df9bec13f09f911c76c1bb0c2edc91f0933caf6f71e4c296e5f53ad54711aa6632b5f3e3dcb1f335594517a0c086e23fad8892fb6a3e77dd978
 DIST jenkins-bin-2.160.war 76018620 BLAKE2B e215220e978ac0407c742e3e5989b50f9d18ed387991b2c7c1120d4f9018ea3a24dcfa3127d29291af5d7dbf0155c3a68744c429e53ef3e160d33a5a3296cdac SHA512 7e6f6d1381ab9b46cd62423a607a6c8c05438073cd21cd7827f66fb98300a54c9528e87d00ca2332ec43068aaaa54493bf0469fe81be20fe444c10fb25cc6c96
 DIST jenkins-bin-2.164.war 77329094 BLAKE2B c8b470ab3f4606947520b8867fbf09611a00385f89ff95b64c9c603d2f3fadcad1a136f73b0fa0f0cbc8bb7df6f77c1449b8556342a366894c358f1117fd9a0f SHA512 92e1a4c236d0091fea9b70236c4cd14560b3d12ebe51e8698e1ad2d70820bd4acae6f0579be741b2eb7749ac95fe4454392f2e1879e54b0b14a265541d7acb66
+DIST jenkins-bin-2.167.war 77246248 BLAKE2B 58cb64cec5f63bc147557098740bcc02a131fd8ed7f935763130f037800aa7886e4c544d47ac595077d490037035d9d83976da4c62e5b7582a6366ab863654da SHA512 55d760aad38d64201cf806e8dcff7b07da8e1eabad279909f6dc342a5312f8f162b584e6fb0e77fb4c2db95424a0004b571c883245c01c0d8352291e33c2a0e4
 EBUILD jenkins-bin-2.150.2.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.150.3.ebuild 1105 BLAKE2B f7a952c5ee25eb45ece299eef7ff68bda7794af0b353cbaa870397f80bf018ac17b9bff1795278b3786bcbc4b0010b0fb6bbac62c7c78b939ef0d6617bab06a0 SHA512 23407545cfce8da7faef840493908e1eadbbbbca816de39766623b140743592d9aa9d7b0aaee886f3c92fa4ccf0a7e4e65f8bc901df2203402030fedf69c3cec
 EBUILD jenkins-bin-2.160.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 EBUILD jenkins-bin-2.164.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
+EBUILD jenkins-bin-2.167.ebuild 1098 BLAKE2B 2f3db1567a93bd44e04e1441a0275204c628e4e197100362aa9f3705b3bbe911d4e34e19d1c40dc934df1ca7f8d865e339593d8ee4d13b7220f89aaca8d3f6ec SHA512 7f02c505993ea3293284583f07ffdcf1a47331fcb8b8505da9b40b5d18ef81baee7cbc0eb750f95acb01e8680a62ec96547e8a36b8adc0d812d67e64bfa2960a
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.167.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.167.ebuild
new file mode 100644
index 000000000000..7d232cbccacd
--- /dev/null
+++ b/dev-util/jenkins-bin/jenkins-bin-2.167.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit user systemd
+
+DESCRIPTION="Extensible continuous integration server"
+HOMEPAGE="https://jenkins.io/"
+LICENSE="MIT"
+SRC_URI="http://mirrors.jenkins-ci.org/war/${PV}/${PN/-bin/}.war -> ${P}.war"
+RESTRICT="mirror"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux"
+IUSE=""
+
+RDEPEND="media-fonts/dejavu
+	media-libs/freetype
+	!dev-util/jenkins-bin:lts
+	>=virtual/jre-1.8.0"
+
+S=${WORKDIR}
+
+JENKINS_DIR=/var/lib/jenkins
+
+pkg_setup() {
+	enewgroup jenkins
+	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
+}
+
+src_install() {
+	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
+
+	insinto /opt/jenkins
+	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
+
+	newinitd "${FILESDIR}"/${PN}.init2 jenkins
+	newconfd "${FILESDIR}"/${PN}.confd jenkins
+
+	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
+
+	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
+}
diff --git a/dev-util/kdevelop-clang-tidy/Manifest b/dev-util/kdevelop-clang-tidy/Manifest
index 72be96e1e00e..db1252381480 100644
--- a/dev-util/kdevelop-clang-tidy/Manifest
+++ b/dev-util/kdevelop-clang-tidy/Manifest
@@ -1,3 +1,3 @@
 DIST kdev-clang-tidy-0.3.3.tar.xz 55804 BLAKE2B 30ec12d5a2bc7d8b5d111374c8954a65bebe89a4a192d6ecfde7065b54fcfb41e46137a328cd172a06ef3e00cbee42581b1ce7561b2b2a43430b33aebd70fa0d SHA512 448cc8e30cb6e237c43eb52f4694327900558a34a707d15195c2ad460f48e405315b5a667cfcf7a402dc6d9c2861594912159f63ac4cf61546a3ddf8777be489
-EBUILD kdevelop-clang-tidy-0.3.3.ebuild 1083 BLAKE2B f684a5520f87a6b2cc043810b2201cc35140028f461a43f0c77643ef158b5c2c711d0f8f533ce9fa33705e4b6f7eef52ca949cddb23d1420c92e0404610b584c SHA512 b2add913f9fcd7fc2c375b5df40ce44be265c93875b42d2689a9bda7130e6366528017f74f49edee9a99aba092bd2d15a1e58a01d0e0a998e8f4d386d97c1c32
+EBUILD kdevelop-clang-tidy-0.3.3-r1.ebuild 1057 BLAKE2B a53e6cde4f9728f5f19b0153f6072d03feb7f7f0bef98a5a4e5fca4ad6454e7d124fd9884142da79fd5a8807161ee176c7dfc05b71532858625d104a6f44ad71 SHA512 f1a85ba903ed54ac183ddaca351d378bf88d2e243feacb8245a1f72952f60ee4b1de72038abca39b874fc89bdbbbff39220c1edfceee707ff4c518c032acdf86
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3.ebuild b/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3-r1.ebuild
index 4e1d831e0c22..c7bc44d08c47 100644
--- a/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3.ebuild
+++ b/dev-util/kdevelop-clang-tidy/kdevelop-clang-tidy-0.3.3-r1.ebuild
@@ -1,23 +1,26 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-KDEBASE="kdevelop"
 KDE_TEST="true"
 KMNAME="kdev-clang-tidy"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN/kdevelop/kdev}/${PV}/src/${P/kdevelop/kdev}.tar.xz"
+	SRC_URI="mirror://kde/stable/${KMNAME}/${PV}/src/${KMNAME}-${PV}.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="KDevelop plugin for clang-tidy static analysis support"
+HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="GPL-2+"
 IUSE=""
 
+BDEPEND="
+	dev-util/kdevelop:5[test?]
+"
 COMMON_DEPEND="
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kcoreaddons)
@@ -31,16 +34,14 @@ COMMON_DEPEND="
 	$(add_qt_dep qtwidgets)
 	>=dev-util/kdevelop-5.2.3:5
 "
-RDEPEND="${COMMON_DEPEND}
-	sys-devel/clang:*
-"
 DEPEND="${COMMON_DEPEND}
 	dev-libs/boost
-	dev-util/kdevelop:5[test?]
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-devel/clang:*
 "
 
 src_prepare() {
 	kde5_src_prepare
-	# drop when upstream depends on >=kdevelop-5.2.2
-	sed -e "/KF_ADDITIONAL_REQ_COMPONENTS/d" -i CMakeLists.txt
+	sed -e "/KF_ADDITIONAL_REQ_COMPONENTS/d" -i CMakeLists.txt || die
 }
diff --git a/dev-util/kdevelop-pg-qt/Manifest b/dev-util/kdevelop-pg-qt/Manifest
index 9361d705f2bb..0d7708168f60 100644
--- a/dev-util/kdevelop-pg-qt/Manifest
+++ b/dev-util/kdevelop-pg-qt/Manifest
@@ -1,3 +1,4 @@
 DIST kdevelop-pg-qt-2.1.0.tar.xz 660268 BLAKE2B 4cf890f5a3281cfefee14575c5ebc3d756f69f27af00fbe806aeac27aa1f2e5643a78dc415d9d5ea3c5434c5b08266aa114cb1d844002222cdc861f133e6b7b2 SHA512 0d0350c921a85ce6682219b0d67617aac21f5e3a95f6d50869c172200db02099e10cc025439ca5a08a93b711e21a3393c5bc50bc709fb4f6a57f19266c6f469d
+EBUILD kdevelop-pg-qt-2.1.0-r1.ebuild 519 BLAKE2B 5c576faa37c2eb4a79dc545ca1e7ee7161e620c8d2005b97cc0d7bb8accdb57e49d8bb0083e94849eba8e88b8602855f3fef8de23ef7dbe158e4cefdba6ceb70 SHA512 1f70c09b1cb788cb6ee42d9be9cf8eb81c9885345db6149d696df15c956aa3672861b981a77f0a810bb16909b0183df77e3d4f1b290c6440ab2e97c89db647fd
 EBUILD kdevelop-pg-qt-2.1.0.ebuild 489 BLAKE2B db137e6e9e0afca0484c28ddda0a309c31b7e3cc4a81a6307580001a755cd286ec183c6f87714c882d2d4fe4e1f5b5a385c6cb2b62909ba2288074e81f63e349 SHA512 2a715a11b24881f1829b717c46d4cdaf74a569f60056be30a7d8a6acb06f54ddddfbf72b2bed11daf6df93beff88999e300d17824030758b3a1fa1bbfedaf09e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..48120d4e89e4
--- /dev/null
+++ b/dev-util/kdevelop-pg-qt/kdevelop-pg-qt-2.1.0-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="LL(1) parser generator used mainly by KDevelop language plugins"
+HOMEPAGE="https://www.kdevelop.org/"
+LICENSE="LGPL-2+ LGPL-2.1+"
+IUSE=""
+
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+RDEPEND="
+	!dev-util/kdevelop-pg-qt:4
+"
diff --git a/dev-util/kdevelop-php/Manifest b/dev-util/kdevelop-php/Manifest
index db4fda82cedd..28a6f4b7b9d1 100644
--- a/dev-util/kdevelop-php/Manifest
+++ b/dev-util/kdevelop-php/Manifest
@@ -1,6 +1,6 @@
 AUX kdevelop-php-5.2.4-tests-optional.patch 2468 BLAKE2B f30fee2d349b2512a8fb1a02d6d1380ee5b11de43e58187438f8030faad3eaac6cf56b21ef6a7e047efb1bbca0188005092404ef0efed400ff2ad23f4752f4fe SHA512 5ef6d1b86ff63177bd28e4161e4292810aa651163581022be657786391fdfe4017e0ddd1cb94ba0be104153dded411f4b182deeda243987cf5d09f167868ada0
 DIST kdev-php-5.2.4.tar.xz 685356 BLAKE2B d9c9feb1099b5d6b0d57651f2588ad51016e159bde78a7104c3f9b429e75c9ef596329173e27f5010e39388575e23b920af2b7fec72b0801c21370f235f20acf SHA512 3729cf0ea4ade85349778dd05ef9835a6993309aed05c7d7ef7d91c90ddaf09d1c5fad495753aa32f6a93b339dfbd14be9cb4b06b04a10d9d065aa8cfa1fa3cd
-DIST kdev-php-5.3.1.tar.xz 1008084 BLAKE2B 6e47c9a99b6b1f2408570f6cd31c05271b59af90bd0fb1f90f6dd4a66aed0976d18de3618906f970c75f056abe5527900a51f0ed428a07325e62e6c11d804760 SHA512 7dd6a58be583ec6e1e8eb079f7f14b01abc7f0c9d73eb9e7cd8be413bf43eef79d90c53a0b13446db9e354824b6d39e62a99bfe4a472b3e59f2dd50203726fbc
+DIST kdev-php-5.3.2.tar.xz 1008036 BLAKE2B 33940afeeb7b8594f0dbf56e444ba05f9665c7e4c9bc1d55c9d6a5b85bd2e03a04db1b8f27d968d627e26cfa573a3da519bb1d0eb592dc784296c9db7ea1fad8 SHA512 d8649bca173eccc1aa6568715e5976beb762ad7a377adbdab8f55aad76176ca5c8d16477ec70fa231b5699105d2a827c2ffda1c4835419c670c561b4444605b4
 EBUILD kdevelop-php-5.2.4-r1.ebuild 1247 BLAKE2B 24daa76c99e3ef06a944f837ff18ac86bd8dc41917d49a4b58681fe677ef504d099b502f14ef7b6503523bd70e3d90e704181cfc712e51bbd47633a623e50965 SHA512 a5e1f1c06b877575eb42054ad2289d19f3f9b04c08c071024500ef612d1c7fff7d924c77643c47ea9a3f0e7e073d32e6092bf3fad8b45255b28fa4063811f43a
-EBUILD kdevelop-php-5.3.1.ebuild 1086 BLAKE2B 8fad26d279e8f40c1fb6cfcf454872fe0255fb4b8979ac62cbff5df016aadb30276f5822b13fad809b6e035e9a1f56391d9f3ec48e5e859b9e58b00461035111 SHA512 b22871202a2a84457d5f26b3e09ee98e2b9c33e3eff40a3dd03e9a453ee99fe22bdf424baebfcd00b92e13e65ae4238296fef06407adc90c8a28cf02a98bb80e
+EBUILD kdevelop-php-5.3.2.ebuild 1141 BLAKE2B 06962ec7c5dfee2c0eccf495e6caa2910ed030fa7ac0c6ebb5b9f41707ef7797706883bb643a36bf8b92b0af82ec171db6e316fe84394f4c1b3ad088329db225 SHA512 abcbf392fddb6b64b2d94a921fb488a93cfe6624c85f9e8082996d38498b6bd1df6118514f67b8392badeb730af46c7cbf7015e8636abe0da1fdcd811cee81c3
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-php/kdevelop-php-5.3.1.ebuild b/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
index 9b1c18f583ba..730fe6342498 100644
--- a/dev-util/kdevelop-php/kdevelop-php-5.3.1.ebuild
+++ b/dev-util/kdevelop-php/kdevelop-php-5.3.2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_BRANCH="5.3"
-KDEBASE="kdevelop"
 KDE_DOC_DIR="docs"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
@@ -12,12 +10,20 @@ KMNAME="kdev-php"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="PHP plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND="
+BDEPEND="
+	test? ( dev-util/kdevelop:5[test] )
+"
+DEPEND="
 	$(add_frameworks_dep kcmutils)
 	$(add_frameworks_dep kconfig)
 	$(add_frameworks_dep kconfigwidgets)
@@ -33,12 +39,9 @@ COMMON_DEPEND="
 	dev-util/kdevelop-pg-qt:5
 	dev-util/kdevelop:5
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	!dev-util/kdevelop-php-docs
 "
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-util/kdevelop:5[test] )
-"
 
 src_test() {
 	# tests hang
diff --git a/dev-util/kdevelop-python/Manifest b/dev-util/kdevelop-python/Manifest
index 7a0890d41143..b34db31bfbf1 100644
--- a/dev-util/kdevelop-python/Manifest
+++ b/dev-util/kdevelop-python/Manifest
@@ -1,5 +1,5 @@
 DIST kdev-python-5.2.4.tar.xz 1073172 BLAKE2B 774ef9853d9304073c5c8ff0657774a546c361d316116c1b09f21dad5f65cc8566948f42d179d5e612b64874ea14087e26794fdc3f3c7a9910569592c064973b SHA512 abf86aeeffba496a51cc6969bb0dd75509b3385332914f8135e3b1ec5e4da592af5a7d07fd98ad231d8c09109c2396037727e3db0a7ce14bd427f87d558fa3b8
-DIST kdev-python-5.3.1.tar.xz 1074256 BLAKE2B dd122e9150c156276515213bb1326d60be43bdb5a1a2ab1a303de2521b63ac4e8b1609f4bb6c015e75cf57006bd12ec76b8b442b5e0f46a642a573e0c920324b SHA512 d8ffa2d842775b7bf6f1d5cace81b124c8979bbcf474b75f2565ae0efa7c809c4e66a86af53212a332ef6db77e8887c84b3fcbe8e1c4cdf51b56794b7d247829
+DIST kdev-python-5.3.2.tar.xz 1074980 BLAKE2B de19a603d9c0fbf870b271b16d98b676ad9246edbc62f926c63ec66f51806c52fdec0284b016b291599b80d68faeb7eef80f4b5efc7e8f12f6362948b1df05c2 SHA512 95d8e0e94bfad70fabad75e362f5483db897ba56980251a76af48df863c7277746704c826692a6cec854e60c97f3ea9791b1e162b7ea2f357d469715d0a74672
 EBUILD kdevelop-python-5.2.4.ebuild 1165 BLAKE2B a66030af8d7e71e5cf494e88cb1d1f2d5b843ee7a0e1ce21243e528a9b6daf67dec0033dfb843061133846dae3b25db39149833cce52ff8250c225c9412f98e5 SHA512 7d4113a3e68919132ca8847a9b49cd41379d3d81da5010ba29dea68e1ef7269a25850555b2328dd03b198c1f26c6c9ebf4a8687b20cd8d99eadb64ac10fa116f
-EBUILD kdevelop-python-5.3.1.ebuild 1169 BLAKE2B 3a97ad6e437acecbce5c649c87cd6ab8ad3648ac4a1346be98163f23bae022f2399510624285f0b072d6c037ceeae7b2a1a32b1e55015e1fce7010ead9e56471 SHA512 c93d771a2f83b76dc5c3c8b4cac0beb55f9b66d176f28e474b605a54ae8310602dbcb62af8bd3fae9b03cdc9e113c34209e53460b49f98c109a39438b21a424b
+EBUILD kdevelop-python-5.3.2.ebuild 1124 BLAKE2B e37cecd3a7173dc1b347413b6e71e37c9c6ed56b3e2d2f5a868f948853e8bca6210085d25b5d18dcdc19cfbf3b34aabed77c831cdff1e740390afbe485764a55 SHA512 5438d59b346a6ea75fbf5b8bd11ef00637c0356690678f600efd027f5bdacad6b505621937b7e2c6fe9f1e1ea2896ce69abfd8dc3398f1a63a7fbb9cc221b0f4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3.1.ebuild b/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
index 95cc296ddff0..0a046b765fe7 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3.1.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3.2.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_BRANCH="5.3"
 KDE_TEST="forceoptional"
-KDEBASE="kdevelop"
 KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 inherit kde5 python-single-r1
 
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${KMNAME}-${PV}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="Python plugin for KDevelop"
+HOMEPAGE="https://www.kdevelop.org/"
 IUSE=""
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -43,11 +46,3 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 	kde5_pkg_setup
 }
-
-src_compile() {
-	pushd "${WORKDIR}"/${P}_build > /dev/null || die
-	emake parser
-	popd > /dev/null || die
-
-	kde5_src_compile
-}
diff --git a/dev-util/kdevelop/Manifest b/dev-util/kdevelop/Manifest
index 5ab2a1d39099..2d7b47067da1 100644
--- a/dev-util/kdevelop/Manifest
+++ b/dev-util/kdevelop/Manifest
@@ -1,7 +1,5 @@
-AUX kdevelop-5.3.1-typo-in-QtCreator-theme.patch 931 BLAKE2B bb06c705213d6d714cab9bffe93e61d1809cbe8f2a5bc4a35bdf5f4563bab69ac1420382f7cf41cbe766d3c37d8ab729ddd2ff2364660fdab9937e1af4e47c66 SHA512 84738c0cdad91c2596e20e894ef8ab201dc1f38c9647ac3c7a7965b5efb6f41ebcc978101c54383d43990a491bc5895d8829ead0848ce613a3a9aacaafa12c75
 DIST kdevelop-5.2.4.tar.xz 6647172 BLAKE2B c3dc301cf16bdef95000aa6cb3ebe615054f49ad29bc67870c31d329cf7bd4df81dad330eb26dd28c19627b2040f62522d755afa4450bb125872350d1f8039e1 SHA512 1c64b4f56452e8c926c5bcea5a9d8368fa62926d1ec507d289d8cb47275d478898d56fdf083fc24e291aaf4738cc5b7ddfd239e6993848e862bc4d83e270558b
-DIST kdevelop-5.3.1.tar.xz 6671416 BLAKE2B ac09bb2f9254279af662d472ddc712e09892509a7eae0dc0df8fa7fc1b36ec0b90c381503699f7844141cef644e33d70c8a3ca77267958e46bc56fe55f4c5c2c SHA512 3b8c9d839a0fab48a2ecb63cb3dddb96c096c6d244f95baaefcbeca5beb91557769773da367a02f1ad8bd33ec44d14157a988989576062894a081a4073928a0a
+DIST kdevelop-5.3.2.tar.xz 6851944 BLAKE2B b918cd0cb9b915227a442641a110db27387fd2e946c0411e40206a4a68990a9268a6c47c7f1da8a8f8a5c2690a1577c75fbbbb353d69ddfeed419e2c561aac4a SHA512 f0a8354a596a13dab0c5560d8308097918f5540b02d9a66a63155af00aa024aae9c01b455290ecafe705784a9c25afd24f7d936d1f817af1fb5b52d96e6dc596
 EBUILD kdevelop-5.2.4.ebuild 3694 BLAKE2B 7f0e35fe10187cbd8085b16d966340eb13a6df533816169e2a75fb1ad1cd21e1fea14c3bba1a169eebb42b345894bcf0a3ad3e223208279f03334fd2709daf8a SHA512 8961f2ba12d2c1b4a961c1fe93eb366bcad5663960122edd640a40e7e12b21d74763f31b18173612de41bc82f4091b560f9bc605ab60706eb2d36b37e24c1c57
-EBUILD kdevelop-5.3.1-r1.ebuild 3812 BLAKE2B 7a9efa508de1b2a8a83ba7cce6b0434cb17d05c438cd1f5b696feaa2c208d377231c350a3463efe40bebcd428679f8730869ef3455819c36b6ee5069304c0351 SHA512 62f067530d70179c0d3ed48970faf7edc079aa41fac16ea98ce294a3d760fd080594ec41c275b27324ed942eb2e830bdeee5a5756387e52aa42b0b9dfab43d5e
-EBUILD kdevelop-5.3.1.ebuild 3749 BLAKE2B 2f6d0b890acf4e5d6bf90df72cb5fa964c3790367d578d6cc4c976f6b7018d94f5672feecdac678601a151430b8f7c17bea85bf6b21f22b349d56b3450ea7f12 SHA512 6f9ea985cd3b23f994a9d04f1db853f03bb822d97f2dd3e9c1eba01977334504a197763e4a358c11674c33ce622909aaff5b3c2f763264ad60ab7d027f0b47e9
+EBUILD kdevelop-5.3.2.ebuild 3831 BLAKE2B 6ddc23cf95ddf9fe4226e60ea5d462d3fe85fef6099f3687445acdb0d1ac4d02c9955e02fca0d1d771d7e9f6647d4bca3d006db1650413c6ceaec3c90e389e7b SHA512 cb55d0422b19db8d58efb22e55bcf3ed33bdcc1a7a1ea37ae122fcf91461c77ad68ea433cd4576d1ce1ff07c58af55c76b288841026955e0640957be5a0bdb00
 MISC metadata.xml 698 BLAKE2B edf6f5784cae9be6ea0013e2f4b85234c748ff5b716511cea8b401e7267178a821d27bbd5b66d38833e018c6a90855ed28390be385818e67f25105674b73aacd SHA512 62228270953a089d69530e11f5dd9a55c86f9758d6d86f9a3eb46a1a6e3efaca38c066bacff5b5f49a409d6c65be96e84f1be63cf6aa3fc7bc04706b674501f0
diff --git a/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch b/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch
deleted file mode 100644
index 97a0b660760c..000000000000
--- a/dev-util/kdevelop/files/kdevelop-5.3.1-typo-in-QtCreator-theme.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8ceab1ea06ea846acf1d75955b0e0e725fc8b2fa Mon Sep 17 00:00:00 2001
-From: Maciej Mrozowski <reavertm@gmail.com>
-Date: Fri, 18 Jan 2019 00:59:28 +0100
-Subject: [PATCH] Fix typo in move cursor left action in QtCreator shortcuts
- theme
-
----
- shortcuts/QtCreator | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/shortcuts/QtCreator b/shortcuts/QtCreator
-index bd1334742e..b74aba9b54 100644
---- a/shortcuts/QtCreator
-+++ b/shortcuts/QtCreator
-@@ -38,7 +38,7 @@
-     <Action shortcut="Down" name="move_line_down"/>
-     <Action shortcut="Up" name="move_line_up"/>
-     <Action shortcut="Right" name="move_cursor_right"/>
--    <Action shortcut="Left" name="move_cusor_left"/>
-+    <Action shortcut="Left" name="move_cursor_left"/>
-     <Action shortcut="Shift+Down" name="select_line_down"/>
-     <Action shortcut="PgUp" name="scroll_page_up"/>
-     <Action shortcut="Shift+PgUp" name="select_page_up"/>
--- 
-2.19.2
-
diff --git a/dev-util/kdevelop/kdevelop-5.3.1.ebuild b/dev-util/kdevelop/kdevelop-5.3.1.ebuild
deleted file mode 100644
index 53e691a99ab1..000000000000
--- a/dev-util/kdevelop/kdevelop-5.3.1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_BRANCH="5.3"
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALDBUS_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
-LICENSE="GPL-2 LGPL-2"
-IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_frameworks_dep threadweaver)
-	$(add_kdeapps_dep libkomparediff2)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qthelp)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qttest)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/grantlee:5
-	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
-	gdbui? ( $(add_plasma_dep libksysguard) )
-	hex? ( app-editors/okteta:5 )
-	plasma? (
-		$(add_frameworks_dep krunner)
-		$(add_frameworks_dep plasma)
-	)
-	qmake? ( dev-util/kdevelop-pg-qt:5 )
-	reviewboard? ( $(add_frameworks_dep purpose) )
-	subversion? (
-		dev-libs/apr:1
-		dev-libs/apr-util:1
-		dev-vcs/subversion
-	)
-	webkit? ( $(add_qt_dep qtwebkit) )
-	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	$(add_qt_dep qtconcurrent)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kapptemplate)
-	$(add_kdeapps_dep kio-extras)
-	dev-util/ninja
-	>=sys-devel/gdb-7.0[python]
-	reviewboard? ( $(add_kdeapps_dep ktp-accounts-kcm) )
-	!dev-util/kdevelop-clang
-	!dev-util/kdevelop-cppcheck
-	!dev-util/kdevelop-qmake
-	!dev-util/kdevelop-qmljs
-	!dev-util/kdevplatform
-"
-
-RESTRICT+=" test"
-# see bug 366471
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package gdbui KF5SysGuard)
-		-DBUILD_executeplasmoid=$(usex plasma)
-		$(cmake-utils_use_find_package plasma KF5Plasma)
-		$(cmake-utils_use_find_package hex OktetaKastenControllers)
-		$(cmake-utils_use_find_package qmake KDevelop-PG-Qt)
-		$(cmake-utils_use_find_package reviewboard KF5Purpose)
-		$(cmake-utils_use_find_package subversion SubversionLibrary)
-		$(cmake-utils_use_find_package !webkit Qt5WebEngineWidgets)
-	)
-
-	use reviewboard || mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_KDEExperimentalPurpose=ON )
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version "kde-apps/konsole" ; then
-		elog "For konsole view, please install kde-apps/konsole"
-	fi
-
-	if ! has_version "dev-util/cppcheck" ; then
-		elog "For static C/C++ code analysis support, please install dev-util/cppcheck"
-	fi
-
-	if ! has_version "dev-util/heaptrack[qt5]" ; then
-		elog "For heap memory profiling support, please install dev-util/heaptrack"
-	fi
-
-	if ! has_version "dev-util/clazy" ; then
-		elog "For static C++ Qt code analysis support, please install dev-util/clazy"
-	fi
-}
diff --git a/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
index ca7b83fd34ac..099fede3aacd 100644
--- a/dev-util/kdevelop/kdevelop-5.3.1-r1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.3.2.ebuild
@@ -1,19 +1,23 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-EGIT_BRANCH="5.3"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALDBUS_TEST="true"
 VIRTUALX_REQUIRED="test"
 inherit kde5
 
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/kdevelop/${PV}/src/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 DESCRIPTION="Integrated Development Environment, supporting KF5/Qt, C/C++ and much more"
+HOMEPAGE="https://www.kdevelop.org/"
 LICENSE="GPL-2 LGPL-2"
 IUSE="+gdbui hex +plasma +qmake reviewboard subversion webkit"
-[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive)
@@ -56,7 +60,6 @@ COMMON_DEPEND="
 	$(add_qt_dep qtxml)
 	dev-libs/grantlee:5
 	>=sys-devel/clang-3.8.0:=
-	x11-misc/shared-mime-info
 	gdbui? ( $(add_plasma_dep libksysguard) )
 	hex? ( app-editors/okteta:5 )
 	plasma? (
@@ -70,7 +73,7 @@ COMMON_DEPEND="
 		dev-libs/apr-util:1
 		dev-vcs/subversion
 	)
-	webkit? ( $(add_qt_dep qtwebkit) )
+	webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 )
 	!webkit? ( $(add_qt_dep qtwebengine 'widgets') )
 "
 DEPEND="${COMMON_DEPEND}
@@ -93,10 +96,6 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # see bug 366471
 
-PATCHES=(
-	"${FILESDIR}/${P}-typo-in-QtCreator-theme.patch"
-)
-
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package gdbui KF5SysGuard)
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index fde45618793a..968fc958048a 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,13 +1,10 @@
 DIST lldb-7.0.1.src.tar.xz 19384628 BLAKE2B 4720aa85afb90b84264f53736ca8a225bfc807cd84271f8be35a06437e718fb40a0f5090f213e203ffb746b254583f59e912d00300635e78f43aeb75a8dc4048 SHA512 7e98c3148ac34b42404e5aaaff91728d19e9062110a333f0bc7a62ec324fbb6d033ea44b56e144dc1e94febb2107cfb33c71bb3602c2168a6270dd807a2cc5ff
-DIST lldb-8.0.0rc2.src.tar.xz 19603496 BLAKE2B e13ae6c20a34e0b77729abfd1c6108b213fcfbd31674b52e42d21ee3b9db334a1c4e772e787cb7ac3f3695078d3ea37b7d6f464bf575460dada59356131c8460 SHA512 5cc3687999356c6b17fe8eaea9187e2b7e275a641aefa3e94a45d6016df67fdfd2c25a77e225516496503074284be2ccfbca0d43912e8b5a9f5f72d231f85261
-DIST lldb-8.0.0rc3.src.tar.xz 19605220 BLAKE2B 20cc9bf0680162628d7d09d3589151255fac74eac5be0b99bad2b6a810bc77f12403a7d9b7ae420c918643966271aaa49a13435e5668b6ce5be7525356361bd8 SHA512 abda094092fc40d83ea98a2cb19aeb3f5a51ffbeb810e8aaebf3eac9c7be84f0123bf5397d7ac74109b8aa45d589e4e38646efe1817bdb6272bd957ba7a92cd2
+DIST lldb-8.0.0rc5.src.tar.xz 19602752 BLAKE2B 4f861bf53b254d3b2496b954a566ae02fe043d938cc04b931c88237dbf593de42c1e51ace0f81280b9e646a2febe853f9be72bec8f91d351ba7f9fe3b4d46df9 SHA512 b10e57410b4414e9f373bb2486690108d6a83c8268c9fcc4e30af60f488bf0dec660c4556ff384cb12b0af29d3c9e5a05a9bf57a0bc9acd1d3c39cf071304440
 DIST llvm-7.0.1.src.tar.xz 28311056 BLAKE2B 737aa6144a415e41a4ff2c8bd5a727d6f14d7b1810c62cbefa5a25fe642c98cddf8a28e35c7e9783373aa3b96f5c0943229e229ad1b43e56e9ed6db0f27ab128 SHA512 ac43a3cb71a53deb55e3693653847cf20bf6f5d9056f224e6956c96d63bc59ebee9404f088eec9cabe65337b4607a905ef931354b373cf64e0004c6905a6b5df
-DIST llvm-8.0.0rc2.src.tar.xz 30492444 BLAKE2B e7afd3b66e3eb204e07348f0bc77f0ae03d8e9581de4c94cba7c0b43b53f36ecd891c1272ce43ea6c78999fd404a7db105266a2eaca22975133571e1152961af SHA512 9d93197848e9472cc2fef2477897e4f4d74a79b17a164fd43446b0ffb327e7f484cf64f0c294d9a99707c0b46282eb0d16e6ceb5d2d568f25e4235f70ae3c5e7
-DIST llvm-8.0.0rc3.src.tar.xz 30507604 BLAKE2B c9baaca537d292af9f12368df86090750508113eb7db393fe44c1ba7579df947f0a7092e6ddd4403bda9f9ed75fe8c049f3baf6d8671faa0c91e3267c584893a SHA512 82199841c2084cffe4e86b4f2d5ebe404059196f1f6d000ee69cfddba05d78c4500ad7499615fa67e9774ead6cba5a23db484dd85f752c8d08e8067f7d7b98ca
+DIST llvm-8.0.0rc5.src.tar.xz 30507432 BLAKE2B 3f20c3dc270439a32fe23e403ca5190e624f329a10d424d15475d32d89725b021f12af19845928da41be4b83afd254df1f6d27f235b0d2ab81ff76d9e588250f SHA512 b015bab2f0b0644d9fab295dee5d3b2a4d4d7c9d5870a06d7829f43d61e92aeb31b28d4c074f6a20ad803dde06399ef3298c951f1580b010f4b756f75bb4453b
 EBUILD lldb-7.0.1.ebuild 3010 BLAKE2B 9d82e23d83a5726a5c966d14e4660e7199e03716597c2be0bf2adf33037c1fb4cd459fda2ab44230e18efc681690f16e25753de7b3bca2932b1081e6feff887a SHA512 92a937daf00ab27650045dad8fae9e7a1e9e2b014b37ee9e13c8452f25fa58a78196711b0e5a41a65f12947a1a9fd85ddbf9c360c4036478a699417501c2c02f
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
-EBUILD lldb-8.0.0_rc2.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
-EBUILD lldb-8.0.0_rc3.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
+EBUILD lldb-8.0.0_rc5.ebuild 3016 BLAKE2B a54f8a425a716ab94b9d97441cbee297e93297fc632e9f658c89b0d9df62d25a5bd13ff0062850f78f0de13c4ff010e3d2c4e8648aeed764e622eba9dd4db6ae SHA512 6b852c966bd6a1b4c6789fb2f0a79e79ba68d1884d97af78b452c6388017b72bc9a6139e4f487da85b8569787097eb6416ff6856ce21e362064e4da230723f84
 EBUILD lldb-8.0.9999.ebuild 2960 BLAKE2B 39990504c70cab7761ae1e465bf257558488f3c90b5e07fcaa72e9b4c6e874e62e4d15ddadcb0fdb3924af3aaecec8f14b1747e1e3cf837c0b77b77b1b44f906 SHA512 68d1ff044126076e1962eb1a09eb0621a313ed92a7ba2fff6a9959f00f39b219ac6478113c641f0c55f3b687ea9ce7cf23ac7c6ebaad51788f162f639598fc94
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-8.0.0_rc3.ebuild b/dev-util/lldb/lldb-8.0.0_rc3.ebuild
deleted file mode 100644
index cab280bed822..000000000000
--- a/dev-util/lldb/lldb-8.0.0_rc3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# 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://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
-
-LICENSE="UoI-NCSA"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="libedit ncurses python test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	python? ( dev-python/six[${PYTHON_USEDEP}]
-		${PYTHON_DEPS} )
-	~sys-devel/clang-${PV}[xml]
-	~sys-devel/llvm-${PV}
-	!<sys-devel/llvm-4.0"
-DEPEND="${RDEPEND}
-	python? ( >=dev-lang/swig-3.0.11 )
-	test? ( ~dev-python/lit-${PV}[${PYTHON_USEDEP}] )
-	${PYTHON_DEPS}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${MY_P}
-
-# least intrusive of all
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${PV%%.*} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_unpack() {
-	einfo "Unpacking ${MY_P}.tar.xz ..."
-	tar -xf "${DISTDIR}/${MY_P}.tar.xz" || die
-
-	if use test; then
-		einfo "Unpacking parts of ${LLVM_P}.tar.xz ..."
-		tar -xf "${DISTDIR}/${LLVM_P}.tar.xz" \
-			"${LLVM_P}"/{lib/Testing/Support,utils/unittest} || die
-		mv "${LLVM_P}" llvm || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DLLDB_DISABLE_CURSES=$(usex !ncurses)
-		-DLLDB_DISABLE_LIBEDIT=$(usex !libedit)
-		-DLLDB_DISABLE_PYTHON=$(usex !python)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		# compilers for lit tests
-		-DLLDB_TEST_C_COMPILER="$(type -P clang)"
-		-DLLDB_TEST_CXX_COMPILER="$(type -P clang++)"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# oh my...
-	if use python; then
-		# remove custom readline.so for now
-		# TODO: figure out how to deal with it
-		# upstream is basically building a custom readline.so with -ledit
-		# to avoid symbol collisions between readline and libedit...
-		rm "${D}$(python_get_sitedir)/readline.so" || die
-
-		# byte-compile the modules
-		python_optimize
-	fi
-}
diff --git a/dev-util/lldb/lldb-8.0.0_rc2.ebuild b/dev-util/lldb/lldb-8.0.0_rc5.ebuild
index cab280bed822..cab280bed822 100644
--- a/dev-util/lldb/lldb-8.0.0_rc2.ebuild
+++ b/dev-util/lldb/lldb-8.0.0_rc5.ebuild
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index fcebbea36a4c..966568aedffb 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -1,4 +1,5 @@
 AUX ltrace-0.7.3-alpha-protos.patch 849 BLAKE2B 694ebae21ebb658d87455d01cb82376d2a1f4854961d1bd04c351955259f1ae99cf436a8f885b9e1aaad8e842b021dc5818ad5f37667276589d9651d04a4deeb SHA512 014660bf48b7e5bf43b17fd3f82fb8a01f3855c16dc2fed76f6a9e4f348ec28beca0e7429ee10dc3aba3bd0bba143d21ee5b67ccc7057cb006ef694a6d38aa72
+AUX ltrace-0.7.3-ia64-pid_t.patch 184 BLAKE2B 4d739f7ad6474541cec166cc1262637edbf30b32ef3335ac92e834bd611472de5473801ad307b7ba56eec0657bbcceea48d7fe17517663c6389d0843e9a9d5bc SHA512 1029f86f3b3e33eebcdbafa6dc56e2ece2a33234a6b7a0b05e4bb87424829c5f512e019e6c6a962e639a9cfeac56edea3d0ac250fc31489755e68d2181ce254f
 AUX ltrace-0.7.3-ia64.patch 1538 BLAKE2B 2a407d2e19e74ddf22da1371cf72585cec5c630d00670798c6c8e9b3991d3aac641784bceeda544b49e76ae572c487bc5455de4239aa967e25318625e0307e0f SHA512 c6e7576047aa06eca67a80ecaa008854a2e312b1d38693cc802a6b6be6f671003716c6a0d3268fb3f076f3311fb27c228f55220bcb2432afd0210542020764ad
 AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588ee7cd074cff4b90f57fe821f6124d4aee9e2cb8f60b46b7007659d5a29d929cf579c38d858c31b8667ba50f64d579909c81 SHA512 9f407805719f21838fa3d2c48aaa96025fb4785a28b5b4e50b2593093067ed6cb406dbb662e0178e84e9db101b4cfa12867127cd212abf6417130e7cb4c21002
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
@@ -8,5 +9,5 @@ DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
 EBUILD ltrace-0.7.2.ebuild 870 BLAKE2B d54ab07bc77f0123e1c45045cfdac7211871299520eaa945083febb3e4efddab68450257beb0882467ff3b488c588d03f371bc775575d9270edc20d529765d3d SHA512 4ee1d65ecfd2b2d69a06c4f09e32715b6c4ffd242834bcc683053de28932d6fc94a8a6b176890bac2c5013478c3db29405680b05e51bda9b919f71083e1337a1
 EBUILD ltrace-0.7.3.ebuild 878 BLAKE2B 63d0fc0e772670082d1ee5b36922db061d3bcd13c1d94093c1a520992a13d28fe19d06f88d3774f36075a9a39d6a7d907d7366ed7a0d3bd54847a8b921756fbd SHA512 675739c0dd96d879fe87d66b7711217e7d4070a0d6b5fc2bb3f0b4667e1e27ad521a373bb0030b6bf62344da4db3af0f674a3a5fdd3f1542cc34c5e486d16ad3
-EBUILD ltrace-0.7.3_p4.ebuild 1294 BLAKE2B 91af85bc4edb62f647c1417db9d174bcb10b8fb6d2face7ef7e21c6d67b97cd842ac5efc0ee4b452cacb0c5bd655acb11b843b79f3867f73a9146f9d5661fbe3 SHA512 d51347f1b630e1a86d0806080b987c05e57ed0cbdcc0fad77a027fa78b89de774131160e4ae7132602661b3a65b39a1f284c205211fdffd53906121e6f21bbc3
+EBUILD ltrace-0.7.3_p4.ebuild 1345 BLAKE2B fb979d8531e45c2e18dd5fc7da79b2bbab2d3ceba3743a42599ce26624da926463f78abe5b93bf16a6edc50bcb8d1fa439b931736259095e9917f679ad1ff323 SHA512 2b4ef00bd037f8b72f2b6566acee782dae675764a68f9e63eb9c604146ae24270f2db31761d0b3cb7da5d169e7ff7e0b6f086df36ce130381a95e603a8c9ce43
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch b/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch
new file mode 100644
index 000000000000..c466ce17e02d
--- /dev/null
+++ b/dev-util/ltrace/files/ltrace-0.7.3-ia64-pid_t.patch
@@ -0,0 +1,6 @@
+--- a/sysdeps/linux-gnu/ia64/breakpoint.c
++++ b/sysdeps/linux-gnu/ia64/breakpoint.c
+@@ -26,2 +26,3 @@
+ #include <sys/ptrace.h>
++#include <sys/types.h> /* pid_t */
+ #include <string.h>
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
index fd5f6d7ae503..c17e3402f379 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -34,6 +34,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3-ia64.patch
 	epatch "${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
+	epatch "${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
 	sed -i '/^dist_doc_DATA/d' Makefile.am || die
 	eautoreconf
 }
diff --git a/dev-util/lxqt-build-tools/Manifest b/dev-util/lxqt-build-tools/Manifest
index d29527394589..d8a7242c3f24 100644
--- a/dev-util/lxqt-build-tools/Manifest
+++ b/dev-util/lxqt-build-tools/Manifest
@@ -1,3 +1,5 @@
 DIST lxqt-build-tools-0.5.0.tar.xz 23392 BLAKE2B 1f28ae093af772ed2b6f75a7933b76a2c608171bf15e0c8483477d7f3b702dec79f41af70bb38863c3b17ff9d52a8f2acabd4ed2347bb7f421d2074b8767e96c SHA512 6802f3d5e3d622b136cf312ad929353aac1f42355c00ac9e3fb7a9d46c63dba1f87a0a4fd11185289c4e7222d5b0d30b8829dacd38c88de45901ff0559639e90
+DIST lxqt-build-tools-0.6.0.tar.xz 22520 BLAKE2B 99e8032e111f776708d0a84e65db6534f517e75803d2cf747618889dccc46e9d55caa0ba3c89c88d56143a69ced015df9f1eae68a34c7ea050c6f97aedcf0f33 SHA512 f95c47d40f26defa8bc4e13a0449428945c282cb5e2201610e9529bfd5154a438ee9dcc4f556bd76efe13b97533bbed2f49ab5c100225907781093094a692227
 EBUILD lxqt-build-tools-0.5.0.ebuild 503 BLAKE2B 79a8b9b8f017d64574c9b27ea37bc5d996bc7a3e9bfffce322fe63bc85690e013664dbeaf79ff2371b060f88c1bf2bb84ca2597fbf93b56b03daed8891453db2 SHA512 d95996271fa9f93b4efe8ffb16498c5431d8d83909ff271fe5783c393fe3506c89bceb997aae0f912ad325d84dcd34f53ff36c569b66dbb22ed8d7e46fc4cc3b
+EBUILD lxqt-build-tools-0.6.0.ebuild 512 BLAKE2B e6294f672a7e6b3eda41e2eceb4dfbf711561d7653021772237715a627531a6a5ae215e4f95164ac3be0f3bdf8c9698c553320ecda13ee2b1da81120829e266e SHA512 523b7f62ee39adb6548788b404914365e5c2032671040bb203d1e3296f35c17d59e976c80037ee61aacb6fb64cb34f1530f3973de16af27fb107171f0d16a0e0
 MISC metadata.xml 322 BLAKE2B 8b119aeafbe57841b2e072a7a009dd20383a752d6cce052c5b2e6c98c2341baad6e74fbb8798ffbf5c17719a37ff4d25efda922fcc32bf851b82e520af69777b SHA512 ffd6f030759c5c9e6f2aa42550a0de265550a03872c7b11c12ac4429a7dd1c3cbdb7cb470238273a313e9fcddbc5072b7dc4909811c4ab7609c0acc2e385a948
diff --git a/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
new file mode 100644
index 000000000000..7cd05eadac92
--- /dev/null
+++ b/dev-util/lxqt-build-tools/lxqt-build-tools-0.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="LXQt Build tools"
+HOMEPAGE="https://lxqt.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/lxqt/${PN}.git"
+else
+	SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+
+DEPEND="
+	>=dev-libs/glib-2.50.0
+	dev-qt/qtcore:5
+"
+RDEPEND="${DEPEND}"
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 33d126bdc88f..175ccaec0735 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -3,6 +3,6 @@ AUX mdds-1.4.3-buildsystem.patch 893 BLAKE2B 7884c16fcf8b6f1ddde0dbae6e4059e121f
 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 950 BLAKE2B a258610a5f66f8c6d79619a24e18dbd757d0d186269509eaa7b96a92e987e53976c63d461581d8f18825c792b40c55f07f4d16eb763572b2ea7b201e0fe7a305 SHA512 696a2d9c38dfb6103d0e358d514864c48ac06f0cdde9c31c8d82d7439d9ed8f40b141809525ee57e8c87de6b7961e3ca36804f1272109ac13f5f9d64305bbeae
-EBUILD mdds-9999.ebuild 955 BLAKE2B 75a8c7ae5b5c447112991d5b31f57fda4fb48b7b1ee0a5f7f676ec50e1f2036f89181b3f33ca4a5d72a0f332171b947b582f4e2bd374e846ff9a6e928cf6e775 SHA512 e7c89d121a11aabaf28c1940975b868e5b0b98df4fe71bfa248edc046ef6b9047f7d0364d7347c321fd879fdc22c6f853734e3eb576f07cd5f91707208d4785a
+EBUILD mdds-1.4.3.ebuild 947 BLAKE2B 887b5d36026f5e671c34b2a294698310baec8527c12afda3f75854b0857fd0af15ddb14e192984b6d6c8424a02464f91c8f3a7850cb9cbc4d5f8f168bdd50996 SHA512 291e6eeab1590acf930c13bf3c16376056173a58f8caf0675a47bb0b8b08568cac96a6cc7505f5bd3abe5dfaf28c9b72ac95b145cb0fdeb3a7e1745ca72ed658
+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.4.3.ebuild b/dev-util/mdds/mdds-1.4.3.ebuild
index 8ca6d8fc087e..ead8f8892513 100644
--- a/dev-util/mdds/mdds-1.4.3.ebuild
+++ b/dev-util/mdds/mdds-1.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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
 
@@ -19,8 +19,6 @@ LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		app-doc/doxygen
@@ -28,6 +26,8 @@ BDEPEND="
 	)
 	valgrind? ( dev-util/valgrind )
 "
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
 
diff --git a/dev-util/mdds/mdds-9999.ebuild b/dev-util/mdds/mdds-9999.ebuild
index facdbc17f0d4..4b1ef077e933 100644
--- a/dev-util/mdds/mdds-9999.ebuild
+++ b/dev-util/mdds/mdds-9999.ebuild
@@ -19,8 +19,6 @@ LICENSE="MIT"
 SLOT="1/${PV%.*}"
 IUSE="doc valgrind"
 
-RDEPEND="dev-libs/boost:="
-DEPEND="${RDEPEND}"
 BDEPEND="
 	doc? (
 		app-doc/doxygen
@@ -28,6 +26,8 @@ BDEPEND="
 	)
 	valgrind? ( dev-util/valgrind )
 "
+DEPEND="dev-libs/boost:="
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${PN}-1.4.3-buildsystem.patch" )
 
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index e2120adeef39..fdd5ffefadaf 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,6 +1,7 @@
+AUX meson-0.49-python3.5-tests.patch 1228 BLAKE2B 1cf444e239ec6c24f0fef9d20edf92e364c5c55debf61c115559cacb676596e98a9e01970661b16c4a95bfbf161d6c02e314bbe746979cb77c8f7f6dc5ce7fa6 SHA512 c856436331f6d80912e0519303051e49f4c2c08d348e575ff71b2628621ce752148bccf7aa348d0f27d7df11ff15ee96439d4438d0a2755e1f6c66d2be0ac942
 DIST meson-0.48.2.tar.gz 1311011 BLAKE2B 54cb8ca4164238f1c2b77327c330a7615a8d62c63c0cbedcdbe395bf2a99c454407fbc61af8d61d38a85de5dee18e73b98b534a2c9d19cc8f622e25549b84bbf SHA512 beebc90df420c15255c49a13e2f4917934fec8fb2c5b878a59ee0cd2ae46eb05571e995e12b3110b72be89fd11ab4c534ed72aa6d6fe72719ef060df5e75695f
 DIST meson-0.49.2.tar.gz 1340730 BLAKE2B 07931bca42907eb961f5f15da5216448d33539a091de4e7df53f0713471f2b0c581d1e3f9ba7eac2a87b61861e5408a5af1a5cb8c17c9561f81cd377b2ea7fc3 SHA512 4aca4c273e7c23034c1ed76aa48c914aef34ca4be9df9d5810b8dd3dac9f5f67aa577a682490aa3d81c0503b5a5a8ac1e2452b2f2fdd7a5c7db2aa504047b87d
 EBUILD meson-0.48.2.ebuild 1737 BLAKE2B 0015a7cb7dfa7dbf0a57352d7271e972490247914a091d429dfd547d7b92d9122441ad2ba3022b54442a6b94ca2913b0f82e69899055a6c60d65160ce1a2fea6 SHA512 11bf7cd817ddc3426c004ddf6a62419c2e4113299c57fc28f42267916060a349e584c17ac8fc10e54504c547cbd182928d1824b7be778eb5498056d3d2ca3167
-EBUILD meson-0.49.2.ebuild 1547 BLAKE2B 6ae191ddfba8fff7af35c718370f707213279e022a9c781f26061bbd57bb426601a18e97a3b22b732e81e3c37a859211ed65185d1b88d3f488537be0bfc1e492 SHA512 f4b8f1698ad7f89cba39a622538339ed4f7d7d04f95374c23494eb7a39aea656f12682b0c912bb8fca3703fd05b305c1d0245816fd00d7736af7841d4d2e02e0
-EBUILD meson-9999.ebuild 1547 BLAKE2B 6ae191ddfba8fff7af35c718370f707213279e022a9c781f26061bbd57bb426601a18e97a3b22b732e81e3c37a859211ed65185d1b88d3f488537be0bfc1e492 SHA512 f4b8f1698ad7f89cba39a622538339ed4f7d7d04f95374c23494eb7a39aea656f12682b0c912bb8fca3703fd05b305c1d0245816fd00d7736af7841d4d2e02e0
+EBUILD meson-0.49.2.ebuild 1772 BLAKE2B 465819137a0ad5b52547d88c47a4ea9ac591440e98e1de4deb7c83e9753a16114e0a4a9e84bf0c0c52a2d05ef77baca6ffdc0d30d720aaee6da45a73f8b7b6d2 SHA512 d0043e6282a35030ece03c6ff20b673843b049767ce89f1c1a7832a69931f6ca3773772ec1d99a3673970a5d46056c6aefd7c2acb4c5704f5fce8cfadb737e0a
+EBUILD meson-9999.ebuild 1711 BLAKE2B b2ab12ee5111a491c9e5278cc0cc49cd8acead98418272927c8518c58c31ce7a5754ca8092a749ba40ba35558b11fc3ceffbb8fde736aa442efc71d431e834be SHA512 e502aefc4aec2f7833e9cdc8921591ce0f2e447e029494b50f83df5be7957224ff64e53d6b6ef320b24fe84d3a5d393337098a71a6cde45d51d92504675bd6e4
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/files/meson-0.49-python3.5-tests.patch b/dev-util/meson/files/meson-0.49-python3.5-tests.patch
new file mode 100644
index 000000000000..640348b2bc2d
--- /dev/null
+++ b/dev-util/meson/files/meson-0.49-python3.5-tests.patch
@@ -0,0 +1,34 @@
+From 65192af2ff62a032a3f19d065c95e12b83aae709 Mon Sep 17 00:00:00 2001
+From: Simon McVittie <smcv@collabora.com>
+Date: Fri, 11 Jan 2019 18:03:15 +0000
+Subject: [PATCH] run_unittests: Use Python 3.5-compatible subprocess
+ invocation
+
+subprocess.run() didn't get the encoding parameter until 3.6.
+
+Signed-off-by: Simon McVittie <smcv@collabora.com>
+---
+ run_unittests.py | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/run_unittests.py b/run_unittests.py
+index 342ad883..e1246140 100755
+--- a/run_unittests.py
++++ b/run_unittests.py
+@@ -5029,10 +5029,9 @@ class NativeFileTests(BasePlatformTests):
+                     ret = subprocess.run(
+                         ["{}"] + extra_args,
+                         stdout=subprocess.PIPE,
+-                        stderr=subprocess.PIPE,
+-                        encoding='utf-8')
+-                    print(ret.stdout)
+-                    print(ret.stderr, file=sys.stderr)
++                        stderr=subprocess.PIPE)
++                    print(ret.stdout.decode('utf-8'))
++                    print(ret.stderr.decode('utf-8'), file=sys.stderr)
+                     sys.exit(ret.returncode)
+ 
+                 if __name__ == '__main__':
+-- 
+2.21.0
+
diff --git a/dev-util/meson/meson-0.49.2.ebuild b/dev-util/meson/meson-0.49.2.ebuild
index c7cd92e8d1f5..09b40845cc6a 100644
--- a/dev-util/meson/meson-0.49.2.ebuild
+++ b/dev-util/meson/meson-0.49.2.ebuild
@@ -33,6 +33,10 @@ DEPEND="${RDEPEND}
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/meson-0.49-python3.5-tests.patch"
+)
+
 python_prepare_all() {
 	# ASAN and sandbox both want control over LD_PRELOAD
 	# https://bugs.gentoo.org/673016
@@ -42,7 +46,12 @@ python_prepare_all() {
 }
 
 src_test() {
-	distutils-r1_src_test
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
 }
 
 python_test() {
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index c7cd92e8d1f5..89b176910cb5 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -42,7 +42,12 @@ python_prepare_all() {
 }
 
 src_test() {
-	distutils-r1_src_test
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		distutils-r1_src_test
+	fi
 }
 
 python_test() {
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 2d4259d6e689..a7fdbc7b1522 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -2,5 +2,5 @@ AUX gentoo-helpers-r1.sh 299 BLAKE2B cac826ecdcf18d07b3bcc612f87090bcb26dc166f49
 AUX gentoo-helpers.sh 286 BLAKE2B 8f8ed2932cb2a0c954851804f727f1099bf3f0acd4b2ece892f08edbbedf49be7b9953afdc923aa1fc50a115e01dec03a3d06fcf9a69bcda4d896c8a40560a3e SHA512 51fdfb9330a2d5bec9bcad9e91635a5fc245b3c02527ab70c0f9285cae0bb4266ba1ffaca26eaf6c4f9caf66a151bca776df36a0de2c4862e5d18d9417555502
 DIST buildsystem-1.7.tar.gz 38597 BLAKE2B d0981ef282ac0d93d81a1a6a6bee1fc2a0151c962be6ce2900a67843ba8ebc67e00508cded2a7375f6bbe0d45572690f127872936a282de80eb08655ac571603 SHA512 f6a46ac25f41e695ec13d7b2b564250c4cc44a40a688904eb17aa4b547c2df0102cc0effb7a23a2ffa6b9178ae5cf452b63980caf26e06e479168c85803f1e58
 EBUILD netsurf-buildsystem-1.7-r1.ebuild 697 BLAKE2B 803dfa0b661778a40fc84e6e216503ea4b5dd3b7c28cc6d3812ac2ed8905a8b6c56bfbcd56d48cbea15bbb32c3fa09b3348fbe2db9142c13ab8f564288df39a0 SHA512 91dc40f9542b22d2a3fe3b61b5d1f5eb457b78d6c72f9ecb53d24872e90e5a299d5c5d79f07aa3bdf44a9f2748dd515f3dc3a4b5784d538988dd121946b7e00e
-EBUILD netsurf-buildsystem-1.7.ebuild 669 BLAKE2B af4475055f868fa7bafbf348aadab03af2ef5938c71ac7c8987a39ee247f06ba5ae4dc95e6cceccc18e10bee4727178d9d2cc605f25392b6c8d514ded4e63fa0 SHA512 a00aa794b4da6ef6bc4dff115d452904b661c08b342960846c13407051deb5c2c01364250cfa72f7bd0b2c09be7c64097337637417397f9187f25287b6e2060f
+EBUILD netsurf-buildsystem-1.7.ebuild 667 BLAKE2B c63a2ab3ffe66b359b717f1572bc3788ed125a50797d2f5c7fd83938c136edd72584b67c9f8c4a7b7b16346e13e890d7f93d388254be52046c678814496441ae SHA512 41643f9b47b979a04140b3d200b6f9d0c65ea873093fff4f7eb2e90bd545554c21664a83cab83fc2ca601afb72bfbce86b99f3ccd20422812149186cd88b5a09
 MISC metadata.xml 247 BLAKE2B 6a66309df2e6d095dcb3c45e08b061e6e9bf2a074da8beeb37f4d5d4c523f9c09b1bc15afea9c73cd5da6c317b5f47549a5affa40438cf1bbb14b097654170fa SHA512 032acc8722c09ff98d8a24e355eaa2962e97f11ec990029198b123f568d7680b0e8416c1cac716faf4c08e08968cb10fa046869df7ee35f396ba691fc4c20cfc
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
index a597d3f5fcd7..98224af8242b 100644
--- a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86 ~m68k-mint"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~m68k-mint"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 445d82e68f28..b416f5805f1d 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -1,4 +1,3 @@
-AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2bb2d19b5a588d566522e4829896c0f3862fd396d23f731da186e7a9ad369af00a0dbcb7c8b2e3cfbbeb SHA512 180c3390001a6bb49deef4f459d42fd7141a5cf68a7077cfe3b5b1384f7b40911f9e4d871ffce07f51b347deb2c2568c266c5a5d1d113010090cd4f65eebeb6e
 DIST ninja-1.8.2.g3bbbe.kitware.dyndep-1.jobserver-1.tar.gz 203848 BLAKE2B a6002abcfe4003dd5c9ccb8fd504b98736a6bc249323ca7afabc042a5091b9e7f0c0c19853cd7a270e00b0825ea14a7ba47c1b35d15f725c7b4866de1a79c07a SHA512 74f42181a2a712653450b0ab7ce5ad93b5ec010f4ab8411c732f682be5a6a991a7481ae1649ad70a7b903c45427b1e238b001aef29702f0896a1ae393ee22bec
 DIST ninja-1.8.2.g81279.kitware.dyndep-1.jobserver-1.tar.gz 204539 BLAKE2B cee66a5d6ad7fd1254e68cf7be1e97eb796ec3103bdb9e869dc66757a96ce1d6e946018aa048855e70d6a3698ae609f75740809a8e9183057da16769f07e1fa6 SHA512 ae5f9c4c76114cabc4ec06056edccfa4027d514c4ae0f3ab08bbcd3ce2322e9ff08b8f90fe69fab989707adb6ecc78f226b65e223b41535aa5c0db5b6c61117a
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
diff --git a/dev-util/ninja/files/ninja-uclibc.patch b/dev-util/ninja/files/ninja-uclibc.patch
deleted file mode 100644
index e87eea842722..000000000000
--- a/dev-util/ninja/files/ninja-uclibc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/util.cc b/src/util.cc
-index e31fd1f..1caa1ce 100644
---- a/src/util.cc
-+++ b/src/util.cc
-@@ -585,6 +585,13 @@ double GetLoadAverage() {
-   // Calculation taken from comment in libperfstats.h
-   return double(cpu_stats.loadavg[0]) / double(1 << SBITS);
- }
-+#elif defined(__UCLIBC__)
-+double GetLoadAverage() {
-+  struct sysinfo si;
-+  if (sysinfo(&si) != 0)
-+    return -0.0f;
-+  return 1.0 / (1 << SI_LOAD_SHIFT) * si.loads[0];
-+}
- #else
- double GetLoadAverage() {
-   double loadavg[3] = { 0.0f, 0.0f, 0.0f };
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index c852641a620d..2d36164a420c 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,3 +1,3 @@
-DIST packer-1.3.4.tar.gz 9071395 BLAKE2B 96b20bd8af31928e67cb5b7897dce5e8b4eca3853f55226f6f477464d547a595b60b500d7bc5ef1fbd60bb4eb1c2eb51ddc1200b64efd3e02ec0de074c9f5594 SHA512 65b59b240fe48bf0cc9ce7492d2c21ac8c19ff0cae44ea35ca0164c6ba28d34322007999a42759042df6eb90525bbd93322197007149c1960bef80508f4c0b70
-EBUILD packer-1.3.4.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
+DIST packer-1.3.5.tar.gz 9198704 BLAKE2B 210c824aa61fed8ab58ea6eed2a1804d8b144e7e20f0794721b2c282d066969d1193fc36b004bb7d31d8a2b19fa609e673d05457653bf8ad694a142563e839cc SHA512 becd747b43c8a9c0aa93d1d723f2e2383e9f2adc19e82653142ea13080aa393750cd3fdf86fa259af21af6b6417bf023e7e482402dfa56d347720fb740ebe906
+EBUILD packer-1.3.5.ebuild 790 BLAKE2B 017172611fb382cf7c9f3f374c404de971d09f68cf44202bf05180fce8255b321132a91e5cfa7d1d7bc517e8b59849e9bed6cdde4db4244eef07993f7f87212c SHA512 4b2aa5d90c965ad271c688565bc1e37cc0e91b7222b8d33a7f6d9fd271e60a5721f31e496df7cb921c0fe3546678fbe9da5cbecaa3609415566a98eea1456a9f
 MISC metadata.xml 1367 BLAKE2B 30b2ebc8ec0449bb63f4bf97431bf841a09ef98dd7bf59064bd3d6ac8ed697d254de3ed940274795fd35e56ebf582a3880b4e0a3063074b7fae04bbcc07396fa SHA512 dfb93bd681962fc8290c886248021e8b281c4b184acba7133824a7c00eb9ca03a378769329469ffbaa1559ff6427988d925acbcd68cbe76518f4052831e2ac2b
diff --git a/dev-util/packer/packer-1.3.4.ebuild b/dev-util/packer/packer-1.3.5.ebuild
index 8cae3f47d007..8cae3f47d007 100644
--- a/dev-util/packer/packer-1.3.4.ebuild
+++ b/dev-util/packer/packer-1.3.5.ebuild
diff --git a/dev-util/perf/Manifest b/dev-util/perf/Manifest
index f07e29d3370b..80eaa194e143 100644
--- a/dev-util/perf/Manifest
+++ b/dev-util/perf/Manifest
@@ -1,4 +1,3 @@
-AUX perf-4.1.5-prefix.patch 1637 BLAKE2B 8fdccb3d6d8f2955118e96edf4990e4d9a172524d49f36d757254dd983733c81f82d3920c21f40b6dd5e4df3d5ec2b799bb163c44dc5340f4128c5560430bb4d SHA512 ff7179d7b06513a83f0909723ad47774c07ad089079f43750c24a1dca685745048bce5ea6b0766e65e48b75b50d5a26866e827a89b0206800769ea2779355d6b
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.20.tar.xz 104257836 BLAKE2B fb52cad2897da319299486fa8c3b9415cd0aee0842dbf353a5b269720dcb902db407bb55dd95a77b212dcb4a488c15363d561f3649d6bd16885561f2466d90b1 SHA512 e282399beea5da539701aed2bc131abd5bc74a970dcd344163e9d295106dfd700180e672ed546ae5e55bc6b9ac95efd5ca1de2039015c1b7a6fc9c01ea6583d4
 DIST patch-4.14.33.xz 905284 BLAKE2B e67bd9a96708aaaf65eb0aa852493b2323c9e237bfcc6fa837f795e481943ead3e2d5005ee72e40fc247df01c50877d9da3848a05aba3c999c3cfb7678cbdbc9 SHA512 5c76be5171709c2df7df7d5a8e8f3d0f7ede47b433da3b0f1710f262c8fcf5cf6c744a96d4336ea397c2c88a5f0a7507a5ab08c7c82f08deeb7a6f887ad77cfd
diff --git a/dev-util/perf/files/perf-4.1.5-prefix.patch b/dev-util/perf/files/perf-4.1.5-prefix.patch
deleted file mode 100644
index 0c4dff011306..000000000000
--- a/dev-util/perf/files/perf-4.1.5-prefix.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-commit 75e84ab906ef8935cff3df3d8929f1bafea81599
-Author: Lukas Wunner <lukas@wunner.de>
-Date:   Thu Jun 18 13:00:32 2015 +0200
-
-    perf tools: Fix build breakage if prefix= is specified
-    
-    Invoking Makefile.perf with prefix= breaks the build since Makefile.perf
-    hands that variable down to Makefile.build where it overrides
-    
-        prefix       := $(subst ./,,$(OUTPUT)$(dir)/)
-    
-    leading to errors like this:
-    
-        No rule to make target '/usrabspath.o', needed by '/usrlibperf-in.o'
-    
-    Signed-off-by: Lukas Wunner <lukas@wunner.de>
-    Acked-by: Jiri Olsa <jolsa@kernel.org>
-    Cc: David Ahern <dsahern@gmail.com>
-    Fixes: c819e2cf2eb6f65d3208d195d7a0edef6108d5
-    Link: http://lkml.kernel.org/r/5582c48a.84a22b0a.a918.5285SMTPIN_ADDED_MISSING@mx.google.com
-    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-
-diff --git a/tools/build/Makefile.build b/tools/build/Makefile.build
-index 10df572..98cfc38 100644
---- a/tools/build/Makefile.build
-+++ b/tools/build/Makefile.build
-@@ -94,12 +94,12 @@ obj-y        := $(patsubst %/, %/$(obj)-in.o, $(obj-y))
- subdir-obj-y := $(filter %/$(obj)-in.o, $(obj-y))
- 
- # '$(OUTPUT)/dir' prefix to all objects
--prefix       := $(subst ./,,$(OUTPUT)$(dir)/)
--obj-y        := $(addprefix $(prefix),$(obj-y))
--subdir-obj-y := $(addprefix $(prefix),$(subdir-obj-y))
-+objprefix    := $(subst ./,,$(OUTPUT)$(dir)/)
-+obj-y        := $(addprefix $(objprefix),$(obj-y))
-+subdir-obj-y := $(addprefix $(objprefix),$(subdir-obj-y))
- 
- # Final '$(obj)-in.o' object
--in-target := $(prefix)$(obj)-in.o
-+in-target := $(objprefix)$(obj)-in.o
- 
- PHONY += $(subdir-y)
- 
diff --git a/dev-util/pkgconf/Manifest b/dev-util/pkgconf/Manifest
index 30bd6f851231..e85f98572f83 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 9dba572b557293d860660c6cd0137ba69ffd99c7e275a72d9d76438443087eccb973d22bb853702919272d3a82177828c04181ee88c05a3a762fcc6905ec2c17 SHA512 26b22644b575785cd1f8a5bd84a81d28872dff8aab1ac463a8872b448f21e8c203db141a8296bb069aa308d748c153eaccb480d3d84f4161d67d623624ef46d0
-EBUILD pkgconf-1.5.4.ebuild 1386 BLAKE2B 7379edc97822d00a0a7d7459da6cf1c6e973f0bcc71087c8fcbc4c000c7b12f747eef9b2897f625210b6f43e4cd4e6ccdb8d87c99780e875d75827e9b2527d08 SHA512 f3d39a6d0dfb99d910cc0bfc7fa43457f99ae4c534cce0c83c7b991af21c4e6b87b3557502082e43f61136d45608632d2b1a2417262c3bfae2c9f7eba0b20a7b
-EBUILD pkgconf-9999.ebuild 1387 BLAKE2B 21aec1964adf22dd313788b30c2f73d59c3f7edfb7c5df550987931bf24a57f875d4d94b156f28fbb83a0891d440a73a0ec339e9e5ec9d3f12ea6b4c9ebe66d0 SHA512 5c01e07320da7402caacdf360a587302797c5adcfcdbea08c4c6d31b1787e5786af6e6e40de0aa5f210de4dbf2a4be882649a9e059f786933f5b154bfedb6491
+EBUILD pkgconf-1.3.7.ebuild 1286 BLAKE2B c0da3d4043a5a8f01ab9cb2c2a89afcf72e810f3e930b37aeb29ad7ec2249e58adc3d57c11a78201ef88bff7d98768b8d569d4022fe55ac4158adeb5da20d3c6 SHA512 a77dc6e3abafd00b9b39861684e145b8a2257029abff868ed08b959aa9d85144718862a8913a784b9d61e959a6ff2afc2ada117df7072df1bb6df36cf4755b4f
+EBUILD pkgconf-1.5.4.ebuild 1386 BLAKE2B 1da361e151e12d92d0693ed8655164a9d3e16ce83b39d3b7422db5fe3691f39d5b6dabc2fe4b786334d53bf0f5b40c1a646dd360ad0c71d244313af9a8a3b7fb SHA512 555614dae9d0bd2fc2aa5b23b25fdaeec01421437745ba74f6a8b70c37fca1c2d40cfba834c039ae966dbf438fbd92012550814b1330ac562e1bdcd7d336de2e
+EBUILD pkgconf-9999.ebuild 1438 BLAKE2B a3c1785865b579242a0b4a95f5298718410bc24af2ef3687847e91510df0ecfa7f294e69e498c027c9fd7298d8e85ce5702e04a6850d37415d7745536f6645ba SHA512 5cedca7911702ec8fac036fa5e7660bdb7368ad126aeb022baf883a7e6091691bded229085518d4d6acae3666bf1594a4df3128806fbc8011323c7035e72d6ba
 MISC metadata.xml 493 BLAKE2B f060e84a29d4939b1a684012d9a99af208682dcb52a2ebb465c05d005dac66b1cb11059226d1a91b2610315e869db8236d10772de6317009bc356638812007fb SHA512 384a9dd73a54ffc33dadb704b6c314f5450d960e6fa3483bfd697579075cc3e9bf4ffd379207b0d7080a15f11b9566c38b7afe0c506a44c111c28339a7d1ce86
diff --git a/dev-util/pkgconf/pkgconf-1.3.7.ebuild b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
index 9e4cdcaa9155..98f940c603c9 100644
--- a/dev-util/pkgconf/pkgconf-1.3.7.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/pkgconf/pkgconf-1.5.4.ebuild b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
index 42b1c0301801..e6192248fe13 100644
--- a/dev-util/pkgconf/pkgconf-1.5.4.ebuild
+++ b/dev-util/pkgconf/pkgconf-1.5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/dev-util/pkgconf/pkgconf-9999.ebuild b/dev-util/pkgconf/pkgconf-9999.ebuild
index 9e8d44de69d1..780b57975a03 100644
--- a/dev-util/pkgconf/pkgconf-9999.ebuild
+++ b/dev-util/pkgconf/pkgconf-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 2012-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,7 @@ 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
 	fi
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index c597147482ae..35cb7aa7565e 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,16 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2018.2.4.tar.gz 260812419 BLAKE2B 2274d8af513535e4c5b3b69619c944f503dd9f2248a43cf3352221b34c40604f409038d85366321e858037e3c9c63dc838c046917c3102a2d536e4aef05c1636 SHA512 aca812b3355552c6a65865385e82c96fbca06f9caa39fd21723710922865f7aeb38de33eb041efb1e3553e161c34de6d8b8ed724d7c91ba16f3a818711ca9468
-DIST pycharm-community-2018.3.1.tar.gz 310702122 BLAKE2B c54153b9529bf03a09d92eb8b139da45bfb047cb1fdeacc9b64f17982edd237ed0633c391c15326ecaed7d9e599b3f87c0a16a2eb1302ceb37dfc1e0329693d0 SHA512 8d1f418bd97d8249481ad63fa699c141e498820698485b74c6f08674e4b0eee6054e9ad1e59260342fd615a5030ed932d1177ed8173ab9cf6026561c10fee9d8
-DIST pycharm-community-2018.3.2.tar.gz 310664794 BLAKE2B 2dd7e59514909da3e319b1d8eb8b3e24e8dc7d67868ffea621b1c3273b6daa32459f09fb2d2e5b94d8044d9c2a0ea55d5940551bfd945e3ed8dabc200bcc2927 SHA512 613c1556dcf86f448cb496cf492ee76636dfef22cc4eb55f57ca1ed91a53f8a78da6455cc6f49becaa6250e136d786c92014e23a4333fbf0a6477a2f1e67a21c
-DIST pycharm-community-2018.3.3.tar.gz 310740450 BLAKE2B 53552c228c81b17833d02a18f21838e768fdce3de8595a32fa832938208520306c1858d1e3ca509671e0412f2ec3b70acdf802a8af38816d91970f0c08b93147 SHA512 f1e774633718361fa623cb9810cd23be5da98f1bdc6cdfb01ef0980aa1163e0dea1e6c4ebbd1496ff903d81fec744f022a7c7854e29302c19d503541565dd1a0
 DIST pycharm-community-2018.3.4.tar.gz 310736836 BLAKE2B 2d43955b4d4299026c3fccd00c42e71b98c314d33857b1f81a84f365efde4b89d29b8c20826a3f89b6dc36fb293d867874edc75d68f5070516a27ccb68034cd2 SHA512 35b133b0db3b7fdbc4f08d0070de5aec8b3f170657c932e5c5c0af2e8c4be8b9e408558a0595794acd73e2ef5085295929b2a11013e6e72b852fead4ce572f60
 DIST pycharm-community-2018.3.5.tar.gz 311914955 BLAKE2B d4e1e2cc19a416d7f5ecc1ee181c0b6a4e29ee3577800f2426ec84a7a16f53992526b1df8e3ccd43ccbdeeb7f6521d579fad41d145ecfd24408d2d18b9b577d6 SHA512 a81c95397388b243a5b548e2b4bc54f1be3fdedd191c33a90f57a53002d90eb462d5fbc69b2fa88ccb35d8521cd1224e4491928e4c1810a2e7429a6ba6050d36
-DIST pycharm-community-2018.3.tar.gz 310642963 BLAKE2B b32f3c9a3c28bc1ee4658c1ef60cbbe2c4775b310512b3a7fd1b28839bf1c69a566198808b128d18cbbe2d987f61d80bcbcc590177b25d8e9c8fce5fb1754d49 SHA512 00121b4ee9daae92d5c389913f4dd9efcd634f9888b21f6bcae10a3a67cc4bc36a5012590e6836224168053521edf5ba848080f4fc1060df04dc4c58cfdd9fff
-EBUILD pycharm-community-2018.2.4.ebuild 1060 BLAKE2B 4f7fcf4d1ee8cffadac3b12f443783e65409292b46da396d9e7ed5de664c4e6af8275c9091e8c141b42e19d761ebac97adb7ae0fe3a76985164e4625bc67ece0 SHA512 b93caf199b4ba30b5cf1c3dd090acb8239dc75e4a9e449a1a7558ec503bbd31b573872dcf84e37ff54650f43f0e93c09939ddd29141e92857414a2760c804868
-EBUILD pycharm-community-2018.3.1.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
-EBUILD pycharm-community-2018.3.2.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
-EBUILD pycharm-community-2018.3.3.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
-EBUILD pycharm-community-2018.3.4.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
+EBUILD pycharm-community-2018.3.4.ebuild 1060 BLAKE2B 6ac3d2db2453ee6199d90e16a1cfebb303e36d85c86907ebe0c1c765b785e30e68c6d2f942e2ab9409b64688215a30b3707a2251d765d75972b921b921e57a5d SHA512 9417eb41e3ee6c142a90abe8363074023927c644c687022dea88a0aa6d35c2d771ec493abd9e0ce8e345eb8e150a969178f09c9d5bca3117a718a96d3a557bcd
 EBUILD pycharm-community-2018.3.5.ebuild 1062 BLAKE2B 87e8bbff2301e59ebf0b2568362321a6fd7b86a95fde5f000ffad5df2010a2b160871fab220f2b4d3ec67e414dba73e47887038017a72b5d1480a989a4a93dbc SHA512 51d7c8514ebf34d136eccbd63e78ecde03318a3bcc8e97e176617e8e1cb5f8008452cb576a609869054553d360e01511bf960047c081a1094d2e1b1e891dc70d
-EBUILD pycharm-community-2018.3.ebuild 1062 BLAKE2B d252071726f4b53218d7ec646a6d50b35bff956a4b0a3a32d6e8366a9d0710098751950048a6051fba9f202a92d4bdb47197d905385e4326818dd42ff79274e3 SHA512 3a37fcb8938cdc3ff63c473ae46dfb07e25f3f63a6fa9de32c93b6962bdda9d56840aa7c6ea9388602d54c6d87cb70cc65424e2acf3f7f9a4f3b9ce5053c0392
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
deleted file mode 100644
index 2f2c58e1dab2..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.2.4.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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-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-2018.3.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.1.ebuild
deleted file mode 100644
index 7a0fdedacc6e..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.3.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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-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-2018.3.2.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.2.ebuild
deleted file mode 100644
index 7a0fdedacc6e..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.3.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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-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-2018.3.3.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild
deleted file mode 100644
index 476b12dea206..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.3.3.ebuild
+++ /dev/null
@@ -1,54 +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-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-2018.3.4.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.4.ebuild
index 476b12dea206..4fdbcc0f9b03 100644
--- a/dev-util/pycharm-community/pycharm-community-2018.3.4.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2018.3.4.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-python/pip"
diff --git a/dev-util/pycharm-community/pycharm-community-2018.3.ebuild b/dev-util/pycharm-community/pycharm-community-2018.3.ebuild
deleted file mode 100644
index 7a0fdedacc6e..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2018.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 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-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
-
-MY_PN=${PN/-community/}
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 668ce7910a26..d0b8349f5967 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,16 +1,6 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2018.2.4.tar.gz 343705704 BLAKE2B 69cb8a57f8daf8d986c201e549bfb68b048a2f78e819aeee000bab836c5a25b50d0d6aa9870f6ff8b35907ba9bd69fef7071d421c74970f68496e4448495d43d SHA512 3bc35cfeb1f1d4b95bbc490bfdb724ab76757a5f819c7acc2cbe85688493a9d8dc57cfa179a424fc24679f2093f55d5417a6859001093d58518a8b330d60f7f4
-DIST pycharm-professional-2018.3.1.tar.gz 397871775 BLAKE2B e9f950125c5c1f355e48e16a8c047751a88c6ee6e4862c6dbb8df12aa3e0e57a3d0d61c2cccb5995f2763e0d99eaaa967c19c884c40a350a7148dae71a66be0c SHA512 9324315f865bce9b379ab9f698eb6e97917aa3cb4ef90612b22d33516c18cfbed9fb806dd9bd4884ead6e7a72e2b481e5636956630ac7da75234ff8ba4975878
-DIST pycharm-professional-2018.3.2.tar.gz 398099987 BLAKE2B 68ec7f409335b5f9f35f623fd962c2f975c6e1fa844b8f142ab3d4604e1e0a1f10c361d95281a414b1e15e60f6dfc0d1b061c1512533d5ce171f0ee34872f538 SHA512 69dd521a44a971f6a5620d879234a7f788ec44a94fd2793df41b8765c5e239ff1d04364172b53750cdc248a945f2f6df02e1b5687c61156286797441ba7fc9e7
-DIST pycharm-professional-2018.3.3.tar.gz 398193313 BLAKE2B 14445d3c3cbd7be865569971d37943caff56a14198c9e81708d692110e4abafdaf10700c842f72f54fe252b2e211b46aa4336f583ae548e0d65ee3ceed4ce95f SHA512 ba8807491a78c0da2e772724c15c9aab6e48383f5407adb98a34d5196e2a1015f52f3eef9fb20c0da9115e3d283ed115663a732fc930cbc2bfc8f63d4ce0af5a
 DIST pycharm-professional-2018.3.4.tar.gz 398325518 BLAKE2B 27ff339d2e8e3db0c94f7a1d8d9e1c740380f62d4b132dc37afb2e1cb4b6ccacdaf29e6caaf25aebd25e650c7a4d1a089b74b3cf1ee8d492722604b11644467a SHA512 34f2461e0af1c18364e7414fe4f92fc34b1c82e17dd2db0c46b812909febb30e9aff26c1c363072f36facb6bbd6d186497fc02b6a7916c808dded63fc7350696
 DIST pycharm-professional-2018.3.5.tar.gz 398296895 BLAKE2B 281fb2c28e556a98e90be37e82fc39d5ed3d50416f1bb519b1a9273880e952faa5a3a85eb1b90928ccb4ad45684fa9be715788ae412b74b4ac287b45bf5458a4 SHA512 2d84368d3058856024f289084d506d92711a369b79d582b9c53b6941514e3089604bac8dc9c5be0a7d15b483bd74e4e1cf2d60cb5f61e3c9755a98091003f42d
-DIST pycharm-professional-2018.3.tar.gz 397608153 BLAKE2B 7130533fb3721d1f573105dec2289091cab23b6438acadda0c62f945e7a9b2a0a55b4d55260e1f472ec77d1fd8dbc9ac9e7f7220ef26424ffbe918874049071e SHA512 0e83fa9117d46a503a3afd790fe2512cf04abc327ff7efdf46e40a24bcd028d6d2033ce56cdb1c4cfd1a8552d7d31af6e97a203c6273a5fd1b79263575fd2ee7
-EBUILD pycharm-professional-2018.2.4.ebuild 1203 BLAKE2B b87a534b51b301a4bce7b3e954daf3637f83708029dd94e2383349e5af411d61fbf6ecbe894b2711a1198e957f7ea8ee4f5fdbd8d61b0ed8df999eb74db7ed3a SHA512 fa3a1e8dc8b969f3b84365200fc6176c6813fa825c692ca6b28743e8b4b653e6efc456013de78463f026099060c74a576d44fe71fff9c6aa57e17410d9577f82
-EBUILD pycharm-professional-2018.3.1.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
-EBUILD pycharm-professional-2018.3.2.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
-EBUILD pycharm-professional-2018.3.3.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
-EBUILD pycharm-professional-2018.3.4.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
+EBUILD pycharm-professional-2018.3.4.ebuild 1203 BLAKE2B ca69d0047d4998c0ce5143b86187f1c04d879857ab738c45783ba8f315ab2434ec659e6400be6265c4983eaf653d9053396c6378e832c45229a431c5085cb2b2 SHA512 c02ed49d3a9616261b0fe5d0868aecb5e5439ee8d5789f7ed1c5c6e4ac33100e957b11b1e674aa2fbefbc61939bd7f466c6ff478dcfe8c7a9a7985bc08fb1d60
 EBUILD pycharm-professional-2018.3.5.ebuild 1205 BLAKE2B fd6883c04a2040f667cd5f4c1dbf6f1579ce69bce8f4becb35fde48f7ec91868b15a3b8a51346d064fa848360c93cfc19655799aee0dade3581f28b7087ba898 SHA512 571ab186725b50eff3e9203f92afc59e6dbbea03f37f9459023d351c4f7bd731b68a05117245b30117d55f75a80579b9ee5539ae27a9ee9fadc86bdcc2b35db9
-EBUILD pycharm-professional-2018.3.ebuild 1205 BLAKE2B c8f578c9898c87644c0f50e07f4466692f8f78cf782d6f25eb2f1c63afb0f232c54b01c2b153ebd7cce9463bbf5d06bcb88bc57ef1f12945b0a026797fff9c1c SHA512 8e64b26728718df1fee377b7c9929240c63df8ad0574d17bd940c3809b014f0b5b272f70c2ad91ddc12652539380415684648d7554f65f80911a8ca3c74818c7
 MISC metadata.xml 243 BLAKE2B cb7dd17733891ded65a8bf58abb3bdbdf30cd714d8dfd0cc9f83c6a53e979dca2cf2b1a31e3dbb2610df6000ef9c774f1840e9f453855c286687649a01984225 SHA512 0d6cf75e47bf075548f8c3e929caad7d6db621737788cbaadcf00e761a6b5ca50341db48171e6a16e905c91bcb9af57f6a98acfbf3d127dcdf84c17a4c4821e8
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild
deleted file mode 100644
index 9dff91df4d89..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.2.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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-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-2018.3.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.1.ebuild
deleted file mode 100644
index 24928072aba2..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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-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-2018.3.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.2.ebuild
deleted file mode 100644
index 24928072aba2..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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-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-2018.3.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild
deleted file mode 100644
index 4b028da13f8f..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.3.ebuild
+++ /dev/null
@@ -1,57 +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-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-2018.3.4.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.4.ebuild
index 4b028da13f8f..994b2eb0c059 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.4.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.3.4.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-python/pip"
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.3.ebuild
deleted file mode 100644
index 24928072aba2..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2018.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 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-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="opt/${PN}/bin/fsnotifier
-	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm
-	opt/${PN}/bin/libyjpagent-linux.so
-	opt/${PN}/bin/libyjpagent-linux64.so"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_prepare() {
-	default
-
-	rm -rf jre || die
-}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 19d4f64e6ac0..2b4367c7c0a7 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,27 +1,13 @@
 AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618
 AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
-AUX scons-3.0.1-respect-cc-etc-r1.patch 3470 BLAKE2B 4302f7f6448541ba76aa1e66a51535603b4ea7a4c47cf9ed59c23d559f32668604a2b7250ef1d7e6c40e34c93d02ac4858bee1f3b7196c8eda05c4cb8fd464b0 SHA512 6154b22c677176d8644a392ad68d63da04a2f3616c6861471b7ea397f4542aba63ee30b1f14e2ad2f183ef78e3ccaf8ddea8c712b46f18da44881b20ea8c1497
 AUX scons-3.0.3-respect-cc-etc-r1.patch 3381 BLAKE2B f7003c4fc7b054dbbfe4f185876470cf04461fd1a408f44bbac2967c9e709e7f16293dcdaf2042bda811610ca65e3007dceb0f8764b7ac2ea7675e901159d097 SHA512 054037a917a8cdc57fbca940a23699bb6ba55554b4753774df7d0b5102e0468ebb770910727f96ade949e69a6db94f2ed60e84061bd3967ff2366724980eb129
 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
-DIST scons-3.0.1-user.html 1121915 BLAKE2B 0ee57d112ba6269a488335e9354723c645e4b06129c26ca64d45923066ad92cf5519fa4933ef74dd5254d5b068b2909290c5c930a4247ebd6a5f1761f683a6e2 SHA512 e49ae91b04509d32f67d17cabb6619ede49c7190d80efcbd1e0bd1992574ea08c7abc892cad26f8b995b0f43bccd099a96ce633d63d6f56aafc442f9aa734aec
-DIST scons-3.0.1-user.pdf 2541376 BLAKE2B 43895501bf8b4a7eda12c5b3b076e6a71e949727224c279ef77671f7d4094245d37b9d8aeca6daa7d043c5513cc0c83e82a06f8a50bb4add4f0d750fce416bac SHA512 9fab1915c96cd32908cbbf123dfb8c97be99ec45df0461fa68ac47706f6bfc51d7ab970a43630e5414b01a8b9d27409e356b57c134478cec13f1bcbd97f615e7
-DIST scons-3.0.1.gh.tar.gz 5481813 BLAKE2B 750668bf034ff48f635db0395fc4fc950a7148c315099738da4d96f346d025b7dd3849e376d566e5f55793ee0b901ad8a4d7ff661068420f085ab76404ca244c SHA512 092a5d88191e4c9deee2e14371745fad1c3beee746f55256729444ad56a141a28f45ebeef4b2a7ec37344048ff16864d85b978855c0285a14b7c6f46f91158ac
-DIST scons-3.0.1.tar.gz 634815 BLAKE2B f5bacec048969d592697bc3dfb44678c25a92982f7ba81f9951e73532e8b9ac0906fe72c979d7818db5ab9b2c6dd380df21d323e47ea4cc0db646d6eed4b7d94 SHA512 b7be40ba507366cc678f31b910553cadaf59781c3a91833a34acbd29d9cad0cda38f6753034bf92c3af55d1e0c2f72aba5d81f1ec67205d0345b005d286f7084
-DIST scons-3.0.3-user.html 1131439 BLAKE2B d1755cd462f7e6aad51c6289bd3137c0ae67fd145f3c6fe19a19ad49c793351f9dffaaef7a42f42922f2535aa384f0ce9c23a18070f3a22897a210ac44cdb1af SHA512 48dae93d14928bea3ac17731f7e379a1a907059d75fd7979af02c1442b80cba0bd2c93e3fde4e5220261b3e4afd70f323ecef991dc0ec7b9694e08b11048b932
-DIST scons-3.0.3-user.pdf 2545890 BLAKE2B c68c173e62c4a42e01d87f749556ebe1ce4b6f2c3e96e8b87825aefac30b59ad9642977c35441172e1453ffbee1812a383d7bfc24112e4562f5f24a1defc6ae2 SHA512 75da4a0870c9ef860ad1789f9a229b94affe35efd228c450d842a88090279dcfd9ae93b05df366a3d43da27c2e44ee36ae702013b9d4fe2e78db895a7892f182
-DIST scons-3.0.3.gh.tar.gz 5497106 BLAKE2B 5bf6b2eaf59200b8eeb19eeb9f4ceda6b9b6bf32561f220565617dc08c9094687ec5200eeb2e182f89d01647d5d6638d0ac742a4bd297cb4f781578707f63a83 SHA512 594c1c4c48a3c48418e2b3945fe17af96ff29d435704e8b6cbb85406cd38109d0b865cb2f7bbbc733f69ea5e0f283f4b5942a0140dac263725968e62d0c87a2e
-DIST scons-3.0.3.tar.gz 651374 BLAKE2B e095affdcdf75203559f6e1c9a94ec4ab29c5d8e84354d1ed04bd4b64f7cb14ca1916ed576eb0d180c4e871878b98072e923dd84ce5b8e61ce7fb5ab3747773b SHA512 a9f52bca2f5d98f9ec3aa6ce0fd05660d573e6738daef2162306c95f19bd95851bd83f44cab4a81187c051491b0f016137e443f70d764149bb00ad03f46f273e
 DIST scons-3.0.4-user.html 1127751 BLAKE2B 5bafa81d075c063cc8c0c4d147fdf7573834e7b0af9099b7b68d7cf3c8872061b7ecc93e7119723eaa9d393e4463744a9e9bd8074ce28d8b518d366a11e4a215 SHA512 f3bc5591b90fb05420b00a110d32921394b867255b3925fab97420b864579702a956237983fb5b0a25d2f6d0268493b0f1819fbcb6f1027cc10ad7b59e2836a3
 DIST scons-3.0.4-user.pdf 2561758 BLAKE2B aefd100912345f399e52d805bc2f01846f0bcdfb31524212e69fb41713c193a233a30dcea9133e35001a145ce62b84c648b6d57856c0d5dfa019974546cb4d82 SHA512 03b9e1e8b60ca07986956f1e5c63d56573222ea303bed1976167239b4e9ad73056776a80c7fe2529987aa90856c35bc1c858d1a445f34e7964b675e700845e71
 DIST scons-3.0.4.gh.tar.gz 5500498 BLAKE2B 2157141d70f0f6d80606a0d53e0b6b99f72ac6d5f8b63e8825c1f484eb5c92979b50e897d2aadc2b201ee6f06a0d1df00ab272b96cc303c34f75124123f40a90 SHA512 d57924f0e7713ec2e5d7159fbf0078947aa5ce49f7cdf7a4ea47c19efbce7ec335a5e5448e200240be1095655c5c25f1466285f0bed5bdadeb2673845b23c4f5
 DIST scons-3.0.4.tar.gz 652334 BLAKE2B 742909dcc598780c7ca7884c2403d9fa0cab44228c6597975157148f460dadf789d3c6aaa36125815ea8fc5ba70538ede56542cbecc656c2918341e2827657b3 SHA512 064a604939460fa85aa247776e5a2083ce98cac5f49f6035886d207f5cf167255756ee10cc00dd8228278d0d1efbed2afd8793bf3ca736a3ac970fabc3c4b627
 EBUILD scons-2.5.1.ebuild 1591 BLAKE2B 5a370c069a841b45cb9d7ec214c66312f5b3f9febcb953fd466662c5e70b866a1f48c70adacc7d9a43f11bcb8c07cb7d18a7f3dde80843460812742d982b108a SHA512 a08e399a4b43143f13b13d4731e839039dbc1b53482078b990d67f06c65a481f4eca889616fb5fccbc9fccd6c1703f307af5b8a010466039ec149eca5c7fa309
-EBUILD scons-3.0.1-r1.ebuild 1956 BLAKE2B 755a5cc59f7c791246113db9fca9ca453e890b6a44f8f6d7683e11ca8d204b3889a8e7fd024cf142b8629a3127b13ebe3c2c75f47cb18621bae552216d8849ce SHA512 6a3132dc13e48512c65e863fd7dc04e64b910fddc39debd6b73bcc3fad1ea82e9c662286a729c0643e02f5a906a793701e5b770a42be27ec504df9244052ec09
-EBUILD scons-3.0.1-r100.ebuild 2067 BLAKE2B dda32803f5b3d437cda566e7ba6c82ae175e8fecaf5314d557a3541269cf4cd3ec40b8ce684851579b1398f27b05d0afb8e1603c1b0687800ef09cdd0389641d SHA512 3a9c18f5fd65b8f18a1fe64f708b52201ccb42d9da5fedcb8ba12ea319856849f6e17c4b062d68556f1a033d11c0bdb31109c1dea0072b0d7c028b8fe0453312
-EBUILD scons-3.0.1-r3.ebuild 2055 BLAKE2B cb8d960fa29ac78b63c8a206738b849340dc5c767ad025142d2b2d6886f9e34560ed2d7ab776b761665ca3b960fb4b577ce6bdfbf0497bddf2d6b8231924dc90 SHA512 c0bff0c0657432ab736bd25eb46cbd5662f006d42602281c66a2b4032e776e8c630dac727c271766fb2ed1cd27f4ca7952e653ee09e81209fb6df2a97d0c0ad9
-EBUILD scons-3.0.1.ebuild 1738 BLAKE2B eb1430c2c64fe79b36cf776b1df482726982e7b871393e5f1e829e2e5e02c21a1db129248121435b97bd8288f4aed5cbde3a0f167041d8a0c26fe86575903062 SHA512 1454bc63720c78d58362ae72d311d3fd4b81ef8b01900cb36f6cda2aab235d06a4fb6c2631927ac4efcee0fc761c6a672a925bda248a7def5d49b43529d042d8
-EBUILD scons-3.0.3.ebuild 2092 BLAKE2B 40a899fc2889669146e1bdfa5a93e3625c2afb639b8c5d7d2627312b34b3be085c7299b63a82c26a6b4de6a2d89bf3387f9e9d21efc5305b4dfb1a89c97065a9 SHA512 32b0c21d3e3f202df7d3a268d91bd8e945e7a6badbad6529366f3f82846fcc19fdd7b74dc85c587310727a9cb62c06ee93165a4c7a95a854647a8ca2dfcf4fb6
-EBUILD scons-3.0.4.ebuild 2092 BLAKE2B 40a899fc2889669146e1bdfa5a93e3625c2afb639b8c5d7d2627312b34b3be085c7299b63a82c26a6b4de6a2d89bf3387f9e9d21efc5305b4dfb1a89c97065a9 SHA512 32b0c21d3e3f202df7d3a268d91bd8e945e7a6badbad6529366f3f82846fcc19fdd7b74dc85c587310727a9cb62c06ee93165a4c7a95a854647a8ca2dfcf4fb6
+EBUILD scons-3.0.4.ebuild 2088 BLAKE2B 987963a902a594266fa6a1da0e2e06f96b439da4ac05b36243a1b02d5f66ad92951cbb0497a41f6bbd9f6d36cf504c8b2e97529c59151584618f8b2813ce614c SHA512 37fbbe605dea48e5d60a29260c26a6040c25ecb19784f631a3f46e68fbe2c9da74ffd66eefa7ea7413c02d6724dcf462ba1046ff62ac1023c927996987648ad6
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch b/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
deleted file mode 100644
index 748646b14f10..000000000000
--- a/dev-util/scons/files/scons-3.0.1-respect-cc-etc-r1.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 68fc19b7fd6b65ab850e4fd8ef5e85c672989f92 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 May 2018 08:01:08 +0200
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
-
----
- src/engine/SCons/Platform/posix.py | 20 ++++++++++++++++++++
- src/engine/SCons/Tool/cc.py        |  3 ++-
- src/engine/SCons/Tool/cxx.py       |  3 ++-
- src/engine/SCons/Tool/link.py      |  3 ++-
- 4 files changed, 26 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index af34650c..5533c87c 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -93,6 +93,26 @@ def generate(env):
-         if 'ENV' in env:
-             new_env.update(env['ENV'])
-         env['ENV'] = new_env
-+
-+        # Furthermore, force common compiler/linker variables as well
-+        envvar_mapping = {
-+            'AR': 'AR',
-+            'AS': 'AS',
-+            'ASFLAGS': 'ASFLAGS',
-+            'CC': 'CC',
-+            'CXX': 'CXX',
-+            'CFLAGS': 'CFLAGS',
-+            'CXXFLAGS': 'CXXFLAGS',
-+            'CPPFLAGS': 'CPPFLAGS',
-+            'LDFLAGS': 'LINKFLAGS',
-+        }
-+
-+        for envvar, toolvar in envvar_mapping.items():
-+            if toolvar not in env and envvar in env['ENV']:
-+                val = env['ENV'][envvar]
-+                if toolvar.endswith('FLAGS'):
-+                    val = SCons.Util.CLVar(val)
-+                env[toolvar] = val
-     else:
-         if 'ENV' not in env:
-             env['ENV']        = {}
-diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
-index 590ec5fd..5f9229a0 100644
---- a/src/engine/SCons/Tool/cc.py
-+++ b/src/engine/SCons/Tool/cc.py
-@@ -80,7 +80,8 @@ def generate(env):
- 
-     if 'CC' not in env:
-         env['CC']    = env.Detect(compilers) or compilers[0]
--    env['CFLAGS']    = SCons.Util.CLVar('')
-+    if 'CFLAGS' not in env:
-+        env['CFLAGS'] = SCons.Util.CLVar('')
-     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCC']      = '$CC'
-     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
-diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
-index 430851c8..ca5ab563 100644
---- a/src/engine/SCons/Tool/cxx.py
-+++ b/src/engine/SCons/Tool/cxx.py
-@@ -74,7 +74,8 @@ def generate(env):
- 
-     if 'CXX' not in env:
-         env['CXX']    = env.Detect(compilers) or compilers[0]
--    env['CXXFLAGS']   = SCons.Util.CLVar('')
-+    if 'CXXFLAGS' not in env:
-+        env['CXXFLAGS'] = SCons.Util.CLVar('')
-     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCXX']      = '$CXX'
-     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
-index 07e92507..614d1779 100644
---- a/src/engine/SCons/Tool/link.py
-+++ b/src/engine/SCons/Tool/link.py
-@@ -292,7 +292,8 @@ def generate(env):
-     env.Append(SHLIBEMITTER = [shlib_emitter])
-     env['SMARTLINK']   = smart_link
-     env['LINK']        = "$SMARTLINK"
--    env['LINKFLAGS']   = SCons.Util.CLVar('')
-+    if 'LINKFLAGS' not in env:
-+        env['LINKFLAGS'] = SCons.Util.CLVar('')
-     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
-     env['LINKCOM']     = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
-     env['LIBDIRPREFIX']='-L'
--- 
-2.17.0
-
diff --git a/dev-util/scons/scons-3.0.1-r1.ebuild b/dev-util/scons/scons-3.0.1-r1.ebuild
deleted file mode 100644
index 777e651c9dfe..000000000000
--- a/dev-util/scons/scons-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_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"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.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"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || 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() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		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/scons/scons-3.0.1-r100.ebuild b/dev-util/scons/scons-3.0.1-r100.ebuild
deleted file mode 100644
index 0eedf0cbe6de..000000000000
--- a/dev-util/scons/scons-3.0.1-r100.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-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"
-
-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.1-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"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || 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() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		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/scons/scons-3.0.1-r3.ebuild b/dev-util/scons/scons-3.0.1-r3.ebuild
deleted file mode 100644
index 286ff3abba41..000000000000
--- a/dev-util/scons/scons-3.0.1-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_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"
-
-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.1-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"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || 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() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		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/scons/scons-3.0.1.ebuild b/dev-util/scons/scons-3.0.1.ebuild
deleted file mode 100644
index 1a6f2c59360e..000000000000
--- a/dev-util/scons/scons-3.0.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_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 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-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"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || 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() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		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/scons/scons-3.0.3.ebuild b/dev-util/scons/scons-3.0.3.ebuild
deleted file mode 100644
index 7ba0a5a8dbfb..000000000000
--- a/dev-util/scons/scons-3.0.3.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
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-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 )"
-
-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"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || 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() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		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/scons/scons-3.0.4.ebuild b/dev-util/scons/scons-3.0.4.ebuild
index 7ba0a5a8dbfb..480a9f438d1f 100644
--- a/dev-util/scons/scons-3.0.4.ebuild
+++ b/dev-util/scons/scons-3.0.4.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"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 7d0244b53377..3b8f115c202e 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,8 +1,9 @@
+AUX spirv-tools-2019.1-Fix-vertex-instrumentation.patch 4948 BLAKE2B 72df8f60ee84d3b129803e1ac2c2befa59392bd9cde51070155798f12e3d72bb5de0bfb93117599f315e6f106c6f9852dbad4d1ce0d9b4f3831a5af3844ef0c6 SHA512 9f1fe685e9205e848cc931802c003529b885c1f409a12e6bf118269a3073be8535ab3431cfcea9d89e8d78b55205795861d47e94f9728153541efe9354564003
 DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
 DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
 DIST spirv-tools-2019.1.tar.gz 1493682 BLAKE2B 823b6435fd59a732075073bcecfbfa3081248a2fff21a1375502b812b30a1f988bb32afc41d2f6a6244b4bf37aa9fee2fab710f2cf6d051170e3622d8adf632f SHA512 c528046e1495d58ff0aca773b3b8fa091f943414853cf0344d8e690d868e0df5b1aa66bddbab245c5e52cc2fbaf0a2032a3be518fb8ada7f89b8023fa89776b4
 EBUILD spirv-tools-2018.4.ebuild 1034 BLAKE2B 891188fa617878fd86b7847dc32cefeb69801fa89594763b212891018bd0e251fb64401fed9a4520ab82685843916f3b1f4f94017937fc1adaad4bf8bd847bc5 SHA512 78784487fe26c9a5562d8d7aff69b45e40c13b3850319b1f45b48ab84bfdb1ce90ebab3edcc112935bc3a64b63603e8505c2fc3ee7393d5541c2bc2587c51b0d
 EBUILD spirv-tools-2018.5.ebuild 1033 BLAKE2B 43041e0dcf349d1626cf0e247d9078870291527663cf5a689e2a77cf0b5d1b02007534a1a56f7d13fcb39c11c81ad10b92aac7e69db0105f85fae9675c316219 SHA512 06c008fcaf213eddabcd0a507a97219a711c2cc9d0c0b6994a2b8f096894266229732c18625b8d14e5b3f885b5078a1348f496321d08faccfc7ee1cfb3929344
-EBUILD spirv-tools-2019.1.ebuild 1034 BLAKE2B 05deb016aade08af27d23eaa13f07557294cc8dc51bd287224216f251911dc1c4c38943a2ce99439c5c4530815500edf570e15c4a810fd15978d36a388be9e19 SHA512 8f5fb33de2e5e6585a52f00d2d21ea22646a4a633547d08160bd5fb836035865452709445ff0adcafa9e2e9fa11b747fbc4ae6bb4531622caa4e128110e3b720
+EBUILD spirv-tools-2019.1-r1.ebuild 1106 BLAKE2B 9096aa222071fc43fcbd5288be281c78cba4154691904cfd120cac10084b73eb740743584a1d9a2607d884abe1e12fc2e278b9a25ded8a73fdc0c095576c4cc7 SHA512 9aadb1bff7f14003fb1ff57774ea737379127846cf6ec605f7f1effef2fd2c92b983c9cd06a94ccf2d11f10dab7a71b2253732f8bb60097d5098cd4742856e09
 EBUILD spirv-tools-9999.ebuild 989 BLAKE2B 339235087f10627cde2be63c6183ccd4c8466f495f2027e84be6970a88356aa9da65276969abf792d1adfc201935542e6d96a73dbaefc0e07f190ccd1ad2d00b SHA512 9e54b8ddf9a38a6e5dc6d5250be45cd5fedd80c3035cc71cbbd07d26bf737a36128eadbd644bb6e7bf8331e1ad73b9e6adf5b56cc6702138c8e6bbff8ce47356
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch b/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
new file mode 100644
index 000000000000..4ca2c53969a3
--- /dev/null
+++ b/dev-util/spirv-tools/files/spirv-tools-2019.1-Fix-vertex-instrumentation.patch
@@ -0,0 +1,113 @@
+From 8d2d66f30c5c25029ac029af2bc9c4aa6979e5bc Mon Sep 17 00:00:00 2001
+From: greg-lunarg <greg@lunarg.com>
+Date: Wed, 16 Jan 2019 16:02:07 -0700
+Subject: [PATCH] Fix vertex instrumentation to use VertexIndex and
+ InstanceIndex (#2294)
+
+...instead of VertexId and InstanceId
+---
+ include/spirv-tools/instrument.hpp    |  4 ++--
+ source/opt/instrument_pass.cpp        |  8 ++++----
+ source/opt/ir_context.cpp             |  4 ++--
+ test/opt/inst_bindless_check_test.cpp | 14 +++++++-------
+ 4 files changed, 15 insertions(+), 15 deletions(-)
+
+diff --git a/include/spirv-tools/instrument.hpp b/include/spirv-tools/instrument.hpp
+index 69d1ad259..f8068099c 100644
+--- a/include/spirv-tools/instrument.hpp
++++ b/include/spirv-tools/instrument.hpp
+@@ -75,8 +75,8 @@ static const int kInstCommonOutCnt = 4;
+ // error.
+ //
+ // Vertex Shader Output Record Offsets
+-static const int kInstVertOutVertexId = kInstCommonOutCnt;
+-static const int kInstVertOutInstanceId = kInstCommonOutCnt + 1;
++static const int kInstVertOutVertexIndex = kInstCommonOutCnt;
++static const int kInstVertOutInstanceIndex = kInstCommonOutCnt + 1;
+ 
+ // Frag Shader Output Record Offsets
+ static const int kInstFragOutFragCoordX = kInstCommonOutCnt;
+diff --git a/source/opt/instrument_pass.cpp b/source/opt/instrument_pass.cpp
+index 8ba8ce504..6935a43dc 100644
+--- a/source/opt/instrument_pass.cpp
++++ b/source/opt/instrument_pass.cpp
+@@ -168,10 +168,10 @@ void InstrumentPass::GenStageStreamWriteCode(uint32_t stage_idx,
+   switch (stage_idx) {
+     case SpvExecutionModelVertex: {
+       // Load and store VertexId and InstanceId
+-      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexId),
+-                           kInstVertOutVertexId, base_offset_id, builder);
+-      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceId),
+-                           kInstVertOutInstanceId, base_offset_id, builder);
++      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInVertexIndex),
++                           kInstVertOutVertexIndex, base_offset_id, builder);
++      GenBuiltinOutputCode(context()->GetBuiltinVarId(SpvBuiltInInstanceIndex),
++                           kInstVertOutInstanceIndex, base_offset_id, builder);
+     } break;
+     case SpvExecutionModelGLCompute: {
+       // Load and store GlobalInvocationId. Second word is unused; store zero.
+diff --git a/source/opt/ir_context.cpp b/source/opt/ir_context.cpp
+index a2f207c0c..fe69027f8 100644
+--- a/source/opt/ir_context.cpp
++++ b/source/opt/ir_context.cpp
+@@ -669,8 +669,8 @@ uint32_t IRContext::GetBuiltinVarId(uint32_t builtin) {
+         reg_type = type_mgr->GetRegisteredType(&v4float_ty);
+         break;
+       }
+-      case SpvBuiltInVertexId:
+-      case SpvBuiltInInstanceId:
++      case SpvBuiltInVertexIndex:
++      case SpvBuiltInInstanceIndex:
+       case SpvBuiltInPrimitiveId:
+       case SpvBuiltInInvocationId:
+       case SpvBuiltInGlobalInvocationId: {
+diff --git a/test/opt/inst_bindless_check_test.cpp b/test/opt/inst_bindless_check_test.cpp
+index ddafb3dc2..a426ce04c 100644
+--- a/test/opt/inst_bindless_check_test.cpp
++++ b/test/opt/inst_bindless_check_test.cpp
+@@ -1650,7 +1650,7 @@ OpCapability Sampled1D
+ OpExtension "SPV_KHR_storage_buffer_storage_class"
+ %1 = OpExtInstImport "GLSL.std.450"
+ OpMemoryModel Logical GLSL450
+-OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexID %gl_InstanceID
++OpEntryPoint Vertex %main "main" %_ %coords2D %gl_VertexIndex %gl_InstanceIndex
+ OpSource GLSL 450
+ OpName %main "main"
+ OpName %lod "lod"
+@@ -1684,8 +1684,8 @@ OpMemberDecorate %_struct_61 0 Offset 0
+ OpMemberDecorate %_struct_61 1 Offset 4
+ OpDecorate %63 DescriptorSet 7
+ OpDecorate %63 Binding 0
+-OpDecorate %gl_VertexID BuiltIn VertexId
+-OpDecorate %gl_InstanceID BuiltIn InstanceId
++OpDecorate %gl_VertexIndex BuiltIn VertexIndex
++OpDecorate %gl_InstanceIndex BuiltIn InstanceIndex
+ %void = OpTypeVoid
+ %12 = OpTypeFunction %void
+ %float = OpTypeFloat 32
+@@ -1730,8 +1730,8 @@ OpDecorate %gl_InstanceID BuiltIn InstanceId
+ %uint_2 = OpConstant %uint 2
+ %uint_3 = OpConstant %uint 3
+ %_ptr_Input_uint = OpTypePointer Input %uint
+-%gl_VertexID = OpVariable %_ptr_Input_uint Input
+-%gl_InstanceID = OpVariable %_ptr_Input_uint Input
++%gl_VertexIndex = OpVariable %_ptr_Input_uint Input
++%gl_InstanceIndex = OpVariable %_ptr_Input_uint Input
+ %uint_5 = OpConstant %uint 5
+ %uint_6 = OpConstant %uint 6
+ %uint_7 = OpConstant %uint 7
+@@ -1819,11 +1819,11 @@ OpStore %81 %55
+ %83 = OpIAdd %uint %68 %uint_3
+ %84 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %83
+ OpStore %84 %uint_0
+-%87 = OpLoad %uint %gl_VertexID
++%87 = OpLoad %uint %gl_VertexIndex
+ %88 = OpIAdd %uint %68 %uint_4
+ %89 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %88
+ OpStore %89 %87
+-%91 = OpLoad %uint %gl_InstanceID
++%91 = OpLoad %uint %gl_InstanceIndex
+ %93 = OpIAdd %uint %68 %uint_5
+ %94 = OpAccessChain %_ptr_StorageBuffer_uint %63 %uint_1 %93
+ OpStore %94 %91
+
diff --git a/dev-util/spirv-tools/spirv-tools-2019.1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.1-r1.ebuild
index d59ad889f8bd..3a4de8ee7369 100644
--- a/dev-util/spirv-tools/spirv-tools-2019.1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2019.1-r1.ebuild
@@ -20,6 +20,7 @@ RDEPEND=""
 DEPEND=">=dev-util/spirv-headers-1.3.4_pre20190302"
 EGIT_COMMIT="2297d4a3dfcbfd2a8b4312fab055ae26e3289fd3"
 S="${WORKDIR}/SPIRV-Tools-${PV}"
+PATCHES=( "${FILESDIR}"/${PN}-2019.1-Fix-vertex-instrumentation.patch )
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 3c22fc0cba5a..af77a5137466 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,8 @@
-DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
 DIST strace-4.25.tar.xz 1425268 BLAKE2B 896685589686864316940b8493e481f5e37d1c2f536551f79193bc851d66614816abbc989dbff2b18e38f5bff535315ca732221d520f282227b74a4eab3ebb4f SHA512 1465ef5ebc77cee73ebae5e12c72ff1826f48cdb2b36bdd5116380fac3add73f3ede3ca2694358bfb0c3e3141be5b747b353749130a366c81d05709b2d7bb879
 DIST strace-4.26.tar.xz 1444216 BLAKE2B ea8ff5f863afa29a3a40e8d89ff5c3835c64adf7c34c8957bbe3d99a02998d61714437470293d1759e87c1ceb8ed42564632ef33dd9d5303452ec7505822d1ba SHA512 cce153246802fcdb1547bc11164784066101a2e672e2a264cb742593b559e579aa4bedc749d87fdd1fc2045f4f79b54d419bb50c823074d2cca6f3c75ccf2290
-EBUILD strace-4.23-r1.ebuild 2250 BLAKE2B 646df74a9667e4855d3e116c96710dc5f5dbe4e183be4a7517707d1644d8bbd9f6cbb7414abd1296f7949bbb96eff265b07df8fa7184902362194b8d15e08c29 SHA512 6491184f507bfb9b39e17a30bfcba0f1677d0d9a9aebade5f70b58b94551e46bcd00ea4eeec0e90a473c0ae3dd5547c891ef4b7ea2f178900e8d701dce356765
-EBUILD strace-4.25.ebuild 2290 BLAKE2B 38069f4bb849f47f1367ef3ee8c9ca5a305301fdd793add6d96bdf82d186e3b33081b006ae01c05378acf4f908081fcc7c90d241ba86f9efd700aba3c7270aaf SHA512 ddd1654ab65a55ee789788aa4aeb570fcbcacebf9009e6d39d6cd79cb46128e126c2eab0ddbca67bf48aad0ecf9fd995b8fbe45e8243fbc6cef415a709faac6a
+DIST strace-5.0.tar.xz 1468752 BLAKE2B 3626697ec340728f2703cd5d8a4e8f274184a6b8ef76b1d239ba7a2ec8c76d7dd7e47e6cde6f5edc8e14ae0322e82a6425fb8586d0f1aba709c4d2208a503027 SHA512 cba3280ada27ef434eda54d0e150f04ab89ad227d67b29bd0993f9ac7747eb32b0e49af8cc493b92eab99c0848ec8dc6bbd9b1db423abd53f19129dacbddf265
+EBUILD strace-4.25.ebuild 2288 BLAKE2B e39d94b807ba5ce91458dda8447ae2b755a5a61b0ad651632e7fde3c755dfe7c0737815f6f40a9cd13e0aeffae1fa55c386a0ff9326d25440f04be487f4d7d02 SHA512 8af2410ba171659feb8495c769c7143d29a1c4c39fa1a3de04c4be9b712663089edfb1c3d811a0fd8d2b039e88cc7f71c73155e46c04a1873ff0072bf829a8f2
 EBUILD strace-4.26.ebuild 2301 BLAKE2B e082ebd9683bda40d46e8438ca7d6d3dd533ca5db8882e3e301b2073795bd1067037cf052e434ca002d7f80d0c7c174a67fbd30bf2e9763e3ba2eb88bad68bb5 SHA512 14afc5fc20b55812801485d2cfedc9c49c9b5a8e3855ef08b1bbd7b799f05dd2b35d6714ec9d2af4d5ffbe740bc7f359add9df4d66af2f745809f4ed06a2f2fa
-EBUILD strace-9999.ebuild 2272 BLAKE2B e1f86bbddaacfe0d7c531dd871cd9f0f365d3f02dfce6dee388a4f89b0a5de0963695358ce3716b8c1bba366cd7fa5bff9261524d53975d540be2ad85244139e SHA512 372028d8e3ec29deabee8834187c3730d5fd671caad95246ea09d96030295dd21a4d1085acd6488e8219f0b44a2ef140e46390052eca150031883b233e9f559d
+EBUILD strace-5.0.ebuild 2307 BLAKE2B 8d6eda425278182da95dbef8e55bcb7c589453e564fe265bc8ebae9363eae0d9bb1e38fdabc8767b4a561f1a58584603b3debe904e0ecbbf3a8ea6744f375223 SHA512 b4875ea4ad145e2591c6078ed660c9acf7cdeb938b2a2b9301158c6a8f77e830820f30bd07e2603271544fe565a73926de93f139fc0dbddab9473dcbdc05ae98
+EBUILD strace-9999.ebuild 2307 BLAKE2B 8d6eda425278182da95dbef8e55bcb7c589453e564fe265bc8ebae9363eae0d9bb1e38fdabc8767b4a561f1a58584603b3debe904e0ecbbf3a8ea6744f375223 SHA512 b4875ea4ad145e2591c6078ed660c9acf7cdeb938b2a2b9301158c6a8f77e830820f30bd07e2603271544fe565a73926de93f139fc0dbddab9473dcbdc05ae98
 MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/strace-4.25.ebuild b/dev-util/strace/strace-4.25.ebuild
index d50519061e0d..89d8011c17c8 100644
--- a/dev-util/strace/strace-4.25.ebuild
+++ b/dev-util/strace/strace-4.25.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/strace/strace-4.23-r1.ebuild b/dev-util/strace/strace-5.0.ebuild
index 34d307fd4b9f..e4f979cf0519 100644
--- a/dev-util/strace/strace-4.23-r1.ebuild
+++ b/dev-util/strace/strace-5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
@@ -42,8 +42,8 @@ src_prepare() {
 
 	if [[ ! -e configure ]] ; then
 		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
+		sed /autoreconf/d -i bootstrap || die
+		./bootstrap || die
 		eautoreconf
 		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
 	fi
@@ -69,10 +69,12 @@ src_configure() {
 	done
 
 	# Don't require mpers support on non-multilib systems. #649560
-	econf \
-		--enable-mpers=check \
-		$(use_with unwind libunwind) \
+	local myeconfargs=(
+		--enable-mpers=check
+		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index cf9b88390846..e4f979cf0519 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.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
@@ -69,10 +69,12 @@ src_configure() {
 	done
 
 	# Don't require mpers support on non-multilib systems. #649560
-	econf \
-		--enable-mpers=check \
-		$(use_with unwind libunwind) \
+	local myeconfargs=(
+		--enable-mpers=check
+		$(use_with unwind libunwind)
 		$(use_with elfutils libdw)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_test() {
diff --git a/dev-util/synopsis/Manifest b/dev-util/synopsis/Manifest
index b9ee6b2faad0..4ef3e8190370 100644
--- a/dev-util/synopsis/Manifest
+++ b/dev-util/synopsis/Manifest
@@ -1,4 +1,6 @@
-AUX synopsis-0.12-gcc45.patch 482 BLAKE2B 4c35528e0a6265d14e7de30236d59eae363889909862aec09b03696e209863465e3bff5b608e972c060fbe3844efd904ad6d599261d713cf651c7eee3906e4cc SHA512 bccb0c6975d0763bf29f08de86349cb41aee1843e08201c7cd22455daddda1c9d419ab39ae67348d0566ae681fc1f90f777d3756b10e0fad2f72eee5fc213b9c
+AUX synopsis-0.12-gcc45.patch 486 BLAKE2B 21ecd520052a4836f1ba4a3e2f3df0847c682d052c42a3b5f058cc7f6bbe6fd3fe4e0dc7b6fce6c415edfd07eaba7d6c694688e974ad8cbfaf2a1585ae716819 SHA512 4afc8a63a358980e4f73f6ff8dd68a17bec42ba72938dccfd46228f2667451a7055a91ddcaeeb70e350d2f806ec868b5b011c9893ab681be61051efc02c244c8
+AUX synopsis-0.13-bdwgc-8.patch 1017 BLAKE2B cec979a65c7bbe3aaf4265968df024da9dff107d54b3a8d919d3f392d4f39b346c5e01fa1a943a67d6e734eba76767176ec3e91917a32d983090cc6810b78318 SHA512 9ad8eff9ee3a2a9e7cfeb31ab17aa46cf395be03a38a950fe4a70c8ac1b88852aa0c9dfb2fb5b933ca07a5775230e89ea51e8a32d7019b8f2021c1d117893bea
 DIST synopsis-0.13.tar.gz 10691494 BLAKE2B 8a41505eb77a64bb94b5794fc2a1161e8a23f2e2b3bbf9cebd8216e026a20a56f5036585cc9fc457a6bde980e891861dbf2beffa40ad55ead4e31aa2bb7379e7 SHA512 cdd84f4b9fc8a7b0edaa017e7a332bba06cd4fc804c49b84b1558a84e814e3a8a4b8c5801a8eaf149e6475dbacbb879f04ade57e31d660dfac5e0c83887abd54
+EBUILD synopsis-0.13-r1.ebuild 1296 BLAKE2B 9abf96d35c4759a542c2d5e2e58962b4b0c45d959ace5930a332cc19fbf02d7021877268630c9f7487f0f4432db16b1b66a138fc7cf3d54a9e4755b5f7afadc6 SHA512 41aba6a7e8028c44857889b3aad62caebcb0c8316d0d7682d9da1832adfff4c23dc6fe97c98064a81340ffcdf947c092d0f3633928baff5d844f07486c4e0a84
 EBUILD synopsis-0.13.ebuild 1229 BLAKE2B f0dd4e7fa463025d12eddd818c3b128793a2587a00010cf2b013f91dd099eaa32b3f7814fb320e9a8cf23b5fb56a2fb9adb2a6c8d52cf71282cd9a0036141ef6 SHA512 a3467acc11f424adf0e140b1541ece9c0088a507795eb65f84b2e50f2825f211c93ae12c2f73d9d890f289f635ac25bdd86fc8770ae4d37331a8667bb4a601e6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
index ff0fe2be5da8..c0dbdd91dc1d 100644
--- a/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
+++ b/dev-util/synopsis/files/synopsis-0.12-gcc45.patch
@@ -4,8 +4,8 @@ http://bugs.gentoo.org/show_bug.cgi?id=318429
 
 Patch written by Kacper Kowalik <xarthisius.kk@gmail.com>
 
---- Synopsis/Parsers/Cxx/Types.cc
-+++ Synopsis/Parsers/Cxx/Types.cc
+--- a/Synopsis/Parsers/Cxx/Types.cc
++++ b/Synopsis/Parsers/Cxx/Types.cc
 @@ -169,7 +169,7 @@
  // Class Types::FuncPtr
  //
diff --git a/dev-util/synopsis/files/synopsis-0.13-bdwgc-8.patch b/dev-util/synopsis/files/synopsis-0.13-bdwgc-8.patch
new file mode 100644
index 000000000000..5d10b65c60f9
--- /dev/null
+++ b/dev-util/synopsis/files/synopsis-0.13-bdwgc-8.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/679642
+https://github.com/ivmai/bdwgc/issues/268
+
+--- a/src/configure
++++ b/src/configure
+@@ -4046,7 +4046,7 @@ if test "$ac_cv_enable_gc" == "yes"; then
+   GC_BRIDGE=$srcdir/Synopsis/PTree/GC-enabled.tmpl
+   if test -n "$ac_cv_with_gc_prefix"; then
+     CPPFLAGS="$CPPFLAGS -I$ac_cv_with_gc_prefix/include/gc"
+-    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc $LIBS"
++    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc  -lgccpp $LIBS"
+   else
+     GC_CPP="-I\${includedir}/Synopsis/gc/include"
+     GC_LIB="Synopsis/gc/.libs/libgc.a"
+--- a/src/configure.ac
++++ b/src/configure.ac
+@@ -72,7 +72,7 @@ if test "$ac_cv_enable_gc" == "yes"; then
+   GC_BRIDGE=$srcdir/Synopsis/PTree/GC-enabled.tmpl
+   if test -n "$ac_cv_with_gc_prefix"; then
+     CPPFLAGS="$CPPFLAGS -I$ac_cv_with_gc_prefix/include/gc"
+-    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc $LIBS"
++    LIBS="-L$ac_cv_with_gc_prefix/lib -lgc -lgccpp $LIBS"
+   else
+     GC_CPP="-I\${includedir}/Synopsis/gc/include"
+     GC_LIB="Synopsis/gc/.libs/libgc.a"
diff --git a/dev-util/synopsis/synopsis-0.13-r1.ebuild b/dev-util/synopsis/synopsis-0.13-r1.ebuild
new file mode 100644
index 000000000000..9d2b76695a59
--- /dev/null
+++ b/dev-util/synopsis/synopsis-0.13-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_IN_SOURCE_BUILD=1
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 multilib toolchain-funcs
+
+DESCRIPTION="General source code documentation tool"
+HOMEPAGE="http://synopsis.fresco.org/index.html"
+SRC_URI="http://synopsis.fresco.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+COMMON_DEPEND="dev-libs/boehm-gc[cxx]"
+RDEPEND="${COMMON_DEPEND}
+	media-gfx/graphviz"
+DEPEND="${COMMON_DEPEND}
+	${RDEPEND}
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.12-gcc45.patch
+	"${FILESDIR}"/${PN}-0.13-bdwgc-8.patch
+)
+
+pkg_setup() {
+	tc-export CC CXX
+}
+
+python_prepare() {
+	rm -r src/Synopsis/gc || die "failed to remove bundled lib"
+
+	# the distutils script passes its options to a number of
+	# autoconf scripts, to not all of which these options are
+	# relevant. adding this option disables these useless warnings.
+	sed -e "/self.announce(command)/i\        command += ' --disable-option-checking'" \
+		-i Synopsis/dist/command/config.py || die
+}
+
+python_configure() {
+	local mydistutilsargs=(
+		config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-gc-prefix="${EPREFIX}"/usr
+	)
+	esetup.py
+}
diff --git a/dev-util/sysdig/Manifest b/dev-util/sysdig/Manifest
index b9e31029cab3..f3a9142be8fd 100644
--- a/dev-util/sysdig/Manifest
+++ b/dev-util/sysdig/Manifest
@@ -1,5 +1,4 @@
-DIST sysdig-0.24.1.tar.gz 846153 BLAKE2B bc64317e02526d9729c9fb3738f2982f4b425cdb43c64f77944938186cde4ed2d8d2649984efe0055bbaed250b08bda4008272805024e1d8993e17bc93509663 SHA512 a89ce82527b47104161668e134387a04f4a6753adcd881df25410b629603b58fc8f675de6941f4911ad2da42ffbfd46b38f9cc9837c0809c559fee9a739a204a
+AUX sysdig-0.24.2-kernel-5.0.0.patch 1181 BLAKE2B 4d58160740ef2751947148850253add6962049ca7e9036854f9f1800addb9d81a05c815f93a294a418568edf55200aa0f782633cdee4bf9e161b5278e31360c2 SHA512 ff0c365de5213c68ea4cae153d949f97e7abe72c632d5142f06d46b159305076396637723e09b7ce361c7778a60b2c583b02ed8f45fa39c4b5a1989c4b0e3b8e
 DIST sysdig-0.24.2.tar.gz 855317 BLAKE2B d394ac3bd7e405664da2b45d8cfd5d3433e20266a9489f63b7d4c3bb955a60640d13bb33e6dd2057b16b6ce0617afab88cad2ceab58aa50f6b43a64f6a50f45b SHA512 10ec381144733abc2c386f6570d4245ac2c1eec64d0f56800963acbd9cc38eece504f836f1ab0e24224ff44233945c8273b72efc77d7eadce98d7c4fc378740b
-EBUILD sysdig-0.24.1.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
-EBUILD sysdig-0.24.2.ebuild 1933 BLAKE2B 6dcb3dbf1649629690b257ccb9ead1f44eca5783de68d58e133b0a514d1f052d9e1b2af06f6c5323e87b61a31e2aebe87137116cf66e8522bda39376e28c7342 SHA512 dfc4ddeea7c3f4984a878da9f0a039ca2084232083c94526d9d6be7223acee7a846f39690057a5b31b1c88524d5229cbdbe91ba302fb2ec5b9bc66efa54a6a4e
+EBUILD sysdig-0.24.2.ebuild 2070 BLAKE2B 2dbed3d36ddad0c6ba3646440cc2614f458a71aa7893e9495c632796a9173c0fbe82844def70689aece395d2f3826ae9da277c73328d29458cb19e1486a15885 SHA512 0972247a9975339c162c7fde71f4e0ff7811be67665f6e8fb89658327aec179c89564fd223e493a1e3b936cd070e9dfff6cf3d543633b3ab5b805ffb1a60a204
 MISC metadata.xml 507 BLAKE2B 4e19c0d3370019c80eda625ae812a4485139ab8a83285946ebc6ef62abad280beaefaaac29d7a57e14b5ca5448bd9d1c23a8cf6a4f783149633dd09e7ae1465c SHA512 d218731de7acfbbfa3c3043b2d942c00b7f5aff1a020b6dca2019f202be3a5390f44337e04691a0d4641e661f7581f703db5fda3d2a116c0d63fb7d9da25ed06
diff --git a/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
new file mode 100644
index 000000000000..711eb182751e
--- /dev/null
+++ b/dev-util/sysdig/files/sysdig-0.24.2-kernel-5.0.0.patch
@@ -0,0 +1,34 @@
+From 2c8f0263382bf64800faec5fba5cc3e005d9fb1e Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Thu, 31 Jan 2019 10:54:00 +0000
+Subject: [PATCH] Update for change to access_ok in Linux 5.0
+
+Linux 5.0 removed the 1st argument 'type' from the access_ok macro.
+Update the ppm_access_ok() macro to cater for this change for Linux
+5.0
+
+Bug: https://github.com/draios/sysdig/issues/1299
+sysdig-CLA-1.0-signed-off-by: Colin Ian King <colin.king@canonical.com>
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ driver/ppm_events.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/driver/ppm_events.c b/driver/ppm_events.c
+index 717590888..cc3eb98d2 100644
+--- a/driver/ppm_events.c
++++ b/driver/ppm_events.c
+@@ -46,7 +46,11 @@ or GPL2.txt for full copies of the license.
+ #ifdef access_ok_noprefault
+ #define ppm_access_ok access_ok_noprefault
+ #else
+-#define ppm_access_ok access_ok
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0)
++#define ppm_access_ok(type, addr, size)	access_ok(type, addr, size)
++#else
++#define ppm_access_ok(type, addr, size)	access_ok(addr, size)
++#endif
+ #endif
+ 
+ extern bool g_tracers_enabled;
diff --git a/dev-util/sysdig/sysdig-0.24.1.ebuild b/dev-util/sysdig/sysdig-0.24.1.ebuild
deleted file mode 100644
index 3ba452c42e38..000000000000
--- a/dev-util/sysdig/sysdig-0.24.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-: ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-MODULES_OPTIONAL_USE=modules
-inherit linux-mod bash-completion-r1 cmake-utils
-
-DESCRIPTION="A system exploration and troubleshooting tool"
-HOMEPAGE="https://www.sysdig.org/"
-SRC_URI="https://github.com/draios/sysdig/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0
-	modules? ( || ( MIT GPL-2 ) )"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="libressl +modules"
-
-RDEPEND="
-	app-misc/jq:0=
-	dev-cpp/tbb:0=
-	dev-lang/luajit:2=
-	>=dev-libs/jsoncpp-0.6_pre:0=
-	dev-libs/libb64:0=
-	sys-libs/ncurses:0=
-	sys-libs/zlib:0=
-	libressl? ( dev-libs/libressl:0= )
-	!libressl? ( dev-libs/openssl:0= )
-	net-misc/curl:0="
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/os-headers"
-
-# needed for the kernel module
-CONFIG_CHECK="HAVE_SYSCALL_TRACEPOINTS ~TRACEPOINTS"
-
-pkg_pretend() {
-	linux-mod_pkg_setup
-}
-
-pkg_setup() {
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-ggdb::' CMakeLists.txt || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# we will use linux-mod for that
-		-DBUILD_DRIVER=OFF
-		# libscap examples are not installed or really useful
-		-DBUILD_LIBSCAP_EXAMPLES=OFF
-
-		# unbundle the deps
-		-DUSE_BUNDLED_DEPS=OFF
-	)
-
-	cmake-utils_src_configure
-
-	# setup linux-mod ugliness
-	MODULE_NAMES="sysdig-probe(extra:${S}/driver:)"
-	BUILD_PARAMS='KERNELDIR="${KERNEL_DIR}"'
-	BUILD_TARGETS="all"
-
-	if use modules; then
-		cmake-utils_src_make configure_driver
-
-		cp "${BUILD_DIR}"/driver/Makefile.dkms driver/Makefile || die
-	fi
-}
-
-src_compile() {
-	cmake-utils_src_compile
-
-	linux-mod_src_compile
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	linux-mod_src_install
-
-	# remove sources
-	rm -r "${ED%/}"/usr/src || die
-
-	# move bashcomp to the proper location
-	dobashcomp "${ED%/}"/usr/etc/bash_completion.d/sysdig || die
-	rm -r "${ED%/}"/usr/etc || die
-}
diff --git a/dev-util/sysdig/sysdig-0.24.2.ebuild b/dev-util/sysdig/sysdig-0.24.2.ebuild
index 3ba452c42e38..abc1676d9a6a 100644
--- a/dev-util/sysdig/sysdig-0.24.2.ebuild
+++ b/dev-util/sysdig/sysdig-0.24.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -46,6 +46,11 @@ pkg_setup() {
 src_prepare() {
 	sed -i -e 's:-ggdb::' CMakeLists.txt || die
 
+	local PATCHES=(
+		# compatibility with kernel 5.0.0
+		# https://bugs.gentoo.org/680084
+		"${FILESDIR}"/sysdig-0.24.2-kernel-5.0.0.patch
+	)
 	cmake-utils_src_prepare
 }
 
diff --git a/dev-util/sysprof/Manifest b/dev-util/sysprof/Manifest
index 0fc9e52b68c4..b0c2f10f748d 100644
--- a/dev-util/sysprof/Manifest
+++ b/dev-util/sysprof/Manifest
@@ -7,4 +7,4 @@ EBUILD sysprof-3.24.1.ebuild 1762 BLAKE2B 2af5ed24c22b41c66be0e4526b8e1627f12153
 EBUILD sysprof-3.26.1.ebuild 1764 BLAKE2B c3afd518bfb3a05f88c51a4f2f43834ddacaf6ce62701a4ec828623d3adb733a59b4d67f5952f740a72ff261e6a27464bd521fdc941cf83386d1c583c28e8453 SHA512 6c627f3dfb0f5bf32576489b6a03be94c54faf192df73be2fc39fc5bccb98e2c19a99f5d303e1b663e28d2df5348a411d40f633b259f1244e9b63857293db2e3
 EBUILD sysprof-3.28.1.ebuild 2125 BLAKE2B 3b0c90203488837b33015d2048cbd066bf7b0800f1135f04c810885c6d336ee9bab33b0e7e7730e01681a4cea77101b87865e9c85a5c51a85496d408519f80ff SHA512 02a7727f8a58712bf3fc9c91c41a0a5ddedeaa513c69ab9d5a0c5487c10d9afcaa8cbc35065b5d477378c71a919bafbebfe5fc1ce9cba1ed64e072f130c902f8
 EBUILD sysprof-3.30.2.ebuild 2078 BLAKE2B 16e63e53f4669f64be0e1d1d9e1dafbc5d04f65962a3f3e4ddd3015cb87dde0c1f53ea78cea895ccbf222926c05620fd2650149c701e0743326f5d6a88ab5777 SHA512 376ade85ba12c517d755535c16c23181dbe4b8ecb383bdf511d94074b8c09809d791a90a96bd42cadd571af6dd96e3b3005c6c0a8dea8d6d6ece05ef26bf92fd
-MISC metadata.xml 842 BLAKE2B a36dfd049b5a5307006e5189a46fff5b6de8f16fbb8fcaffa8d737895e9864974478c00007b452c350b673fdc735e809ace65fb31d9a7e21c4d4905d9e1d3574 SHA512 cf90f7e7b64c02bb8ca0ec210959c39e004b0c4f6707b2c489ef2a566fd8d62961b902c00deec95f2f762c55d142f5d706a944553cd8e37bcce3d62c9eff8a9d
+MISC metadata.xml 729 BLAKE2B 06e0c5194be5a6241062ee78bad2d2b5d0c58643657b2626c644d9f4aa14880b97340e2c87480a3e23eb297c3c3d08bba74ad45cee4b15d248bd0bb647cc7bac SHA512 4aa6b8b04ba7f008bc5e4de81cfed88efe2714c4330ce3d02433fde3d253063f5a7e17e6384ba2213d0e6421f15875943133d670b6ba5effb739d81914b3f0de
diff --git a/dev-util/sysprof/metadata.xml b/dev-util/sysprof/metadata.xml
index 2f805617ad1a..5ea946de4371 100644
--- a/dev-util/sysprof/metadata.xml
+++ b/dev-util/sysprof/metadata.xml
@@ -5,10 +5,6 @@
 	<email>gnome@gentoo.org</email>
 	<name>Gentoo GNOME Desktop</name>
 </maintainer>
-<maintainer type="person">
-	<email>tetromino@gentoo.org</email>
-	<name>Alexandre Rostovtsev</name>
-</maintainer>
 <longdescription lang="en">
 	Sysprof is a sampling CPU profiler for Linux that profiles the entire system,
 	not just a single application.
diff --git a/dev-util/tinlink/Manifest b/dev-util/tinlink/Manifest
index cb85486fadba..4b54eebcde81 100644
--- a/dev-util/tinlink/Manifest
+++ b/dev-util/tinlink/Manifest
@@ -1,3 +1,3 @@
 DIST tinlink-1.0.0.tar.gz 4726 BLAKE2B 7760043a6ee54ba8d675d3fc7b2edcc0c3ad19f73d228c3b77ca278b6b58668d302e63335ef0fa03e184f2c68b27a5822c898143912bfd1c323bc7f009e88e1f SHA512 30e81ecba9850caaedc6d295d6ae88a24b8799e1ab74158a3f98da17d68dd6b0dd23a7076f887114f695f1023e832225bff8c4c2044dc105763ef47b0111ebef
-EBUILD tinlink-1.0.0.ebuild 584 BLAKE2B 10f7de628bd846f54b999bcc6824cd84f65c3d0bab3ae5b13e2a378cb0ac37526d80505d7087e0469cc640ecc00d7b06241349b45787c3d92736237dab872ec0 SHA512 50c46bc83cf04688822b04eb9c38379eeefd6b6d2a1f7c4f518f0a78a49b2d5a28f3b3d47e36c590bc30849fd3c74cdeb7b8a11b8165b0210a102c5c91a05ee6
+EBUILD tinlink-1.0.0-r1.ebuild 529 BLAKE2B 54e46550e055e24dacc15ef36c1c46b5b262a999886c7405a2ad7014a854498d48c4ee17c803ee34d44895071156d99546819046658e39dba815f96fdb0d66c2 SHA512 6fd3c1178a518009e3716948e72453b51ab815d953d0981b951c5f8a1ada4d6fe646ecd7af785796a415d75d5a47503fbc5cf30e0b424fb6bb5050e1eea0cb0c
 MISC metadata.xml 256 BLAKE2B f970beb47a5cc598eaf22967c64cdb8a46f9dd94a369a636419862c04bc53fe5e1bddc4c2b9cdaf8f038d0de69d5ab8299b62addaeb7e1dfea3846f884357e4e SHA512 eb8e446afc52f5f079733bdaf0db316e97194ba08e3b1370a287db29ea0bd7974bb237dfc67ff22a115538ec830b632b98390a8e59ace9634a89dfa9c02037b5
diff --git a/dev-util/tinlink/tinlink-1.0.0-r1.ebuild b/dev-util/tinlink/tinlink-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..2a2612b009a4
--- /dev/null
+++ b/dev-util/tinlink/tinlink-1.0.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Tool to create very small elf binary from pure binary files"
+HOMEPAGE="http://sed.free.fr/tinlink/"
+SRC_URI="http://sed.free.fr/tinlink/${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+src_prepare() {
+	default
+	rm Makefile || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" tinlink
+}
+
+src_install() {
+	dobin tinlink
+	dodoc AUTHORS README example.asm
+}
diff --git a/dev-util/tinlink/tinlink-1.0.0.ebuild b/dev-util/tinlink/tinlink-1.0.0.ebuild
deleted file mode 100644
index 114a484c3049..000000000000
--- a/dev-util/tinlink/tinlink-1.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit toolchain-funcs
-
-DESCRIPTION="a tool to create very small elf binary from pure binary files"
-HOMEPAGE="http://sed.free.fr/tinlink/"
-SRC_URI="http://sed.free.fr/tinlink/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	rm -f "${S}"/Makefile
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" tinlink || die
-}
-
-src_install() {
-	dobin tinlink || die
-	dodoc AUTHORS README example.asm
-}
diff --git a/dev-util/trace-cmd/Manifest b/dev-util/trace-cmd/Manifest
index 95db1ff37d51..d005d9f9e94a 100644
--- a/dev-util/trace-cmd/Manifest
+++ b/dev-util/trace-cmd/Manifest
@@ -1,10 +1,6 @@
-AUX trace-cmd-2.5.1-makefile.patch 1152 BLAKE2B fc44b06f2d59d2c02ba7c1f9145d06c4b256177cf9cf2f1b9928b2f08d49a719e675a543ffcbdbe5c08e00d9f27eec01052d278d90fedb294296be68d61b1bf4 SHA512 e74742d3c050f9e7bdb566a82a5212e6474b34ee6fc46e9ffa313ad3f2c323f55b63521ec857ae44f39ef168135fcdf733314fb3e04709e51f03ef7aed99c416
 AUX trace-cmd-2.7-makefile.patch 1164 BLAKE2B f3bd1f27d473d9f71eb81cb5d635a798b520a21e25f1bc47f9b78c35c056b74c3644812ee06fb5c49b6cb84d442f2b8a68f230f60da955b1f631e0a2200621cf SHA512 fb96207c85f32d72a28466c9c7c145dea76d39b91fb024cf1d6b8a9dec4f07832d17f1e1d454628ab9535d376ad055fbc5bb00666dcc355aad64fc259a7d2ab2
-DIST trace-cmd-2.5.1.tar.xz 1577148 BLAKE2B 25436354315bcfe886cca26678017846ac95c8f19877bf9fc7ab24ed543406b61516ad56185e78c3a8d79bbbc672419fca468b205f178cdc01baaf0dfd140702 SHA512 2280eefa130a3914c34798f8bd4097a55f7f4fa4632b3d26ee1317bba54625d259ac61c6576dd3051fb2be48fb593fa54a4203d1828b7fec5fd196de00491ea2
-DIST trace-cmd-2.6.tar.xz 1584768 BLAKE2B 42b2b4ac37246d610a2747bf0cb025d0f0ef5954a40c57acb8df8245f71fb516e0c124034b44addfee119ea453f1e732f6a2a73fa5e3bfb18da5ea7e1f920ed5 SHA512 cf479a940825935aa89b282c7a617d56fa5dd1f82e3322a969c4e0a08343ceca16c40058ead5f5878260ce0a003102550808c5475110706580769dffb1897c54
+AUX trace-cmd-2.7-soname.patch 339 BLAKE2B b89d513caa361cfcab00d821e09ae47ce84527add57ce94199262f660f8df5ff436b8ca1d47707d5939c7df760cdfda71c6163d8c4e71ad983328aee5b6f2a20 SHA512 a64a8f6ec1745a1221380b35e779b22d9044df007798eaed5617ea81a391ed0e1baba1f74af9bed280805f748c829b7ca3cc0f7fb773adf791c33373dde3c662
 DIST trace-cmd-v2.7.tar.gz 1865571 BLAKE2B e0df57c78c6505c856381f17cfdecdaa7a4441eee4cfc57af4fff79a0157ca7aa7c76a81428ddf8d9d00d6bb0a5391b99d4bb5f92fadc7e4062a0181facb2cc9 SHA512 e507eb6609f1fd3dddec541e9f69c466f4f3f66c28f0a7f4292615e3984cebaaf42725f3d82b8c625e5c60977d1f9b5e96cce7664b951eb5f99b955cc440efe4
-EBUILD trace-cmd-2.5.1.ebuild 1519 BLAKE2B 85aa750902bd3d6ba16431f78c2ed2a829b3ec03e257a466e91f3a4e824256c32b41ae246dec989abab19fbbe92b4c3cfff14ee443c4262fcb5b1ff388e19a1d SHA512 564125aa45004c07e27a83d2e78fbbfd9670c4079c7d8afc679c9c3445ceca54370bd168dcccbf65101752bfb8a5b9b7f04264f172d7b12be917d1388d2e5c5b
-EBUILD trace-cmd-2.6.ebuild 1500 BLAKE2B 04764f54ccb207b141349af6a3d1c2e976eccb3eb80d24ce929c3964ebf3f9d4aa2a8be034e3f85284c96725de30eb901e999078e070fffe398c9d42b7121167 SHA512 866ac85fd69cac13215ca03f3044bf2214a46c0d711c6e4305acab224e7df6dd8258189a1c11155ab385c76d1592834b5ff79b1a6e8619c8940100c2c91c522d
-EBUILD trace-cmd-2.7.ebuild 1715 BLAKE2B 31e68124a5048736e04d4d69d9b262eecb3baeaf8a4c46da8d2ab7706a6fa490289b42fdf1cb284873823e0657a06ac695f384b7f5eb854d815cd93d8f33c120 SHA512 f2f4cfd9d579b9cc63ecf1a60d3c9eaa0b436a418afdc33e7a8c6b7364ed7d7e2077f04bba7d4ec3486f61e971dc3bfffbcc1b1b57df92aae4732a4fd56e9781
-EBUILD trace-cmd-9999.ebuild 1715 BLAKE2B 31e68124a5048736e04d4d69d9b262eecb3baeaf8a4c46da8d2ab7706a6fa490289b42fdf1cb284873823e0657a06ac695f384b7f5eb854d815cd93d8f33c120 SHA512 f2f4cfd9d579b9cc63ecf1a60d3c9eaa0b436a418afdc33e7a8c6b7364ed7d7e2077f04bba7d4ec3486f61e971dc3bfffbcc1b1b57df92aae4732a4fd56e9781
+EBUILD trace-cmd-2.7-r2.ebuild 1712 BLAKE2B 03502141565b64c9c589e46ac8fa436d6734c120ea5ad15427ee16095d2a84242428aeb81ccf9546a4fe057da06641dc8058327e67283db926c3c1ad6f970397 SHA512 cc968b5d8347869e3503ea3fe696432df1fbd52c77841ea29634ddc447ab7cc74afe908f262d6b27a7f07e4b347bc2cef802de9d2e08082c2bfef88b10207165
+EBUILD trace-cmd-9999.ebuild 1712 BLAKE2B 03502141565b64c9c589e46ac8fa436d6734c120ea5ad15427ee16095d2a84242428aeb81ccf9546a4fe057da06641dc8058327e67283db926c3c1ad6f970397 SHA512 cc968b5d8347869e3503ea3fe696432df1fbd52c77841ea29634ddc447ab7cc74afe908f262d6b27a7f07e4b347bc2cef802de9d2e08082c2bfef88b10207165
 MISC metadata.xml 349 BLAKE2B 1e1c9812f4cfe7bb90e2637dcf21947f2702244cabc78ac2283112af7a51064d5a4732db71aaa360e6f111f5e6e5b8492e04252e84379cd21424113d2779ea71 SHA512 0a6322fba3de56559284a0f1e4abc83791cf089a74cb369d167b30dadaa019353c8eef0e09e91ad84b130f0660c1dfa665e4252987903884029f4d08fe80c552
diff --git a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch b/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
deleted file mode 100644
index ec9fb1774a3a..000000000000
--- a/dev-util/trace-cmd/files/trace-cmd-2.5.1-makefile.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 186e245..9127f23 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,7 @@ plugin_dir = $(HOME)/.trace-cmd/plugins
- python_dir = $(HOME)/.trace-cmd/python
- else
- plugin_dir = $(prefix)/$(libdir)/trace-cmd/plugins
--python_dir = $(prefix)/$(libdir)/trace-cmd/python
-+python_dir ?= $(prefix)/$(libdir)/trace-cmd/python
- PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
- PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
- PLUGIN_DIR_SQ = '$(subst ','\'',$(PLUGIN_DIR))'
-@@ -98,8 +98,11 @@ 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
-+endif # NO_UDIS86
- 
- define BLK_TC_FLUSH_SOURCE
- #include <linux/blktrace_api.h>
-@@ -242,6 +245,7 @@ endif
- # Append required CFLAGS
- override CFLAGS += $(CONFIG_FLAGS) $(INCLUDES) $(PLUGIN_DIR_SQ)
- 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
new file mode 100644
index 000000000000..937f0617a4a4
--- /dev/null
+++ b/dev-util/trace-cmd/files/trace-cmd-2.7-soname.patch
@@ -0,0 +1,13 @@
+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/trace-cmd-2.5.1.ebuild b/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
deleted file mode 100644
index c6acbd767956..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.5.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils toolchain-funcs linux-info python-single-r1
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc gtk python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	gtk? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-	gtk? ( virtual/pkgconfig )
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch
-	epatch_user
-}
-
-src_configure() {
-	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
-
-	if use python; then
-		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
-		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
-	else
-		MAKEOPTS+=" NO_PYTHON=1"
-	fi
-
-	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
-}
-
-src_compile() {
-	emake all_cmd
-	use doc && emake doc
-	use gtk && emake -j1 gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" install_doc
-	use gtk && emake DESTDIR="${D}" install_gui
-}
diff --git a/dev-util/trace-cmd/trace-cmd-2.6.ebuild b/dev-util/trace-cmd/trace-cmd-2.6.ebuild
deleted file mode 100644
index 4187d0fdd2f3..000000000000
--- a/dev-util/trace-cmd/trace-cmd-2.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=(python2_7)
-
-inherit eutils toolchain-funcs linux-info python-single-r1
-
-DESCRIPTION="User-space front-end for Ftrace"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git"
-SRC_URI="mirror://gentoo/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="doc gtk python udis86"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	gtk? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
-DEPEND="${RDEPEND}
-	sys-kernel/linux-headers
-	python? (
-		virtual/pkgconfig
-		dev-lang/swig
-	)
-	gtk? ( virtual/pkgconfig )
-	doc? ( app-text/asciidoc )"
-
-CONFIG_CHECK="
-	~TRACING
-	~FTRACE
-	~BLK_DEV_IO_TRACE"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.1-makefile.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
-
-	if use python; then
-		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
-		MAKEOPTS+=" python_dir=$(python_get_sitedir)/${PN}"
-	else
-		MAKEOPTS+=" NO_PYTHON=1"
-	fi
-
-	use udis86 || MAKEOPTS+=" NO_UDIS86=1"
-}
-
-src_compile() {
-	emake all_cmd
-	use doc && emake doc
-	use gtk && emake -j1 gui
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	use doc && emake DESTDIR="${D}" install_doc
-	use gtk && emake DESTDIR="${D}" install_gui
-}
diff --git a/dev-util/trace-cmd/trace-cmd-2.7.ebuild b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
index edebefd435ba..d38e2e55b21e 100644
--- a/dev-util/trace-cmd/trace-cmd-2.7.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,29 +13,26 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	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="doc gtk python udis86"
+IUSE="+audit doc python udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	gtk? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
+RDEPEND="audit? ( sys-process/audit )
+	python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
 	python? (
 		virtual/pkgconfig
 		dev-lang/swig
 	)
-	gtk? ( virtual/pkgconfig )
+
 	doc? ( app-text/asciidoc )"
 
 CONFIG_CHECK="
@@ -45,6 +42,7 @@ CONFIG_CHECK="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7-makefile.patch
+	"${FILESDIR}"/${PN}-2.7-soname.patch
 )
 
 pkg_setup() {
@@ -53,7 +51,11 @@ pkg_setup() {
 }
 
 src_configure() {
-	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+	MAKEOPTS+=" prefix=/usr
+		libdir=/usr/$(get_libdir)
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		$(usex audit '' '' 'NO_AUDIT=1')"
 
 	if use python; then
 		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
@@ -66,13 +68,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake all_cmd
+	emake V=1 all_cmd libs
 	use doc && emake doc
-	use gtk && emake -j1 gui
+
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" V=1 install install_libs
 	use doc && emake DESTDIR="${D}" install_doc
-	use gtk && emake DESTDIR="${D}" install_gui
+
 }
diff --git a/dev-util/trace-cmd/trace-cmd-9999.ebuild b/dev-util/trace-cmd/trace-cmd-9999.ebuild
index edebefd435ba..d38e2e55b21e 100644
--- a/dev-util/trace-cmd/trace-cmd-9999.ebuild
+++ b/dev-util/trace-cmd/trace-cmd-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,29 +13,26 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git/snapshot/${PN}-v${PV}.tar.gz"
+	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="doc gtk python udis86"
+IUSE="+audit doc python udis86"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	udis86? ( dev-libs/udis86 )
-	gtk? (
-		${PYTHON_DEPS}
-		dev-python/pygtk:2[${PYTHON_USEDEP}]
-	)"
+RDEPEND="audit? ( sys-process/audit )
+	python? ( ${PYTHON_DEPS} )
+	udis86? ( dev-libs/udis86 )"
 DEPEND="${RDEPEND}
 	sys-kernel/linux-headers
 	python? (
 		virtual/pkgconfig
 		dev-lang/swig
 	)
-	gtk? ( virtual/pkgconfig )
+
 	doc? ( app-text/asciidoc )"
 
 CONFIG_CHECK="
@@ -45,6 +42,7 @@ CONFIG_CHECK="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.7-makefile.patch
+	"${FILESDIR}"/${PN}-2.7-soname.patch
 )
 
 pkg_setup() {
@@ -53,7 +51,11 @@ pkg_setup() {
 }
 
 src_configure() {
-	MAKEOPTS+=" prefix=/usr libdir=$(get_libdir) CC=$(tc-getCC) AR=$(tc-getAR)"
+	MAKEOPTS+=" prefix=/usr
+		libdir=/usr/$(get_libdir)
+		CC=$(tc-getCC)
+		AR=$(tc-getAR)
+		$(usex audit '' '' 'NO_AUDIT=1')"
 
 	if use python; then
 		MAKEOPTS+=" PYTHON_VERS=${EPYTHON//python/python-}"
@@ -66,13 +68,13 @@ src_configure() {
 }
 
 src_compile() {
-	emake all_cmd
+	emake V=1 all_cmd libs
 	use doc && emake doc
-	use gtk && emake -j1 gui
+
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" V=1 install install_libs
 	use doc && emake DESTDIR="${D}" install_doc
-	use gtk && emake DESTDIR="${D}" install_gui
+
 }
diff --git a/dev-util/vmtouch/Manifest b/dev-util/vmtouch/Manifest
index d3d8e6bca9d3..3bd44295fe15 100644
--- a/dev-util/vmtouch/Manifest
+++ b/dev-util/vmtouch/Manifest
@@ -1,5 +1,5 @@
 DIST vmtouch-1.3.0.tar.gz 18733 BLAKE2B 558561302f2fc4fd9ba940d766f999bbed0f471ca15b174900457aead0a5c61ff7ea40a0b71e2e471e1613af38d657367282cde21525aa0841cd595824c89d85 SHA512 ddb86b764dffea6c43a2dc5c48dc91fa862c104a2e5ee7beefb45815b60aba14d255936082593cec97534f7231d65f91f23b0cab3f985695af365c34341a8a19
 DIST vmtouch-1.3.1.tar.gz 20311 BLAKE2B 5e54d4d82b6f666ed3077af5a75807f5d69c03a2f55b1f652a32ab373d668c427875cbed3a7b5d23bdfa37e9e65a0c7fe7bb08dd7b63b99927d5641064dd0f1d SHA512 77c4f55c003a03c06e894cc19fae651f4be85ab416d5ba64053580d6daa2ac59be59e8d4a93b243681ef7ead47fe7fb12b2efa3971af33af89c2ab39905ea854
-EBUILD vmtouch-1.3.0.ebuild 649 BLAKE2B 2ddeb42784d5e0809b2628e90623a8c3ce9473ab95cf8e4e766c2b5e85c6a8005b25c94d63f7de3a247f7445478926c3413f39589214791f143bdb6aab233e4e SHA512 264357a3750c59ec8ff4558107702d38d9a2f2a7a1afd16441631446b6be0d17b61f4b445ce884580e82d50b33b5b9a24bef0aa598bd8f641d08dc6c3a8b6af7
-EBUILD vmtouch-1.3.1.ebuild 649 BLAKE2B 21cfcad3dd9e62a0e793dffc4ba9148cd36f74eec3acf8b3e6f71aba17675887d9b8cca0756f0af11596d3d90459fcf808498ecc7c2adb0582da8d174d58bfac SHA512 716452e5832229c9a7d05316d4a439a244f49f35097e3e0899d934d31ca549725b2d839d529e729e986016409639877ab3d7b86e9f5d75eb75f4f03fb6df6ee4
+EBUILD vmtouch-1.3.0.ebuild 650 BLAKE2B c2c22d90b4997cbcff3f1c66c64b8ce4467ed80a0cd148f0ecfa620d0748de396a50d9965230160b07942d5da1a6ba512aeac7d220585418acf608a54db047c1 SHA512 cce5d7e5b5d72d194ef85bb87a4a1135edda0a0cf934e9bc4b49ce1ec99a20fa3b3880ccdb89a7fc51f80131a114c49c592bab1424f369e4f155ce0337eb6b97
+EBUILD vmtouch-1.3.1.ebuild 650 BLAKE2B 93facdebf71d698bd604bdf8004dfcc3c5f81ebf603d80c0e891115dfc9829231678f8b70339abc1e5236fcb6ddecc1913ee5cab0a369ef93c2d09199e62d8fb SHA512 764bdc52ad340230053714d0482f96f77f86ce99ce4bd1f5fc715717792f2c9220b0473a0c7c42e312278b12f7ddeb77bb7a7f579691a2c96f7dc74c5f7cd6dc
 MISC metadata.xml 554 BLAKE2B 461453a6c800b43ef294f3e1f9abf012aca9f09f29431184228ebadfa67fba74b6de87402499260b4f5dfe944e93f431be70547aa96a556fb1cdc242f645155e SHA512 b2ea2c6e314fa0f849ae17461352372b583a5b1f52ce64ea07fda64d21147b649854f54b43788396bf35b91f625389337912f31b80f8428d94fcc44d20896b18
diff --git a/dev-util/vmtouch/vmtouch-1.3.0.ebuild b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
index 0ac4532e6bd7..fa9794273df1 100644
--- a/dev-util/vmtouch/vmtouch-1.3.0.ebuild
+++ b/dev-util/vmtouch/vmtouch-1.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
-HOMEPAGE="http://hoytech.com/vmtouch/"
+HOMEPAGE="https://hoytech.com/vmtouch/"
 SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-util/vmtouch/vmtouch-1.3.1.ebuild b/dev-util/vmtouch/vmtouch-1.3.1.ebuild
index ce4da1de358a..c01b2005e2fe 100644
--- a/dev-util/vmtouch/vmtouch-1.3.1.ebuild
+++ b/dev-util/vmtouch/vmtouch-1.3.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 DESCRIPTION="Virtual Memory Toucher, portable file system cache diagnostics and control"
-HOMEPAGE="http://hoytech.com/vmtouch/"
+HOMEPAGE="https://hoytech.com/vmtouch/"
 SRC_URI="https://github.com/hoytech/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 3c0ab28493b6..7098edb59365 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,7 +1,7 @@
 DIST vulkan-headers-1.1.101.tar.gz 556510 BLAKE2B 12cde0e5fe17e4119ceb87d5e58c0147f128af0a435d8be1c0a9fe862c68c59df6ec1ff77b62b07bba4792c3f70c30f172678e60707dc46a53c4037fbdf40dc3 SHA512 36fc1059a50c8f1f66f2f79c1e8058d26a30a2083b1cb431536b476f8e4a6edbcac56a99a35accd20a6e19471f86940d9dd3dfc9f0940be212b36400bd0ed394
 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 720 BLAKE2B 911e969cd21ba62b1f60c308577fa59dbd8640a4f3f592f6fc7c82e510d6776e923baced37b8f435378f3384356da51bb83ce6bc70a1133874279770c9e39c58 SHA512 6420dc1b7fb3af12ef08cf5cbe463da81d0e0226fda809f6505048298abb776557fb07ee7153d802976610dd356f3df750d8e2177b745ec901b239bab0a292d5
+EBUILD vulkan-headers-1.1.101.ebuild 725 BLAKE2B 28fdcc8886f41fb8b97dec82330e0fb1519879833fd4de71327f5db77492d1211350b6052387d1dcddcd8c6f3c54852a645937b688f2e6c3b2073c4db555c59c SHA512 78d230adfb3df09d2bf9017152156d0a9127c8bc65e21343b45e3f8ee5f4dd7955a6f5b466d102b9e74b708a2f491ddbb830c35c4f6440e65d05892330987ce5
 EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
 EBUILD vulkan-headers-1.1.92.0.ebuild 719 BLAKE2B 96be71fd80089081a6b2f8b1bf2de8a470029654125df7655fbdbd66ac824d411b57f5deca3196b5d18e19b322f3b92227f5bc2a6f99dcda26376b46cbbafd90 SHA512 bd1a2273d4191b60a46811f74073310618933339305aa81bbcce08d9a54880c85fdd18e44ed4f68042fdf76b5455e9bfe27976abaf58c077bf0df671daaa37c2
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
index 04a94c22d5d3..99c8d3e93f79 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.101.ebuild
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 else
 	EGIT_COMMIT="8e2c4cd554b644592a6d904f2c8000ebbd4aa77f"
-	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 f457c3f2c283..de425c4fbf80 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,8 +1,8 @@
 DIST vulkan-tools-1.1.101.tar.gz 351619 BLAKE2B d00a8adc687c6ac513748fd706b7167dd6e929f37ed2315b8c5e7f302976625848e9ad383261e8948adfc6926247676ccec2b6c8143d23343c4022f3a20795db SHA512 e4f5c3236eded7c17f381a9d6cdd20930444c486d0c8c3aaf67f5a46b3787643517e29d3d5d7305e72a60450b0e73daed996a9336a4166ab5241585e85190387
 DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
 DIST vulkan-tools-1.1.92.0.tar.gz 344286 BLAKE2B 2bbf19b458b780f26b5520fa298416cda50c951fd04529da4fdf77b0e2c57d38ca1dd7e9bd08cb14cf9a7eda0b5a58623f7a75e0d421d1511ed50056c2b369ca SHA512 cdca9332b399300b7011c90ab25a8227028009ffade9c587788229175476a000843a340625691a6a7970433961b776d8aab69332a4d3b5a2d89fdc18330302cc
-EBUILD vulkan-tools-1.1.101.ebuild 2200 BLAKE2B 0e9bb2e475a3dda73b3e2f196ee9575accfa54bf483e43a854f9083723fb32b7ace0cc1ca97cff4d3cd30274cdf67cc13ae5990e83e635af0e5263b3e62b004a SHA512 fb5cd9bdd0162d674f141f1ff5f01ea5888e5e03b4f03ded62f78a4f47a26b567a7365f75d0ec3c63e337d9e1447541632660e06816ced904b8b5c82dfb8e059
+EBUILD vulkan-tools-1.1.101.ebuild 2210 BLAKE2B 1f83d32e69d98dfa82afa0914e96bffca4851320746520b14ceb50314aa6c8cf7dfecc8958c74aa3165d385a29641a1d0333accec2fe17895e1329975825f563 SHA512 0800c70453967fcc74caf36be755e5ca63e816096d28ebafccffefb6a87b188b7c5f13a4322cc6d2beb91d1413c3bb4543c07afc0871c0ce56344a8a32f57a16
 EBUILD vulkan-tools-1.1.82.0.ebuild 2570 BLAKE2B 5e4807b5921e8883b183b97f9e0ee093d75fa5b71e4039e608823276db6440cd9e6f2168532762a513115ce6768847f04a3f5a544a0fb0ea88f519a554002d06 SHA512 0dcad5bd9b43b807c1e2622a003cb17de07ac46d0df1fa4510efdddd662e05894d7d379f21ae0aaafc6128f0629e859f2b8c911020371699dea2948e63e1a286
 EBUILD vulkan-tools-1.1.92.0.ebuild 2199 BLAKE2B 0ab17921ca1bdce82e1e506514e1bd0c9cebc9248cc5d1d7fe13b2f6b33c0af94d801d66f2c872e0e6f2678f618e9ff990db3f634971023aa77a2c25d9d05219 SHA512 535d82546f589843880b741df3844ec5b88e25690d8da110379a46d3c79cf74ada8ffdfe7becf86ab465514cbbb0170d533c17cbf5335a5844631b1a4bf63db3
-EBUILD vulkan-tools-9999.ebuild 2200 BLAKE2B d924055938b632919d81de174f0d2ff5afe1fc5af9a357392d4e626efadd01b2e6a900839416d4e6f7566189ec0c7d7e4df23fbdbd73c4ed6c98873ec1dc45f5 SHA512 e0216a51be8082952aa2abcd492fa9144930f2a4c6ac56dcaf737a9ec977df521e736e9965b9ebadb383b169ff4406e576cce380c32a39f485542dc6327ac4e4
+EBUILD vulkan-tools-9999.ebuild 2210 BLAKE2B 313a03c092a3fefda23ec39b5b5449f7a8f3601681f65b37288310e139a3f22a5a678384c4ba4974354b04150ae11cd2482098375bb6889621fe14e15deffb05 SHA512 341043f3fd1c37bf3f8bdfb45026924d511ebb9b11de50be596b8aa09f2abe28eb44751d6b55c790de78fd6ae550973285d5afe6a8a2b222d9730a0b1a941472
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
index 7c544ec45b97..05eddd6d1e94 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.101.ebuild
@@ -26,7 +26,7 @@ IUSE="+cube +vulkaninfo X wayland"
 
 DEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	dev-util/vulkan-headers
+	>=dev-util/vulkan-headers-1.1.101
 	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index e7562a4d6835..0409548ade33 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -26,7 +26,7 @@ IUSE="+cube +vulkaninfo X wayland"
 
 DEPEND="${PYTHON_DEPS}
 	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-	dev-util/vulkan-headers
+	>=dev-util/vulkan-headers-1.1.101
 	media-libs/vulkan-loader:=[${MULTILIB_USEDEP},wayland?,X?]
 	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
 	X? (
author	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-03-19 11:37:34 +0000
commit	b7b97785ebbb2f11d24d14dab8b81ed274f4ce6a (patch)
tree	9fd110f9fc996e8a4213eeda994a8c112491b86d /dev-util
parent	066d27181e9a797ad9f8fc43b49fc9a10ff2f707 (diff)