gentoo resync : 21.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-21 17:50:24 +0100
commit: feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree: b6e5c40ce2abef3da27ed50a023153f475e0ddef /dev-util
parent: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)
112 files changed, 1224 insertions, 1341 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d2244ad2df6a..8b17e3526818 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index c6972bc04207..49266bfea0e7 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -8,6 +8,7 @@ DIST bazel-1.2.0-dist.zip 267514282 BLAKE2B 1c4f9dcf2c18e6880d701dab3de2e880e552
 DIST bazel-1.2.0-rename-gettid-functions.patch 3303 BLAKE2B 75aaed0b8e5fe33910d1b428ad421bbf37cafdc38dc46cbe9d9fe516e957f1dc3a30333c40a6ec3e61580ca908189a8821937ddd28aa9cf119ae237d63c576fb SHA512 0d4dc5c5931ff3a16bb9ac228ec560fc0115444a3d3787f12866e11e8b3833ee8a26cc65c97aa9898c1f7a6c380820d62544d2ed7bed0d6f21aa4293e244eb04
 DIST bazel-1.2.1-dist.zip 267514406 BLAKE2B f9d316ac096f503a2c7fe101b103b88e7f0247f767a8dc28eb8c9d2cd0b6df6fa785f3b187e1a3963e2f9f0ae742a3330e5104e7a8aea75cb9b9e100366a5aca SHA512 bc0e6526bfbb8725a4f2ae95fc88b22229301b64559325fca3bcf5a9bc642cec2b2284eb9a6ce0699f1f910378b89ee23657dbea7928a92cc1900f1f2f405ff3
 DIST bazel-2.0.0-dist.zip 259625808 BLAKE2B 31b62fb3da1f6fc7efc4c3f44521e12f879a1e5b532fe814d8f49c01c511b34cd65df252d6d143fdcd96f72dc94d76249f79be50fc66a459132c030ef0182ca8 SHA512 db609e9d0ee0cdbfb999de850db17907af02dc26e605f4617dfeb2fbac5c30c4c0a9f48c6ba3673ffe8babb5b9e157cc51c32832015b85ed279b6b160506cdae
+DIST bazel-3.2.0-dist.zip 269368916 BLAKE2B 1eb54c42e22432d2c836a87179094563b797744de423468bf9bce1b7b4dbcdce20e033ed03c4cd7ea5026c9e0d971e16202aff09f9c45d91c9fc53af6f0f8802 SHA512 fd8191188ecb49087b2b474bc383b2bb5d131460952be64b8930dc7e573fd14f99f231c4270b88fb4c9537fb94a04588fb580891519d20c7b90d705238f17f81
 EBUILD bazel-0.22.0.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
 EBUILD bazel-0.24.1.ebuild 2881 BLAKE2B 695d96ecc9d2cb3639f65fa4f78b79d3c4baea2855a0b55b7bc416d4de031f38f7d80c68e774299fcf04fbeac313922783c0608e7b9a4b56a495ab51b7ea0932 SHA512 973714e250185a402177c7c73d17eae5eb44cb9267c0d5029bd9d4d252664e5a528e070ee9c9b325693e36b15ba75b86d702938c6a3292cd3dd8eee3da12b8c4
 EBUILD bazel-0.27.2.ebuild 2608 BLAKE2B ceed3c5831778697f11113f5932c9f9cc6a169d16319707ffb57863aed8478e14e0b6fc4481e8b9a4bfb649b259f0556d75d1dd34687202a9488611cf826490d SHA512 07c7ab384e5630f272b373deefc291c75cae01263a1b98e0cca0c323f282370824aa5042474d91b7b319446ee195f321a9f8531918e268a64d0959a993e6723d
@@ -17,4 +18,5 @@ EBUILD bazel-1.2.0-r1.ebuild 2931 BLAKE2B ea152126f1c20d98aaeaa185b66c2894e3cd82
 EBUILD bazel-1.2.0.ebuild 2609 BLAKE2B fcbe18a014bbf3895bdb52600b84df9c644cd33f0ff7fcd9c92ecf026bd0d36a8168d9da135c51467939add01ba6c0f4b661509721a863100d2d46e87e04e279 SHA512 4d13e0dc6a26aec266de20b3fc6310713fd3c232c6e89364a5fd607f3d15f37b4bb6d9dc402a23030942c71c0df0a243799d1dc82e7d3dc841ba1af9f104d37a
 EBUILD bazel-1.2.1.ebuild 2937 BLAKE2B 5371d6b42699c1ba2a33dc9e43d85fb17f02b243da718ff2c0825ca661743f24a8fcf359d0bf3b94f3e47dfd71304226a695de81250effe8629675ea277f60e6 SHA512 8c1f625d496ae7815edce1e1920e01228203183796e72de9973fdd3d84e6be2583f0d0b85bac00163592e1532241a97c89e7218312f8b33bce686930bf30ca0d
 EBUILD bazel-2.0.0.ebuild 2609 BLAKE2B 51ea0ad4c8d1b5e7749f8a8717668a28f534595c4825a53a481973b9163128fd2b7b401528a8413b6e14364ea0823551d87e56d8af3db89efb0e606182d6fec2 SHA512 9c419f99adf78aa95199ba3cdca46f5ba8688dc201f04b47a7d3d097ba28ab062ef97c7912e2eb798a06e650bb90fac3e51d174f771f7253d9ccf7c84493e0f6
+EBUILD bazel-3.2.0.ebuild 2609 BLAKE2B 51ea0ad4c8d1b5e7749f8a8717668a28f534595c4825a53a481973b9163128fd2b7b401528a8413b6e14364ea0823551d87e56d8af3db89efb0e606182d6fec2 SHA512 9c419f99adf78aa95199ba3cdca46f5ba8688dc201f04b47a7d3d097ba28ab062ef97c7912e2eb798a06e650bb90fac3e51d174f771f7253d9ccf7c84493e0f6
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-3.2.0.ebuild b/dev-util/bazel/bazel-3.2.0.ebuild
new file mode 100644
index 000000000000..8963929994ec
--- /dev/null
+++ b/dev-util/bazel/bazel-3.2.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1 java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jdk-1.8:*"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+bazel-get-flags() {
+	local i fs=()
+	for i in ${CFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+	done
+	for i in ${CXXFLAGS}; do
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${CPPFLAGS}; do
+		fs+=( "--copt=${i}" "--host_copt=${i}" )
+		fs+=( "--cxxopt=${i}" "--host_cxxopt=${i}" )
+	done
+	for i in ${LDFLAGS}; do
+		fs+=( "--linkopt=${i}" "--host_linkopt=${i}" )
+	done
+	echo "${fs[*]}"
+}
+
+pkg_setup() {
+	echo ${PATH} | grep -q ccache && \
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel-get-flags) --host_javabase=@local_jdk//:jdk"
+	VERBOSE=yes ./compile.sh || die
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 867575e976dc..b96b6ae30bf2 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -4,12 +4,15 @@ DIST bcc-0.11.0.tar.gz 2611511 BLAKE2B db12e10a3da11b1d3691ca5e0e036f56af4c5765d
 DIST bcc-0.12.0.tar.gz 2627075 BLAKE2B 44c435eaaf6233ad24249cf5da4e778cd31e41573199ded97d1f411c7424128fb11f838c55fa48c692b4d5f267ea594d6cab9992dc76137da1b41453285c98c5 SHA512 db3ea929b1296f4d9d82d2a11e89e11a1c31512d3f7f935475a7613e0128a5cf9441f3138969535ef41de0c0f677c7446f62f1c64575d41a9896e5339f3f112b
 DIST bcc-0.13.0.tar.gz 3928016 BLAKE2B ecaf2dc077a5e0b808ea1d588a89793291ed56de8747e1cb59f0e841b70e4a4f0333e2941ee2b42b5b9a570cd8d4f9941be772e7790186be156e452a416d40bb SHA512 7c82007979814ac11d1dfc81fe8e00d988f518f7fbba3e115851e17500c22eca23b33b84f9053acc10aefda0ee3b80429f8daf1389590c2d3686ee8d7ced72cb
 DIST bcc-0.14.0.tar.gz 4021098 BLAKE2B 2c66c82e14ee7f858f2e4ff8aa158d03c1580686f4023e920f643454283ed26265ec1e122695a308c4e570c369a0f66e6b0a9347fd9046f2eeb6cd4b536e4dc6 SHA512 216033a6944134c9f9b03a254c83236ff49b02c87808d2719a51a5ebe3b2e3f6b283e905cfbbc85084eab60cf8ef89c3135b4e07ddb9bd83348c69f6e49a84b8
+DIST bcc-0.15.0.tar.gz 4056782 BLAKE2B 4ae1ee615111b7fadc29fecc0799e3bd65da4f741c83f86e75b7376dca397ed83e6b159dba149a5e675110a0fae92397c0685085b9691786361cfbedff31d4dd SHA512 d340ff54138cb44f610804edc7c8f7424d7182d81fd48c1e3edc6b45977eca8171b6367242abc4418e1baf2c8d3b53a77d0a408d053f246a0c169ddeeea2a68e
 DIST libbpf-0.0.5.tar.gz 160335 BLAKE2B 2cf4a3e6edc002b3a32f9d08bb22a07863d8f6f90472e9593a9e9a93b08a00f0557d5a59fa841325b947e6f7b129232e7cd1fdc906f45de57b0dbe594548f1c2 SHA512 e42f6cc8f834f2d3cf9138d655bd3727ffffb2693850f7f6409ec4d536336bc5fa479a64eefc802a5915e333677eca843f8f1bd0132589bba10bdc89064eee0c
 DIST libbpf-0.0.6.tar.gz 213791 BLAKE2B 9f0a08cc7bae41f7fa93d5ba2f535f76ce47fe691efb6bac6257b88a5607deb62fa53f59984d83b6070ccd573c902899f7528b376d9acbfd77317659de6ab061 SHA512 1678133d9a2bd1cf13d4d1f9b83bb3f0642de91e3e3c8d785e2993257035573aff39b9a1a457e73d9c4c1c66b6a52544a8ad06ac560766d335428bb3fc421e71
 DIST libbpf-0.0.7.tar.gz 262068 BLAKE2B e77ff25449274881ddb9d32f25cd6ad8988e4524102bd109049ee6cfce3e2753fd99ebe2a080f809a4c5422dbf6b17633e4b0cea156f289bf95b92f8375a273c SHA512 c2cbc869b7e11339deab3152a6e2d0b3bba25da513d18d77fb0a698cbe61d6bd48175a58e7dd7a3695fbf27faf48b4f517ac5d3a3c66c086df2e5d1b73a2595d
 DIST libbpf-0.0.8.tar.gz 262519 BLAKE2B 2a3620c97834cc23e716476b6966c1c65c1c82064b3ba1ae4ab4906ae362a777d9aa7ae40620f9a259fe969a5a897e97c14d97f627f39c47fa28c89abb1efa9a SHA512 1074fb52b7a158e4e2713c4c7083528ccf2d99b899853078f230234ba112071bfa66e174d8800d36516e26d5bf06da44d100a5b2f866d267f62c9308f431220c
+DIST libbpf-0.0.9.tar.gz 273706 BLAKE2B 54dc77a8e415c24e6394877fc9ad54daca78a4e4f4779607e977708e8b88b6d7bb5854b618a808b1758529b9fdd574fc85f5969791a88b9a124cc42b63f7a161 SHA512 597ac41ab1727c48f2c53c9626b482ae7abd558b4c7d237e33206e3292295d5e5c2f56d31063d30caedccdc3fd289c040f718ff9aaaf210920f1b9c4c772660d
 EBUILD bcc-0.11.0.ebuild 1862 BLAKE2B ed50015774cd375e2bbbf7a5be10ddc53c7864314fbb839027952860e25fafd5bcace7a42936ee316db1e18c13082be994a9b1084d94468f8293b1b780dcb978 SHA512 9701b5a605c19d4fe78ccb68477be41aac1b9fbc9990932e25d28b8e074cc528746893dc7fd70d919366d3b94e83d2b45cf806da94e793b683d07f8611b4d09c
 EBUILD bcc-0.12.0-r1.ebuild 1886 BLAKE2B f3879a2437abbfc99b87ad1a3a5c1b8b600a9e0213be90ee17ecba036b76798529de61b159dd7af7ce56000e071d44923f2707d366383c5f6ed228fb78b10858 SHA512 492110b8a4dd64c30bf8d8f5af5dce183976ee31d3ee5652efe61e7734c779b8a08d9334fdb2c4c0aa4a90df71a5a1d5374677eb9c9566ce534ee760b135caf5
 EBUILD bcc-0.13.0.ebuild 1925 BLAKE2B 4cf4fcfd74ca4a941be56ec92c003be585b81105dc0986e0a63cdcafbb0a9c22f7803aded42ff0214338312463019f6ba7938775dcd6538afd80d85a92b0d523 SHA512 69e3e78d7f6ead73c007e821f5ea2a6e3f5244cf716703b763427bb49e89f5012ec0327fdf142dee93b6c9091c572985a8cc3738b6b238e19e9ceef0a4a9e0d6
 EBUILD bcc-0.14.0.ebuild 1968 BLAKE2B 00d8a66ef59c00a518ee27211236327d883972d4d71eeb9906c0fc20e1eb764dccadaf807937b8c15b67fba45c881f04b6cf8ef866bb24817506d39a2b7bd1e4 SHA512 4620985b4d093c7f436f9d9a7e10f5077afff49f21bf4664bb55c8eb41f2dbac8d9b70ccc91ae6d852f8cabe65e0056540894ea1ba7659e7df7aa691fe75170c
+EBUILD bcc-0.15.0.ebuild 1968 BLAKE2B d26398d364cd3737535b7b2edd992f731cacca839f96fc53908321c86eb40d8944b5c4eaf0b337a61076532dee73e9e99b2a856cafbfa90048f2cba5f7ddcf75 SHA512 c45482e2f910d9b1e17c2531530161cb81f9d240b510092c9890c32aeb628a6572dd785eac846758256fe79e4b15f9c307b86cf299f48c788f9cc061c31177b0
 MISC metadata.xml 386 BLAKE2B 73062e6902dd7d7f9afb988cce26a8aa5a66e1252652ae364f2295b0a5e77013eec682b36ab65c93772843ad0ec8c7187cd29d8308a3ba17dbacd1ef193f03ae SHA512 6529fa57011cd17b9892e1b8f05e063ae6314f85665a30881335efa80e9b9238a7b61d1f732316e45496707bf350d03149e7ec5efdf1a0fee6d5a788b58a7e70
diff --git a/dev-util/bcc/bcc-0.15.0.ebuild b/dev-util/bcc/bcc-0.15.0.ebuild
new file mode 100644
index 000000000000..18274e39b788
--- /dev/null
+++ b/dev-util/bcc/bcc-0.15.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit cmake-utils linux-info llvm python-single-r1
+
+EGIT_COMMIT="v${PV}"
+LIBBPF_VER="0.0.9"
+
+DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
+HOMEPAGE="https://iovisor.github.io/bcc/"
+
+# This bundles libbpf, I tried to unbundle it, but I am not good enough
+# with cmake to do it. Patches accepted...
+SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
+	https://github.com/libbpf/libbpf/archive/v${LIBBPF_VER}.tar.gz -> libbpf-${LIBBPF_VER}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="+luajit test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=sys-kernel/linux-headers-4.14
+	>=dev-libs/elfutils-0.166:=
+	<sys-devel/clang-10:=
+	<sys-devel/llvm-10:=[llvm_targets_BPF(+)]
+	luajit? ( dev-lang/luajit )
+	${PYTHON_DEPS}
+"
+DEPEND="${RDEPEND}
+	test? (
+		|| (
+			net-misc/iputils[arping]
+			net-analyzer/arping
+		)
+		net-analyzer/netperf
+		net-misc/iperf:*
+	)
+"
+BDEPEND="
+	dev-util/cmake
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
+
+PATCHES=(
+	"${FILESDIR}/bcc-0.9.0-no-luajit-automagic-dep.patch"
+	"${FILESDIR}/bcc-0.14.0-cmakelists.patch"
+)
+
+# tests need root access
+RESTRICT="test"
+
+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() {
+	LLVM_MAX_SLOT=9 llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	rmdir src/cc/libbpf || die
+	mv "${WORKDIR}"/libbpf-${LIBBPF_VER} src/cc/libbpf || die
+
+	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}"
+	python_optimize
+}
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index a38f9b270ce8..a0cd92a467aa 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,8 +1,11 @@
 AUX 0.19.1-no-libevent.patch 2262 BLAKE2B dc743112a7addd9abd0391cad7fd15d0060cf666c0fe13b6edb0eb065b49cab18099a9c812df560ebb456e57bbab64f65a4e2617fd262fff53e88eca62ec9b53 SHA512 6d8aad17f504b862d5f8f093db6cfa0db294b6f4130fc74116059400ca39833d75454c66b78644713480dfb062484354a1c457dc2e39c9f0ff27b8ccba5539d3
 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
+DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
+DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
 EBUILD bitcoin-tx-0.16.3.ebuild 2427 BLAKE2B c3410c5a84de81fcafedae1236e339f034938e7adf817a4dcdeed76f7ea64cc2c84e529785732de392bca904b34563cd80bf40f755a7f5f4d8afb92fcd97cc4d SHA512 0b277b10e5fd15866a07e06bb33f6f398b6fbf88fd4159ab50b33947f42e88870b67b9fc3e3375cf16dd15fe3828a550cb30067ca03eafcc9aa93fd1ad2bdccf
 EBUILD bitcoin-tx-0.19.1.ebuild 2533 BLAKE2B 88b2dfd6f40edb8e66cd9f92dae8cfb395e21e67cce278694395898079e48a7902f35e3f54d30e0f1fdd729f077da4e5de229f3781fc5e90e6eef7e84c566fc6 SHA512 f9b170301f82cf07436a30bb4ef911af0263c422866dd507673316725084c4f1f4782e8904be2d8d48d564b6bbde27e369a4309eeecddc5744b0864331fb1f54
+EBUILD bitcoin-tx-0.20.0.ebuild 2529 BLAKE2B 3b273c3e025eed28f0415d0864cd735ce34d0a2923cace7b4c2cad1d5ef58479a5e9762cc0912179e0ec1ea30116c04e9ebc605b78242529280ddc4dcdc91ee4 SHA512 77739c8c5e33e6a2afe92fd2c182c8470c7faa0dd907929b641de3a2aeaf0b01a321896302b246ef348a59bc8cb35b91adfce65148e10ac6aed9a5bd60d2d284
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.20.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.20.0.ebuild
new file mode 100644
index 000000000000..0bb0c0386d5d
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.20.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd"
+KNOTS_PV="${PV}.knots20200614"
+KNOTS_P="bitcoin-${KNOTS_PV}"
+
+DESCRIPTION="Command-line Bitcoin transaction tool"
+HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
+SRC_URI="
+	https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz
+	https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>dev-libs/libsecp256k1-0.1_pre20170321:=[recovery]
+	>=dev-libs/univalue-1.0.4:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=sys-devel/autoconf-2.69
+	>=sys-devel/automake-1.13
+"
+
+DOCS=(
+	doc/bips.md
+	doc/release-notes.md
+)
+
+S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}"
+
+pkg_pretend() {
+	if use knots; then
+		elog "You are building ${PN} from Bitcoin Knots."
+		elog "For more information, see:"
+		elog "https://bitcoinknots.org/files/0.20.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
+	else
+		elog "You are building ${PN} from Bitcoin Core."
+		elog "For more information, see:"
+		elog "https://bitcoincore.org/en/2020/06/03/release-${PV}/"
+	fi
+}
+
+src_prepare() {
+	local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/"
+
+	eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch"
+
+	if use knots; then
+		eapply "${knots_patchdir}/${KNOTS_P}.f.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.branding.patch"
+		eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
+	fi
+
+	eapply_user
+
+	echo '#!/bin/true' >share/genbuild.sh || die
+	mkdir -p src/obj || die
+	echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die
+
+	eautoreconf
+	rm -r src/leveldb src/secp256k1 || die
+}
+
+src_configure() {
+	local my_econf=(
+		--disable-asm
+		--without-qtdbus
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-util-wallet
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--disable-fuzz
+		--disable-ccache
+		--disable-static
+		--with-system-libsecp256k1
+		--with-system-univalue
+	)
+	econf "${my_econf[@]}"
+}
+
+src_install() {
+	default
+
+	newbashcomp contrib/${PN}.bash-completion ${PN}
+}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index a3608994559d..83cabc6415ce 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,6 +1,7 @@
 AUX bpftrace-0.10.0-dont-compress-man.patch 722 BLAKE2B 583969e9f4457a49f17f33d984ab2585ec2e6f6976846af4d39084ce41bf334892b0971d1a1571e9495d4a05eea680412899d1fb23a8eb25a9b9cab84c3b101b SHA512 1f588dd589933c2fbb0ca79a5782c542cb137e748a442b9904153f76d142ae117755e1c24acfc50947e6040afbad78f31ef0c181082695f63ebb61b3acbe4b6a
 AUX bpftrace-0.10.0-install-libs.patch 5790 BLAKE2B 93f12b430f8ba5772423fc0350c59d0f43b9de05fbbc03c4ef46c113886b74a330c397122daa6a423f4a6111b1d113679503b06d7e507f23a837dc06a4c662ca SHA512 585b1128e1a7d4cb92a38eb4043ff824179aed5767f9884d54714dbcc5148d95ca1e95b1fadbde520f57be60501d850c217204f7aed1c556ea5924e422c661bd
 AUX bpftrace-0.10.0-llvm-multi.patch 2516 BLAKE2B 354882237ce984c776ae8f4c0c442a3f250b007d11a03d3bc794c69df9405d67ee09e0ae86ff2585ea025e941a246904e80556857e531c1f3fc06befba88c7da SHA512 5a5d6db61da9c1d07991500ab7feeb5aa945d11dc2f6387d7ccb04ff6a07da478d9a1005a79bba8ad04805eadca95fc72ffc3cc1ffc4bca76ea66f08ea56e2a8
+AUX bpftrace-0.10.0-no-bpf_detach_kfunc.patch 379 BLAKE2B cb796b682fa5b4a89d4f7e879e23d7b1fd3a8202b87467dec8cb3abb0b80edaa3b3353bfd56277d2a087541576a0066526110266b961ae36c57c833cb38c46b1 SHA512 be47a1f688f71c49d249a4ce1292e705f0cc5fb0ec73b77c976cde896325cd65423fba9999a5fba2d027230da02c8a8ebc5d2d73f22e46d53b42ae9528a8724d
 AUX bpftrace-0.10_pre20190614-install-libs.patch 4653 BLAKE2B 66229e4b3f7edc345eeac5f833348f7a434ee7f6c830c344b3c357fafec98b8cc8c725cf37ee01802d085cdbf9deb0fa13d9dd72161b230aff589c75b17890a3 SHA512 63f899bd119f86ee6e9bae0c2ef6e657a37a33c700414ea4757353f0637e89ef9ed3dbf1b70414eec1a5c2658451e8be3e7de1941a0796cac621361bcdd14537
 AUX bpftrace-0.9.3-install-libs.patch 5117 BLAKE2B 6cad778dd19ab040f3bd88390329cc49261c83dcc0ff97f9e663d5fb0d55da87d0e4c1efaabbd31b11e383ea0f904fdab8bd7f34fbdd0805abe20d623673c1fc SHA512 0842712b8d32ba4f7bc0767e3748ed4e8517187c9c75d426e1946aacce3a46fd5f7100d4cef0bed655a763d102cfeff160d549065f6b9c6000a7b3f496cb8b87
 AUX bpftrace-0.9.4-install-libs.patch 5481 BLAKE2B 96df784e95fc42e385dc3330d0ea074863a8ba3c3aeb8d7078b29e03708b2e46fccc30f097dbf2c347f0fb4afadee0d2b7cbb038b05a2d81fbd66e4e008302dc SHA512 e74994b020939035fb9a9b646f5572ae3f241f194e7f119c771d5391a651f27ab0733364a4ddcccd7759f5951141e61c4bf019f98a62a820577687109ca50854
@@ -10,7 +11,7 @@ DIST bpftrace-0.10.0.tar.gz 835854 BLAKE2B 623369bb2a2ad8d5eec364afa98bdae3fbe5e
 DIST bpftrace-0.9.2.tar.gz 715019 BLAKE2B 1f20998bd379b91cb46d7e856a5d892e0de7ad6d9f85cb657fcf6a0c879167c0931d28c78e4be98adab349144fe0bc99871cf70556dd1998e5b8f918fa1702e3 SHA512 5c6ee5fec690a907c370ed0bed85906d304215d7f97b99a2cae90453061f522fa6369627c9524a5a24e97c6cbb595a880a2a1b1d71095fffb693a4cef172a6f0
 DIST bpftrace-0.9.3.tar.gz 743506 BLAKE2B d00708bcebaf7f039788dfc52f4a0bb501bb3c52e8b789060f824652b3917ea3950d77dbc7bee04da013f4b552338251bda9781d19a03ec227208b943fded232 SHA512 49b12735fe2fbf4f72d3d0c0372a7a570c7abc92d1f626624d591a863009c8bfabdf86825f133885800c7ea293773651be66e4c792f9cd397f82d250a7af83be
 DIST bpftrace-0.9.4.tar.gz 792253 BLAKE2B d34d390a612825141b86ba14482f06820c88bea76580c53c17d19a6480c0e2a5656531f39b79fbcea4e004ecd3eea36877560f22fac584f36a3dffa1e7fe96c5 SHA512 d2b32235fa81d6f06771df32877388a9105230adfc638b0d0ebf4f11a567246e8514d93c14da9c7008dbacd6b2c4108604fc5a2721ef831efa5c596cbe50b1da
-EBUILD bpftrace-0.10.0-r1.ebuild 1576 BLAKE2B 1c759c8c221b39ba4d22b44805db9bc49d8db79148339220b06ff761284dad5326c26184689051f310e1878280f2ccbbc0fa5f228a4a71020f146a85a47501a7 SHA512 a0a495b1162ed0d33bbe6a6d9e7c47f5e3aa7c29c2e7446eac4e502fdc099d397436735da4f010c544125ca9c10de5db7059ae26098d974c01505d16152e657f
+EBUILD bpftrace-0.10.0-r1.ebuild 1676 BLAKE2B 57af40bbdefcc28fc775f7aadeb2d7213b974b130aa51591076354f1f351ecace66d9c1355c99adab7f5cdcf2e711767d1f045f6e076eef2476055d7a0309bd2 SHA512 42b1eefa65583294af9baf692dcd9d8da5577b4e59cdb202b5d0df25e7746acafeac9888ee2c7eac8bff8974edaf4407c9d07e62e47662a02743fc0de0fbc9e5
 EBUILD bpftrace-0.9.2.ebuild 1402 BLAKE2B 539e79098fd31d8ade5449f53e9b63d4c8b3ecd3e2716eab76f8a7eab00e11480224502369899f68eb839c9cb48cebc1f5fd6d6c231f93a4a16d58e19e973171 SHA512 9021699f98686a48954e39d653797b10d68cc56b284bdc77a58778dec41c20617031b1ccf8e15283a6b630b366856f6ec0d1013c6150709cc37f25d786f289db
 EBUILD bpftrace-0.9.3.ebuild 1391 BLAKE2B db3f13374aeac65bc6bbaccc6ae187c6f601c753d7b426562dad7af055c1c4a32965abd1a4d8100eddf96cc6b5cac8c1d839cbc4c9cd2ba4822f83c23bcb6c2c SHA512 1fc37e191621ba5c63d43e55f772b505eddff423f37d3697061a4a03000a5bbc8086cb5e4df87c98d080317213581058128b4a5a40c807e5034e6786ca8d37ee
 EBUILD bpftrace-0.9.4.ebuild 1487 BLAKE2B 1003d7865410fb246ac9aa58adafa018e3979a331543dffd7fdce772517875043f6602d7d2856aecf7eb76094d7bf6531f9cbd5e3f296c98f8e0e55178c069b7 SHA512 e122a7c9ab7db361447eb3a7ce79b416ede14b0eebe5ea0b507344fd4203f9e0cf9c9375f526494c4ec1f5c4bafc3153a97dc6bc8554001aac3e609f0f7b233e
diff --git a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
index 196615ab2a94..26c1753afef8 100644
--- a/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
+++ b/dev-util/bpftrace/bpftrace-0.10.0-r1.ebuild
@@ -45,6 +45,8 @@ PATCHES=(
 	"${FILESDIR}/bpftrace-0.10.0-install-libs.patch"
 	"${FILESDIR}/bpftrace-0.10.0-dont-compress-man.patch"
 	"${FILESDIR}/bpftrace-0.10.0-llvm-multi.patch"
+	# bpf_detach_kfunc has always been a noop
+	"${FILESDIR}/bpftrace-0.10.0-no-bpf_detach_kfunc.patch"
 )
 
 # lots of fixing needed
diff --git a/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
new file mode 100644
index 000000000000..145fb1c0ca91
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.10.0-no-bpf_detach_kfunc.patch
@@ -0,0 +1,13 @@
+diff --git a/src/attached_probe.cpp b/src/attached_probe.cpp
+index c7e789e..08f657e 100644
+--- a/src/attached_probe.cpp
++++ b/src/attached_probe.cpp
+@@ -116,7 +116,7 @@ void AttachedProbe::attach_kfunc(void)
+ int AttachedProbe::detach_kfunc(void)
+ {
+   close(tracing_fd_);
+-  return bpf_detach_kfunc(progfd_, NULL);
++  return 0;
+ }
+ #else
+ void AttachedProbe::attach_kfunc(void)
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 70add3bebb21..58009c161898 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,5 +1,4 @@
 AUX Add-gentoo-to-the-VERSION_ID-check-exclusion.patch 1137 BLAKE2B 0ced9724aafd4511542248846364011fc022b06016a329225c3203e4e932db0932d60ece526b095b60a30acfce0e700d8bfedaccf8d30c75b3c38a9e85b51814 SHA512 6e774541b8b2b229eb29171f78a46cd93f6c01056d410e0423ca757f5e5b956a4e29bb4a7b0c38d281e3afe126423e65bde8e367657fb663cb01ebc8c6f2c622
-AUX Remove-distro-version-test.patch 804 BLAKE2B a568d6daaa349b4bf02b59c5a7ef88e6c3017e45840dc2f93d8459dea0d11924c92255446fa5f3ef851a38daec1e8140275cfaac6876705e7ec3a5fc6815a49d SHA512 b98005b8a02456d60bdc8085efb4c6fa52386e7b185bf7acefbaf3cd8fe481f87cad68a4d4986f498e35dca1618208032f0a73b04ca0515bbb2703729d3308fe
 AUX buildbot-2.8.0.fakedb.patch 358 BLAKE2B ad4066e76acd5ab17c487c7d56f388fb6d0d4fc147656fb7c3df36519e93a11d1f7f97cfb3c7e16c299d92a83fe71b24bb45d8ffaab106ca8d2b711d8f7802fe SHA512 1a3389cf5de1a43294a5eefe967246fd52d796627b92b2d6ab28de4b3394786945743cf76fbda1699e8291ed639fe2f7616db13b16fb369554798793cb5ecd81
 AUX buildmaster.confd 362 BLAKE2B 72d36c02b825ab26e8d85348c3dc65800e03c8d9439a4ada658764b5f87e83e07eb89b1b5bedc59466135008135733319d8e4a31657c9f3f0c1713d1649ab820 SHA512 5b3e3cc75187d0b44c8e59cdfb605752db20913b025eadc7e673bc7c9c45b33e1a0d19362c0cc0c023cd32255946d510f172090ada9cbf2978f4807de29e2b72
 AUX buildmaster.initd 1654 BLAKE2B baec16ceb91386629cc9ea0b22118dd3dd76ec6f50a1ced00ca246fd8b0e5df96d9ccb75620d4e8a96560f99a3a2ceaf8e113172a9ed4de238dc21c955470bec SHA512 a036559f61bd7d8f5834e9e9cc6bfaa7e8b70a694c6344482449c29c8168a34ecc180c908e7aab6b722e1487c51a53928693c0dcfbfd016622781bcfdb7d5d7b
diff --git a/dev-util/buildbot/files/Remove-distro-version-test.patch b/dev-util/buildbot/files/Remove-distro-version-test.patch
deleted file mode 100644
index c489be25c1c3..000000000000
--- a/dev-util/buildbot/files/Remove-distro-version-test.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From b7201f706f9238d642dfe96da89006b437e3760d Mon Sep 17 00:00:00 2001
-From: Brian Dolbec <bdolbec@gaikai.com>
-Date: Thu, 26 Oct 2017 12:00:37 -0700
-Subject: [PATCH] Remove distro version test
-
----
- buildbot/test/unit/test_buildbot_net_usage_data.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/buildbot/test/unit/test_buildbot_net_usage_data.py b/master/buildbot/test/unit/test_buildbot_net_usage_data.py
-index 709c804..7885d1b 100644
---- a/buildbot/test/unit/test_buildbot_net_usage_data.py
-+++ b/buildbot/test/unit/test_buildbot_net_usage_data.py
-@@ -153,4 +153,3 @@ class Tests(unittest.TestCase):
-         distro = linux_distribution()
-         self.assertEqual(len(distro), 2)
-         self.assertNotIn("unknown", distro[0])
--        self.assertNotIn("unknown", distro[1])
---
-libgit2 0.26.0
-
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 34720f4070c6..d39c67d5ef8c 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,5 +1,4 @@
 AUX ccache-3.5-nvcc-test.patch 262 BLAKE2B b33b6372e8e6c597d7ed6c781f0a3ac22c435d1309fe387e62c5f9b61c783294ec81cfd1c8a0afc60e63148dcc89f95ebc6d313a0567431a8d05c96e3d59bae1 SHA512 651e26335df8eb551f95064d67925d6e7dd15c8a082b291cdea31fcbc2e5482b2358de71c205c668173b3dc5a75ef004d95dbdd92391e4a4aa6bc1283f5f3a72
-AUX ccache-3.7.8-dev-null.patch 1915 BLAKE2B db860ccdab29862922d08fd9af5426d04e8871b74c717efc2bcff1084e66f262be287ce8c3c6ce5c84dfd3c03457183dfe38bb77afe76be2f8edeb7e97e46822 SHA512 dece4fa910f2477fc481d974915b47928b130afcdc278b3b0fe5c71eb63f2c65e400e7d07826d42cf7086ff8e1a702b348557a7b96bbe22ce25113209e1dd2b6
 AUX ccache-config-3 2147 BLAKE2B 6e703e12b6a2f83b838f8b1d1e534de3366b6e2994990b30c381b0df28be9c0ae7c0f1d7325282e97ca54881171846c13945b264bd4a793785ff1a19d0941669 SHA512 05d512b001b6a2fdc947d10d810c89683144080a060c24a37422e9b587594e1ee42fa1d7607461571f196819dae92146d861e8ae116e9226e1ff97ea035b3003
 DIST ccache-3.7.7.tar.xz 351592 BLAKE2B 0b211cb77ceb42b7ee5dfcde98d9f53bf222cf18b8d38a7cf6fc9631c5e1c79ca82e6d0a0dbacfe2d5f61b2acefebe202e06fc3b8035f0f25a5f9954554a18cd SHA512 f93380aeb45e815964abc3b62f1963abafe22e0c6a7b61d039e710c7f935221e02678e21af65add4fd59fd5a141824ab95f4a7afc8dd557de36737c365cab816
 DIST ccache-3.7.9.tar.xz 352948 BLAKE2B 791491c3f9da58f06bb0a58e411d9a7b3e39e460102793ef736820913d43d488ce7daffba572c21f507ea78d8da04edc3aaa47eb1a0fbec8cb35461a60b770e9 SHA512 5d39baeb66265451b0e9cef250f6d9c5f6869cd87e27c108c9a50bef80050122ed4280ff662a81bba8d1d1311f2004bcaf9ada6b783a42eedc67ca01ebc48bb4
diff --git a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch b/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
deleted file mode 100644
index 389f9e3a1e2b..000000000000
--- a/dev-util/ccache/files/ccache-3.7.8-dev-null.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://bugs.gentoo.org/712080
-
-From 9a794689a8ba47e79c96d6c370976448b756973c Mon Sep 17 00:00:00 2001
-From: Joel Rosdahl <joel@rosdahl.net>
-Date: Sun, 22 Mar 2020 14:30:23 +0100
-Subject: [PATCH] Disable hard link mode when the output object file is
- /dev/null
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When hard link mode is enabled, ccache ≥3.6 unlinks the output file
-before writing to it as a workaround for a bug in Clang (#331). This
-unfortunately means that /dev/null will be removed when building as root
-(don’t do that, BTW) with hard link mode enabled and /dev/null as the
-the output file. A similar problem exists if the dependency file is
-/dev/null, regardless of hard link mode.
-
-Fix this by not unlinking the output file if it’s /dev/null and by not
-copying files to /dev/null at all. (There is no need to handle other
-non-regular output files since /dev/null is the only allowed non-regular
-output file.)
-
-Fixes #564.
----
- src/ccache.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/ccache.c b/src/ccache.c
-index 6e9da51..b9bafac 100644
---- a/src/ccache.c
-+++ b/src/ccache.c
-@@ -1299,6 +1299,11 @@ move_file_to_cache_same_fs(const char *source, const char *dest)
- static void
- do_copy_or_link_file_from_cache(const char *source, const char *dest, bool copy)
- {
-+	if (str_eq(dest, "/dev/null")) {
-+		cc_log("Skipping copy from %s to %s", source, dest);
-+		return;
-+	}
-+
- 	int ret;
- 	bool do_link = !copy && conf->hard_link && !file_is_compressed(source);
- 	if (do_link) {
-@@ -1432,7 +1437,8 @@ to_cache(struct args *args, struct hash *depend_mode_hash)
- 	args_add(args, "-o");
- 	args_add(args, output_obj);
- 
--	if (conf->hard_link) {
-+	if (conf->hard_link && !str_eq(output_obj, "/dev/null")) {
-+		// This is a workaround for https://bugs.llvm.org/show_bug.cgi?id=39782.
- 		x_unlink(output_obj);
- 	}
- 
--- 
-2.26.0
-
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d7ff27abd031..904abe090a10 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -19,10 +19,10 @@ DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20
 DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 DIST cmake-3.17.2.tar.gz 9469251 BLAKE2B 85818c6346ee600a0185687809b666a3186831d590680bba8a41d6d52cd3852ce84fdac240100a7b91f06897a779e1e44b67d9a8da4e806347c9a4a46dab354d SHA512 4998ec3ac7367cec237187b1568a1935b402c39959c1869c9ae94e013060f6d2e03089eba34187f91063de169df78425dee2aa01acb925347aeb97f99bcad6a2
 DIST cmake-3.17.3.tar.gz 9470753 BLAKE2B a4c863e0cf7105eb47e1bba7641ab3431506f0a4f5c84a4de203cb996e629d1ee236d91ba5e1439f0123ab3c8b3871ef4e3b1c21940aa97c125cc7ab2a3f9873 SHA512 13479bd48ef8a8c95277a62b4f42e63152a5979292a98b5456022ca42ad3963cad75e917cc8b92a8485dbf5a2b59cde3fdc90fd9abdb806bc97c8570d03c1c69
-DIST cmake-3.18.0-rc1.tar.gz 8940485 BLAKE2B 069047d4d5ea7070e13fd106eb2b7d2f86a168406799963c9f2815428cc23b0a5b769d704eb8fae42d405f902418041a50e35c6eb22e1911fdffd86971f5c824 SHA512 d660edf0e15796671662c6665d4d9bc621fe31e940dd976e59404aa5b5c71fe782057b63c45615b6a624d5b36508982c5ecfd03ed84fbb27b0084d45d76360d5
+DIST cmake-3.18.0-rc2.tar.gz 8948443 BLAKE2B cf225cb9470fb99741fee83f0acb2d9a673130df5c29af546f9742e433e39811f942d5a5e3748110cf6f8af58d65f4dba05ff2106144be933f9d22781d796687 SHA512 30f6a223151bbfd9d18c39d5236a7d420e4a526fa88f7254dfffe3dd456b2e6efe66ab206b4c9a9ac758ab4d1cb89a2484c52d90f9d7658a8093f6ee2dc90632
 EBUILD cmake-3.13.5.ebuild 6250 BLAKE2B 51fd5c675042b869a8dd3f54ceaed2f3a2d9bc43aeb2894b1b8c9d995660bc81ed9b39f99bfbb376d0dd658942def7bc2c1ec3538efc36c1f43f65bc1ca5dd5b SHA512 638eece44d2cb688d92fd9fbedd189aee9b0b878b1fd054984e806d17083eda352695136bf0d800d9e2ecb7993917f2da4f1f1913e14c7686c4d7cff8c641f60
 EBUILD cmake-3.16.5.ebuild 5911 BLAKE2B 8bbcabb94f033e35c3c6436d7c53a08901bfa102e2b1d8dc57a090e7bc7a68c9cbcd80c1e758540282b2d03d6a3e72f54e35cea0c37cb905a648b1daafe370f5 SHA512 7d1462f3281e275fefea2f5983ade92ba3436981d652be57861bcac44f2b6b6e42e8da900574347cf76df123e4a6da37b5e3d94d06fa514ee3b91d32d9916675
 EBUILD cmake-3.17.2.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
 EBUILD cmake-3.17.3.ebuild 5920 BLAKE2B a535ec010204caa3f00518bb87fa54ff4b918b8d3b634dbccb7f378c17a0adea0c519b205ed9d4fd0921074ba7ed745998856ab8beb80a1690121ec76fdadf63 SHA512 a495b8c65861c336daf24045d231c7d7106d48a90bf83dcd7c0f3e4f891c08bea28999b2d5656da8a3fef541b605fc6ac08ee403f5ddbf72b98b58441482933a
-EBUILD cmake-3.18.0_rc1.ebuild 5859 BLAKE2B 1f840725f5f008e9f35da31ce7038be1234bf6479a132190556466e530f5a9516aa931db53a5c90f5ac4911df28fd0810c041bd7e1d255a3ee10b192da099f64 SHA512 330fd0a4fcedefd2fd83da8f623f0f22d75e585e2d3179a13fee8b49b8d4832935f19fe98114154c459dbb0df9375de52171725b9af35f5c4f9f860072ce2224
+EBUILD cmake-3.18.0_rc2.ebuild 5859 BLAKE2B 1f840725f5f008e9f35da31ce7038be1234bf6479a132190556466e530f5a9516aa931db53a5c90f5ac4911df28fd0810c041bd7e1d255a3ee10b192da099f64 SHA512 330fd0a4fcedefd2fd83da8f623f0f22d75e585e2d3179a13fee8b49b8d4832935f19fe98114154c459dbb0df9375de52171725b9af35f5c4f9f860072ce2224
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.0_rc1.ebuild b/dev-util/cmake/cmake-3.18.0_rc2.ebuild
index 3834479c5035..3834479c5035 100644
--- a/dev-util/cmake/cmake-3.18.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.18.0_rc2.ebuild
diff --git a/dev-util/comparator/Manifest b/dev-util/comparator/Manifest
index ce4ad7dcb55e..ac57aa548506 100644
--- a/dev-util/comparator/Manifest
+++ b/dev-util/comparator/Manifest
@@ -1,5 +1,6 @@
+AUX comparator-2.12-gcc10.patch 793 BLAKE2B 0bab88fa6aeaf046ee4dc569aeb0d3344a2a9def5e2a67f1139fd59621dac0cb7f89468b04fd776b4a81f883c55fe5d311890409a0de22363ada166c3c20475a SHA512 c4e4c03f0dd8759e2fbd9421465b75254f4a02a56846347c4f1062c411c124f62e803854af389a527a8323f57daef563f7948eac5fbe25ff3e0529c7384a1287
 DIST comparator-2.10.tar.gz 1463175 BLAKE2B 58d6bddc5f785de3768ed2c4845b75af03c1fd7f646fc15efaeec09878a72355c46c64f67866217994797193aaba6d4214685c7be89be9872620dce5930238e8 SHA512 b880f7a4a0fbfad44c53606c6d97509305d8485f0ab76b62bb0d1d1d6d4be9fb81e7a08326e78cabd1a9314e6efbf3a966eb6393e424f59dc657975a63ce2988
 DIST comparator-2.12.tar.gz 1463333 BLAKE2B 081251a0a3cb2f99d5b74092a46a868741049d27c367fc9bc3445d35fe01eaaaee75f7afd3674ecdc2569c2ac1ef2d5acd838a546aa307b33c977c4c8a91db12 SHA512 dc5acf3d5900e293e3f0188c0809bc99f2f18edb55df882b2e12e66bc655e7faf030b8daffdd2d175234b398e6a8c125ca6af615933c998651d7f1579734b080
 EBUILD comparator-2.10.ebuild 866 BLAKE2B d57e9166f9a0f14ad04c4c2f686198f866699f1ae0eae03a93e256c9d3195bd008844861000b4a45d4b30092be377110067152133d39d07195c3cce705f39682 SHA512 21ed08a933430f6044de705507a60b875786762f9ca413cef8f74814122aeac931676dedd04c3a1b32b7651f9a6f904e878aefe625d4b255d4e84c27d5da0570
-EBUILD comparator-2.12.ebuild 888 BLAKE2B 76ec12b1e1f46d85c301d8d72313a5284f3d137296906c7f0f7552f166450f3da3abaeb7a69fafaeccabb5bcfa6e8d958557e3c9ef8d4d7444bd2d84f216068e SHA512 6f34b242b1eff4e6a2880981bfc77920f04b37ff5e32da4cc33d6712f66c8d613addf50aeb0b8ff93305bc5ef24852bbabf2bc6285cb15494a4483276220b091
-MISC metadata.xml 355 BLAKE2B 012b8c0b8ac6bf274c4d9cdfd496e29e0c2549d98db030508cfb5e546d9e8aac2733cb39a6e7a3e36551472c699b3c7d5e4ad876e88a64397a06f889d5ecc824 SHA512 bfd1f38c1527a5e045c82f58b4f9dd253705e2eaa93bedad1e6c15c470de3ace37862211e647f0c79066c1cc1b0f68f211e26601099e6a802fda053e7ba48d26
+EBUILD comparator-2.12.ebuild 964 BLAKE2B c9d913a687d3a58f7e07da2ff568469fa7567a41caaed32b5e30d3af238fc59246161ae660a7bf2b4d69504dbe0d248f7fdfa4e2ebc4cf0a1fc2c6d36867626d SHA512 296ebc6e810726346ec62107016c64788bf5b8a62c64e3de055a263f3e3ebf1b194397d609ac8164316413f6a10649e4e7bbecb280c78852907c3919c1ff4875
+MISC metadata.xml 434 BLAKE2B 383d68cbb1192908d9a2dbf445852696f4f819564bb414516f8d15ed444ae0dba20ebd59ee6211be104e947dd1c78488c3abfc7a4a040d6fea0165cae853a287 SHA512 d499eae431272e1541f286cba5dc150442c12848469604ce6696ebc2f60f0b394c3376ebee5a5757e884f1372f732415bb169e7393f27c59a4d0faa57952d7e0
diff --git a/dev-util/comparator/comparator-2.12.ebuild b/dev-util/comparator/comparator-2.12.ebuild
index 5e4ba126dbd0..8184007cd403 100644
--- a/dev-util/comparator/comparator-2.12.ebuild
+++ b/dev-util/comparator/comparator-2.12.ebuild
@@ -1,29 +1,30 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 PYTHON_COMPAT=( python{3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1 toolchain-funcs
 
 DESCRIPTION="ESR's utility for making fast comparisons among large source trees"
-HOMEPAGE="http://www.catb.org/~esr/comparator/"
+HOMEPAGE="http://www.catb.org/~esr/comparator/ https://gitlab.com/esr/comparator"
 SRC_URI="http://www.catb.org/~esr/comparator/${P}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="BSD-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
 
-RDEPEND=""
 DEPEND="=app-text/docbook-xml-dtd-4.1.2*
 	app-text/xmlto"
 
+PATCHES=(
+	"${FILESDIR}/${P}-gcc10.patch"
+)
+
 src_prepare() {
-	sed \
-		-e '/python setup.py install/d' \
-		-i Makefile || die "sed failed"
-	eapply_user
+	default
+	sed -e '/python setup.py install/d' -i Makefile || die "sed failed"
 }
 
 src_compile() {
diff --git a/dev-util/comparator/files/comparator-2.12-gcc10.patch b/dev-util/comparator/files/comparator-2.12-gcc10.patch
new file mode 100644
index 000000000000..8ba6914129f8
--- /dev/null
+++ b/dev-util/comparator/files/comparator-2.12-gcc10.patch
@@ -0,0 +1,26 @@
+From c7fdc67aefb67851a1210c7d5adfc7287c4b6572 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Mon, 15 Jun 2020 01:14:24 +0300
+Subject: [PATCH] Fix compilation with GCC10
+
+Fix compilation with -fno-common, which is enabled by default in GCC10.
+---
+ shred.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/shred.h b/shred.h
+index d7eeb93..0e35b28 100644
+--- a/shred.h
++++ b/shred.h
+@@ -100,7 +100,7 @@ extern int shredfile(struct filehdr_t *,
+ extern void sort_hashes(struct sorthash_t *hashlist, int hashcount);
+ 
+ /* linebyline.c feature analyzer */
+-struct analyzer_t linebyline;
++extern struct analyzer_t linebyline;
+ 
+ /* shredcompare.c functions */
+ extern int merge_compare(struct sorthash_t *obarray, int hashcount);
+-- 
+2.26.2
+
diff --git a/dev-util/comparator/metadata.xml b/dev-util/comparator/metadata.xml
index 6ed3edf95f59..ab8846bb689f 100644
--- a/dev-util/comparator/metadata.xml
+++ b/dev-util/comparator/metadata.xml
@@ -6,4 +6,7 @@
 		<name>Anthony G. Basile</name>
 	</maintainer>
 	<longdescription>ESR's utility for making fast comparisons among large source trees</longdescription>
+	<upstream>
+		<remote-id type="gitlab">esr/comparator</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/dev-util/cookiecutter/Manifest b/dev-util/cookiecutter/Manifest
index 21ba2416c311..0a86e8686596 100644
--- a/dev-util/cookiecutter/Manifest
+++ b/dev-util/cookiecutter/Manifest
@@ -1,6 +1,5 @@
 AUX test_cli-1.7.2.patch 579 BLAKE2B 8a77388ddac5bf4aaf1f2f3d950318a8f3af582df9bca9004a6701c7347ff81abea25b0c33586153198906358583a2acf8e17b20248ad98215c44411739df581 SHA512 d5906423db6cf8254c411a5f33f4f0c6b9b2760bace1db5e131ac8ec47b740d5b78feb7caa450efcec6cfb05997ff8038fb9e3fff81585d9b64b455b492e5a52
-DIST cookiecutter-1.6.0.tar.gz 255579 BLAKE2B 68d50bc51cc0fa2f7fa84bf77933ad27b4dbdd9c06ed459c5aad8d604256c205bad5434b19b1b93ee95fdf5bf211124558994a9204a79cdfc1e433576a0e7fba SHA512 0a06ae8fe7aceeeb0bcb98b5981d743b2e2e5d5f121c2e0703bb76399b0433816beaddb64c92f28d50f1781737db25907a10ec7b59f6c02c17171cfb56fb12f4
 DIST cookiecutter-1.7.2.tar.gz 253484 BLAKE2B de1c773cd5e53532edc7af7aaeac6061b1a5293330b8162da0f31895b0c3a58a4e0f36d66bee3da328a6b0a59fb5bd917a2f3f6fcf7772a4c63db5cd0030caae SHA512 15cc145f143b4cac6e78b12e1c29e191d0c1c96b0187db05a4c8aac18310a5cb31d912073674ef4c01727c9b5a3b67f8c508842cb625db338b4034faa52a4a4c
-EBUILD cookiecutter-1.6.0.ebuild 1244 BLAKE2B aec48fcedf80ffba9d86564edb5b98bb36833c0fd14af2fc0804848f75e7a0301dc909b450070a5c727a04bd0ba861ae8d59dd67d4d9b1b5b3d20b4500728069 SHA512 97c8b61e19023b9561f2720525329aa051861a2605e8e15cca0a5e916ccada89f4dce13bfee54507f6e5bc69684048694659fab02d372243062e04b3c7e2143f
+EBUILD cookiecutter-1.7.2-r1.ebuild 1303 BLAKE2B 192a2db32493ed6a064f404a20e46ecf5a682c757c31d8034c6e572c7fa56953d60ebcabdab35fc78cd6bae69a347f03b3ac8c78d52b561684d1b87088fac153 SHA512 bfad0f39c54948634045053dcef3aa92e7b1a7a212fdf5cbf1b552e46d34d0df388ace0aaea79dab53bf4bce6f242e98dc8d0d59a7c828c76bad525695b3e7ab
 EBUILD cookiecutter-1.7.2.ebuild 1294 BLAKE2B d84b3f46a9c738d5d98ae1a66d8ae591b4c402fd9cde74c8b089aeaea9da468577356ad7fd17c2fe618a13a4c283cbc7c79d78e345e4fb2041da05e70bbb1349 SHA512 6f2c0623dc4fdad071361c430edad1a18a2f37cdcd63db1bd165e9ab2b455a98c27a3c7b38b06cfc054b87e2c3e7e5e15a7b2a6326925f00740f3b4aad192c08
 MISC metadata.xml 329 BLAKE2B 3030c112beee6c6e136abcd0390ad47553f874ba5ec6f5d19d87f84d5c9d930ac71d2219c064944601a09bce7c9b71ce1257d1664070f749f4447e2549521bee SHA512 4c36a71c316a8f5b946668fc160685a293c25a292917baad1345fdbafa5108166cf50343cd5fd3627447b5af5a1cf40848488eb0085708b0ca032ba7c44d4101
diff --git a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild b/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
index 9f74aae46a14..fb9639ccbe2c 100644
--- a/dev-util/cookiecutter/cookiecutter-1.6.0.ebuild
+++ b/dev-util/cookiecutter/cookiecutter-1.7.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 
@@ -14,31 +14,35 @@ SRC_URI="https://github.com/audreyr/cookiecutter/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-python/future-0.15.2[${PYTHON_USEDEP}]
-	>=dev-python/binaryornot-0.2.0[${PYTHON_USEDEP}]
+RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	>=dev-python/click-5.0[${PYTHON_USEDEP}]
-	>=dev-python/whichcraft-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/poyo-0.4.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja2-time-0.1.0[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.0[${PYTHON_USEDEP}]
+	<dev-python/jinja-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/click-7.0[${PYTHON_USEDEP}]
+	>=dev-python/poyo-0.5.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja2-time-0.2.0[${PYTHON_USEDEP}]
+	>=dev-python/python-slugify-4.0.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.23.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10[${PYTHON_USEDEP}]
+	<dev-python/markupsafe-2.0.0[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-cov[${PYTHON_USEDEP}]
-		>=dev-python/pytest-mock-1.1[${PYTHON_USEDEP}]
-		dev-python/pytest-catchlog[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
 		dev-python/freezegun[${PYTHON_USEDEP}]
 		dev-vcs/git )"
 
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
+DOCS=( README.md HISTORY.md CONTRIBUTING.md )
+
+PATCHES=(
+	"${FILESDIR}/test_cli-1.7.2.patch"
+	)
 
 python_test() {
-	py.test || die
+	pytest -o addopts= || die
 }
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index 153e2ca1f496..99f2d2578eb0 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -8,6 +8,6 @@ DIST cppcheck-1.87.tar.gz 2243258 BLAKE2B ffe42bfb2e896163678c5bb24e46ae2391ba82
 DIST cppcheck-1.88.tar.gz 2364053 BLAKE2B b688974ff83019422cc5b2ec575d9838bdff4ada17d71fb3d436f07eea50429490c222659163b845667d98c0ec186b3288464827894e379fd017dd0c3fea645f SHA512 fa4ede0665546341af0ba3dae09a00b6efae09ec7838c616c580be01ff6902594d61168a059539779be0c78e1708d2bd9c8e7987dd0bb67dc8fa332a10d1de6a
 EBUILD cppcheck-1.86.ebuild 2326 BLAKE2B 292de19a52987e0c8a56458956c0f8fffaf9feda3c745805d9e1b22b8982bff7dd5405be71a467e2743b989d66a7d987b44ea5741366429c2afdfc91e692c264 SHA512 c934f617da26e49e0593c62bc44c88663a206186f4556fc7240c45f8e48a98b3c0d2552ad5cca61f284ff56c31597900400e366c5bd8bf17ac9caea5fb0dfed2
 EBUILD cppcheck-1.87.ebuild 2343 BLAKE2B 5d5b0a974743823fe8c942eb39b3d3049ed9cd7929b4e7db65ba12f34bc65c2a75c58f363fcaddfc21435782df8257319d225b9e8d55830de87fdffc655101e6 SHA512 eb10790caa7f2eb91b0ce00c5f0cde85df1da076f481fd7a8a4655d8a27c89225e238f36c271bb1f1e9e10940c642c79e014e81aebbb8040ee50e953a622c212
-EBUILD cppcheck-1.88.ebuild 2339 BLAKE2B 878a18db0aad6abc71b5b28dba3b7999f09118046e65e89aab8152a2472261f8108751960829746be18fc2fffb37f5fe3ed8e05126e761891e9afa255b484f96 SHA512 7460936b8aed85c3e0f513297fa29e8449564cdb999c47dce3f29d7c308ab9a71e29aaf5a30a43b6a4153b6c7a33ef128f58b38c3f3669406d88ae8e112354ba
+EBUILD cppcheck-1.88.ebuild 2338 BLAKE2B 2ebce8ad2055903800eeafb7bbf1c84938fc88a54dca95f6cbe34c178f063a993431a576b35ea1b2c33a82d92db7311dd85030eb8a11197c6dc2b86c344cec7e SHA512 e1a1e8b05fa3cbe4149b9b3e9b5e63d230057735716c6f22bb94ee2c0d9c85eff9de26800c7ef59c6691a576d8160fadc0908a752c1f1351f895a4bdeb7c56f4
 EBUILD cppcheck-9999.ebuild 2237 BLAKE2B e90d8e35afcac652a03c518bdb0ed494fb2fdda35c55d0d6e9c995525274f6d0af55e05f87a0bd4948ccd2b56b6cb3cbb8caa7b189d874e55d2d83c9084e4afa SHA512 ceb118dc93351cdadc345b5a5f4fb64f76ff15afd2537680a19d24aaff13e8f572718c292734db102023eac1208884e054122a08b9508dc774493062c4d670de
 MISC metadata.xml 401 BLAKE2B b48cd9d365773e4c050d1ce2f58a108fa33bf28fb669a8fbe99a9b15d33cf203fa4a94d3411674892efb4cb5e5bd1cb5a08d97a3054b7fbdacc462695f0d1874 SHA512 08b51c30fcc21277bf320c1c9f36cd9efc7c39261b52f70f686953731c2d075482fc1959457dbe276877d508510b32a23d8f7def4ca52044fabc44a23c56a8f4
diff --git a/dev-util/cppcheck/cppcheck-1.88.ebuild b/dev-util/cppcheck/cppcheck-1.88.ebuild
index d281fb794316..bff6e611639f 100644
--- a/dev-util/cppcheck/cppcheck-1.88.ebuild
+++ b/dev-util/cppcheck/cppcheck-1.88.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/danmar/cppcheck/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc64 sparc x86"
+KEYWORDS="amd64 ~arm arm64 hppa ~ppc64 sparc x86"
 IUSE="htmlreport pcre qt5"
 
 RDEPEND="
diff --git a/dev-util/devhelp/Manifest b/dev-util/devhelp/Manifest
index 230f9bb82fb0..82fe74174c92 100644
--- a/dev-util/devhelp/Manifest
+++ b/dev-util/devhelp/Manifest
@@ -1,5 +1,7 @@
 AUX 3.30.1-optional-gedit.patch 1259 BLAKE2B ccca312359fcf0105a3ae934e0b51582f597eb84b34ceb82967d5939c735537b261148202f6fb277ad102a1337794b2416dd158d7432a4d13159721c2bdf3abb SHA512 e7a0a659711063d0ac37814bed3c8e43cb1d7bddd313fa87b7cba2a1d2eaae45ad6fb430f247c190f0f4f15813135c572779f44dfad8bf223aead214f4e8566d
 AUX 3.30.1-optional-introspection.patch 1266 BLAKE2B 95bc2dece601e561c95d420e3bb564b318c7498ac67e30ae9f40909bd781445c4c8c2e1e1dbee2932c530d24f19357c49a7ba59caeffb767aec66b1feef6605e SHA512 959319c7e36f1dbe1dbfa858f53a91b6f6f1c4e469a7a3b237bd8ec96a7636fb719084f5bf9c0146b253eaf7f9512db4a077ec1e40065a827597131515d889e6
 DIST devhelp-3.30.1.tar.xz 317956 BLAKE2B 8646fb97f0649bc166c8a21472f4c638f37bdfdc9e34b7214f0e5bd32c1c78664cc320f978fb27e313de54e88cf31685596f4bf7f43235ae96345292db6a9fc1 SHA512 f6f028948edd4c6954eaeeb026bf69c11284d725925d354ef42ecc67275cdcac66e8d3657d95d50926350543489b2bb2fa3a194d99d01494bedac60d3a2b4bbc
+DIST devhelp-3.34.0.tar.xz 288352 BLAKE2B 26c8c05c161e5607492fc26f012280468ed247ad4c166013e9df5fc1c76d59f98034a157cb58be9554ec65f46520b7d0d2ba78de00134570e84ca5a5ba0dc504 SHA512 34ed48ed323827b01f7d32e186da856c788ddfe37d6836082a81e6c8e4cd7bfc2265309cc3b298a0aea542b85e9261987d47a5a4396d865ec7e4cc13a9d05814
 EBUILD devhelp-3.30.1.ebuild 1812 BLAKE2B c91d39303521e9713889b705880ccf73844d384ef862ac44bc27da7dd89642330a53f1895c987c130d9a045f338f7a2e21556f71a1c52f74fd662c451bd91387 SHA512 7bbf8b15ed05ba91002737ade2f2bafd818c20a94237f7816e538aa9f5103d18968be82f1105e333e1b4cb50c8024c72e832775431aff18e892dd369dae54f1e
+EBUILD devhelp-3.34.0.ebuild 1787 BLAKE2B c12b19b022f1f5d1fb6d383a8d7e1a0362d8c1ef4925bde40b981071c95a9dc9ed0116f38866956973ecf5182e22177e0430faa6d4a609513c33b4420c043113 SHA512 d7bf74e684d8040bc06ac35bbe37f3230a4c8847045b6a18f8750ea4fb4632123cd6812323e5b282faadd13b3fa6e07ea31db2b9ef34ecabeac960a210b69867
 MISC metadata.xml 337 BLAKE2B b031370d8a469a93790b021e5d5f1bbd368ad0c13b144e4fb593d0abbe04d2408f6a7083ae1a1580ef5fdeaf26c59bcbcfcc0d5731f2fd42bde769cf1fb1ece2 SHA512 76931a5e5bff4c6f32aa55e27ff6ef6e320f79c21f1e3c3b3af4733dc0c141a7b782dfa38227fca4d6d50b763dcc3fd191581862ada051951b3185c596ca6753
diff --git a/dev-util/devhelp/devhelp-3.34.0.ebuild b/dev-util/devhelp/devhelp-3.34.0.ebuild
new file mode 100644
index 000000000000..f3b8ff316281
--- /dev/null
+++ b/dev-util/devhelp/devhelp-3.34.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome.org gnome2-utils meson python-single-r1 xdg
+
+DESCRIPTION="An API documentation browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Devhelp"
+
+LICENSE="GPL-3+"
+SLOT="0/3-6" # subslot = 3-(libdevhelp-3 soname version)
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="gedit gtk-doc +introspection"
+REQUIRED_USE="gedit? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	>=dev-libs/glib-2.56:2
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	>=net-libs/webkit-gtk-2.20:4[introspection?]
+	>=gui-libs/amtk-5.0:5
+	gnome-base/gsettings-desktop-schemas
+	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+"
+RDEPEND="${DEPEND}
+	gedit? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			app-editors/gedit[introspection,python,${PYTHON_SINGLE_USEDEP}]
+			dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+"
+# libxml2 required for glib-compile-resources
+BDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/libxml2:2
+	dev-util/glib-utils
+	dev-util/itstool
+	gtk-doc? (
+		>=dev-util/gtk-doc-1.25
+		app-text/docbook-xml-dtd:4.3 )
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/3.30.1-optional-introspection.patch
+	"${FILESDIR}"/3.30.1-optional-gedit.patch
+)
+
+pkg_setup() {
+	use gedit && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dflatpak_build=false
+		$(meson_use gedit gedit_plugin)
+		$(meson_use gtk-doc gtk_doc)
+		$(meson_use introspection)
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	use gedit && python_optimize "${ED}"/usr/$(get_libdir)/gedit/plugins
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 6ba0ce6f323a..c7f2406308b3 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,5 +1,3 @@
-DIST diffoscope-146.tar.gz 1570347 BLAKE2B c94be83c8c1de97c054b10dccb66f9f1df9dd1a84b0491137a61b5c1d539947332a2629b4e752ff338d4797cb1eb655a7244b17abcaf7f1dc856b3bd4303810e SHA512 50c6ae4241f599e3fbe0a99bc9654a739d2c97314c2e04d0f1c225c0e90fab1ea6e1e2f39ab1f14efb06d2e29683a8a76419b1dc044f7f2f11db1329a831a30f
-DIST diffoscope-147.tar.gz 1570418 BLAKE2B 845d4c5f59d479237b614962601493b06f07955d5aa4469e47e4e2619587c32b6daad81a528fd0a9db6c492cb7a4c8366edf69aec460bc994e1b38fc01cc5ad9 SHA512 4017bbf3164febfa7ec628ad34a7ee5aa3cde6528878f0197ce0fab82bbf8067f0f9e7d51ed569e0d69c8a82bd3b044d9dfcbc3c4f4a6195ac9886594796ec61
-EBUILD diffoscope-146.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
-EBUILD diffoscope-147.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
+DIST diffoscope-148.tar.gz 1570459 BLAKE2B 007900cd798b3371f3b779a35a2d12fc52222d2df3c1430ac091992550161ffe2be43efc6e4837173221bb75e72f9ca59afacbaad65420d0ad7310b80b924998 SHA512 e3012c97133e44009295fd3647012cf0e51e449b0e2b506be40169d8c444fc04654b0bf3ba92dcb0ec2ac85bab4577b75e986ce0e41e18ca69718004265f6117
+EBUILD diffoscope-148.ebuild 2161 BLAKE2B 9ef4a812c5fec5a923b0b796814052c00842cd36a447832fe65aed32c341454538ddccce2baac0b038d8bf02cbed98a2023eeba33e8a7868f34a882331098c34 SHA512 e508fee8307b2e634ec33877124156fcb8afd43307747b1f61e18ecfeaac00c1140c1906ef87015f3b76f70ac5679c28fed47539e52ce0adc29c6257ad6deacb
 MISC metadata.xml 2137 BLAKE2B 6ff55f85ebf3f769c10c3e17a69900918abe142e491b7b8460bed8fe6a036763a743324bf1a10e7a3772761b38c9632ff1352e9c6677ef691f81acc29dc321e9 SHA512 e782e12dc91d86612768a2e0c498f54a9728691a76008ee1e6cdbc4d8719c2593344f6c37786982abb0de7b85d743d7614652a2e8c9cd9fef053c3a32e1e484c
diff --git a/dev-util/diffoscope/diffoscope-147.ebuild b/dev-util/diffoscope/diffoscope-147.ebuild
deleted file mode 100644
index 63058ee2f20a..000000000000
--- a/dev-util/diffoscope/diffoscope-147.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg gzip haskell hdf5 hex imagemagick iso java llvm
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar tcpdump xz zip zstd"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	gzip? ( app-arch/gzip )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( virtual/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	xz? ( app-arch/xz-utils )
-	zip? ( app-arch/unzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
diff --git a/dev-util/diffoscope/diffoscope-146.ebuild b/dev-util/diffoscope/diffoscope-148.ebuild
index 63058ee2f20a..63058ee2f20a 100644
--- a/dev-util/diffoscope/diffoscope-146.ebuild
+++ b/dev-util/diffoscope/diffoscope-148.ebuild
diff --git a/dev-util/gitlab-ci-linter/Manifest b/dev-util/gitlab-ci-linter/Manifest
new file mode 100644
index 000000000000..039be153669b
--- /dev/null
+++ b/dev-util/gitlab-ci-linter/Manifest
@@ -0,0 +1,52 @@
+AUX gitlab-ci-linter-no-strip.patch 508 BLAKE2B e7c41901cdaef662218fb5e1631971ef68831c12b0217cfad424a6d4f3498357d8655cea292c03232bcc1ba91e84f110ca6d711f3a58b9da33ed4f07bede1db7 SHA512 21be7d8a38b335e942a226417a33b578142beed311aa264090022ce168dc7c0f17a5dd17ff26a0449078d995650fa221f5be4114cc570f1e6e1873d5e36c487e
+DIST github.com%2F!burnt!sushi%2Ftoml%2F@v%2Fv0.3.1.mod 34 BLAKE2B ce54a247aef91043830bdf0603c8452ba38eceb1495af6e7a74c9119234a0dc5cd080cb25258c28f5e270acf91189a5ed33e361cbf17de2be5e37dadbda1d90d SHA512 320941bc3b7fb8bc595e6135cbc513a7583d129f0cd92508055291e141191066303cf75148e25198c21f6c6c539a790ea3210f3ecf5de6a2a03b70c753091146
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0-20190314233015-f79a8a8ca69d.zip 12266 BLAKE2B 93705895ca63c348ac5397fe8531214f5745a3be6f5760f9d3fbf67fd85b917dab4a2077376251a005bcf07450df1fe0b0114feacc5f92c6facbb2da637beacd SHA512 284116b4f2778ee7981e3aa5583c4e685afd8434e36ca647f0c72c5bb308e87bc3bfae8c83acd259c9da75549339aa382663b7103e4033b2418e314106923c0f
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.mod 217 BLAKE2B 4232fdc22064d42e7b97efa666b5345f93d53d40ba11231778e5d17bc7d48c6178d27f4e8678d2139ba4e40a90d46a6caeab1a9696b76db5aa361fc17d3c8c93 SHA512 000449de8fe27ac12c5e7614bfb48a31d506b582ce2deaf0a0709d3673c9fad41e3b97e25df872609c5a190e899a56755d2d9f974a38523c51c9fa3af521d73d
+DIST github.com%2Fcpuguy83%2Fgo-md2man%2Fv2%2F@v%2Fv2.0.0.zip 11426 BLAKE2B 645000d6293b81d736462fbd50a8f96483b39d07e5bb56e5a6d2fbef55a760499237f963e4b45eabe34b955280997f8218c656eb6db0a1a35093d2ab8f17cc63 SHA512 140a934e4d50fc1e5bb36bc3bfebc05863b32a50fbb6e203abb3aee1f9e9cd1c2af6ee5e0757f9d6199522c30e06377a3c94842d877513e5c9339ef7d1dcbc9c
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.mod 126 BLAKE2B 629ef676ff997553b93c44e9024e6b3d613b51e276d2ffb65bd9042ec1cb0455124e5ea7c5dd0e69599a25031ed536cb3356321e37248921fd8287b47656104a SHA512 a61784b08b335d2a893688c279cf6f4b1ca222c3bc8236fd24536aad2b185fa718805c9022e1ce142bd87e39fed639fdc9035c9ea9ff110e985cd01cd612e9a0
+DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.9.0.zip 12428 BLAKE2B caf7a05e79d8b7dca069966765705619ee15800d8276d968bdf4385bc1141cc06b24755ac49c65caafdde5d8b34869df1f7e42ca302ee6a80b9ac7edd8a803d2 SHA512 c757f8455ce261c06749eda03ba807ba8b2427f0a14b0b62a6ee4e9d1ba220986e6f122b061fed6f44d68e4802864a988c722604b52989a4e31761e0e7ea8163
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.52.0.mod 29 BLAKE2B ec6988d536e1cfabecc7e1ee6070c6429c88de9bd970b3ecb35bf8e42ac3d2dfa08beefbd3741ef7a039020e6d41332039c6bc0e13d5e79bca84cf669e4f552f SHA512 67077f6e3f3c2571d6df326aa1d6351c3f7950337a23c548ff69e73df265db516eee559ee4afff17868068f2754c7ef272e46bc3dd5ac324ed002b749116794f
+DIST github.com%2Fgo-ini%2Fini%2F@v%2Fv1.52.0.zip 60990 BLAKE2B 700d2e6b2c1c3e2c4d525bd7edaec6c70ad39f10358d18a994db46466d3544f76912b42d4e24501eb704de4bb2692e70b28834ce7bfcf3257547ef0c71e556aa SHA512 2afa4eeb5aeb915184b6d2bfed560e3e3433d6206713998a539784d46387b2e704db793a061afec29e9e2f4acfd30ca88a8da8c2d3ba4cfa769cdfdc6d30b7da
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.mod 36 BLAKE2B d7cd8f31950392cb5de7f4223ff9fe3257568dd0a1c1b81c8b97934ba92379753dc936c81c39e5b553e4101bc7c035ce81c8d669d85ed1d1eee41a74218f3d88 SHA512 35151946ce44fde9d3bde1d0626749ac4bc68cc448736c3b0f056f40a9ae30aef591db614b271df3eba3a96dbc94052ea5bf7ff68749ec980088d60361934771
+DIST github.com%2Fgopherjs%2Fgopherjs%2F@v%2Fv0.0.0-20181017120253-0766667cb4d1.zip 257755 BLAKE2B 13d505a73dd179828fd3dbcbc1dfb90f6bdf8a888bb7ab160713a566472adf63d45491fa29928853d76725c2ffa5ada33e802cf857376c83cd8085a31acb48b5 SHA512 5bb0e61c8622e09cecc099c80cd97cdefbc497d4ad0e88984b2936e7731991e972883eb639be1cc3f56249a97b4f14c6820cda6b1c08e4a2323aaca22b840dea
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.mod 29 BLAKE2B 8efd6f84dfcb696fa2ebf7b09c7405d57457dc67e03a2cc753cddd93698b1b03d84022f241c4b652dd80e0521b2b1ede8127fa15dd47d1f678a7fe1c31fafedc SHA512 3a397e0ee84d8d426eb5a1f39c07d608e0ed53b1d4b2fdbd137d23bf9f401840802d18d5203bc468fac76402c508bfebf49bb20869d8a715e44c49e21fd3da4f
+DIST github.com%2Fjtolds%2Fgls%2F@v%2Fv4.20.0+incompatible.zip 9901 BLAKE2B 0c8cf7ad0809f65d91b9ad5b27759cfedc5efc25194f19effd4b19c35c940461a48a57636ef3c707b27ac614b693ea05830bdef6943f11993bf561ef558cb99d SHA512 08b7201a9aa3294a3fc59bec78fee09f0d1bc7507b50b1d1cb1fa29a523c6870d00b633ea9679c9c86df9841739f46e9d5d9bbf0e3ec15b8ad08e57db67eedc0
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.mod 80 BLAKE2B 486156a648d66786de2a05b45b054ffbc6ccbb45ffe98230d3b3126ff533fd546af1b348fdcf67b1b3ae9310918869355fc39390a4f67b99cd7a1bbd1c6cf891 SHA512 f69ecc2e8097c17a9c0002181451d56a8a7496f62e87f437802420e9af27c5f80da2be189597759f2a5ee2656dca8c1cf91a5374b8e46919f7a6e0f9579d2526
+DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.4.zip 12838 BLAKE2B 668586a4df02fa2d5db174a4ada1245a463946d4bccdef2599b791414af4f10eb07f56c61484977eeb21499db7f9b46f8fea03feebbaae5511504c13e3f7a64d SHA512 c3104e921a94b1a424cbf6936e8e5cdf5823947132f41190c211e050c9c8b7135c7b319eee0667a2b958c9f4fda27b9cbad4436d37b512e269716249dbfbef65
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.11.mod 104 BLAKE2B b8d6df41ff2e8952e12f0518d455969d7a496b8318052ca37ffabc663d9602b9df70385274818af8bf1b50e70a44ade59b0436133e08818ceb385d34a3b44c03 SHA512 218110264da1c7396295627414259fcc65cc9823216d6c03f2a6d7499e17205e540821add3216ba673efda92f1e5bfbb817416874fc745ed1d926c43fdd9bc99
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.mod 104 BLAKE2B a8f54d5566d54ac27763dd535705d64dddd862f32d23f234b1ffbf759cbf4aa16886c90a96198ae2f4c0d0bc892932f1b8244e8ff0f8150bb87123947d734016 SHA512 7bd9f6a38aa9a16c3569142164389d1c4046170f66b5e9044f7aaa3192e9d2e2ccec486e3bc7fbac868c9693b6d333068c1a34ccd9e79dec1746a86348951503
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.12.zip 8902 BLAKE2B 7257687403b9f8f066147fdd4ee1bec7e4b02cfd3fddda8349a89d9b9ea5b93d9bef61280ed48d68adac4dfed7e382ee96886aa0d65d85406fb93dc6fe0c53b1 SHA512 79ba14a04838c509500e6098553e8aadcd7105445387160a8aa1a6d7b0e70f0e807c99036c31faf51920544da2156195174c8530e317a72728719cb0a9a66098
+DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.8.mod 95 BLAKE2B bb0de423d1270e7ec38c7ee345c788b23e2083b05e4f745832327358c4c054ef8d2f3f48d9bb7bc669ddc67796ca0abae164c1d40b2def5f38749d8ee4bd6f32 SHA512 923114bfd285393d06f681ba57db69f042f57d8cd7817a1611c7719121c812de8023a049024165e10112bda31a7f99d3bfe0d4c4f419557ba8909a2d005be405
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
+DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.mod 42 BLAKE2B 23dbba19737db7327590adaf3988abb9b5548cb3f959a9746a3b745c51f3c1397f071f2573a413a088f58e32959a2210c2b5354c47c263e90ad2ff1506872a5d SHA512 ac376a387fa39fe35dc4d073d8becd74e79f52e9d36b0a6628740dfe0e7c1f4fb6533fc262212663b105afcaa104082e055fa87d20cb3068359faae6dcba7738
+DIST github.com%2Frussross%2Fblackfriday%2Fv2%2F@v%2Fv2.0.1.zip 110026 BLAKE2B 862c858d51e59569c38e1304de08c256752db260cde7f7f44fab41d22695999fe73483d3854166f4e8d3da9b4f8e41b7999d7e44510ab8c2ca6c0120173b77e3 SHA512 992df87104aa66dec048d39496c85819cab19bc890cb2c60326660d011642f49cd926b082d3eb4136b229a6e4893ed023a133e4bf83a4993c534b24e14d77b4d
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.mod 49 BLAKE2B 47bc5235e81d233e28b446ec2403accc442b4cc1ee956a0b7d47b5dac2a525f22bba87d05c3fe09179837860655f27191e073a3f6d7d0dad81c9a750752fe5f8 SHA512 6f6b924c2a3af28ef4342cdf8b83b726f2c409accf19c6ba0a4a47c6ae61857e4b69727fceb9e9e16fb8ce660a7181952714d49b6cafaacb282fa4e8af6e13b3
+DIST github.com%2Fshurcoo!l%2Fsanitized_anchor_name%2F@v%2Fv1.0.0.zip 3399 BLAKE2B 348c2171bf3404d8b69166fd412707d8a348e1d808618036de2ae01fce77e3880fc782ef301f9b4135a19d81ca9ded5cc0cc4fd73d36b66b121b7f0baa73df51 SHA512 d02d5e4b8a24b1709c053138c4128d4bd6347d4adef95d1e25141935cf560fdcfd5c2b7837d6e690f175f1cd5a21b0279ce97b8b3b66d5e0a5006e4103b25f46
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.mod 43 BLAKE2B ea265a40bcaaba6e4401504643cb9bc2f775a23792b1802d6c1b665121c49db7d4d850ba03c31087fbd6f344b08349ce00a106e430c8690b8016c95318cf3973 SHA512 222b0edcf745e14eb775eac28668dfa0c52051cbf302ec441b58d75846fc2570a0fc2e616cbec68f6312a1648fd7e6997b6597b160b1a7f84c1c500a42e93e6d
+DIST github.com%2Fsmartystreets%2Fassertions%2F@v%2Fv0.0.0-20180927180507-b2de0cb4f26d.zip 81760 BLAKE2B a5767557b0e96fa3bbbace46e08d6a2167be2c203a44ffaadcf14079a23e906ee9197c8028fb29bdfc596d4f39e7bdd29993a1a520c36c8b08c5c5b6bd6bd2cc SHA512 e204307d5a06550292a4fb6e44912260aa5a7f9fcce0883d8abb324a53673512218982b1893e7d563eb7d6313ac98a8638072aaf7b5d66d359e82832f2a8bb2f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.mod 302 BLAKE2B 69fd290c3e72f4ee0597f480bae8647d80ab5c4acab21ac3ea19e847e3af4ac91a767876fac04c94c2db8bc782a24577d3478d3d0653f673609f2d57d6cc3427 SHA512 24806ff2cbf2719f50bb37cc5ffadeca1b64c7b089a1647695b45d647ddac16332504c7026813b4ab9316e53e755ad0ebbf6db9ca88179d0526ca2634e27e25f
+DIST github.com%2Fsmartystreets%2Fgoconvey%2F@v%2Fv1.6.4.zip 1521758 BLAKE2B 653e697d76d392b18c09e5c1c96734a737071667345b9d6ff9c9589bbe74e1c50849dcd7fc00b660adc1aaa30366aa9ca93a94d5eb4e605f7897d9714119f926 SHA512 3bdd2bbeaf755618d9fa7f324814497308361cb0f3f93a7ac84b9fc01b79ab346353ff0a022d3d85e74aef57b3773e03ea9279d0a60de317a1c57d5eca2d1507
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.1.1.mod 183 BLAKE2B 43fea991eaa4bf055a796d40ee3a72557fca99711c698b3ef2feec5d175ff6cd1af486f7e3b08c6f95b6035ea5a6c9bd76478264102ce85cb0bf08f22b841957 SHA512 4630a9172936eba1e550a8f6e95847faff6c2a3687900143cb8ad593df1b1f7f793969efb94dbf42a529074f6a4049554773157c3bc4eb7179f435d0af317c90
+DIST github.com%2Furfave%2Fcli%2Fv2%2F@v%2Fv2.1.1.zip 127871 BLAKE2B f713b16ba454f912eda4cf6c87064070cd0259c36ccee8e6b6396a850f9faf827bda52a0e90a45e2eae8111c3190cacd8c21fe63509ac1c3f1aa411c36c82ebd SHA512 6d36797eba4d962555385d03bc94bf23e6b45d24aa3c11324e90926f294ea41a32812c02d9f6a8f201d52b17ed06c3206bac9d1d385653b475565adc4e7fe762
+DIST gitlab-ci-linter-2.2.0.tar.gz 38488 BLAKE2B 78d4083ad10cb43cf2d2f1a57f6e37ca7cb99acc60da751bcfe44d728affb70dfd9dcd62d37def09f7d1b26fcf9f04e8bdd06bcfee7aaa891f387b038c985bed SHA512 3d63b7f73ebf5ba1885f8d56e9d8179f3854b45a6129cbbd2db0e8b3f4b2ee33ab1f3f2403f227aec667108fa56b4b1018cd1cd43c912599ba772dbaa1b0e036
+DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
+DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190311183353-d8887717615a.zip 1273340 BLAKE2B 7d42472afb905448b6ae6f66258dc805fa7c4b9c8dffb230ad6458b250fe5d564a3f6e2bf97b241ac9293c9f5885f28cc996ab7953a0ba9e97b8731911b982d5 SHA512 57852d3cd066a9eb279f909b464824041e138db1eb98c66ffbbc81259cb3f94da8ecd4d2b961646fbbe0c05156785ab2f44408b19d9f467001627d7b12fed4af
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190222072716-a9d3bda3a223.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200116001909-b77594299b42.zip 1913147 BLAKE2B b29c9c32f5141a45284bb17e0236b0650a8bc60da0326e47e153563ba2259b5e30d043db1d1aa5bf98cb80b28f5481483a3b2c33776e8c40ccc6e2955b440dbd SHA512 26e655cb67ad0630e05c176a342135ec67c08eaa396000095f568f0c112810a262c204d7973e16a16539c69b7f543062ba29b6b1c9bc934f7b0783b79dd33b7a
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200323222414-85ca7c5b95cd.zip 1470272 BLAKE2B 9a8bbb988370bedc24428e6c78f42a9ba44dbb852ce91c3d7fc54e83678b72b9177e67c955c49dc8ef7a1e2e214475a2e55c53254469e3426ec271e90ec9e2d5 SHA512 e46ef76fe4a1628def4c6a291003b64cf11185c0214427af9c49b9ff3af99f258488d49e887206a9c8652784228d822665c5841ce87d6ff993e95ea3d0494129
+DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.mod 87 BLAKE2B 32cb406deea05323b1121386bf61f344f8eda0b5370e95bb73828ce0bea50bee375ae3e9b076b9d683a4d89561709c5e97e45e6b08344fbdf6b03b3ce4398dcd SHA512 18ae9b2f54109b4ec5cdea433ee0e3b7006e4d5ea57022d6e8151d4d364735a6b55cf7b5eb2f43b602ec786b2b6819ad78dfc33151ee1a63a0b1199f54ce34a1
+DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20190328211700-ab21143f2384.zip 2564153 BLAKE2B 17b70a9d5cff84d5b12dfe1165aca6f2abdb38e2d9f83daf8b715b9e4b16fc230f8f82612f9502a4118ed63104331a1d3eec4e324ef8a57b9c07bfce5b056f04 SHA512 2e381b4ddbbc3e31256170aff49d38475ce26d1510615793fe5d23d99cfbed1732e75cf6419375b491e740397af39aac664d03d72e2a93b2b5293d7fbd394cf4
+DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.52.0.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
+DIST gopkg.in%2Fini.v1%2F@v%2Fv1.52.0.zip 60570 BLAKE2B d278fe137f1b7c3954aa7bf2a9b140bc5c9e1e92c30808e906a7db89c1f52c41558a26834f3f9e40470b0db9fe0378dd13edebc9d011a56607f9d8439377cd2c SHA512 1650d20c77a249a2cb3fd391ca2b0fdadccc9fcbadd33c82c347303f71aecc1306d0f8261986c71bdb8f33200de9803e055cbf6e17c55e98255e9db7e82a16bc
+DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
+EBUILD gitlab-ci-linter-2.2.0.ebuild 3104 BLAKE2B 61929c407f9e79d5ca3f2c80f4c7f6460473f4e3f6c3f891156301c50c03e05777ee40258a361c2ffa7748559aa7173154ba19814dbcec4f2adae2efdbe1ded6 SHA512 bf6455d4e4ec03aa5b30be9a88ed5c9c2597e55f1b2f7a40d3b7864d090bfc9956c9ecd0e49c86b91d89d99babdb3feeed9aaf6217f0253300fb3b2d577b6027
+MISC metadata.xml 257 BLAKE2B 8a445824133c1734e7b46cdd3a60bb4ac98fb4159b48856d0e296c796c700a2d9ec9ae3c94072f07aaaed98ac22088892b03c358e577df9cfbafa40194e756ee SHA512 9d6339780243409ea9233a9f5faa5c1f5b13431d35792fc6986ed5c3e9ae2e21139f44c11140519ea6cf10ab6db1d06408c1305af9e99cbbd1f2d4b27361a13c
diff --git a/dev-util/gitlab-ci-linter/files/gitlab-ci-linter-no-strip.patch b/dev-util/gitlab-ci-linter/files/gitlab-ci-linter-no-strip.patch
new file mode 100644
index 000000000000..95bb444ddc73
--- /dev/null
+++ b/dev-util/gitlab-ci-linter/files/gitlab-ci-linter-no-strip.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile b/Makefile
+index 87b1456..832a1e1 100644
+--- a/Makefile
++++ b/Makefile
+@@ -56,9 +56,7 @@ BUILDTIME?=$(shell date +%FT%T%z)
+ 
+ MAIN_PACKAGE_PATH=$(shell go list . 2> /dev/null)/
+ LDFLAGS+=-X $(MAIN_PACKAGE_PATH)config.VERSION=${VERSION} -X $(MAIN_PACKAGE_PATH)config.REVISION=${REVISION} -X $(MAIN_PACKAGE_PATH)config.BUILDTIME=${BUILDTIME}
+-ifeq ($(DEBUG),0)
+-  LDFLAGS+=-s -w
+-else
++ifneq ($(DEBUG),0)
+   LDFLAGS+=-X $(MAIN_PACKAGE_PATH)config.RELEASE=false
+ endif
+ CYCLOTHRESHOLD?=20
diff --git a/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild b/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
new file mode 100644
index 000000000000..9ea4cb00364c
--- /dev/null
+++ b/dev-util/gitlab-ci-linter/gitlab-ci-linter-2.2.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit go-module
+
+DESCRIPTION="linter for .gitlab-ci.yml files"
+HOMEPAGE="https://gitlab.com/orobardet/gitlab-ci-linter"
+
+EGO_SUM=(
+	"github.com/BurntSushi/toml v0.3.1/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0"
+	"github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod"
+	"github.com/fatih/color v1.9.0"
+	"github.com/fatih/color v1.9.0/go.mod"
+	"github.com/go-ini/ini v1.52.0"
+	"github.com/go-ini/ini v1.52.0/go.mod"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1"
+	"github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod"
+	"github.com/jtolds/gls v4.20.0+incompatible"
+	"github.com/jtolds/gls v4.20.0+incompatible/go.mod"
+	"github.com/mattn/go-colorable v0.1.4"
+	"github.com/mattn/go-colorable v0.1.4/go.mod"
+	"github.com/mattn/go-isatty v0.0.8/go.mod"
+	"github.com/mattn/go-isatty v0.0.11/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/pmezard/go-difflib v1.0.0"
+	"github.com/pmezard/go-difflib v1.0.0/go.mod"
+	"github.com/russross/blackfriday/v2 v2.0.1"
+	"github.com/russross/blackfriday/v2 v2.0.1/go.mod"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0"
+	"github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d"
+	"github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod"
+	"github.com/smartystreets/goconvey v1.6.4"
+	"github.com/smartystreets/goconvey v1.6.4/go.mod"
+	"github.com/urfave/cli/v2 v2.1.1"
+	"github.com/urfave/cli/v2 v2.1.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a"
+	"golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod"
+	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd"
+	"golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384"
+	"golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod"
+	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
+	"gopkg.in/ini.v1 v1.52.0"
+	"gopkg.in/ini.v1 v1.52.0/go.mod"
+	"gopkg.in/yaml.v2 v2.2.2/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://gitlab.com/orobardet/${PN}/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-no-strip.patch
+)
+
+src_compile() {
+	unset LDFLAGS
+	emake
+}
+
+src_install() {
+	dobin .build/gitlab-ci-linter
+	dodoc -r CHANGELOG.md doc README.md
+}
diff --git a/dev-util/gitlab-ci-linter/metadata.xml b/dev-util/gitlab-ci-linter/metadata.xml
new file mode 100644
index 000000000000..3c49bd23955c
--- /dev/null
+++ b/dev-util/gitlab-ci-linter/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+			<name>William Hubbs</name>
+				</maintainer>
+					</pkgmetadata>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 89c04930a9e7..d7832b2c907d 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -6,7 +6,7 @@ DIST glslang-8.13.3560_pre20200404.tar.gz 3185684 BLAKE2B fac831212b46b22f10657e
 DIST glslang-8.13.3743.tar.gz 3183453 BLAKE2B 2e8fc3693477be8bd6f8000a0eb032b314f5903991dc5a73dbd913a92aa0d6878e45f29f0a01ca5e8453b566d8a503a3cf4256def7f90a4cb561391b047c2a1d SHA512 19169c4ffa511113978af8e8efc57b290d4aa962a4c2429dbea1af72204787c6ce20ffbbb452dc04bef5416e00510819d84463a2e76295b9a59b409e12af6792
 EBUILD glslang-7.12.3353_pre20191027-r2.ebuild 848 BLAKE2B c21ffc390e783a2abae679b7c10b20b0f6b2c7c0240638a54b2717c0e65289006b367ddc96115f6234a3c999515314736011649283c14ec73aec8c37abd26710 SHA512 d6b739906ffc084106aa5dcd0182980c91a0874b1425f1eaa2b05e206597e2f7c807f87c02c8fca0db5c1f9860a378579cbfb4646f429bca72de672c151e87ee
 EBUILD glslang-8.13.3559.ebuild 759 BLAKE2B 64a7cb4e904a835110d41ce432dbb04a2e60efd884daa5daea7f36eaa6356126793239889b0b69ce87ebdcaea2987550b84405c58553dd87276a579a61b788f2 SHA512 0a362fa37d32551a976a8ced67b9dee1556b3c8f5c90cdb7446643c4ea4f07e388bfc9594e9de9ad3daa5f8c638db3373ef6592566ed72349dd892c5a24777b6
-EBUILD glslang-8.13.3560_pre20200404.ebuild 884 BLAKE2B 126abfde9be25dbbbd33e08f45d8462f49e36fa617534f1307bcc9f0a8be8214c5fa7aa360fceb5987aa5a96aef13711533c7ab1a91dbafd5499864822eef1e4 SHA512 ffe09ee75aa4fcf0553d7304a9d326b36db517173b19d32f2e768ae74372216b396dac4180ee479ea8a6c1c5d339671b35293f0f9d6d2c77853389fe930ac188
-EBUILD glslang-8.13.3743.ebuild 849 BLAKE2B 74e7eb4b4ce2b001829b8c5f4056a37781be2497d9bfe4ffcd217e369e3bf0543fd93bed9c52c4141ddd769b682a5a3b649dd6c5ef45c1b5dc3a318d6ec63077 SHA512 31a3b832468a9145df12525d531107cf1583b9982ed05dbe53ec6b83d015e4231412f9cd0d9c2bf7891c2288f94e910c4befa33238f377439a9c3560943bf3bc
-EBUILD glslang-9999.ebuild 770 BLAKE2B ea332118b323713227c3cf942ced066a9a787a989787051e92b330adf1c64285e3b2fdd7a78757c7128898131c5421403a5493aab30c4bec0b96b076b3696d31 SHA512 9adedff6a45bfada507ac9b09ee8d23d05cc6e957842273b11d88129a4c93c236ed6c4d65a20efaf7c42d19c073dd8733fbf70448bc3f2c7c9e434adc923d88d
-MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
+EBUILD glslang-8.13.3560_pre20200404.ebuild 870 BLAKE2B a79d014151d18393e8fc95cd4bf3ca7eb859ba7250665ea97d3f77c60973dd496c0ca82a1c0f90d5870bcb6b2e87d5fb29ee9bc968b70b9df6900cdc90827f6b SHA512 47ad53da564d55ab780b5a69abcc232798f2c48b9babf9391416abf34a8f7871ffbb27d6893cf98caf56cf079b3885f06e8b6e60a3407a5e051938beef7b8cd7
+EBUILD glslang-8.13.3743-r1.ebuild 835 BLAKE2B d23510edf3f2238c6a720c5c8a8eb0a2c296c2afa04201cfee0ae04f154602e2c3db5226a428b7aff1b167ba2c2ddd05587e589c11ce733da2436b8b67f9f724 SHA512 dc922535ee006ae074b42bdd462fe552575fb922c0faa886db3d960e768f19baf680860e4eb4b545f6f5156cc5343e59c660a2f4ee93b7aa550e630372fb2f00
+EBUILD glslang-9999.ebuild 758 BLAKE2B f4f9a1e734aff4245c035d872d6c3a04abebf472730398d666bddab58cda002843b4dd9f06eac7d652c4db176cc9333e025ad27ddd1752a509786e12e341f9d1 SHA512 dc7eed08504ce61a142ad4ab3e6a9cdef360163dc5deb29dc61823ddf25f4915abfc0e127900c0acaeea3173e46c2fc152eaff41bdb6313861b04c052c57925f
+MISC metadata.xml 330 BLAKE2B fd98c615a1b5c3364e122b66d18e9667ff1bae51218e2474862a0376f352421cfbe7aa3b4f9751ff8e8f24510f4a6e3f0e1977ca759b566b54f48fa45243980c SHA512 9658890a6aa3ae0c91e71416c3996d9c8064bb970521b5c444d617fc4a51ef2edb62aa7d44b25ef96768417de0c5478999e74405c6d9ff847816311990c945ee
diff --git a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
index 4279ffe872c9..b39594040ce6 100644
--- a/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
+++ b/dev-util/glslang/glslang-8.13.3560_pre20200404.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="b5757b95005bbf6b0287096c5b708c5e25645311"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https:/
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
+RDEPEND="!<media-libs/shaderc-2020.1"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
diff --git a/dev-util/glslang/glslang-8.13.3743.ebuild b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
index a899b7455579..c6ed470a423f 100644
--- a/dev-util/glslang/glslang-8.13.3743.ebuild
+++ b/dev-util/glslang/glslang-8.13.3743-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	SNAPSHOT_COMMIT="${PV}"
 	SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}/${PN}-${SNAPSHOT_COMMIT}"
 fi
 
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https:/
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
+RDEPEND="!<media-libs/shaderc-2020.1"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
diff --git a/dev-util/glslang/glslang-9999.ebuild b/dev-util/glslang/glslang-9999.ebuild
index 3d445bb75ed1..169c585773e9 100644
--- a/dev-util/glslang/glslang-9999.ebuild
+++ b/dev-util/glslang/glslang-9999.ebuild
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ https:/
 LICENSE="BSD"
 SLOT="0"
 
-RDEPEND="!<media-libs/shaderc-2020.4_pre20200405"
+RDEPEND="!<media-libs/shaderc-2020.1"
 BDEPEND="${PYTHON_DEPS}"
 
 # Bug 698850
diff --git a/dev-util/glslang/metadata.xml b/dev-util/glslang/metadata.xml
index 241e7de59999..c277a8030673 100644
--- a/dev-util/glslang/metadata.xml
+++ b/dev-util/glslang/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="project">
-		<email>x11@gentoo.org</email>
-		<name>X11</name>
-	</maintainer>
 	<maintainer type="person">
 		<email>sarnex@gentoo.org</email>
 		<name>Nick Sarnie</name>
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index 62aee8d78ffa..981ce2fc7189 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -2,5 +2,8 @@ AUX 3.34.1-optional-vala.patch 1249 BLAKE2B dcec506c976b6438cec14d941b911cdc11fe
 AUX libgit2-1.0-compat.patch 968 BLAKE2B c17cfba66245c6dd15973a094a89b5fe23493e2f83521c80c214b0ca9edde99fe8982ff73cc779de07b8a4fd548c8a85ca7570d2828299cf7b1e9e599ff9c5cf SHA512 da367d649bf14e1a4b8d0d59e446e6198939fc25f49484eb05d0f9195cd1136d098d581781e872e80f385996a7b043fd5756fea12fd24a931bece04b8ba3698a
 DIST gnome-builder-3.34.1-patchset.tar.xz 44680 BLAKE2B 91e91ac8d0fcf6b54d32ce9f1dc209ac22db790a29d724dad20e337fe1962f3d407b59e7f976f1e88277833849c962a470346bb5a308e39b637e6e9ca1dc2c2a SHA512 a114346b093976db227087743a7bbe2ca9523b64a67c95729bfeb7c3c346b3bfb4d02f5e11d36bbbaf506bc7a7f140883bdea7c78407243287bc400dfda43b57
 DIST gnome-builder-3.34.1.tar.xz 11974748 BLAKE2B c34a31c50b327d02632ff18d48ad59f925306901e8874e0c7811b9258c56027403de0d9dc1877c696d96037bdfcdcc27f56f59a41d232e47b330382b1dbf67e9 SHA512 886c732f20563818dcf1deb96d4277fe96a9499b999cfbc7a64286e816e9a36bb978932d36a1e764b54c2d36891b7546fa058f51e036b0fa101c0872f4ce51d8
+DIST gnome-builder-3.36.0-patchset.tar.xz 136856 BLAKE2B a482f371313af4ef6a0881968846c4543d169b6bd36942ae4b72d493012d73c9705e4a7acc8f7dfc1e8cbcdeb2445b4e225f39c3a9a219e24b90be773c0768c1 SHA512 ebaec56950e0e45ba2851b13d4e1518163a291dca207bba25efe12eaaa3cd69e9bae06d2f4e5b9e9852a4305fc3933764ec9a882843f84ce58bd2246991d16fd
+DIST gnome-builder-3.36.0.tar.xz 12015980 BLAKE2B 1724c7b17e58fea08cd22894eb260236419f215c1b68d396359ce40432e8a0c08d0ead2b70e888cbb767f78362d4253395b98821fb1d1ff9a07d5881df88c8e3 SHA512 ccd6ca916ed6ad10b69e5573482e2ea48cf4227d858605825ab56989840ebbf5a6dfafc915a1f8df3a1061b37c80adfbd03fc9d616c67e08a5032069b11aa4a6
 EBUILD gnome-builder-3.34.1-r1.ebuild 7372 BLAKE2B a60c1261ab7251f3a0cfff69538f0f92bb8a197d2624e3aa62703b9e6b808e3c0793a048a61ff0b409c51c1f6467ca0f5df7d513a825103bbb4c71263fb0bd2b SHA512 e1fcba969d1a9ab368775a80cc7a0ebe35e76a11cd78d49509a2837ab5efd045f9cf1e058397ab943bcdce4eb99e71baea8d2c72f398baeca8500f40dca28bca
+EBUILD gnome-builder-3.36.0.ebuild 6904 BLAKE2B 53f8cc1b0aa6fb85a0fa208b45c68c932c264c477c256c095fdab539567a1ca5db7bc1ed81a97be58c59551902c64b0792165d0cd180b521a5bae62fb8d7d6ef SHA512 eb9469f65d67b9e582ee341a137bc1eceef75c9b37898e0d1c3c47012227f63af0bdae7f57192705fcdfb009d751f522e5e4f89752d72ef75fafd16296a98033
 MISC metadata.xml 1085 BLAKE2B 0b2bdcfec562b85e54880c819a0345c2aedf4f8b1c0bc34b7b4e3e8551697dcbb3ed93da1e016f3a164bb677459e8d628ba943252e51e842152282c3757f0232 SHA512 58890d32c2d04d63eaae8489ea68054ffc50df5bf9970af6b159b2dfbc99b8ed2d2db80aa29907463c137caf5eb8aa129c1470d1e19ccbf398ff8789f7f63987
diff --git a/dev-util/gnome-builder/gnome-builder-3.36.0.ebuild b/dev-util/gnome-builder/gnome-builder-3.36.0.ebuild
new file mode 100644
index 000000000000..af7182a070d1
--- /dev/null
+++ b/dev-util/gnome-builder/gnome-builder-3.36.0.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISABLE_AUTOFORMATTING=1
+FORCE_PRINT_ELOG=1
+
+inherit gnome.org gnome2-utils llvm meson python-single-r1 readme.gentoo-r1 virtualx xdg
+
+DESCRIPTION="An IDE for writing GNOME-based software"
+HOMEPAGE="https://wiki.gnome.org/Apps/Builder"
+SRC_URI+=" https://dev.gentoo.org/~leio/distfiles/${P}-patchset.tar.xz"
+
+# FIXME: Review licenses at some point
+LICENSE="GPL-3+ GPL-2+ LGPL-3+ LGPL-2+ MIT CC-BY-SA-3.0 CC0-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="clang +devhelp doc +git +glade gtk-doc spell sysprof test"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# When bumping, pay attention to all the included plugins/*/meson.build (and other) build files and the requirements within.
+# `grep -rI dependency * --include='meson.build'` can give a good initial idea for external deps and their double checking.
+# The listed RDEPEND order shold roughly match that output as well, with toplevel one first then sorted by file path.
+# Most plugins have no extra requirements and default to enabled; we need to handle the ones with extra requirements. Many of
+# them have optional runtime dependencies, for which we try to at least notify the user via DOC_CONTENTS (but not all small
+# things); `grep -rI -e 'command-pattern.*=' -e 'push_arg'` can give a (spammy) idea, plus python imports in try/except.
+
+# FIXME: plugin_flatpak needs flatpak.pc >=0.8.0, ostree-1, libsoup-2.4.pc >=2.52.0 and git plugin enabled
+# Editorconfig needs old pcre, with vte migrating away, might want it optional or ported to pcre2?
+# An introspection USE flag of a dep is required if any introspection based language plugin wants to use it (grep for gi.repository). Last full check at 3.28.4
+
+# TODO: Handle llvm slots via llvm.eclass; see plugins/clang/meson.build
+RDEPEND="
+	>=dev-libs/libdazzle-3.33.90[introspection]
+	>=dev-libs/glib-2.61.2:2
+	>=x11-libs/gtk+-3.22.26:3[introspection]
+	>=x11-libs/gtksourceview-4.0.0:4[introspection]
+	>=dev-libs/json-glib-1.2.0
+	>=dev-libs/jsonrpc-glib-3.19.91
+	>=x11-libs/pango-1.38.0
+	>=dev-libs/libpeas-1.22.0[python,${PYTHON_SINGLE_USEDEP}]
+	>=dev-libs/template-glib-3.28.0[introspection]
+	>=x11-libs/vte-0.40.2:2.91[introspection]
+	>=net-libs/webkit-gtk-2.12.0:4=[introspection]
+	>=dev-libs/libxml2-2.9.0
+	git? ( dev-libs/libgit2[ssh,threads]
+		>=dev-libs/libgit2-glib-0.28.0.1[ssh]
+	)
+	dev-libs/libpcre:3
+	dev-libs/libpcre2
+
+	>=dev-libs/gobject-introspection-1.54.0:=
+	$(python_gen_cond_dep '
+		>=dev-python/pygobject-3.22.0:3[${PYTHON_USEDEP}]
+	')
+	${PYTHON_DEPS}
+	clang? ( sys-devel/clang:= )
+	devhelp? ( >=dev-util/devhelp-3.25.1:= )
+	glade? ( >=dev-util/glade-3.22.0:3.10 )
+	spell? ( >=app-text/gspell-1.8:0=
+		app-text/enchant:2 )
+	>=dev-util/sysprof-capture-3.33.1:3
+	sysprof? ( >=dev-util/sysprof-3.33.4:0/3[gtk] )
+"
+DEPEND="${RDEPEND}"
+# TODO: runtime ctags path finding..
+
+# desktop-file-utils required for tests, but we have it in deptree for xdg update-desktop-database anyway, so be explicit and unconditional
+# appstream-glib needed for validation with appstream-util with FEATURES=test
+BDEPEND="
+	doc? ( $(python_gen_cond_dep '
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+	') )
+	gtk-doc? ( dev-util/gtk-doc
+		app-text/docbook-xml-dtd:4.3 )
+	test? (
+		dev-libs/appstream-glib
+		sys-apps/dbus )
+	dev-util/desktop-file-utils
+	dev-util/glib-utils
+	>=dev-util/meson-0.49.2
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+DOC_CONTENTS='gnome-builder can use various other dependencies on runtime to provide
+extra capabilities beyond these expressed via USE flags. Some of these
+that are currently available with packages include:
+
+* dev-util/uncrustify and dev-python/autopep8 for various Code Beautifier
+  plugin out of the box functionality.
+* dev-util/ctags with exuberant-ctags selected via "eselect ctags" for
+  C, C++, Python, JavaScript, CSS, HTML and Ruby autocompletion, semantic
+  highlighting and symbol resolving support.
+* dev-python/jedi and dev-python/lxml for more accurate Python
+  autocompletion support.
+* dev-util/valgrind for integration with valgrind.
+* dev-util/meson for integration with the Meson build system.
+* dev-util/cargo for integration with the Rust Cargo build system.
+* dev-util/cmake for integration with the CMake build system.
+* net-libs/nodejs[npm] for integration with the NPM package system.
+'
+# FIXME: Package gnome-code-assistance and mention here, or maybe USE flag and default enable because it's rather important
+# eslint for additional diagnostics in JavaScript files (what package has this? At least something via NPM..)
+# jhbuild support
+# rust language server via rls; Go via go-langserver
+# autotools stuff for autotools plugin; gtkmm/autoconf-archive for C++ template
+# gjs/gettext/mono/PHPize stuff, but most of these are probably installed for other reasons anyways, when needed inside IDE
+# stylelint for stylesheet (CSS and co) linting
+# gvls for vala language-server integration
+
+PATCHES=(
+	"${WORKDIR}/patches" # gnome-builder-3-36 branch 2020-06-17 (commit f9a82f62ce6c8)
+)
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	use clang && llvm_pkg_setup
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dtracing=false
+		-Dprofiling=false # not passing -pg to CFLAGS
+		-Dtcmalloc=false
+		-Dchannel=other
+
+		$(meson_use doc help)
+		$(meson_use gtk-doc docs)
+
+		-Dnetwork_tests=false
+		$(meson_use clang plugin_clang)
+		$(meson_use devhelp plugin_devhelp)
+		-Dplugin_deviced=false
+		-Dplugin_editorconfig=true # needs libpcre
+		-Dplugin_flatpak=false
+		$(meson_use git plugin_git)
+		$(meson_use glade plugin_glade)
+		-Dplugin_podman=false
+		$(meson_use spell plugin_spellcheck)
+		$(meson_use sysprof plugin_sysprof)
+		-Dplugin_update_manager=false
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+	python_optimize
+	if use doc; then
+		rm "${ED}"/usr/share/doc/gnome-builder/en/.buildinfo || die
+		rm "${ED}"/usr/share/doc/gnome-builder/en/objects.inv || die
+		rm -r "${ED}"/usr/share/doc/gnome-builder/en/.doctrees || die
+		# custom docdir in build system, blocked by https://github.com/mesonbuild/meson/issues/825
+		mv "${ED}"/usr/share/doc/gnome-builder/en "${ED}"/usr/share/doc/${PF}/html || die
+		# _sources subdir left in on purpose, as HTML links to the rst files as "View page source". Additionally default docompress exclusion of /html/ already ensures they aren't compressed, thus linkable as-is.
+		rmdir "${ED}"/usr/share/doc/gnome-builder/ || die
+	fi
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+	readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
+
+src_test() {
+	# FIXME: can't run meson_src_test together with virtx or dbus-run-session
+	virtx dbus-run-session meson test -C "${BUILD_DIR}"
+}
diff --git a/dev-util/include-what-you-use/Manifest b/dev-util/include-what-you-use/Manifest
index 29ddabf58510..8de2eac1e4ce 100644
--- a/dev-util/include-what-you-use/Manifest
+++ b/dev-util/include-what-you-use/Manifest
@@ -1,5 +1,3 @@
 DIST include-what-you-use-10.0.tar.gz 598644 BLAKE2B 36c81bd493edfdfdc4df31c2dcb49d5acd3f6016f706e0c9d2f031d668ca16d71797d40b04fc9dc25a21738f7075320406fd666db74a0baa3832c149fe674e0e SHA512 e54a7c7e3a6d3e0de7c263d1f26b373d95b8fab5f1f7e76f52d80341bda2bad0fb12238a325dc1e2f6d3ab5e6d8e0b4ed60b5a19dc82e06d480bcb461f9aefba
-DIST include-what-you-use-9.0.src.tar.gz 589377 BLAKE2B b695354787070948d81e3e80b07bbe47a84b5609262df2220b6a62e6d648865b17e060951819f45956c6ca858977614d6e0401640509599b391a1165521b20de SHA512 f2d6ba05121a9968da9e42e8ac66f83ca0f35bfbe7cb1d616e2c6479cf2833c4668cb86e46a04ffcd5e77f10a575da9eeee5272c7609b5afad555d79cb640fb4
 EBUILD include-what-you-use-10.0.ebuild 1286 BLAKE2B 1742f6da93355f96388c2f3f22d8d5f320dd224f6b3a174672a81bc200f02836dd613e97159da3186944b0b299c3b0032281144636d83601d8fa756dca3c75ce SHA512 d93c70b87a04a10ff5e0015c39236769f6dd1c2b39e60b471840d2a2e481efeaf8fcf60808875c77735c1d2cffdf55203514afaeebbcde14e7f34af12d639e6c
-EBUILD include-what-you-use-9.0.ebuild 1208 BLAKE2B 59decc2765b2d2ae78e94c153d4f879112bc07a6b42c4233837415a749bad5449c97f725c48cdaa5e5b3bc09d8142647a56f41b9ab3de5d5996a3a0150a58571 SHA512 e91cdb66656aaacd9fc094a872292ea5faad4bbd5d39a8b2ff075f0ffb4e45dbcf5fbe78ea46a9790a65504097fec81c74b6ab7a7fc4c1214a5fefddd633f746
 MISC metadata.xml 357 BLAKE2B f14a0380bab03b4bb916602ed495cf9c29a4ca5839f71dca0d5f4f14eeb5fd0ddaa66dfcb15d94cbeec2a9021a9e5522ef7ae531b5b6f111b769462596da4216 SHA512 03c298d184adee1c8bd96855ba3856dbc6797f6f866397485cc10c3e02956f7bb04811a086e9cf50bbd6f996011d08ca2d272aa4b06f13ee62af5a585f67b492
diff --git a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild b/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
deleted file mode 100644
index 43be4f410509..000000000000
--- a/dev-util/include-what-you-use/include-what-you-use-9.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit cmake-utils flag-o-matic llvm python-single-r1
-
-DESCRIPTION="Find unused include directives in C/C++ programs"
-HOMEPAGE="https://include-what-you-use.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/clang_${PV}.tar.gz -> ${P}.src.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-LLVM_MAX_SLOT=9
-
-RDEPEND="sys-devel/llvm:${LLVM_MAX_SLOT}
-	sys-devel/clang:${LLVM_MAX_SLOT}
-	${PYTHON_DEPS}
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-S=${WORKDIR}/${PN}-clang_${PV}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_fix_shebang .
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Note [llvm install path]
-		# Unfortunately all binaries using clang driver
-		# have to reside at the same path depth as
-		# 'clang' binary itself. See bug #625972
-		# Thus as a hack we install it to the same directory
-		# as llvm/clang itself.
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix "${LLVM_MAX_SLOT}")"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	"${EPYTHON}" run_iwyu_tests.py
-}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index b80f1754b160..5348b03df305 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -1,9 +1,6 @@
-AUX intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch 1335 BLAKE2B 6b710f0f02f36bc795c407fd70e4f4ef6931794114f692b16ed48b98547345e60293c1d8d03bddff2db20722e362a4cc9493d36ceb2eb7f4fd8abdffd72b6144 SHA512 4af69610c65be18700f9d14f6d856ea8016fb5b9ed0aae6ad8ca0e0c663fd7ea30779f0b17c61a330edad2b550bea1b723a4a64f5807822252725fbc65adfb98
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.3151.tar.gz 5950502 BLAKE2B 8ccbfc5d3cd6307eb5db602822d42e8744e6ca7696494a0dd349847aff0defde2434b9192f17645f1fcbf732ec98a66dbdcc7d03eed48702d90911f912135fc1 SHA512 a6e04a3a90aae9046f2698bf15d5f60862c93e7a87a6e4ae6b6c43c65490583608f201e94a2ef32fc2f72e9fa0da7d6c202f64ef610f03a81384ac537541df14
-DIST intel-graphics-compiler-1.0.3445.tar.gz 6026437 BLAKE2B 4a4708109d125891dfe967186efbc2ebe70ce59dc0302f534dad74c0b1f2af36de0d7ee7cb69059e776ab4669236f5d62750159a44d44a6444ab85a205273563 SHA512 044b941adb921b25a1ab6da3ebe0f7c4d67769b43e5b855ae94871281cf387ce45351b8b46a6e98e3bd573022d7cfd9316629d590327c8f4007e1b1ae9f7071e
 DIST intel-graphics-compiler-1.0.3826.tar.gz 6007014 BLAKE2B fc09d6443818403bca803f3f78fbb9ee9a25ab674372585b880e038227712f8114ca2b17d6b219149f54f9f5856b973d3500f6537027660d1c657d61992f9e9b SHA512 e4f06d6b8d2a7161f80956a8e9cbf23aa7293a31781405bc17ee512d27ca4114facc6bb0fa7f47fde3a37aa79ce288a98aef8b74c4e572e73d70bb50c21f6fbb
-EBUILD intel-graphics-compiler-1.0.3151.ebuild 895 BLAKE2B 9924a3f7db2a7a8e75bdbdbe3d50f42b60c5265ae6e2cb50df52ed860c2178f6a2f00bcac075d5914f47d5e2abd8b7f4fb8e7d2fd06a7aa6d3dcb5d90f91dd6f SHA512 e5d68db8303f165259c399e2d786991ace0628aac5667ac28200d9ba9952c16c23cfb872914cc6e6e4dc00cb9b7bd11b023627f62de5aca661d8bc3de8ecd782
-EBUILD intel-graphics-compiler-1.0.3445.ebuild 1448 BLAKE2B c8175562df6d37f1fddfa760b69fe20a5b1e35ee88493750e659bbdad83b6f4cb3edeadf8f94f0ec47b5f808a04a05f17711ea1ca410d6679dc087d4631b5918 SHA512 00db2187b0869417835a78aec5361df6cf3606ed952b3f3fc51b7a43d027548302723ab02bd613d0dd5f1632c5bd660f208d72b6eb7f1bc6abfffe8d584f646e
+DIST intel-graphics-compiler-1.0.4111.tar.gz 5781246 BLAKE2B 6fe47422b31b0c73d24c3cef1265772927a57751bf5648f862f7c73528f2174268fdb2271c30c49ab038b4dfbe530bc088fe727e66babc5db0a41759e7212733 SHA512 8f589ee83a27b7a8f5abcd008e36a73fb704c20c1ae17e1ef265c59641768b75a0a08f2d6f80355442fff7625154603db3ebe9be0a4ba702b45e85db434f8110
 EBUILD intel-graphics-compiler-1.0.3826.ebuild 1594 BLAKE2B e3a96e480f23b0ce4761cae5734c22ba4e835d9cd6f4225ac0a7539a7038443e0b4d25f6b2eadb0b40de4d275bd03fe1d1945f9e591883f8a37ec6f72db457fc SHA512 1b132608d543afc632148941dce4e50f63ce86a558a798201b2cf5dca7fc1a9f5ba7c3ba8f5dab67d51c2c369f1d844eb10b4d76702f4b7ed4a2cf1cbea1468f
+EBUILD intel-graphics-compiler-1.0.4111.ebuild 1595 BLAKE2B f096bc2bde19be56e368a11e2174f9aef4a412595dd96fa7736ea67d1293aa5325f894c84eb3b12c93a8a9f96230f934f07750202dfdaac56bbcbb9b3bc4b3d8 SHA512 74a2e5639030e4dcd4601005be37846f289ba25c13bbb452769659660a73f36f1e6dfdcd1c432639383f15c9f33cb4990e3446d8b469a47363918cdc1f28e791
 MISC metadata.xml 340 BLAKE2B 6c0e5d932084dffd300a1dc70b29eb0871dfe2187ed8591a5a2f8cba001bf681e908c58a6f9471f7b08842ff538365258305da91004ed63ff97314a07fda529f SHA512 d24016b4ae0ffb05be475f86bb8d72ab4a85475655f409b8826dcd69726e048aa048e321f26ac36f2f52aec40abbfa66a95354a711332df94dc3e57e6c396a0c
diff --git a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch b/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
deleted file mode 100644
index 931ba4437b14..000000000000
--- a/dev-util/intel-graphics-compiler/files/intel-graphics-compiler-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5a07111005b570875da8796f91b385edc483c0da Mon Sep 17 00:00:00 2001
-From: "Wesierski, Lukasz" <lukasz.wesierski@intel.com>
-Date: Mon, 24 Feb 2020 05:27:13 -0800
-Subject: [PATCH] Fix for building separated dynamic llvm libs
-
-Change-Id: I3796e7a925e32bfee2dfda60fbaa3f21122e62cb
----
- IGC/CMakeLists.txt | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/IGC/CMakeLists.txt b/IGC/CMakeLists.txt
-index 8634c456..891a3f5b 100644
---- a/IGC/CMakeLists.txt
-+++ b/IGC/CMakeLists.txt
-@@ -82,7 +82,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
- 
- # ================================================ Flags ===============================================
- 
--
- # Escapes text for regular expressions.
- #
- # @param retValName Name of variable placeholder where result will be returned.
-@@ -3309,12 +3308,18 @@ else()
-         "LLVMDemangle"
-         )
- 
--    if(LLVM_VERSION_MAJOR EQUAL 8)
-+    if(LLVM_VERSION_MAJOR GREATER_EQUAL 8)
-         list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
-           "LLVMInstCombine"
-           )
-     endif()
- 
-+    if(LLVM_VERSION_MAJOR GREATER_EQUAL 9)
-+        list(APPEND IGC_BUILD__LLVM_LIBS_TO_LINK
-+          "LLVMBitstreamReader"
-+          )
-+    endif()
-+
- endif()
- 
- # ==================================== WrapperLLVM package =============================================
--- 
-2.24.1
-
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
deleted file mode 100644
index b6771efb82c8..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3151.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
-
-DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-COMMON="sys-devel/llvm:8=[${MULTILIB_USEDEP}]
-	dev-libs/opencl-clang:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-)
-
-S="${WORKDIR}"/${PN}-igc-${PV}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)
-		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
-		-DIGC_PREFERRED_LLVM_VERSION=${LLVM_MAX_SLOT}
-	)
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
index 7076388bbd05..7c11b12c6397 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.3445.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.4111.ebuild
@@ -4,7 +4,8 @@
 EAPI=7
 
 CMAKE_ECLASS=cmake
-inherit cmake-multilib llvm
+
+inherit cmake-multilib flag-o-matic llvm
 
 DESCRIPTION="LLVM-based OpenCL compiler targetting Intel Gen graphics hardware"
 HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
@@ -13,8 +14,9 @@ SRC_URI="https://github.com/intel/${PN}/archive/igc-${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
+IUSE="debug"
 
-LLVM_MAX_SLOT=9
+LLVM_MAX_SLOT=10
 
 COMMON="<=sys-devel/llvm-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]
 	<=dev-libs/opencl-clang-${LLVM_MAX_SLOT}.9999:=[${MULTILIB_USEDEP}]"
@@ -23,7 +25,6 @@ RDEPEND="${COMMON}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.0.9-no_Werror.patch
-	"${FILESDIR}"/${PN}-1.0.3445-Fix-for-building-separated-dynamic-llvm-libs.patch
 )
 
 S="${WORKDIR}"/${PN}-igc-${PV}
@@ -37,6 +38,10 @@ multilib_src_configure() {
 	has_version -d sys-devel/llvm:$llvm_slot || die "LLVM slot matching $ocl_clang_ver not found ($llvm_slot)"
 	einfo "Selecting LLVM SLOT $llvm_slot: $(best_version -d sys-devel/llvm:$llvm_slot)"
 
+	# Since late March 2020 cmake.eclass does not set -DNDEBUG any more, and the way
+	# IGC uses this definition causes problems for some users (see Bug #718824).
+	use debug || append-cppflags -DNDEBUG
+
 	local mycmakeargs=(
 		-DCMAKE_LIBRARY_PATH=$(get_llvm_prefix ${llvm_slot})/$(get_libdir)
 		-DIGC_OPTION__FORCE_SYSTEM_LLVM=ON
diff --git a/dev-util/jenkins-bin/Manifest b/dev-util/jenkins-bin/Manifest
index 211990e6ed48..bcedaf98371d 100644
--- a/dev-util/jenkins-bin/Manifest
+++ b/dev-util/jenkins-bin/Manifest
@@ -3,12 +3,10 @@ AUX jenkins-bin.confd 998 BLAKE2B 5c44e37118e15fdd76fc7eb0e10e06683828d3efe08687
 AUX jenkins-bin.init2 1782 BLAKE2B 25c78b64308be71d605f3c4f2d33c5cf1074ab431e23a170f7d36002d668def7dbd56b0b45590692047d7d88c6884ec1cc40cb4f077f7edcb853300301805002 SHA512 e0fd85f653bbf5ac80dc929cb265ac86a08047f9102d57f2ac6194cd31794310a3c062824423552a3ee65e298506332436fca037f96963358dc511982f900be8
 AUX jenkins-bin.service 499 BLAKE2B 28a90d5cf40e46880570e87acbc6d78766460faebc6e9a79b8c446fc05babf1de405cf79e29f527f0e9e0bf91093836fb6a50c7040320f59e78bf1971cd14ed3 SHA512 4ede5e0d55bf9d53239a1b8c152d1a3e38510982d6ff01c9c4288d63b8312ab7412979e0af3466638c7ef2803b711d49344692c14e72baa85d8eb4caa15f7506
 AUX jenkins-bin.service2 566 BLAKE2B 38511fddc783a70ae3deab70526c737a883ef090bcfb20216658b0775667022782f3ee8a6638515b46e6a4df96228fb2368521c74a0ddca2f121e9170549df8e SHA512 87b59349edcb1503e6c91440327092732f0dddb8cc35e4576c81da55e08a2ad67d462a4d871c46da4f3ed037de8b9109d766ba36ca9acf244506d129766ed5cb
-DIST jenkins-bin-2.222.1.war 66288019 BLAKE2B 53d8c1edfc9670d6690af881cfa422baba1ba7ebff9f378370eda85655d3d08b109ef02cf5207991f9c2c825f46658325bb3d936addcfb0a43be5b1780cfd282 SHA512 3db18c6cbe903f09a743058f63c372a9daa7b9193e6693240ad0b3b573df4572ca88fb28040be6e5af38e888132ada0d333dde65c74a56ed615ee4fc41d25d99
-DIST jenkins-bin-2.222.3.war 66241734 BLAKE2B fa84737feee7b54d444640c8c1784260d1791c353b30bc81ee17ba855161c92dd3adf202febab521439b59e6fc2e6f8fdaddff62f78daa8b268b5e0503c0952e SHA512 1f0c34bf438d8646085151b0ac4f436d52b8d4f5001490ff79c2ea36379a3911702f993f897cceb782eb854a529d7edeaf642de17806b6f8679a188c97c96f3e
 DIST jenkins-bin-2.222.4.war 66239216 BLAKE2B 0272f91b4460ac9f9cd0235df59f55e3135f593d8098d35aae4db6571e171d3c38c6b3e0ac0ae2f7825a3ac3e56c8e76cc4e15e28743cd2aa007395921eb7100 SHA512 8f82d8c69807c46eb0f0638d59777f10e1017b197a1d88295882e6b8aef6376609ed9da625691eafca786ed0a7314e7ab2abb000a39dcfb6da2d250bbd5e0c76
 DIST jenkins-bin-2.228.war 66137156 BLAKE2B acd1414745f0ffe12ca3025149d5ef8dcdebe6415e54e18f71eb4ef05bb578279409fbf5605763d86144726a82057ba796ea8ce3b79301ea33ddfed1f03ad9f4 SHA512 899c5838cc46f87020c18b0863b8f160c22b0422e7adec1bfd48dce5f06264b5e33ec8411bf9133e28fa8723daeeb5d2cd14a92c261d82e2b2b804d0b1c21250
-EBUILD jenkins-bin-2.222.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
-EBUILD jenkins-bin-2.222.3.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
+DIST jenkins-bin-2.235.1.war 66437256 BLAKE2B 900f5616db3e4e1913e9e07f1d40951fdb0a467e2acd93441a52fed7d9f5961103c46b34627e0add76da11a3e4787535d0a47e5eee20a474f65c14b03fefe9a4 SHA512 1be1f1845de87316107469b9b7c4d0e1e6b0f014f495981f2ecc2ce3acbfd820275c187c61b3f9664ad2a61312e4504171c45edf05e1711bbf61554c5f3fd653
 EBUILD jenkins-bin-2.222.4.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 EBUILD jenkins-bin-2.228.ebuild 1098 BLAKE2B 0bfaac37afbe842e4e1a5572a0f56a77b4bc5915be4cb9a79cd7a56105562e8877c9686a2963c347c2feb06dea8e4aad271bcda9a9e50f17433485f189d39981 SHA512 381e5dd3c921892b0df7497fa6028ced0df8c84a2a0731142c01023cf2d63d60233f24f19e62d40699c606ea162210f54641b6742ad63d6a6c99bd29b24c0835
+EBUILD jenkins-bin-2.235.1.ebuild 1105 BLAKE2B 161bf3f0ad77e74702cfdd1db69cfaa54f6e267e814b358d3fdcac2ca5c7210410d1cf87d03a9e6f987d2ede8459d37f6bf352bc2a7fcd7f2167edf81542aff9 SHA512 d86e52237449bda33bc052d7b1dd3bc15306c4b771c485d34843973a7a7df6c0d0593ab156837cc64a018466222fd0c09bb331bb5c820807f5038300517e2283
 MISC metadata.xml 397 BLAKE2B b1a7fd87c8d5857ab102ec3d3bf5830c26c6988bb97caf89018b05e159f038c9c3a092b4f35788929d05042ac5cfd694bd03a8381686b9472880d0d205a451cd SHA512 4087fd799f4019f09103fb32d7f120e74d94715205bcc66858d11b9457774acaed37f3ad97ca0328f4ec28230a409dcfb0cbaceec142eb0a5fd3241ca35f8810
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.222.3.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.222.3.ebuild
deleted file mode 100644
index 8ab8d5db213a..000000000000
--- a/dev-util/jenkins-bin/jenkins-bin-2.222.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit user systemd
-
-DESCRIPTION="Extensible continuous integration server"
-HOMEPAGE="https://jenkins.io/"
-LICENSE="MIT"
-SRC_URI="http://mirrors.jenkins-ci.org/war-stable/${PV}/${PN/-bin/}.war -> ${P}.war"
-RESTRICT="mirror"
-SLOT="lts"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
-
-RDEPEND="media-fonts/dejavu
-	media-libs/freetype
-	!dev-util/jenkins-bin:0
-	>=virtual/jre-1.8.0"
-
-S=${WORKDIR}
-
-JENKINS_DIR=/var/lib/jenkins
-
-pkg_setup() {
-	enewgroup jenkins
-	enewuser jenkins -1 -1 ${JENKINS_DIR} jenkins
-}
-
-src_install() {
-	keepdir /var/log/jenkins ${JENKINS_DIR}/backup ${JENKINS_DIR}/home
-
-	insinto /opt/jenkins
-	newins "${DISTDIR}"/${P}.war ${PN/-bin/}.war
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}-r1.logrotate ${PN/-bin/}
-
-	newinitd "${FILESDIR}"/${PN}.init2 jenkins
-	newconfd "${FILESDIR}"/${PN}.confd jenkins
-
-	systemd_newunit "${FILESDIR}"/${PN}.service2 jenkins.service
-
-	fowners jenkins:jenkins /var/log/jenkins ${JENKINS_DIR} ${JENKINS_DIR}/home ${JENKINS_DIR}/backup
-}
diff --git a/dev-util/jenkins-bin/jenkins-bin-2.222.1.ebuild b/dev-util/jenkins-bin/jenkins-bin-2.235.1.ebuild
index 8ab8d5db213a..8ab8d5db213a 100644
--- a/dev-util/jenkins-bin/jenkins-bin-2.222.1.ebuild
+++ b/dev-util/jenkins-bin/jenkins-bin-2.235.1.ebuild
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index e8b60897dc86..652e907b2393 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -4,9 +4,9 @@ DIST llvmorg-10.0.0.tar.gz 120804856 BLAKE2B 6b0254f5b913398cdcf2b2ec1ff21988870
 DIST llvmorg-10.0.1-rc1.tar.gz 120834583 BLAKE2B 64244ebcb6f2c171c9f606e5eb0adff2794f06c9312a0ca627fb79c107c0c898ac242cf4e92523c3265fa717322601d7e3f4d178515fac95d03ee92312082b06 SHA512 f877f66046969a4055b166ad50ef876a9c8ecaf03e2cdd7c8e1a3348eb5f5180f222fa457b1f090a6660282a0d9f7a1d39cf09a04abe0dde0a6e1e10ccf15597
 DIST llvmorg-9.0.1.tar.gz 113193320 BLAKE2B b86e405f2b8e00436045fd409fe19cdde75c797b1192c62a22b5ec75e6b4dc8e874a0f33008dc31562445e4cbe53a992b6f48c684255a6a1ef261e595b8b161f SHA512 fa88beeaae94b6d0cd9b5ba38658d0ffed8004035d7d8a4f95c3d31a709b88b581ae9bd7761333c8e5375c44b8f6be01768b5a3be901163159d7e6c43b71da59
 EBUILD lldb-10.0.0.ebuild 2481 BLAKE2B eec1740e4eb28b77a1416b27ce0ab11f95d6d2e81ae6b8aaca04647bda9124422ffe9d414aa5c5f9410b616e473f2609c21201289955b6fe595e9d082b5519c9 SHA512 dfbe98bde465360bcd86ba6ca49c26693430c4ef08e556826af0fe992c57934f397963b6babf106be6594bcfc22f94b0a2a554026af94a7eab286bf916a58282
-EBUILD lldb-10.0.1.9999.ebuild 2458 BLAKE2B 361942969b8237b4d2937ebb991785df9604fd4ead506ec8a40a22213da68cf72558376a02e0ff3bebaad1dbca32e0b659c2e287efe2fd42b4129be410b818df SHA512 3b53debd70430335686e7770122a4821c62b19a3638b6896468462fe1bff16f9345ed469263e6331cdd92f8707d64fd4c5f92a72437578e756c5ea0eb9691953
-EBUILD lldb-10.0.1_rc1.ebuild 2458 BLAKE2B 361942969b8237b4d2937ebb991785df9604fd4ead506ec8a40a22213da68cf72558376a02e0ff3bebaad1dbca32e0b659c2e287efe2fd42b4129be410b818df SHA512 3b53debd70430335686e7770122a4821c62b19a3638b6896468462fe1bff16f9345ed469263e6331cdd92f8707d64fd4c5f92a72437578e756c5ea0eb9691953
-EBUILD lldb-11.0.0.9999.ebuild 2458 BLAKE2B 361942969b8237b4d2937ebb991785df9604fd4ead506ec8a40a22213da68cf72558376a02e0ff3bebaad1dbca32e0b659c2e287efe2fd42b4129be410b818df SHA512 3b53debd70430335686e7770122a4821c62b19a3638b6896468462fe1bff16f9345ed469263e6331cdd92f8707d64fd4c5f92a72437578e756c5ea0eb9691953
+EBUILD lldb-10.0.1.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
+EBUILD lldb-10.0.1_rc1.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
+EBUILD lldb-11.0.0.9999.ebuild 2541 BLAKE2B bd2c91bb4ef638e1ea8386b0a5baf93587ea8a923e09c6ac9a3e8d59c584ac8112399ae391a5bbd003dcc8de28ab5eb441c903972f82335bb9e084b155f8319e SHA512 5baabcc77fa5cd3076a69aa8d72ee912f55cb55c455d9ab5bf800af05ba73ed2c75f17daa1444b9fc81dc30b16e4e2c9e7e52a1b9974bc03cec271f6f1bc56ba
 EBUILD lldb-8.0.1-r1.ebuild 3161 BLAKE2B 02f7f7c7461fed05baa15f6621ed8c32f669182395356a30e407582e74a63cf99b0d3b9c03031a976ea0b7734d3c61c64019b463ef68f315ae936ce679ceec77 SHA512 0a28c0147d2c37dc13dec96401f2d6e670db601735343c9befef24bf9626476a0effe715161703e4250066128c78b97b3f5e1ba5d6e67392b6cdacc0dd42dbfe
 EBUILD lldb-9.0.1-r1.ebuild 2391 BLAKE2B c0e73cf6e7c6fc153855681daa373618baffa2d45bd290855633d957464e99d86112918eec8aa0b43a975750e8ccd87fbffe2594b0110ac406eab8579c654f72 SHA512 8edadff2f01c15b75d894e30546a00826f140a81bc0ebfb5fb214eb5d133d8390b18a3075746fe94f061b36fcea9fb981ecd6de3d0567f73736c388af62c6320
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-10.0.1.9999.ebuild b/dev-util/lldb/lldb-10.0.1.9999.ebuild
index a64ef3c4618b..ecdb75359b11 100644
--- a/dev-util/lldb/lldb-10.0.1.9999.ebuild
+++ b/dev-util/lldb/lldb-10.0.1.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
@@ -51,6 +51,13 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -83,17 +90,17 @@ src_configure() {
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
+	cmake_build check-lldb-lit
+	use python && cmake_build check-lldb
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	find "${D}" -name '*.a' -delete || die
 
 	use python && python_optimize
diff --git a/dev-util/lldb/lldb-10.0.1_rc1.ebuild b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
index a64ef3c4618b..ecdb75359b11 100644
--- a/dev-util/lldb/lldb-10.0.1_rc1.ebuild
+++ b/dev-util/lldb/lldb-10.0.1_rc1.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
@@ -51,6 +51,13 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -83,17 +90,17 @@ src_configure() {
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
+	cmake_build check-lldb-lit
+	use python && cmake_build check-lldb
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	find "${D}" -name '*.a' -delete || die
 
 	use python && python_optimize
diff --git a/dev-util/lldb/lldb-11.0.0.9999.ebuild b/dev-util/lldb/lldb-11.0.0.9999.ebuild
index a64ef3c4618b..ecdb75359b11 100644
--- a/dev-util/lldb/lldb-11.0.0.9999.ebuild
+++ b/dev-util/lldb/lldb-11.0.0.9999.ebuild
@@ -3,8 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-utils llvm llvm.org multiprocessing python-single-r1 \
+PYTHON_COMPAT=( python3_{6..9} )
+inherit cmake llvm llvm.org multiprocessing python-single-r1 \
 	toolchain-funcs
 
 DESCRIPTION="The LLVM debugger"
@@ -51,6 +51,13 @@ pkg_setup() {
 	python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	# cmake eclasses suck by forcing ${S} here
+	CMAKE_USE_DIR=${S} \
+	S=${WORKDIR} \
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DLLDB_ENABLE_CURSES=$(usex ncurses)
@@ -83,17 +90,17 @@ src_configure() {
 		-DLLVM_LIT_ARGS="-vv;-j;${LIT_JOBS:-$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")}"
 	)
 
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_test() {
 	local -x LIT_PRESERVES_TMP=1
-	cmake-utils_src_make check-lldb-lit
-	use python && cmake-utils_src_make check-lldb
+	cmake_build check-lldb-lit
+	use python && cmake_build check-lldb
 }
 
 src_install() {
-	cmake-utils_src_install
+	cmake_src_install
 	find "${D}" -name '*.a' -delete || die
 
 	use python && python_optimize
diff --git a/dev-util/ltrace/Manifest b/dev-util/ltrace/Manifest
index 9285c98346d7..3e5e518878ef 100644
--- a/dev-util/ltrace/Manifest
+++ b/dev-util/ltrace/Manifest
@@ -10,6 +10,5 @@ AUX ltrace-0.7.3-print-test-pie.patch 774 BLAKE2B e67bedbd0ea2470007390634fe588e
 AUX ltrace-0.7.3-test-protos.patch 2551 BLAKE2B 48998f9db4875b8e2af6727b51fc8666cc4f10cbc55bbc4bf32a2b54f1f1032f7c7f07c5196ffff53e23183010eb68df862b4fceaab56d30a580eeaadeeb6f17 SHA512 4652b3f920ad3669d2e6076775b9a598bd999a0fa5319c490f580d93c63f53bd0e3db61cf7a61c5db3a436789802b8fa9646f84ee76e8f37f4f3afb827b84f34
 DIST ltrace_0.7.3-4.debian.tar.gz 11373 BLAKE2B 3004bef4e0181e28606e1c50dcc2265d9869e51bf11288185da46f7a77a0aaffb41af75f84baa7d094f9f752071c9e8f53c565982a955e3250a7fc721c529b20 SHA512 67a868c95703ca9cd8407905e3be416e3a66920f41d9deb78fadb71719d7d3f1a3f67ffcb575acff4bf7e4715102f3a6b0f67c6adb74f37ee66c398c132ff04b
 DIST ltrace_0.7.3.orig.tar.bz2 482658 BLAKE2B 30d1dbb178a41043e4bbbac17a23676db202b64327c9bb4393ae7ace9f5e1a1e2a5ded56cabc7faf2ea55b22ed17126a94c121147aeefb40250710b7307a50d3 SHA512 a842b16dcb81da869afa0bddc755fdff0d57b35672505bf2c7164fd983b1938d28b126714128930994cc1230ced69d779456d0cfc16f4008c9b6d19f0852285d
-EBUILD ltrace-0.7.3_p4-r1.ebuild 1728 BLAKE2B 1d12553b815b042f46da65d32ee9d31e6d475b28eecf607060830934739121fd7cfcfa7846c3f5ba1fcd4418125ee1c3f5bbaf4c7bc61e7595daf37b3c520286 SHA512 ba5e03642a85c89cf091d12b0c097c99e5c40892587d65fa4ad8390bb7828bfa9da4e61272075c4ea0ce2e910f2c40105d601074fd38f4d43af071434b3d1946
-EBUILD ltrace-0.7.3_p4.ebuild 1366 BLAKE2B b3f31392f8643006a79bd8007f97458fba5bbefbd7875c20364e95d9204a1b7af7c8dbb30e6a4d5fa138aa6c089fe6fd72bd0d16a631abe6e743e7c49c46397a SHA512 6d2b829a0694b8d59de72ace57391a0d1cb685c0d0f71806440055416ff80a1f5281e31d05531a2aa60ee96ed12d265f791a36de1c91dc1b7483eb32ff92c6b0
+EBUILD ltrace-0.7.3_p4-r1.ebuild 1725 BLAKE2B 5b7a5b9f7aaeb0e0132ba550f35bee99ad18ea794e1242ce657049dad5346f1af9e51efb5492fa362b4aeb4d99f91ba15d518a972bc30b0d53bbc2fab18ec733 SHA512 eb2f6ca133e89b75a4ea1073a9cea10fc5b345861fc836c202aafa188669db062c77be99202af588a432f77aa1200500d5abc007a459b9b275f1a90f4b65ddcb
 MISC metadata.xml 357 BLAKE2B 393847ec554b92576d20a2e88b3f89b86d93ad51107161c0e5fe198415ad6f8d941418d89b438237f52c6e2cef942b449e8112f5619e219058a7f797a6b261dc SHA512 fff13f831e3d3994abc654ab5c5cb97e14cbec653d42074300cf81b22da05e5318a55ae4b28198fdc7aa8169464385939f5a889ca5ba86c45aa39dfe24772a95
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
index 8ca6b5a1233e..0f327a431cd5 100644
--- a/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
+++ b/dev-util/ltrace/ltrace-0.7.3_p4-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86"
 IUSE="debug selinux test unwind"
 
 RDEPEND="virtual/libelf:=
diff --git a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild b/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
deleted file mode 100644
index 2f15597a0646..000000000000
--- a/dev-util/ltrace/ltrace-0.7.3_p4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-LTRACE_V=${PV/_p*/}
-DB_V=${PV/*_p/}
-
-DESCRIPTION="trace library calls made at runtime"
-HOMEPAGE="https://gitlab.com/cespedes/ltrace"
-SRC_URI="
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}.orig.tar.bz2
-	mirror://debian/pool/main/l/${PN}/${PN}_${LTRACE_V}-${DB_V}.debian.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 ~sparc x86"
-IUSE="debug selinux test unwind"
-
-RDEPEND="dev-libs/elfutils
-	selinux? ( sys-libs/libselinux )
-	unwind? ( sys-libs/libunwind )"
-DEPEND="${RDEPEND}
-	sys-libs/binutils-libs
-	test? ( dev-util/dejagnu )"
-
-RESTRICT="!test? ( test )"
-
-S=${WORKDIR}/${PN}-${LTRACE_V}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.7.3-test-protos.patch #bug 421649
-	"${FILESDIR}"/${PN}-0.7.3-alpha-protos.patch
-	"${FILESDIR}"/${PN}-0.7.3-ia64.patch
-	"${FILESDIR}"/${PN}-0.7.3-print-test-pie.patch
-	"${FILESDIR}"/${PN}-0.7.3-ia64-pid_t.patch
-)
-
-src_prepare() {
-	eapply "${WORKDIR}"/debian/patches/[0-9]*
-
-	default
-
-	sed -i '/^dist_doc_DATA/d' Makefile.am || die
-	eautoreconf
-}
-
-src_configure() {
-	ac_cv_header_selinux_selinux_h=$(usex selinux) \
-	ac_cv_lib_selinux_security_get_boolean_active=$(usex selinux) \
-	econf \
-		--disable-werror \
-		$(use_enable debug) \
-		$(use_with unwind libunwind)
-}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 3b7de74a5622..dfebf7a8ad6c 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -2,15 +2,18 @@ AUX 0.52.1-test_pkgconfig_gen_deps.patch 1688 BLAKE2B f228e1d721449611799606cfb3
 AUX 0.53.1-remove-asan-ld_preload.patch 946 BLAKE2B 2f43446f853b5233c7c959e0216eadae9d190efd4743a138afae73d42f082499793b4688e2419cb3ef38fe7c5e7f29b472e8a27e9ce8701c28f83f390f55dddd SHA512 50b7b4c269d186e3c2274297f04dae46484af4f2f090bef3fc42dfbecab94d8a91b31c27369cf40a52c7ce71cf96d9bc22601739b6e886c6c710f0665c2ef311
 AUX 0.53.1-remove-asan.patch 842 BLAKE2B 02864bbd41dd16d3e9e8e7ce9e9ef604f2fc6babd26958a4364147d392d56d8a87baec41fb009389a5fc989067019c6de89d1e2c82043ba7df463e32c99f885c SHA512 4abf8088832a1a9336fdffe04bc91a1fbab7363b72c5a1d14b22f408ea25f180d6526f8d6b3a2866a819f1895c93035869fff799da36b5040b8fb89a65ab0e23
 AUX 0.54.2-multilib-clang.patch 8033 BLAKE2B 724d87eef8d560eb733b9873d28afaa6dd49c23867440d182d427a9a569bcd6852c5007675fde77724f6e05d1a4beb371fb0b474e8aeec2dbae0a7e8ca3a78b8 SHA512 1251222bc107abc1b5b0acfa6c52b4bfcdd47baf2651b291f162b39d384b61383627a7ab4d925ad2df1f36307e79e4806c6e05eb889e98a58688657e40ada29a
+AUX 0.54.2-prefix-dont-strip-rpath.patch 1118 BLAKE2B c28bbb0293c2d15a493bd09c902cd6bb3f48c6d279063f326796919f9d06d0dc99e5a7e975742ad8fe4da3dc5bc9b07329d0ae7cb3186431c12aa93709aaa665 SHA512 bb41c4d06c04af4249c9c5ba5724c982a5edb1fe16118120ed53e52ed82cde0bd0ea43454799c986dd008b48a3bbdb7dac820260d9835b020323babc6ec617ed
 DIST meson-0.52.1.tar.gz 1507764 BLAKE2B 8daf43d84186905d5c32629ab6a250955bdffda502d2d79f991111d0ae7e3a21b3f9bc09ef5258f709eee4e17b09c6f09e7685a72153efcf8daaaec2645eef8a SHA512 fea3e85191782999de3a9431ec1d2cfacea32cf9598205443855042dca50ddac92eb3e74be4dd6a62bd80a606b73e76a04877b2c8efb275d9de5f87e3f9f8f41
 DIST meson-0.53.1.tar.gz 1552121 BLAKE2B 3f0bbbeba6307397dfe5e49c1f978d6246d8e18317d0361b6f013f5c2ba55ad7cba53c985418686c20db159b7790b45a0c2e05d86f861cd0280fb07afdbeb847 SHA512 0c96c354bcd7e6945473c7df0ddff929ef2bae9c2dfc7b48c6c6174c7f2be4f798398929f9c4d5986aa5fc882305ff76371ad0d65a499f058b33b05ff7025859
 DIST meson-0.54.0.tar.gz 1683491 BLAKE2B 3016beb44c4401672947afa898253b69769f998e18e00baedc3bcb525a9923b9154d7db79cfa4c38fcf66eeaee8137f47917689fdde33674b1f0483b21923393 SHA512 e3c97ffd9409a543e45c8be7b12d4e8437de8dbd0cd236fbe092952d7d0833728d46ff6b679c8a73dae4c4016fdf38b43b56f3959a95968a29db109ebfe254e7
 DIST meson-0.54.1.tar.gz 1687532 BLAKE2B 5bd355b35a4aa037e490615629480a194c04821fb18b137f090af89f6c33c700d0756bb2d7e9e608ecf4873886be10493bfeddce55fef3d905793ad3ccccfa68 SHA512 dbc3fed326ba208f5a6eee7e3106d07450e7a3569d425013fba8c51e7cfd6485f9b083836dc74be49bc9839bd640ce54741d9335097cbd28f6a320d5fec7ecfe
 DIST meson-0.54.2.tar.gz 1691270 BLAKE2B c1ba552b5d56e0b6b73de46ec6bc90fb520665688d2f5c809baf84749d3bb1dec1fe0131136e1539369fa666ae2427c8fccd5928cbda0b8e3e1edb4a5dc8abbc SHA512 ad5ec826879d3d85088ca40d768599a4c8e66983f2a6a7ebe8ab12051cad18b4ade9a2afd30fe543b0a75900822992c8ef7161d369489e2211dd7a1a8ccc32ed
+DIST meson-0.54.3.tar.gz 1690919 BLAKE2B 5d71731fb33397f470e2440d4d45f828d28d56351843a35b575f8b386f0b1c90faf654289e22ba7c2c4bf6c3be72d3dc8a2257d4a688bcbf9a1f2522394e7728 SHA512 2e62bf992bf337ae5a01f7a0fb842ea0cefcdbc81f5675235e41d8182f37df2e003b0a8a90d650c6cca4ff79898f7888474f75e5103a48d7ca14f51a024e4f2b
 EBUILD meson-0.52.1.ebuild 2101 BLAKE2B 5e6eaaf5c081f0749530b4a69971993e7f926ab69e8fc9f239fddb01c12f42fdc5c788736a3707746b286fdedfcd9dd3b59617bc0a794718c16f6cfbe7fc5ce3 SHA512 88a1a8256211fac613752fdfe62fc9d8f666ef7f7dac7a536ac2312357c7bea6a55316dd7e9f81e810c5d10654afc61a3b62ecd59eeeb01a786b335d1b92fc57
 EBUILD meson-0.53.1.ebuild 1981 BLAKE2B ae5dbc32f30a50456ad7bb5780b248e494c22838ba34846141551e206b20ceffcfb3c40908dd17814cdeacac2713b1f4dce69392257b9c12dd3bcc8eab18d697 SHA512 dab0953fc1fd408130d00b2c36fad8a292c0c3e8a1e3b3b97aa675522fd6aa56e9f884f39165ebcc8547d30253250a9e63a7cf922653c1bef569717d51f3f0e2
 EBUILD meson-0.54.0.ebuild 1544 BLAKE2B b326f8d159b8e75dd38300046fb7ce718335dc1717735ea0a41754f5331a0d9613260b736603f8d0194e88878cf3c34dfa18f076ed031c5f51bbbc9897465c63 SHA512 8fd2b4c23c6ace8021c0c267472b5bafc4a64092ea5fab222f1d637927769626e3d5f72f40446dba8603abda0e49a5ae88aac912df49a0d70cc8e5fae097f025
 EBUILD meson-0.54.1.ebuild 2036 BLAKE2B 23f30ffed174af8155f3a1e6cb761d085f1a8688df6137368752bac79fc57fbb6475310d6f2893beefe3754849bd579bdf50d17e4c2052ff3c9c7507f85f0cc8 SHA512 80949c24c9395631fb8c6b60a75df0360707deb3a2052449f47f9908f793b22d632b6881349278f72f9d820c52985f569719d2bbcfdf135d0ec0fbaaef65bba0
-EBUILD meson-0.54.2.ebuild 2273 BLAKE2B 061e0b4cdaeb3220b63f5e874175b3949419fba1712d365fa0ede75a6e8dfb27bd9b632748c103775bcc62170e7b0cc9ad18bbbe7c984b8a78c093ab09a2cdbf SHA512 97b83377523af3c02f3748d8090ee1d054e96513be0e1203b5eca176315c7d785a91cba7edd56d2215cbdbde9f1876a8870ff40c30d87b66d13662faa68a2801
-EBUILD meson-9999.ebuild 2217 BLAKE2B 8e5cc488d3864a835fb5989f27d3a2a73668bc0f06dc3157f5cf6ff1b9361f170d8e13ab0dc46c6b7731aa2a92c34bfe1b2c8255fcb595eceedbbeefbf208586 SHA512 7e7bca6060adfa4d4c8cb5835ed5dab9dbc2ca15c9da486e8fb7d44c969c21564ebaed6f4cc184a9c047a179a0f88c8ea0a6086988cd0e2634186fa6c51d33dd
+EBUILD meson-0.54.2.ebuild 2338 BLAKE2B f2cfb920c655509b00c6c5639fc772a049ea37e1f362e8ec84bef7d5920cb4b4be7e9048d02d38597ab8b0f60afecf589b6f290828f2f456bd237379f4a21067 SHA512 193e2c013adc68da916b0cc57650131757adc2e33c5d91e3db689e6af4ccb386d0c1f669f2a2f402bc062a3adb990baacbfc36560c5185205bdb54ae8956e783
+EBUILD meson-0.54.3.ebuild 2347 BLAKE2B 8e12969d4c7aed7050ea6cb1016cded8c7fcd42bc3b84a5f197006f71f21db310ef34fc62a9ae88a8ba861a828cda73e18d143d4e73bdc9453a76344191543a0 SHA512 ba232f75d4409a55aca941093a96bc36e7ca9794a3761d8084c1728a6f07602a5f934ed7cfdafbddd80e36f00af009fef87e015eb74ce1833168a8a26e08ecaf
+EBUILD meson-9999.ebuild 2291 BLAKE2B dd136009f68b5aab380a5edcfb23b2950262bf4fe31cad2f6a64c699da387b67b3eb7fe1bf81a8fe54cfdda5dc48516f30ec137bdce5b88cd5e58b0884de0964 SHA512 3ddb12fa7defc9faa69136bc95f2f9526e79e48828072f79879162dff4e29da6184cf5ba7951fb5354b970cef3fcd20a6c67b371a6b3b5f0342e2ae2041e9fe3
 MISC metadata.xml 423 BLAKE2B d1d1b815b9d2fabe5aaa28b469272420bc1eb0c070de7431ec0d7bc7202b00ca216e6a347e0ebda22fd079d9f0514734c0e0e345788a7e00c8f1ad594259b4a8 SHA512 5c03d82f2fd8009680d4d98c3f62c10dfddb2d66d03e8f9d9ad8e417d0359e43f77ecca067735b31b63ceb778fdcc508196e99d793990286234ff21892e4dab4
diff --git a/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
new file mode 100644
index 000000000000..1fe2e1ac4cc1
--- /dev/null
+++ b/dev-util/meson/files/0.54.2-prefix-dont-strip-rpath.patch
@@ -0,0 +1,25 @@
+https://bz-attachments.freebsd.org/attachment.cgi?id=204611
+https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=238128
+
+Stripping RPATH on Prefix is really bad, because it means the default
+RPATH entries disappear, and any installed binaries don't work (get
+kernel traps).
+
+Extracted the minstall patch from the FreeBSD full patch.
+
+--- a/mesonbuild/minstall.py
++++ b/mesonbuild/minstall.py
+@@ -488,8 +488,11 @@
+                         printed_symlink_error = True
+             if os.path.isfile(outname):
+                 try:
+-                    depfixer.fix_rpath(outname, install_rpath, final_path,
+-                                       install_name_mappings, verbose=False)
++                    if install_rpath:
++                        depfixer.fix_rpath(outname, install_rpath, final_path,
++                                           install_name_mappings, verbose=False)
++                    else:
++                        print("RPATH changes at install time disabled")
+                 except SystemExit as e:
+                     if isinstance(e.code, int) and e.code == 0:
+                         pass
diff --git a/dev-util/meson/meson-0.54.2.ebuild b/dev-util/meson/meson-0.54.2.ebuild
index 4945b8d2278e..eee417491e84 100644
--- a/dev-util/meson/meson-0.54.2.ebuild
+++ b/dev-util/meson/meson-0.54.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
@@ -60,6 +60,8 @@ python_prepare_all() {
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
 
+	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
new file mode 100644
index 000000000000..f29fb08b500f
--- /dev/null
+++ b/dev-util/meson/meson-0.54.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2016-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+
+if [[ ${PV} = *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
+	inherit git-r3
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+fi
+
+inherit distutils-r1 toolchain-funcs
+
+DESCRIPTION="Open source build system"
+HOMEPAGE="https://mesonbuild.com/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-libs/glib:2
+		dev-libs/gobject-introspection
+		dev-util/ninja
+		dev-vcs/git
+		sys-libs/zlib[static-libs(+)]
+		virtual/pkgconfig
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/0.54.2-multilib-clang.patch
+)
+
+python_prepare_all() {
+	local disable_unittests=(
+		# ASAN and sandbox both want control over LD_PRELOAD
+		# https://bugs.gentoo.org/673016
+		-e 's/test_generate_gir_with_address_sanitizer/_&/'
+
+		# ASAN is unsupported on some targets
+		# https://bugs.gentoo.org/692822
+		-e 's/test_pch_with_address_sanitizer/_&/'
+
+		# https://github.com/mesonbuild/meson/issues/7203
+		-e 's/test_templates/_&/'
+
+		# Broken due to python2 wrapper
+		-e 's/test_python_module/_&/'
+	)
+
+	sed -i "${disable_unittests[@]}" run_unittests.py || die
+
+	# Broken due to python2 script created by python_wrapper_setup
+	rm -r "test cases/frameworks/1 boost" || die
+
+	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
+
+	distutils-r1_python_prepare_all
+}
+
+src_test() {
+	tc-export PKG_CONFIG
+	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
+		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
+	else
+		# https://bugs.gentoo.org/687792
+		unset PKG_CONFIG
+		distutils-r1_src_test
+	fi
+}
+
+python_test() {
+	(
+		# test_meson_installed
+		unset PYTHONDONTWRITEBYTECODE
+
+		# test_cross_file_system_paths
+		unset XDG_DATA_HOME
+
+		${EPYTHON} -u run_tests.py
+	) || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	insinto /usr/share/vim/vimfiles
+	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
+	insinto /usr/share/zsh/site-functions
+	doins data/shell-completions/zsh/_meson
+}
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index 5cd9c5f13bb2..edbd30f51167 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -56,6 +56,8 @@ python_prepare_all() {
 	# Broken due to python2 script created by python_wrapper_setup
 	rm -r "test cases/frameworks/1 boost" || die
 
+	use prefix && eapply "${FILESDIR}"/0.54.2-prefix-dont-strip-rpath.patch
+
 	distutils-r1_python_prepare_all
 }
 
diff --git a/dev-util/netsurf-buildsystem/Manifest b/dev-util/netsurf-buildsystem/Manifest
index 4293ac81c913..a975b31e4deb 100644
--- a/dev-util/netsurf-buildsystem/Manifest
+++ b/dev-util/netsurf-buildsystem/Manifest
@@ -1,4 +1,7 @@
 AUX gentoo-helpers-r1.sh 384 BLAKE2B dc6440065bb1595fcc6844c041cd40b438ac1c899dc01657ccc42efff499ece568af4b32b7859fb8f83f4d09df8cb602cba8ed25eaad1f4ab53f5542b908d1a4 SHA512 1f5de64f600db640fcc31855f10d2665badeaccb9679b01bb96b8ddf66d7ed25e86ed8b46e5eacb2371900bbbe1473754b018d70174f2375851d17bb6241f2e0
+AUX gentoo-helpers-r2.sh 388 BLAKE2B 2e7f1fd1eb7d9366514ccad5cb356689005f7028a423b60600ab8297b053ce37b154de37258ef4bfe759bf2b2b4007c3e416eeb3dd9937f75c9c41ef93c1bfc5 SHA512 8aad232d938e4aaac424389833012eb0c29409b8d558cf4cc6e894b7e3baa23ba29364aa1b7a2872bab6b507d52436cd5ecf3d5b42ccc52bcbed2d2c78034b36
 DIST buildsystem-1.8.tar.gz 38617 BLAKE2B 0fd5539feae0b81828efe90c82baf6ce7fceec2f2189adddb0e32d2106f9263ebd14b32f3dce8daae13110f0e69801caed48ce81709ce09d809ba50041690cc7 SHA512 0f577f4867e5e12770f9b9c42ea55e884362180bc195b6ebf56e56305ce84e230407cd2ebb3b182cc03087ffef5f39187e52e2e2f8f2b86aa20a16fa33bdff8b
+DIST buildsystem-1.9.tar.gz 38723 BLAKE2B 0fc4aae4f9a21058c7e437170e74147f6b6dc20220d53986a212e717846d5738df2771081f000705cd69335fbe61653b24a3e86d454a53b24f9cadd5e7aaac97 SHA512 52d7181af56946b95f22d5cc8fb2c58287fe43c940d4104e4a05744cfe332d0e0ea6da76cb8d635eb34cac4d66f53dc01ac5f440b82a207265d39744f112a80d
 EBUILD netsurf-buildsystem-1.8-r1.ebuild 696 BLAKE2B 8800c0bddf0ff7efc2cb23680f312a1dd7c4bdeea6a41b52a2fac4bdda19e876d26ed793de9eecad1f3e665c96fb067fc7baf5f85c7453af2e76bd10924408d2 SHA512 10727448657df6e2b3f47e4fe0b067fdf7484d56c93115b3559e533216513c97e8c5b9e84fcc4ad52790d1e158267387dc390e81de5290d81481abda3af308b0
+EBUILD netsurf-buildsystem-1.9.ebuild 715 BLAKE2B 076adffafbee97c5e34bd4022514216b6e5dd21bb3e05f447d29e3cf25d53fbdd2554d3eb7b6bb044248a25fa61ebcfb240e2ead8648f1b04d8306a9fadb632c SHA512 326cd81138a70632840241801d81e5f2eff9d2737a768cda0d99d4cfc702c6d7997434623c698c7ba40c18fae8b568e255bd4b6e254b68ddd93d98c06ba51eba
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh
new file mode 100644
index 000000000000..403279ecc5f6
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/files/gentoo-helpers-r2.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+netsurf_define_makeconf() {
+	NETSURF_MAKECONF=(
+		PREFIX="${EPREFIX}/usr"
+		NSSHARED="${EPREFIX}/usr/share/netsurf-buildsystem"
+		LIBDIR="$(get_libdir)"
+		Q=
+		CC="$(tc-getCC)"
+		LD="$(tc-getLD)"
+		HOST_CC="\$(CC)"
+		BUILD_CC="$(tc-getBUILD_CC)"
+		CXX="$(tc-getCXX)"
+		BUILD_CXX="$(tc-getBUILD_CXX)"
+		CCOPT=
+		CCNOOPT=
+		CCDBG=
+		LDDBG=
+		AR="$(tc-getAR)"
+		WARNFLAGS=
+	)
+}
diff --git a/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
new file mode 100644
index 000000000000..70b4b63fad4f
--- /dev/null
+++ b/dev-util/netsurf-buildsystem/netsurf-buildsystem-1.9.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="buildsystem-${PV}"
+DESCRIPTION="Build system used for netsurf and its libs"
+HOMEPAGE="https://www.netsurf-browser.org"
+SRC_URI="https://download.netsurf-browser.org/libs/releases/${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~m68k-mint"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	default
+	sed -e 's:/bin/which:which:' -i "makefiles/Makefile.tools" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	insinto /usr/share/netsurf-buildsystem
+	newins "${FILESDIR}/gentoo-helpers-r2.sh" gentoo-helpers.sh
+}
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 377e18235ad6..2a9289ef7aea 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,3 +1,5 @@
 DIST opencl-headers-2020.03.13.tar.gz 48540 BLAKE2B 5befbf7b1ed9df7e45789f1a5c3ec15a2bb0bee4cf50f89e424b6c69534c045c0774fd6f6424d5311c5415c9e6714033b6c70d3c641f60c037a9c3fab3e00bb6 SHA512 4bf368325f6034b2c59b9d3a22f7c12eec078e5e5a0bdcc3f1f5870e211bf7d03ae7137897262440a9c98a35592f4405d85fae1b53246e56b5544af51bf9b39a
+DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
 EBUILD opencl-headers-2020.03.13-r1.ebuild 607 BLAKE2B dc2f65912fb55daeda19f5bf83b09713304eb2e6d9fcaed827e4298e7492436f467b3348dc053e8317364597e44534cee464b057a81e2ffb125fe1a02caaf05f SHA512 27dc174b9cea161c162a2b1511f4f252c1f39fee0c9ad254afcc486d7104ad64034a430981e05490ba1b91672b06767be7682b2b9449af1ea9f17f319ff63080
+EBUILD opencl-headers-2020.06.16.ebuild 609 BLAKE2B 9c9e9b5811b0526f2884dac2a3a525168004e080c8ab45f32fd136981bfaf13482239dc54e1f2eeba8647ac688fd92cfeeb4495748ebbd71f9d1502e9ef9f1f8 SHA512 b6f5014c64795d56055ee41a9fa0da3f226571d1f164f62d9522f9c656aada3ff2980ee0339ca31d157ba04b44a410df2e44005cf47ea1c967c69353dab99506
 MISC metadata.xml 1055 BLAKE2B bda38a579f6d6369a25342297ec81205dee40d42fc81ccaedb68b0d5b90ae6cd9d3b32eb3fad7d6f4f67f4da5d1dceeb5e9167f94d5619176376778dfa831f97 SHA512 4e75ba94c11582a73e4896f759ce965047357ff123408a2ba3d502c2598269a4273cadb7f02d8b1335a119f2e450fc1c5c07271a3a7c4383d378118af2eed7e2
diff --git a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
new file mode 100644
index 000000000000..917c0cad3500
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+# To avoid file collisions in /usr/include/CL/
+DEPEND="!app-eselect/eselect-opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/include
+	doins -r "${S}"/CL
+}
diff --git a/dev-util/promu/Manifest b/dev-util/promu/Manifest
index 531e6823cc79..d3618b9c4cdd 100644
--- a/dev-util/promu/Manifest
+++ b/dev-util/promu/Manifest
@@ -1,3 +1,3 @@
 DIST promu-0.5.0.tar.gz 643970 BLAKE2B b61e8421b5e68f3cd0ec125faadf64c7491f54cfe03de9d6497cb627e5d548b58fafe735c76a5a86a55489aea56dffb6e02d52acd1ca977ea32ec974f34475ac SHA512 b895c0b5b5a33bd0c2372e8c1c698b8548b1b7086849161ffa99bf9718f4b7f3a57bcf218681d84e4cc5ef31ef39df7e6c59345a84441369ec3ec402999ac4de
-EBUILD promu-0.5.0.ebuild 867 BLAKE2B a8adf3266e7acb90a73b50d0a624161eb7bdbd25b176474b259a3cad1d1d6233fe014258a9b1740ad71cef2ec841d96320f2a0f556db1a39db0dbd0df5b953f3 SHA512 c09728becc3a7483c4d3fdaf95964626dea5f9c6dc93bcdaee7825e2123e2cfedad7c0ba2a58d2c2fcd20203ac56d4ba3f7daddcce8478505f27ba24fe0d26ea
+EBUILD promu-0.5.0.ebuild 675 BLAKE2B a9094322babbfc75b84eafff9026b7fe18f001a7dc8ea2849c08bb1135a3409534bce9efd0303acc214ccc0528633d6a382d6513747d70f7ae6d38f3c6f23896 SHA512 41f559803a6c7eaa7e2a4d7ecd9de42b900c4aafa9a5e0eb8c965c978f00261ecc4fd7814819dc4f04a5d03a19f42ccf9084fc467876508417d780a9eb598068
 MISC metadata.xml 325 BLAKE2B a6e231de6312601f0f92df0d3422b3527b0869cb484ab20933c5fcfba14a3545b122c83e855df882da09b9016109473230f3c7e8b48e9597ffe755916a3890b4 SHA512 51a31843f4341e22ae270e21d32a672ef5ca9739aa8a2066f9d9da2d0451e3f27c890ee1809bae98a68a73a9b4ab9114c4eb056a1fcabda35ea092bf76e9156a
diff --git a/dev-util/promu/promu-0.5.0.ebuild b/dev-util/promu/promu-0.5.0.ebuild
index 7ede34ae7c3a..64f6ce821f01 100644
--- a/dev-util/promu/promu-0.5.0.ebuild
+++ b/dev-util/promu/promu-0.5.0.ebuild
@@ -1,35 +1,32 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit golang-build golang-vcs-snapshot
+EAPI=7
+inherit go-module
 
-EGO_PN="github.com/prometheus/promu"
 EGIT_COMMIT="642a960b363a409efff7621dbf5b183d58670ec2"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="amd64"
 
 DESCRIPTION="Prometheus Utility Tool"
 HOMEPAGE="https://github.com/prometheus/promu"
+SRC_URI="https://github.com/prometheus/promu/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
 LICENSE="Apache-2.0 BSD BSD-2 MIT"
 SLOT="0"
+KEYWORDS="amd64"
 IUSE=""
-RESTRICT="test"
 
-DEPEND=">=dev-lang/go-1.12"
+RESTRICT+=" test"
 
 src_prepare() {
 	default
-	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+	sed -i -e "s/{{.Revision}}/${EGIT_COMMIT}/" .promu.yml || die
 }
 
 src_compile() {
-	pushd src/${EGO_PN} || die
-	GO111MODULE=off GOCACHE="${T}/go-cache" GOPATH="${S}" go install -v github.com/prometheus/promu || die
-	popd || die
+	go build -mod=vendor . || die "compile failed"
 }
 
 src_install() {
-	dobin bin/*
-	dodoc -r src/${EGO_PN}/{doc,{README,CONTRIBUTING}.md}
+	dobin ${PN}
+	dodoc -r {doc,{README,CONTRIBUTING}.md}
 }
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 385322ec6bf6..e783bc29f1e4 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -10,5 +10,5 @@ EBUILD pycharm-community-2019.3.2.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678f
 EBUILD pycharm-community-2019.3.3.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
 EBUILD pycharm-community-2019.3.4.ebuild 1083 BLAKE2B 057214393559bdc2d33c91678fbb068fafde2ab6add11db7b70206df9c89c2645e74b85bc11b864140a92fd41c6681fd33f9bc5105e6971b4a7e4b0697b5cc5e SHA512 d698a7a3ff14fc505f3a340607c78ee5c2df2054e140a8f265ac5a9a84c6f8f12c33bee2ff063fc00c59b3df612cab0eeb4cee19db04a9efbb03e7f4242a144f
 EBUILD pycharm-community-2020.1.1.ebuild 1207 BLAKE2B 844dabe048848146e2cd78c03587106b66fc60fdbc97ca8acb4f29a3ac1591abe754cfec22de3c484a35517fc19a6c37626bb82431e10df980342af0fc71af0f SHA512 6feeba1cc6210b0521c1922452835f5ac15a17b6c6c443bec94f9c8c9c698e167915e0f022dccd1b1483d029ec594a159253527ac29b58851fcda63f8028a113
-EBUILD pycharm-community-2020.1.ebuild 1207 BLAKE2B 844dabe048848146e2cd78c03587106b66fc60fdbc97ca8acb4f29a3ac1591abe754cfec22de3c484a35517fc19a6c37626bb82431e10df980342af0fc71af0f SHA512 6feeba1cc6210b0521c1922452835f5ac15a17b6c6c443bec94f9c8c9c698e167915e0f022dccd1b1483d029ec594a159253527ac29b58851fcda63f8028a113
+EBUILD pycharm-community-2020.1.ebuild 1229 BLAKE2B 4d69c23b609ee5e74ec1aad7de75f649b80cbae5cf3e052659bd00e546152c0e28e75d83ff55e158cab52146f8413051e5bf3a0dd703352de9c3be7cbfdc00b1 SHA512 77f96e4e086dd25cf70b9b2568b1f2c530c5b443881136c33728d76e9880c502f678867a4dc9e0efa8c225439be66310e1fa1b9d6f454f80dc26876b164939bc
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
index f8be402a51b3..e8f27505a926 100644
--- a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
@@ -22,7 +22,8 @@ RESTRICT="mirror strip"
 
 QA_PREBUILT="opt/${PN}/bin/fsnotifier
 	opt/${PN}/bin/fsnotifier64
-	opt/${PN}/bin/fsnotifier-arm"
+	opt/${PN}/bin/fsnotifier-arm
+	/opt/${PN}/jbr/bin/*"
 
 MY_PN=${PN/-community/}
 
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index 8193fc74f0f0..dc9bf8eedcde 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -1,5 +1,5 @@
 AUX rebar-erlang23.diff 602 BLAKE2B 761b7e35408487698b27b0169989937305e9c7db14b49f5cbd411f4cfe19525a82e50d3c105f38d1fedc75f4c51d264fbf4a4a496b9bbce826b994241073fea3 SHA512 5f57f199dcd5544dec48119feeb288c2d6f5f0a45307b09489a37702609f6e79db08982764bd07f898c7858d45d8c154e314fab131b70996c95a1473561ba8c4
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.4-r1.ebuild 676 BLAKE2B d53a85d5cbb269b57cc1c22e0861682f66a1fae4d664c5acdd1c495e77b1077071945a2e4c93fa7ab2c0b71f001c8752c409edfe20c223baa6ff2a36f863fb06 SHA512 c332ec872e1dbaa57aee43fa21b8dfd7bef0adc19f7c64529138b2a20df0717900a14ba855ec65828ca1ad1abf4d6c024034970107491a8baf4de2afb168a3fd
+EBUILD rebar-2.6.4-r1.ebuild 675 BLAKE2B df8993a85ef3dd529f3e0c22c5c56df96b9ae0dc46efdb7778d385f07197c566e4ecc5978a02e74b2b7b990d000c46cee5779449976d5a94ff489a47add8dd74 SHA512 fe8e12f494869b1a9561e28e2c061cb147b81df3ac74ccd96130398832ee75e6cef46600313cfd277f6e62e6156f71fc20608c81a1db6a154de7f4de6ea80eee
 EBUILD rebar-2.6.4.ebuild 624 BLAKE2B d634bc46b48270d5c5a4b1c2d3680102d61a469ed8d904faea392a257c161295a2175a26afffaf367b3b2feba3b5268805af142f9cb685a29d6b6945c22ad983 SHA512 08a934a6d39eb91cba297036d22f40f0b6024e05c46630a4096f58cbee55928aeabee71ed0cb3c46a7db0791b7d62ddc6f6306a06756d00987439b0f7b7c4914
 MISC metadata.xml 248 BLAKE2B 404382bd4b92d22cc627b066d14310ac5f538e3bcac366e8cddb43c871c13d4efade2036bb49f5e8ac3c7511f28e6eae58a1e350bc48ef8b9f2031b460c741c1 SHA512 c6b32cd3a892084eff028d3afb657fef0e0921e6636628cfc2d81b7bada9d0c7d03005f8c8ed1ffddc7d491bd6725c771506dd3da20dc5a60619efaccf0974aa
diff --git a/dev-util/rebar/rebar-2.6.4-r1.ebuild b/dev-util/rebar/rebar-2.6.4-r1.ebuild
index ea5c7125e53a..c38856039c16 100644
--- a/dev-util/rebar/rebar-2.6.4-r1.ebuild
+++ b/dev-util/rebar/rebar-2.6.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang:="
diff --git a/dev-util/redo/Manifest b/dev-util/redo/Manifest
index 051f63c47d0f..3838e3b1dd76 100644
--- a/dev-util/redo/Manifest
+++ b/dev-util/redo/Manifest
@@ -1,6 +1,8 @@
 DIST redo-0.42.tar.gz 194344 BLAKE2B ce17ba2bc8b6a074bfc5cae58cc99c1c41b2e8bab93a10f29d1178cb2071bd68ef5528529c320ee55063a4e3bce83705b486bc92992a9c0c18b65e7fec76fde5 SHA512 41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900
 DIST redo-0.42a.tar.gz 195053 BLAKE2B 3e84e961eeb66396d5d5aa8a3f05f10d4000089d12c36bd8e061c163e050b9bc125cd8dcc5987c9f3b25e2b8803ff7c34d48a173ab91fc4a3e9fd63c114adc8a SHA512 8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb
+DIST redo-0.42c.tar.gz 195232 BLAKE2B b24969d71b247d02642340cebbf325e2ae68d4893d02e489930120e6aac76bd3099fd42e7dc36dae1fdea5c7825657957291876b906c2671a6319f8eb45a9d91 SHA512 3196ff5941d9e62084c7332a6771edd0db0082a499ba16fb6de273295c65b734e7dadb29a9fca3e6266421bc964369a8e725ef55f59ade2ecfb5e8bcc446ced0
 EBUILD redo-0.42-r1.ebuild 1064 BLAKE2B 76ac6a5c76fe9b73695bea9b523fbccee16de07cf77eecff673dd1d770449c6acea9b8e62bf7e3ce34fe0a0adf6b13dac8dd2bf9fcc9da647dba28ab263849ac SHA512 8f03fa82a0b69cf564e29632f5faa223f469414ad6ae1ede6e35f80e4ca700d72b17712e8a232d4700d1602b94a3ff03c69672d1455c0af0d3b04251d02d7454
 EBUILD redo-0.42a.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
+EBUILD redo-0.42c.ebuild 1213 BLAKE2B c6d164192bb11fc89a85285e7ebfbd6b665be255ae93e66866fded161077350b6f2dd69c84ae8779bf4f1bb991d654b92bd7bc99753a1f9849a1c8723aa6e67b SHA512 a455891117bdd88c6bfca6952ffb13ebc27d7fe5a52d437356b1540a57e9dec0b54ae7fbdb50f86c305a280e10c9b2dc714011bf8780583dbf4d3c72f1dcae5a
 EBUILD redo-99999.ebuild 1165 BLAKE2B 39a1599939c4273cd1fa0c7541c55c02667932f7c68787abd10be5379ced05c860ffb9f2e2d2b298321b61c98e2e7aac7bb4144ddcc1c6f6e43aaa8076aac8f2 SHA512 a13fb769e4ddc7ad348e5063b9042c638ee6b37fcc0a48e91c3452923bac0ec4f5db744c096a454fc8f71b3fcdf5aed6067d307a2727eb98b58f7d0f6c297356
 MISC metadata.xml 351 BLAKE2B 4093a6abf023ec3d67b11cc94ed6ae14d735ae51748f05ed328f64c44885ba68b72927b4601503ce4d20747f34bdeff17adfa9514c6259c9590609cdcee85128 SHA512 38a2902d3f8370fe111c11b4622250c5c76b2f3d03eca795b0d2ceaec0679fec274b98cf2df726559469844c18de00ac84eed6b391992d1b5aec88ff51ec96b9
diff --git a/dev-util/redo/redo-0.42c.ebuild b/dev-util/redo/redo-0.42c.ebuild
new file mode 100644
index 000000000000..47a81ecf2022
--- /dev/null
+++ b/dev-util/redo/redo-0.42c.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2018-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="sqlite"
+inherit multilib multiprocessing python-utils-r1 python-single-r1
+
+DESCRIPTION="Smaller, easier, more powerful, and more reliable than make"
+HOMEPAGE="https://github.com/apenwarr/redo"
+SRC_URI="https://github.com/apenwarr/redo/archive/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/beautifulsoup[${PYTHON_MULTI_USEDEP}]
+		dev-python/markdown[${PYTHON_MULTI_USEDEP}]
+	')
+	${PYTHON_DEPS}
+"
+RDEPEND="
+	${BDEPEND}
+"
+S=${WORKDIR}/${PN}-${P}
+
+src_configure() {
+	echo ${PYTHON} > redo/whichpython || die
+}
+
+src_compile() {
+	./do -j$(makeopts_jobs) build || die
+}
+
+src_test() {
+	local ARCH= CFLAGS= CXXFLAGS= LDFLAGS=
+	./do -j$(makeopts_jobs) test || die
+}
+
+src_install() {
+	DESTDIR="${D}" \
+	DOCDIR="${D}/usr/share/doc/${PF}" \
+	LIBDIR="${D}/$(python_get_sitedir)/${PN}" \
+	./do -j$(makeopts_jobs) \
+		install || die
+
+	python_fix_shebang "${D}"
+
+	sed -i \
+		-e 's|/lib/|/'"$(get_libdir)"'/|g' \
+		"${D}"/usr/bin/* || die
+
+	python_optimize
+}
diff --git a/dev-util/sccache/Manifest b/dev-util/sccache/Manifest
index 880acca5b394..753f4f46f453 100644
--- a/dev-util/sccache/Manifest
+++ b/dev-util/sccache/Manifest
@@ -1,4 +1,3 @@
-AUX logrotated 171 BLAKE2B c97738eba7f311d563476eb462b05facd41b53b87f7918bc543b4b87f1b1cdd6f61a39661748f8e098752c0337b392c5924db10d1bba87df65dd966a8d278a14 SHA512 d5b0cc5e60626b29f9e7385fe4b37d59108f042a24bfd1edeb9a994de68496b4802029ca48d59a7e45276e18e97943a4a21ea0d7521171207f7b29781fa881aa
 AUX scheduler.confd 438 BLAKE2B 3e047418c6953dc5e21f1caa4770f1c95d58f59dae58938d4d4440dcc149c352967ed25ff2a196cb7b26e871ba6271ccf29b887ecf906faac6ad081f45d1686c SHA512 256cb811d69ffb148bc01e06cc69cd406d4309606c71cc4d8595b3ee140037b882cdb513871c32278b4e58fab8f2778ded202dd1c2d297797a393069f8f6b2ca
 AUX scheduler.initd 525 BLAKE2B 8992cca3a4592585ecd465c6cdd7b7d5d3771bb10ca31d4d404919552b28dfe3862dd05fea453b5aab043d05de5d2f4b46011c4ee6992cdf658a41f32812c526 SHA512 05a973d61f952fd16f84698821624837f6d0f073c826b7ee4ba0f95c0d251ddb6ba84508deb413e96dfd4de28a637e4bd93a5791acd59a4ba75dc28155f21292
 AUX server.confd 420 BLAKE2B 0cdb51dbf3c7d06285d02dfaa39e92a480e0d9ba1ed27473ee6df876c5d60ff5a0ce0ce61c0e60790bda901fe955315665c44fafa207aa94ea7baed0b9ab19d5 SHA512 74be100f820aa89df203097f92c82370c02386980763a47248ffd3c6a3d8ada313ea2e9989e224eb0ffcbd728ba41cc76eebd233c9eedcc8784b8fef78aa8ae5
diff --git a/dev-util/sccache/files/logrotated b/dev-util/sccache/files/logrotated
deleted file mode 100644
index 83824277bd4e..000000000000
--- a/dev-util/sccache/files/logrotated
+++ /dev/null
@@ -1,5 +0,0 @@
-/var/log/sccache-scheduler.log /var/log/sccache-scheduler.error.log /var/log/sccache-server.log /var/log/sccache-server.error.log {
-	copytruncate
-	missingok
-	notifempty
-}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index 6dc7684e6830..afb9b1b7cdd2 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,8 +1,4 @@
 DIST crystal-molinillo-0.1.0.tar.gz 23932 BLAKE2B c9bcd707a3208f5d80e6e3030523d50f86cb5977799de8ea6035d014094e3c2fff9bb189fa98f566e72e1e7ad161e47e44c89d9b264d47f109b2e891ecb469e5 SHA512 8d74d95896cd7ff510c87e2ffba6ae5f04ceeddde574930ee609851312b65d713a315cc24f9aa3fab02f9447ccb25ef2dd2e8179640b8c5cfb3d7d6b52d1ded5
-DIST shards-0.10.0.tar.gz 39507 BLAKE2B f6b6034a626500d0459e01be73de28506dc2efe116a5f662b27edb6cbe363cf4bb3184fcce83838e02dec4db18355a85737b4783560b7d94b643145d08581174 SHA512 8d41a2553fd99bd44a3e8a9aacbd17f2a1e9f8730f90c4682091e8d2a4f2388818bdfc4e4bf654c3cbebd617a74474fb63f1fb86a62998cf79409d4778649757
-DIST shards-0.11.0.tar.gz 45819 BLAKE2B 61b10f2debf6768a151959f2558f54c6cdeb9295068341007f15418f95d63747d68e7c39aa7384da80bad9af668d66906cbc7f51dd8ef93cd09d305df2edb041 SHA512 29190fa5fb05ddc36360674b2979efaef55a1963d77f06c7bd81e58b7e03309cab832c9ab7350017c369b9e09a3500adb2c7408c7bf6ac1888f4285128803632
 DIST shards-0.11.1.tar.gz 45913 BLAKE2B 43afeaaadc1b1ec68353580aacac2eb7d2d69547ba128fdb358682031d83fe28eaae159e39d519ef52f7b058228176fd6ca1aa47aeb03e4a1ccbae7306902e95 SHA512 59a1bd563101c3b3175bd586cc205a821b5087fc70b6bc14fbb612b325c18aa0a2d9b8159ad115e227c9321b1d40703fd7062b413b92252e6efd2ee081d1a221
-EBUILD shards-0.10.0.ebuild 929 BLAKE2B 7d8e32a3c01039c1b361e7689209d99d3b0fcfbdd942a34aad4917ae64f04bf592de8bac87ec36f690d0828f6126cc0d710b29fd72a179d056e98a2b821e4ae3 SHA512 4e314b9093b90d2cf22038d3e3c4b8c39f269584166985f3c7af81a4c478f2fb1c8daaa00af71e944ab1fbe99395bef9dd8bec0acc4c6584ee4cc70ecebee9b1
-EBUILD shards-0.11.0.ebuild 929 BLAKE2B 7d8e32a3c01039c1b361e7689209d99d3b0fcfbdd942a34aad4917ae64f04bf592de8bac87ec36f690d0828f6126cc0d710b29fd72a179d056e98a2b821e4ae3 SHA512 4e314b9093b90d2cf22038d3e3c4b8c39f269584166985f3c7af81a4c478f2fb1c8daaa00af71e944ab1fbe99395bef9dd8bec0acc4c6584ee4cc70ecebee9b1
 EBUILD shards-0.11.1.ebuild 929 BLAKE2B 7d8e32a3c01039c1b361e7689209d99d3b0fcfbdd942a34aad4917ae64f04bf592de8bac87ec36f690d0828f6126cc0d710b29fd72a179d056e98a2b821e4ae3 SHA512 4e314b9093b90d2cf22038d3e3c4b8c39f269584166985f3c7af81a4c478f2fb1c8daaa00af71e944ab1fbe99395bef9dd8bec0acc4c6584ee4cc70ecebee9b1
 MISC metadata.xml 334 BLAKE2B 9958fd270de05b67ac94b791633635bd62770ad0ebe44630e43c26933d2059d042bc00997a8b5b8983c0e839a8adaf238359a17285e4bf8321f082077baaabbc SHA512 8010e36b15550ce7e599e30f1716b3df9d17f464f01cad097e829f3ec97624578f9bb7e24f832e14c67b4cdd5c8d25c998282e39ea0341e81baff39c1bcae658
diff --git a/dev-util/shards/shards-0.10.0.ebuild b/dev-util/shards/shards-0.10.0.ebuild
deleted file mode 100644
index c36571a58c8e..000000000000
--- a/dev-util/shards/shards-0.10.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-CRYSTAL_MOLINILLO_PV=0.1.0
-CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="
-	https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_prepare() {
-	default
-
-	# bundle crystal-molinillo to bootstrap 'shards'
-	mkdir -p lib || die
-	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/shards/shards-0.11.0.ebuild b/dev-util/shards/shards-0.11.0.ebuild
deleted file mode 100644
index c36571a58c8e..000000000000
--- a/dev-util/shards/shards-0.11.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-CRYSTAL_MOLINILLO_PV=0.1.0
-CRYSTAL_MOLINILLO_P=crystal-molinillo-${CRYSTAL_MOLINILLO_PV}
-
-DESCRIPTION="Dependency manager for the Crystal language"
-HOMEPAGE="https://github.com/crystal-lang/shards"
-SRC_URI="
-	https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/crystal-lang/crystal-molinillo/archive/v${CRYSTAL_MOLINILLO_PV}.tar.gz -> ${CRYSTAL_MOLINILLO_P}.tar.gz
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-DEPEND="
-	>dev-lang/crystal-0.11.1[yaml]
-"
-RDEPEND="${DEPEND}"
-
-RESTRICT=test # missing files in tarball
-
-src_prepare() {
-	default
-
-	# bundle crystal-molinillo to bootstrap 'shards'
-	mkdir -p lib || die
-	ln -s ../../${CRYSTAL_MOLINILLO_P} lib/molinillo || die
-
-	tc-export CC
-}
-
-src_install() {
-	dobin bin/${PN}
-	dodoc README.md
-}
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index e3295b97cac6..093008ccce9d 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,6 +1,4 @@
-DIST spirv-headers-1.5.1.tar.gz 369998 BLAKE2B 7ad91a93d2704baeff9d8dd32c67f4a7d428bc174122a37e1a405865ca8f1d9dfbf6b1d096092f8b2e83610679ddb8d311fb7823411548976c9fef3929449df4 SHA512 6ed09d1b825ad921bb988f260a236c82e9755ca3904a2ac130cf82d876a0de087d8d5f6eba01e923fe565c93a8e3eb46346bba21c64a664598a43063e5e5108c
 DIST spirv-headers-1.5.3.tar.gz 387520 BLAKE2B 80f210792294232b9f1ebd12e96a8070b27ca29fcfcf8f61c19b0ddef493511bd1f5f85d44f6112de6154108237147feb564334cd47fb37b6f3e7dfb50620a7e SHA512 fab90cd073aed34320d2a03c441746101e757a4bd44f0b259aaa34e1fafd450b9576d8d539d85a8066cdf0eda3e78c807ccf65cd86ab9d8660195a96e9a50795
-EBUILD spirv-headers-1.5.1.ebuild 500 BLAKE2B 1d85e8c9679beffe2e4904517102f42cd644ebe3e59c3da617479504e81c34ce9cd727d6ba6e8a37a98332363452dff05fa75bf20c990bfa758c7f613b03521d SHA512 adce00704dfab422276017250f418417ecd9076b4cd7c56906009bebe646e708879a121e1f8b08dc3b2db904f138fd05ca7db7bc32a9c4fab7485ed7db500db0
-EBUILD spirv-headers-1.5.3.ebuild 502 BLAKE2B 1223d4b3ac694e776b0c2a7c79eea40ac338a2147357360b728f906d760e235006c60da3fb4a570b7990b49756c6a014927dc49578a2f241268a18ad4b30353b SHA512 7d2d8619e2aec994b0784331e344bbea348b75c572a5f4cb3bae4d3562a11922cfa1327ee04458a83441f71017226d4532ddb764dae3c20fa03115a95ef480a4
+EBUILD spirv-headers-1.5.3.ebuild 500 BLAKE2B b4e6b598ed2ef2abe431eb4505d449a9371220ff950e196718c9dcebad0493db9a05e8378c22780bcdf2a56240b0b4d5b0f1a2964283c0ab6ba199d0de950b87 SHA512 09701ea97c560617c65e165223b07a6faca3a05ab75e746d5a1e4a90ac8321d8a4d6a7e3bdbdf1de02ed293d1e7d16466df65b8467d06c758cf886b4aefa294a
 EBUILD spirv-headers-9999.ebuild 600 BLAKE2B e52054009b4c2a119218fe8e7d1d7606a5355fa93c8a9e14d7e6174dc212d2c87a7d2c57106bd4d217c8fd0ab88234e5a186f700664ccbd04de8b3520afef10e SHA512 420d7be91c892302e0b052c9bf1a628d663f95051a6d38580944aafd1c43c395cb87cec8df6d2d756b8fb4a177b23671911f58c05e9e5b035a41b0b9bb399dfe
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
deleted file mode 100644
index 4bdef3fea3e0..000000000000
--- a/dev-util/spirv-headers/spirv-headers-1.5.1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-DESCRIPTION="Machine-readable files for the SPIR-V Registry"
-HOMEPAGE="https://www.khronos.org/registry/spir-v/"
-EGIT_COMMIT="af64a9e826bf5bb5fcd2434dd71be1e41e922563"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-
-S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
index 8d34a6f3f8ca..56d8e9cf84c5 100644
--- a/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
+++ b/dev-util/spirv-headers/spirv-headers-1.5.3.ebuild
@@ -12,6 +12,6 @@ SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index 782e2b79b617..855d1a42f453 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -1,12 +1,8 @@
 AUX spirv-llvm-translator-8.0.0.1-no_pkgconfig_files.patch 533 BLAKE2B 4d0d1b4c605681b2dbfc4c52730c9f20f8290f11a2be9c37db78e533a996c22140faafc2691c732b49b9de28a59644bd5e39a2b7d4209eb44486cdeee1338de8 SHA512 db4786a10e4380f4575d52cf861a82d0aa9f69cec7d47d574f453d159396e993527ba4e469fab75fabc36b977ee4b61abb9e3787ee2af45af8f5865b3b06e10c
 DIST spirv-llvm-translator-10.0.0.tar.gz 535828 BLAKE2B 0bce2f663b2f70a2db2b1ef0665d627716d63baa6cb47ced532ac2e30e8b0424934d273135581655445ea87f5c84c9df876da0490d7a302a6d00c86b78e05c22 SHA512 d6400bb3e4df780358b5d6d0af889e7654b7dfd472c8d41b77ff98e7ff1bd017c289ecacb59a3dd7bfddb1a5108e21028aa770bf645e06178610bb322de905be
-DIST spirv-llvm-translator-8.0.1.2.tar.gz 461803 BLAKE2B 58814d88bfa555f0deab8d072ecd0b54c1ee22c4f6464a9988d18dad2c99d25a5ed49e506644d01455fb92f476536148e0e0cce2eaca22b4b1c88220724f8d40 SHA512 954d4600f680d3325d4f7ea80551f814f2cee486254227609fc0354c1b112d4dea387736d601750587369a7c4f1c2a528a19f8a969df433649731efdd5ba4c23
 DIST spirv-llvm-translator-8.0.1.3.tar.gz 472853 BLAKE2B 3f00aabd46dd43840b8a16f6a9a061e00385bae6d4e608ad1d2e59f943bfca747e1ce6b2f48eee7e124bc3ac47f5895274d9cf7bb587eba7133152b9658f5e9e SHA512 c10a426d83276718b116d664fd32c8457d87e336e7c99b64d323ea9a08330d206dc94e52ce8e7395bcb8ee2ddff49184b5c7810e4848d624396d0574ce48256d
-DIST spirv-llvm-translator-9.0.0.1.tar.gz 491089 BLAKE2B ebdab77316608c4a4a48e778abc749ac347d0ee4441c8cb152b303e99cf5c16bd4f883dad519f5d4a96b6d05975a56e8d2fa5b6fa403dedc163cc3611b905d13 SHA512 ad0e9a49440f8dc0a9c973c74245640c8392c8ae85431eb5e0ca6ea98e603cb6fcbfcaa8fa3d455df2f53537c7f61915a557f12744c39a9c9f9e1c400ddd74ad
 DIST spirv-llvm-translator-9.0.1.1.tar.gz 498803 BLAKE2B dbc1a3a51671102e13ac265c5de744ec7ddbb74ff1a58971e18bfd7cbc7a0497cbb86d099681ac153d8e104577c93b66eec597b6c646d422eb701ea7c96a57c9 SHA512 a84494c49cc16148301cc468fdc20b9ef41a4532477b69468e32551d2132a9be68346369d5f4c07cbefd7f0f63b3e7ddf11e5c40088f74d8e3379a95c3cff251
 EBUILD spirv-llvm-translator-10.0.0.ebuild 1267 BLAKE2B b12f6b0095a57a290680f695296f85fa3cff3823dae03f527b3da718777c0b4f2a0cf465de5fa1671e191b83a837f949bea27f2664fa9d841efd2613f1108d6d SHA512 5b2c9122bba0244adc28d5cf1c93a93e8d810dec57702d3b71b22944f698dd13757a9b68bb4b30a2f483b94566877eacb205c150ed70139b7ba4756b98c849be
-EBUILD spirv-llvm-translator-8.0.1.2-r1.ebuild 1296 BLAKE2B 90b984d769ffc6ffb5df8d36670511872a628b1106637bc8a4c10b32f25d67e7fb3f3e7f7ca4cbecadb8aea1de3243436370ea92d79bad4031e52bdb3d1a573a SHA512 a63e034215979d0e5381c236237febe34749d1d9b8fede39d32efc70c4b994f56166b166eb5f6f6b3d78abaca744d2503472a515a6e1769a99863957d63c31ba
 EBUILD spirv-llvm-translator-8.0.1.3.ebuild 1296 BLAKE2B 5781e9ac79de0decfc51a8793afd6d61a7db44dfe042bcc815abd73685c9a44d5fe90d0779c6dc8382bd9b7ae38cd45f93a2bfa8a4f1042976332cd7c9a5a017 SHA512 ed909c3a70e5e6a91c415c5694abbed36b8420fac78034d813edc1636a3f3c5cb3a5e6f95df625016dca00f6d7af87625c351fbf4368c6d57f49e165d38eb9cb
-EBUILD spirv-llvm-translator-9.0.0.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
 EBUILD spirv-llvm-translator-9.0.1.1.ebuild 1291 BLAKE2B 22fd214fa80e3331da17994058a0861b5f0a3f3d12b558cba329e6e8d3cd34020bd2d5f489ea89e2916e73aca2a45446cb3c36aba203b5fa3425984a486b140f SHA512 9a7e64db4abbae7d694c17935707fa5a1a79ecd0c454e12f35dfab369bc0d5158118c010629dd4b2fc8ea418c2ed8d0342bcbb0903328b394e6d8354b6c4f30c
 MISC metadata.xml 442 BLAKE2B c63b20489865e563e064525b8df310eca993f15ff03cd533458729e5d6611b678e2f797d6efbe177e1bdeaed84e9bcf63921cb67318e948d579b57cc7f1cd28c SHA512 b036abe761b1aeb68ce5668eb3d501d2e5530be3456e85f51bee15c0aa8387a8be89c212308d7997a5f60bb0301bcdd22a7cb44a27324c05533aed94215b4721
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.2-r1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.2-r1.ebuild
deleted file mode 100644
index 0f46fcff9922..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-8.0.1.2-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="8"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:8=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}
-	test? ( dev-python/lit )"
-RDEPEND="${COMMON}"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=8
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake-utils_src_configure
-}
-
-multilib_src_test() {
-	# TODO: figure out why some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild
deleted file mode 100644
index 4feef376c920..000000000000
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-9.0.0.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic llvm
-
-MY_PN="SPIRV-LLVM-Translator"
-MY_PV="$(ver_rs 3 -)"
-MY_P="${MY_PN}-${MY_PV}"
-
-DESCRIPTION="Bi-directional translator between SPIR-V and LLVM IR"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="UoI-NCSA"
-SLOT="9"
-KEYWORDS="~amd64"
-IUSE="test tools"
-
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}/${MY_P}"
-
-COMMON="sys-devel/clang:9=[${MULTILIB_USEDEP}]"
-DEPEND="${COMMON}"
-RDEPEND="${COMMON}"
-BDEPEND="test? ( dev-python/lit )"
-
-REQUIRED_USE="test? ( tools )"
-
-LLVM_MAX_SLOT=9
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-8.0.0.1-no_pkgconfig_files.patch
-)
-
-src_prepare() {
-	append-flags -fPIC
-	cmake_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
-		-DLLVM_BUILD_TOOLS=$(usex tools "ON" "OFF")
-		$(usex test "-DLLVM_INCLUDE_TESTS=ON" "")
-	)
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# Some tests fail on amd64 when ABI==x86
-	if multilib_is_native_abi; then
-		lit "${BUILD_DIR}/test" || die "Error running tests for ABI ${ABI}"
-	fi
-}
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 463c0cd3f352..89aa912b06be 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,11 +1,4 @@
-AUX spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch 711 BLAKE2B faed59dc76f9320972bdc7966c757df76a1353ccefe9f6dacbf473a8f576eb222d0b4ceaa97a641b41c6c520a6a21149956aeab88b840124caaac08b7a27d66e SHA512 b12004d2e5d6b058549c4e12abcea531e4b8113beabc2264161197b247209168affa0aae529f5ac122b3aa7ece6f4000d877bd5fa4a230f44cb6e9a08ea22661
-DIST spirv-tools-2019.10_pre20191027.tar.gz 1848978 BLAKE2B 174482c7186569878ec6f3409a68a3e11013b12798ffbbfb94c66ae6cd338a3375330908cfebf0cd3c67901bf9c2459c6e586cf95bbf4fee399504aa9958da66 SHA512 d26480b6c70acbdf63e36fb5ed11ce422b976d48ef85e2be263c3897a4d5181c31fb94c087fa7b20f84446f0059c3bb7eac872a6d1b15a599fdeb2a7924232e4
-DIST spirv-tools-2020.1.tar.gz 2053947 BLAKE2B d9e641407e871cda5680e9ddac6af5213848b03ef9d13b9fe1acffcea12e9e40b43a834f9e0ae269f43dfffdc19bfaeca502b69ff69d59b95f6810f89b6bd276 SHA512 edd434e06cba44c402900684b8fea16c394f80951ff993b3962617a21630d2d8ff9be9a5203bc8eb9b402e9cafe8c68f13099cbc1eaf66a546df08cb43668c46
 DIST spirv-tools-2020.3.tar.gz 2170858 BLAKE2B c9fdc6bbf6edbb6e3e5aba1fff9bd179b7b435ecb4ebbe29db38ce0c71166269484f8c3798a69a0fe5d936392b07fc6ccd5f058945aa70330612a6ef8fafe12f SHA512 8abb4fe227dbe9d0fc4279523eb714ce3a590a3c56e3dcd226317bc7835e2dceaef3a46c0873c2f144c61b28f41c0fcdf2985cc4f708fa496186c16738cc493f
-DIST spirv-tools-2020.4_pre20200429.tar.gz 2158602 BLAKE2B 1368fd1d446db447ecc20b7aa06e4a64f2a0278825e1384d789cf0ad0a0d7be4064b49e60d1a79c676056c0c22be5dd855f880a1288a11ad31fe96172e9cc0a6 SHA512 e6412306d7923a8e922edf48b1300f0b0ed35d126e3f56ceaa0c787ff2ff5625d20cf1fab14e022b2503dac0b469eb4ecff01f74f6e18884630f161d03d84728
-EBUILD spirv-tools-2019.10_pre20191027-r1.ebuild 1259 BLAKE2B a40c8c9229746472df5430fc1fad85e91fb91e450f0bbd3ce41b1c23eccd5e401de34ab0eb1227b0be3b63a99f9b58ed52d20e1936f817bcb889e94b2b4ac5a3 SHA512 824f6826eecc640d26b2c58adc26605a8003f695b3cae33efa130d3fdddc46a958011a4d4ef125b69ac2d0d514cb491c263a29ff9785f76a2bdab465c73e9445
-EBUILD spirv-tools-2020.1.ebuild 1076 BLAKE2B 9501147d40883ba2aab5a8f484281bed99dc9536ae9963b8077e3eef1aff41f9b29847b1e8de75ec93d25759093dca19942ab3fc7cdf2176bd2cd672eb4542fe SHA512 806dbf63f4a564b1d5dda351e1eea834c1d2c154f5fa95eaf6a0bb37fbb76225591e84662e4083b4f129cb4cebd27734029fc5646c17576fee01ece1f3012745
-EBUILD spirv-tools-2020.3.ebuild 1127 BLAKE2B 7e5c1d0ecec373b04f8f63f3ef52861d8cc3066290ccd919053bb41a41a524c5e00cc2d2ca2e784d5c70f9f3b9534792780a6075dd018bfbbe66ac1d382dc6cc SHA512 9698036d1f64f646db9901344ec6e807c0b54d6a98402b5e2b2fcd4191ab86adc690d79a40610e0b74503fa4f41ed9306796ee9663544f9d3935eb5a9b99bf6b
-EBUILD spirv-tools-2020.4_pre20200429.ebuild 1161 BLAKE2B 29942db28010f78fc71482075a7a5948160e02ffcab79c5dcbecfc2d70630db216582ef93cf9ff0ba2ebe09186ad432152feced9453371568f84da9b99037d2b SHA512 9bd4be9f3eb91489f930b62e73c41a15158493459fa84e9a558998f9e97c143b6be36bba94d2e94ce3cd66ec72596cfc813c20a3b1dc5a21e747b88d798aafab
+EBUILD spirv-tools-2020.3.ebuild 1074 BLAKE2B b8d44eb6a94f94249747846cc5a669cedda044f106f6266f4ebe9fdbb401ff03493f7976463b9bf9a02343fc11491564aaef35fc8e948d5d15ac1c5029b00c5a SHA512 9f5796e86ddaab54f363d936a4e811e3ad020e2ff7970d6672ffa042027a3c39294a7ac8f0141d6d74d4038fcf3024be84ae2151571ec05cf88fb779291461cd
 EBUILD spirv-tools-9999.ebuild 1076 BLAKE2B f2b331dad1276fcdb1ae4029c75bca06be7136fe8f543053d8a7c0bd025d383132c756397cdab4f6c4cbebddd54f82d8a469802e66cd5906867768a952974256 SHA512 32b887f0b40bb37b1c6d63f93eb787c8982996ca94e293e531904870484ad811ea36f4c124101c6cbf33e95d3984f44fd6d013c3043632d75716356a3f5e0faf
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch b/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
deleted file mode 100644
index c7dda4594c2b..000000000000
--- a/dev-util/spirv-tools/files/spirv-tools-2019.10_pre20191027-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 4c9f81249f0808af316f39c8f0e8b67e46ec0967 Mon Sep 17 00:00:00 2001
-From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org>
-Date: Mon, 18 Nov 2019 11:07:48 -0800
-Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files
-
-Fixes #3017
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 19108f3a0..aecaf8d68 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -215,7 +215,7 @@ if(ENABLE_SPIRV_TOOLS_INSTALL)
-     endmacro()
-   else()
-     macro(spvtools_config_package_dir TARGET PATH)
--      set(${PATH} lib/cmake/${TARGET})
-+      set(${PATH} ${CMAKE_INSTALL_LIBDIR}/cmake/${TARGET})
-     endmacro()
-   endif()
- 
diff --git a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
deleted file mode 100644
index edab7a1b8b9c..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2019.10_pre20191027-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit cmake-multilib cmake-utils python-any-r1
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-EGIT_COMMIT="ec12de9131244a076c34ddca2e8d7451288be7e1"
-SRC_URI="https://github.com/KhronosGroup/SPIRV-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-files.patch" )
-
-S="${WORKDIR}/SPIRV-Tools-${EGIT_COMMIT}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
-	insinto /usr/include/"${PN}"
-	doins  "${PN}-commit.h"
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild b/dev-util/spirv-tools/spirv-tools-2020.1.ebuild
deleted file mode 100644
index 3c8fb137c2e3..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2020.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.1"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
index 96f7dff341ed..98b310bfca1b 100644
--- a/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2020.3.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
 	inherit git-r3
 else
-	SNAPSHOT_COMMIT="v${PV}"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${SNAPSHOT_COMMIT}
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="amd64 ~ppc64 x86"
+	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
 DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
diff --git a/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild b/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild
deleted file mode 100644
index d5aca0e248f3..000000000000
--- a/dev-util/spirv-tools/spirv-tools-2020.4_pre20200429.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=SPIRV-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SNAPSHOT_COMMIT="49ca250b44c633ba7cb8897002e62781a451421c"
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${SNAPSHOT_COMMIT}
-fi
-
-DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
-HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-# Tests fail upon finding symbols that do not match a regular expression
-# in the generated library. Easily hit with non-standard compiler flags
-RESTRICT="test"
-COMMON_DEPEND=">=dev-util/spirv-headers-1.5.3"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND=""
-BDEPEND="${PYTHON_DEPS}
-	${COMMON_DEPEND}"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
-		"-DSPIRV_WERROR=OFF"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/uftrace/Manifest b/dev-util/uftrace/Manifest
index d3004b57c3c7..aa472228504d 100644
--- a/dev-util/uftrace/Manifest
+++ b/dev-util/uftrace/Manifest
@@ -1,3 +1,3 @@
-DIST uftrace-0.9.3.tar.gz 1003880 BLAKE2B ae5e1c44412055ea59e85378877cf3c18f33e0c6ae3a904253b03587dae2c7cce4350f1480f499e645375b1b2502a51a8b8d44e9b7ff1ee588be7180c12b63f3 SHA512 671486a05da8c44400169f21426505266db89e94ef9483370dff8f465b673f70fba994174458f3033991ea0640225e13c639418380a6a580d24c302d42327382
-EBUILD uftrace-0.9.3.ebuild 748 BLAKE2B d76cd329331ec9e6a78ebc1a03f752ac97135578d91099f73148677ee36d8fe94deae62f4e5870189678c4904bcaee1b38a19a1b4fc162968eb58f03a228e9a4 SHA512 32cd013c948244f4ef143171be2ae2ace662125809fc11c8a72a72a2aeef4995cc08fbc275c500ed4559fd712c94c023121121ea1d5864c579cb63ce999fec21
-MISC metadata.xml 356 BLAKE2B cb0c4a184a36f1184494927f5cd72f945d9b7361cbf6ecde1d884197ec6b12c156566c8e61d635647637bb7924f9a3515d232cc6466b38bb463f13be769f88c4 SHA512 c9794b1bd56251df386da82b80d9d2979613f2f158cbb44fc478f8299da022193860cd7387d44f56ef5c14c747e5e276eb0f6db5864a6c78c8e689ddf5fe5643
+DIST uftrace-0.9.4.tar.gz 1068091 BLAKE2B cbf9ead0e2c0e8d59be379e65617cfa310fd4134cfbbc8091c489913f108e8a7a0b81e33d46032f3717a5bb8127cbeeeb246e3be0c37da03981dac4bacc07119 SHA512 f73ad4461051b9c61668161e077897d118ac556d234ff204e32bf14ecdc2c0df148da30ea5d5054641e79ea20b29261d6f637908f5047f5669207ef244865358
+EBUILD uftrace-0.9.4.ebuild 906 BLAKE2B 1dac005c9729ba654a2fb47bb9f62ea3133980bc13b15082a0f456ac11916e405eb68a0b82f2fb4aee8fb08195cc02036dd3a642be920e1d7815b26faef9c709 SHA512 6d2efb66d03e8f0aa828167d7803da3582e43e87c885ce5ed70d59b150d41b3db2206dc50358603f9ab98b418e6ef299d4d6b3161760ae24264f57723ed9ce31
+MISC metadata.xml 438 BLAKE2B 573900b49b5a09077887b8703137b6e33cfe992340299f397601fee032b474fc1127ff96f07a8db6da9bb9592e0ef1f45c996dff40fefeb63a15a233de2fee98 SHA512 b272ef1b4664a53c3d00445285a550f8bf9abcb100417febe7e177b803cc2414b32bf5c6900113dcccea0449a5e23c14543b349c3e6452f5ca1a37d6639214d3
diff --git a/dev-util/uftrace/metadata.xml b/dev-util/uftrace/metadata.xml
index 0162146a7ba7..ae2d867c1726 100644
--- a/dev-util/uftrace/metadata.xml
+++ b/dev-util/uftrace/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<name>Guilherme Amadio</name>
+		<email>amadio@gentoo.org</email>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">namhyung/uftrace</remote-id>
 	</upstream>
diff --git a/dev-util/uftrace/uftrace-0.9.3.ebuild b/dev-util/uftrace/uftrace-0.9.4.ebuild
index d48d238c8012..51506dbff692 100644
--- a/dev-util/uftrace/uftrace-0.9.3.ebuild
+++ b/dev-util/uftrace/uftrace-0.9.4.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
+inherit bash-completion-r1
 
 DESCRIPTION="Function (graph) tracer for user-space"
 HOMEPAGE="https://github.com/namhyung/uftrace"
@@ -14,25 +12,32 @@ SRC_URI="https://github.com/namhyung/uftrace/archive/v${PV}.tar.gz -> ${P}.tar.g
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="capstone"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
+IUSE="bash-completion capstone luajit"
 
 RESTRICT="test"
 
 RDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gcc:*[cxx]
 	sys-libs/ncurses:=
 	virtual/libelf:=
 	capstone? ( dev-libs/capstone:0= )
+	luajit? ( dev-lang/luajit )
 "
 DEPEND="${RDEPEND}"
 
 src_prepare() {
 	default
-	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" Makefile || die
+	sed -i -e "s/ARCH/MYARCH/g" -e "/ldconfig/d" -e "/bash.completion/d" Makefile || die
 }
 
 src_configure() {
-	econf $(use_with capstone)
+	econf \
+		$(use_with capstone) \
+		$(use_with luajit libluajit) \
+		--without-libpython
+}
+
+src_install() {
+	default
+	dodoc doc/*.{md,gif,png}
+	use bash-completion && newbashcomp misc/bash-completion.sh uftrace
 }
diff --git a/dev-util/umockdev/Manifest b/dev-util/umockdev/Manifest
index cc35967bfcb2..fa3a8cda4908 100644
--- a/dev-util/umockdev/Manifest
+++ b/dev-util/umockdev/Manifest
@@ -2,7 +2,7 @@ AUX umockdev-0.9.4-sysmacros.patch 599 BLAKE2B fa261c73cc873ff2aadfc721cdd24dbae
 DIST umockdev-0.11.3.tar.xz 753152 BLAKE2B 9f78d160a653ba2c56e97d1b331dfeecd4dd8f6642744849ec3eb85866e4cbce6399679a873b730beddfac2f4bd7572937df4a3db2440ec1bf929849f928bdc6 SHA512 e9086777bb13dbd79b629dc68555d19fb8799720dfc4548926b87d032d94212814cb9e1de10e26f5940a9b5db9a15f62a594f3baf0050ffb9ea30f1563db6d6c
 DIST umockdev-0.12.1.tar.xz 756920 BLAKE2B a8c1d9734f4c0a8e7f19405e011ce964efce6621b4886efead88e040bfe07d2f5a85f063977dfed1c8fb5a5bf4668024b6e687b688a9609cdba1db419518a8ac SHA512 a8995d09179c7d2d37d319f8e675fb15c3caa605c57b56cbb2e785088909d886e790864475feb82ab2b6eb2449038c636a06250d4f9eb8b28b38f0d80574824c
 DIST umockdev-0.9.4.tar.xz 754856 BLAKE2B 92182ee856e9432f02cf3a739c7af6f2220394eb4dd81ef6e2949380d124f70d9e34c3d3e49053af43794dd0f2ce0feed8be7366df2c9a06bebee9c52d24ba53 SHA512 c291d3f40a0ab366f14021aa0960852de049f4299a0207d93cec28d5961f3bc7f89448add6f7b35c1262d805d1d638837d4d5e6b734879ffb5910da50019e1cd
-EBUILD umockdev-0.11.3.ebuild 1028 BLAKE2B c40e76f3c4930caa6f80c84e258efff7b6825150a262c0f2ba5d49f88f846ecf65bce2a6b64b24cad08d3e78b8d825cc846387531e201bfc38c98a241c37974e SHA512 b4842bac3e364fcd05db12d3e78d31fec7584d2d37c543d23402ab62e6a1e8d67b2e83c310921b12baaa14bba291dba8821ef91809163cd6d1bd44744182f2ce
-EBUILD umockdev-0.12.1.ebuild 1163 BLAKE2B e9497cefce1990ca7057eb352595728ab3d7c172a482bb7320e37fbfab02a8690cd38f8901440bc51fdbc93e5de8f01bb23840e59fbb69d97495bc12a657857b SHA512 a9854470b86e44fb97127ef3e368dec74c53c91ca47e67b814b55596ca51d0216ca5b4b8af11b8fbbdc06816f212e9d3405d0f4167cac7bceeddc3c10369ae2d
+EBUILD umockdev-0.11.3.ebuild 1008 BLAKE2B 2c759f19cab5a3386d0c0fd5226e08d82c903577e7923ee2fd5ed035de80aaee3d2414d20fd9b5aee6d031ec46b999d39818d58bdf5e70ca61ea6973f149df08 SHA512 c59bc1154a73886962f992517da4b4585c8ac8ce99642cebe815d5a691240b1efc2ed323002c2bbd2ecbc752cc24341d2e367987f9eecc46f0a24f6ff79e9b79
+EBUILD umockdev-0.12.1.ebuild 1196 BLAKE2B a5fad4a1391a63b280495c7668724c286c51693a3a6e785bb608ec975a3fc0717cd2c1814fc7cd7513b9e465ab9da3aebc975bcf52ee5a2fec7cd932f62e6af9 SHA512 74f84a5bf5d3b3516d7753f8cc0cea4ce2d99899d9aac29a301b9dba6f1737f9b368cd29efde5f71dd06825a2508abb39aa78a0ef11fe8eeaaf98dc30ec08531
 EBUILD umockdev-0.9.4.ebuild 717 BLAKE2B d68eec4ddf6087fb9f0768c487595bc0617f6b746b9cd4002b8dd95a25579de89eb582703defaef005c0087c87dba0ccae28a03a9e6ccc414c393d28b9780e19 SHA512 555af33316a54fa0e7ec4c6211a0b1322b9e762b47084fe4698638c7feb95b0f1c025e80d4fcf5c3f8a09ab526f25db38b440c722beb62089b13fae3c60a0b23
 MISC metadata.xml 388 BLAKE2B 5140e5be03021c8b50516cddf6a51b8715a1e110e13519313cd3e30b2317874cec5c56eea5168d47496a2055635b87effcc66dac54a66a482818da15b540186d SHA512 ca1c14fa200681d916d6d4539fa9ee8c64d6894d7b78870abfc4ad03446a30703f0fe862a11c5838e26719ae66e0bc944fe0ca75f0f89195128d4e8856b6cd78
diff --git a/dev-util/umockdev/umockdev-0.11.3.ebuild b/dev-util/umockdev/umockdev-0.11.3.ebuild
index c4d61d96500e..edd87b90f8a2 100644
--- a/dev-util/umockdev/umockdev-0.11.3.ebuild
+++ b/dev-util/umockdev/umockdev-0.11.3.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}
 	test? ( ${PYTHON_DEPS} )
 	app-arch/xz-utils
 	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 # Tests seem to hang forever
diff --git a/dev-util/umockdev/umockdev-0.12.1.ebuild b/dev-util/umockdev/umockdev-0.12.1.ebuild
index 8b36fb5d0bb8..105da8e53ea0 100644
--- a/dev-util/umockdev/umockdev-0.12.1.ebuild
+++ b/dev-util/umockdev/umockdev-0.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/martinpitt/umockdev/releases/download/${PV}/${P}.tar
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="+introspection static-libs test"
 RESTRICT="!test? ( test )"
 
@@ -27,12 +27,16 @@ DEPEND="${RDEPEND}
 		dev-libs/libgudev:=[${MULTILIB_USEDEP}] )
 	app-arch/xz-utils
 	>=dev-util/gtk-doc-am-1.14
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
 "
 
 # Tests seem to hang forever
 # RESTRICT="test"
 
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 multilib_src_configure() {
 	local ECONF_SOURCE="${S}"
 	econf \
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index ddcb6f4fee60..2daa54318855 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,12 +1,6 @@
-DIST vulkan-headers-1.1.125.tar.gz 662594 BLAKE2B 7cd18b74ff804ed02df3378485f0783332bd09bf898769c48ded20f7a6495b5208cfae3616de401e17ffcec30421b48222520dcd90b03ad83b548405fd8a656c SHA512 355df13347aaa3b32ad62185810c20d1b2f358525d9d8036f6bc7643e7505a25c087a51e05fa7b0758e4ee63221bb39d01d6e14bfb7f99a53cb2127ca5db5d67
-DIST vulkan-headers-1.2.133.tar.gz 713107 BLAKE2B a29272618d224195d38e13d40ca22ee4822e38f5c7b72d3dc02130ccc6a053e05b955993ec4842486f444d819a7f4a6af0690b5c925e6194f254cc196d024cf2 SHA512 9a8375e2634f55bc50653d530db774d39833ca0e9221f6a50667567b254e7334398cb8c0318cb1342b720f223b795933c546cab3cb433443dfbf2a9702700a4f
-DIST vulkan-headers-1.2.136.tar.gz 757563 BLAKE2B 0f793b260cf13eaff58f26b03b5a874202882e7f1de93db5e703f3f24653d4b0e3845c94a96dab8d19f8efba1c3abc9d8df5c2036f16184ca4e59c6abc94c0cc SHA512 cf3bf2cc930fc3642f867f163844267e9ccbc0587ca619b13a5349cc4b914c44f240347ce9b62afe321f769904f9599cecad37bac6a435603db70419e7a1edd2
 DIST vulkan-headers-1.2.137.tar.gz 740315 BLAKE2B ae7b4736f329eca6ceebac207b89f01137d121b30059361914e94c570efa9ae8276ece03d9b756d3f343db7324adc01a550bab85ef496a54c8e1e93c58e07e51 SHA512 379980e1792a3a9f10d773b178fe6db36332d17b8a5a9dfc4ca9a52747667d44d24ca8498c2110d7a04fe54bf0d20e3a94ffc97b96b7db95f957072787c5f8a8
 DIST vulkan-headers-1.2.143.tar.gz 758635 BLAKE2B e1fa8e1290d2fd1e4cef932e4dcd2bc10ef14449cdb41d57f0e4ef58f9a758add7e05d06d7884b08e080250cbb93bf0b211ac3570f0be6b256f6c70bd9eb1704 SHA512 fafd28822da050211525b289a324d333d5651e74e455a7b1010db55eac624edbbf50f5e7f899e2003c821fd06a9a61fec32ea7d07dc4d90a3b3697e03d3ddcc3
-EBUILD vulkan-headers-1.1.125.ebuild 789 BLAKE2B 0b41fcc284ee87fc0b5ee161ed1bb7fd7c9d2c6c3827bb8358a0b51bac5f2a358368d797510410c2c46b64a9a25b898293158830dbe3ec81a9a64e4501324d48 SHA512 151e8be50ec7117f314338cc7ed397ed7b33de9dd3c1eeb7f2b07ce87273c11adb7abb4a284046e2aeb0102390a69de6f739f539579c0603d405351a2a1dbd5f
-EBUILD vulkan-headers-1.2.133.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
-EBUILD vulkan-headers-1.2.136.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
-EBUILD vulkan-headers-1.2.137.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
-EBUILD vulkan-headers-1.2.143.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
+EBUILD vulkan-headers-1.2.137.ebuild 591 BLAKE2B 127d9ed5084e0f90e171268c0ceb84b2a6173a81945e92dd9de76d1b7129062c1982dcf27b2ba036d23516d7805394c6f592488f8ce942733556d5741a29e3f6 SHA512 baa05ee223757a5efba8e72754a91344af04f3920badb7bafbe8669fdab34aa39eca2eee7bae73913c758760883615910ed1618a90183382323e9b76d02f73c8
+EBUILD vulkan-headers-1.2.143.ebuild 591 BLAKE2B 127d9ed5084e0f90e171268c0ceb84b2a6173a81945e92dd9de76d1b7129062c1982dcf27b2ba036d23516d7805394c6f592488f8ce942733556d5741a29e3f6 SHA512 baa05ee223757a5efba8e72754a91344af04f3920badb7bafbe8669fdab34aa39eca2eee7bae73913c758760883615910ed1618a90183382323e9b76d02f73c8
 EBUILD vulkan-headers-9999.ebuild 593 BLAKE2B 101dc4954cc61f0375202d2398a3bab6e99e379f9dbc3aaab01129670e0413cba3fc9d15f031a44f634ec7576f0cd6bbd52ccfdbec0de9d703f6db5a9a2eff52 SHA512 a95238b09e9d71d72588e9e90af0d99590a8d4fffb6b134cc75c5b9bfc542c40f7a438447ce06aaf4a5ea5922d9ce49763af91b49934c8f66fc5dbb1d7ea8246
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
deleted file mode 100644
index 71fed9417216..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.125.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
-	inherit git-r3
-else
-	if [[ -z ${SNAPSHOT_COMMIT} ]]; then
-		MY_PV=v${PV}
-		MY_P=Vulkan-Headers-${PV}
-	else
-		MY_PV=${SNAPSHOT_COMMIT}
-		MY_P=Vulkan-Headers-${SNAPSHOT_COMMIT}
-	fi
-	KEYWORDS="amd64 ~ppc64 x86"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-RDEPEND="!<dev-util/vulkan-tools-1.1.124
-	 !<media-libs/vulkan-layers-1.1.125"
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild
deleted file mode 100644
index 10d614b0d1fe..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.133.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild
deleted file mode 100644
index 10d614b0d1fe..000000000000
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.136.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Headers
-inherit cmake
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Vulkan Header files and API registry"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Headers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.137.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.137.ebuild
index 10d614b0d1fe..7d33f79e5418 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.137.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.137.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
index 10d614b0d1fe..7d33f79e5418 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.2.143.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64 ~x86"
+	KEYWORDS="amd64 ~ppc64 x86"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index b9305a67a35c..63508125f917 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,12 +1,6 @@
-DIST vulkan-tools-1.1.124.tar.gz 691639 BLAKE2B 6c40d8fd9498205bac9eedfc97486a0567f503847f5efff7d2e36563f72862b9a74e7d5b8c61e7d92822a4fbb91c24ee72614f7efb85aff68d4dbda42e09c422 SHA512 9f1f5dad1a5a847dc2fcc43382ee86f19a4c4b97c300f096b3cb33852378fcb260c33e6e920e9b70839a726bd6473ccceb8ef7504a530a3553dcb30c3ac74421
-DIST vulkan-tools-1.2.133a.tar.gz 698176 BLAKE2B 55f1b298a5daf7c656492c75999002aa54811df448f635e6d0c95cf717ae00c8d8158c39557c3c646281f1b763a848716d1a4429540a5a3a137462e355338427 SHA512 3f7a431b6889e2d62d16105b928707b9ae9d77515398284bfde8ced7b0741523f0b37c281c789d5c786c089854010edb9c7b18ed373f342ca0db7533ec9fd698
-DIST vulkan-tools-1.2.135.tar.gz 709765 BLAKE2B 3e25e8936ebad2b5488618ec3680a322e9b3b20976cbf8e61b37702482e2203bc93c6f63ad5122688e074e9f1b178c57fa32b623ca07321fd7fb08b5aec9eef3 SHA512 604f4815b837bffca132fc0cb6f155ad59c8c13d68dea70d1ca18d1595c6c834f296faac551467766b5e7fe3e3afa3e91c0bb299b365603de2719df9232dde40
 DIST vulkan-tools-1.2.137.tar.gz 710528 BLAKE2B be7d2110f2ca9df5e3c2e898a4e985252f5e6568d061d2842a91cc95941bdd00e9662f6aeba4acacaf7c9a0abfe61915baded15be0ef2a4c43a4b57a5a04e99b SHA512 879529ccea9a894f62222cd0110b946ddf055f092994bf71942a3c5c50906dc062edc5081ea2150757cdb501426ca341e9a4260319c6565acdcb731f172d43d8
 DIST vulkan-tools-1.2.141.tar.gz 711666 BLAKE2B 0ad31cba26106ea76ddeb26e05b59302a6f35c9172eb75fe31b6a05370be0131a92db33a4c54a006b6ba5145447079239d7ff174f7be10feb172fe03d7a1a619 SHA512 5dce372f60f55570bfc7dc4e4da7b4a07f632cfac6a2862bdf773cab61a8c6260bb38cbd48d944e08479248bfe29248214618a78952fac0aeef285e5b888d337
-EBUILD vulkan-tools-1.1.124.ebuild 2289 BLAKE2B 9ef4efda8cfbe0b26afb75e983a91552a25d32a788f6f24f28e5a2cff0bda510be9b2895b708c047bc07dd74544ca043aa7d465dc15be13dd31fb6d443e242a9 SHA512 f877f93a5e449cc497ad3cae1a35f4289a3d3b3d81c762d9a7f68e7024548dd68d2021bcae93166ad8c4e7756d931e63612579cd55fb4d2a27fe451291134e33
-EBUILD vulkan-tools-1.2.133-r1.ebuild 1870 BLAKE2B 255a251faaad7fce7731196a7e15ec2726a821bae1392af9cf802d6bc85c7b66428f51521d0e61b7c9674cb4c67946a5056fa1efa3dbc45ccd514247a9218c04 SHA512 7f1996a305286d3827adb41ceb3d31469024f54d9318970fb7f536b17a8ec26cedc8305725c754211b29bd6040b43f1bd45e63c6772da21c6b6b157a51b1691f
-EBUILD vulkan-tools-1.2.135.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
-EBUILD vulkan-tools-1.2.137.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
-EBUILD vulkan-tools-1.2.141.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
+EBUILD vulkan-tools-1.2.137.ebuild 1868 BLAKE2B 469d21df29887ef3e51674952ea5fe5eb277c4579be7b3dc5a3573d073cc0752640377f544784d58cf4da3da3426118a62b63878db2e586510796fbdb0361732 SHA512 c2759a50c627b63170d205bfd45ef071376f4faaccc70522e7c3d177bf1185da8208029f9705dfd2c81cdae72636869bfd347302c1c2fa6d53fd522fd3e65df1
+EBUILD vulkan-tools-1.2.141.ebuild 1868 BLAKE2B 469d21df29887ef3e51674952ea5fe5eb277c4579be7b3dc5a3573d073cc0752640377f544784d58cf4da3da3426118a62b63878db2e586510796fbdb0361732 SHA512 c2759a50c627b63170d205bfd45ef071376f4faaccc70522e7c3d177bf1185da8208029f9705dfd2c81cdae72636869bfd347302c1c2fa6d53fd522fd3e65df1
 EBUILD vulkan-tools-9999.ebuild 1869 BLAKE2B f47caf24e21149f31c79b2ed3d71b729d6b41ed899212c07bb40f1385e75b7db6a09d54c75a9989a10bf3da21bff2a53a57a9f42b5b28399cece42e25c1e2621 SHA512 3f8b8bf5e6490643cb051cbe7d6827f48d357e374d59a5164159be34d09397ced64a14525488d0c187fe050980c56b8eb98ceefb8a7340c2061a3835392e85bd
-MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
+MISC metadata.xml 500 BLAKE2B 2b03cd2296502530b43020bacbbef0edaabacc6b8d2458ef6d5f653fbbdf6b02ff5fba9988fd19ee9c9e14e41df359c150cbc2fd141769960f2f1b95e213d8ed SHA512 327529a5a8a57115e116c31c5b86a00f978c8612a4905eed90ad3b33671acaabbaa5e7e82bb140ad5d9b1574b0f37a53882d117c50ec320c1ea0c8d5fc25994e
diff --git a/dev-util/vulkan-tools/metadata.xml b/dev-util/vulkan-tools/metadata.xml
index bee42ed5665e..9d9218cb035e 100644
--- a/dev-util/vulkan-tools/metadata.xml
+++ b/dev-util/vulkan-tools/metadata.xml
@@ -11,7 +11,6 @@
 	</maintainer>
 	<use>
 		<flag name="cube">Build the cube/cubepp demos</flag>
-		<flag name="vulkaninfo">Build the vulkaninfo utility</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">KhronosGroup/Vulkan-Tools</remote-id>
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
deleted file mode 100644
index 4abdb96716d9..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.124.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
-
-if [[ "${PV}" == "9999" ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Tools.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	EGIT_COMMIT="119e7c3bbae122f6cc5d778d068fb91e0e85d6a9"
-	KEYWORDS="amd64 ~ppc64"
-	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
-fi
-
-inherit python-any-r1 cmake-multilib
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="+cube +vulkaninfo +X wayland"
-COMMON_DEPEND=">=media-libs/vulkan-loader-1.1.125:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)"
-
-BDEPEND="${PYTHON_DEPS}
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )"
-DEPEND=">=dev-util/vulkan-headers-1.1.125
-	${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-
-# Vulkaninfo does not support wayland
-REQUIRED_USE="|| ( X wayland )
-			vulkaninfo? ( X )"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=()
-
-	if use vulkaninfo; then
-		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
-	fi
-
-	if use cube; then
-		MULTILIB_CHOST_TOOLS+=(
-			/usr/bin/vkcube
-			/usr/bin/vkcubepp
-		)
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=True
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_VULKANINFO=$(usex vulkaninfo)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DGLSLANG_INSTALL_DIR="/usr"
-		-DVULKAN_HEADERS_INSTALL_DIR="/usr"
-	)
-
-	# Upstream only supports one window system at a time
-	# If X is set at all, even if wayland is set, use X
-	#
-	# If -cube and/or -vulkaninfo is set, the flags we set
-	# are ignored, so we don't need to consider that
-	if use X; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="XCB"
-		)
-	fi
-
-	if ! use X && use wayland; then
-		mycmakeargs+=(
-			-DCUBE_WSI_SELECTION="WAYLAND"
-		)
-	fi
-
-	cmake-utils_src_configure
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild
deleted file mode 100644
index ff7a561dba67..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.133-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}a.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild
deleted file mode 100644
index 1d6d8e74d61e..000000000000
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.135.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-Tools
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{6,7,8} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-	S="${WORKDIR}"/${MY_PN}-${PV}
-fi
-
-DESCRIPTION="Official Vulkan Tools and Utilities for Windows, Linux, Android, and MacOS"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Tools"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="cube wayland +X"
-
-# Cube demo only supports one window system at a time
-REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
-
-BDEPEND="${PYTHON_DEPS}
-	>=dev-util/cmake-3.10.2
-	cube? ( dev-util/glslang:=[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
-	>=media-libs/vulkan-loader-${PV}:=[${MULTILIB_USEDEP},wayland?,X?]
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	>=dev-util/vulkan-headers-${PV}
-"
-
-pkg_setup() {
-	MULTILIB_CHOST_TOOLS=(
-		/usr/bin/vulkaninfo
-	)
-
-	use cube && MULTILIB_CHOST_TOOLS+=(
-		/usr/bin/vkcube
-		/usr/bin/vkcubepp
-	)
-
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_VULKANINFO=ON
-		-DBUILD_CUBE=$(usex cube)
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
-	)
-
-	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
-		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-}
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
index 1d6d8e74d61e..c2805c77cf4a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.137.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
index 1d6d8e74d61e..c2805c77cf4a 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.141.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
diff --git a/dev-util/xxdiff/Manifest b/dev-util/xxdiff/Manifest
index 80b166291bae..12fe6c95ab24 100644
--- a/dev-util/xxdiff/Manifest
+++ b/dev-util/xxdiff/Manifest
@@ -2,5 +2,4 @@ AUX xxdiff-4.0.1-no-throw-in-dtor.patch 667 BLAKE2B 9543b6dbd0cfffd309298a100717
 AUX xxdiff-4.0.1_p20170622-cxx11.patch 361 BLAKE2B e8f55fcd8f1564449cedc14df4339e1787391b8b3b6b7594b763d4c8189d858e0a9e41e5881ce2959e643480e6eee9cff348b83ee3968ee2fd9a751cdcb6088b SHA512 ef69f4a84a1a3f57f5ff435e0e863152c949a5faf9010c56bfd3b8455caac98fed1373f8a36d199eef6632d4a9e75ea58b965b9b5cd74ac4386a05a2cb9838a0
 DIST xxdiff-4.0.1_p20170622.tar.bz2 1983188 BLAKE2B b604c68902defca4caaa342123df165ca5ed4757254e7e696e637ff347298cdfd53324de6c21f65de4e0229ad7adb02434eb59e047590d2c71fb1f7e87e508d6 SHA512 a1b4cb26331b0bcc7ccdf3090ca4f1cf821c6819a189e4148cde0ef40e4377bf2b82627571ff05c066c3796e06cadc7c5ad040af0446c8f5bf48c25547564511
 EBUILD xxdiff-4.0.1_p20170622-r1.ebuild 1092 BLAKE2B f32dccc300df7796a66093cf7dd5f36884bd97639779c78b48df702dc5701bc96ce8336e8dbd46f2c61e4f903336ee3c84c86991f2c07919bb851d50461f5b9f SHA512 5401e2786759e852bcfa6ae7cbbbee3b01fbb934279999f5ad7d6fc468325403a5c340489d4030207aa4349af960d3baa2a7de673ec4e74b4d4595c3d1e9be09
-EBUILD xxdiff-4.0.1_p20170622.ebuild 1216 BLAKE2B 7ed2ade587ac6b9662f07bb0e598dac94ab7795fc61d5d3e3e4404d8af820640b51d6ab88037dcce83c21e538d33379285cf5aeb955790d641134f0b780a4d71 SHA512 f6f4c5b92de89f166257c70792b25f546fd09114f31fce2e926ec919830e18bd46f57bc86f0e5534ab522419fec70ea9ca0b3791c1f347ca2e8e56a098868c1e
 MISC metadata.xml 435 BLAKE2B e8dcecbe49cd65c7b3ca119b141b7ac1d971be54d9a2b5fa63d25affaa2eb06f5eac261b004e33808e1ae6c735b131b37eee9380746d192a2aacfb81e49b132f SHA512 2ed2dc743bf4787b8a10c379ec52d84b8b76305f1b80b85da3b7c44ad5e3642673e34f9159d7804bb0780ef8a31d49d121c04c885d524253ab0e8ebde04136ed
diff --git a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild b/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
deleted file mode 100644
index f26795394877..000000000000
--- a/dev-util/xxdiff/xxdiff-4.0.1_p20170622.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 qmake-utils
-
-DESCRIPTION="A graphical file and directories comparator and merge tool"
-HOMEPAGE="http://furius.ca/xxdiff/"
-# generated as 'hg archive xxdiff-${P}.tar'
-# from https://bitbucket.org/blais/xxdiff tree
-#SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-"
-DEPEND="
-	${RDEPEND}
-	virtual/yacc
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.0.1-no-throw-in-dtor.patch
-	"${FILESDIR}"/${P}-cxx11.patch
-)
-
-src_configure() {
-	pushd src >/dev/null || die
-		# mimic src/Makefile.bootstrap
-		eqmake5
-		cat Makefile.extra >> Makefile || die
-	popd
-
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	emake -C src MAKEDIR=.
-
-	distutils-r1_src_compile
-	HTML_DOCS+=(
-		doc/*.{png,html}
-		src/doc.html
-	)
-}
-
-src_install() {
-	dobin bin/xxdiff
-
-	distutils-r1_src_install
-
-	dodoc CHANGES README* TODO doc/*.txt src/doc.txt
-
-	# example tools, use these to build your own ones
-	dodoc -r tools
-}
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-21 17:50:24 +0100
commit	feb0daf81d888e9160f9f94502de09b66f2a63fd (patch)
tree	b6e5c40ce2abef3da27ed50a023153f475e0ddef /dev-util
parent	9452a6e87b6c2c70513bc47a2470bf9f1168920e (diff)