gentoo resync : 21.09.2018

author: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2018-09-21 18:00:10 +0100
commit: 265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree: ab18b5617d138f6684566b619405090989d55a2c /dev-util
parent: 586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)
78 files changed, 698 insertions, 2136 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e1bd35088f74..0675da520c6c 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-ndk/Manifest b/dev-util/android-ndk/Manifest
index 17d84ca190a2..7a3c2fd88e9a 100644
--- a/dev-util/android-ndk/Manifest
+++ b/dev-util/android-ndk/Manifest
@@ -6,6 +6,7 @@ DIST android-ndk-r11c-linux-x86_64.zip 794135138 BLAKE2B e048c6c7172aafce47e5961
 DIST android-ndk-r13b-linux-x86_64.zip 687311866 BLAKE2B 2db7bfd9fa937d5f28fa238494e73ad1d09c539627308aa7f4e2c4114c6762dc908b1752b42dccf792f9c71ff7e3b5e08b2b03e7eac3ff5bea497c33d479d60a SHA512 39f3bd2d0e1daca11870df2e2ef318ad070b19163a55e2c1c4a1a871e02f8ec51263d7cf4b6da54eaadbe4253b5c11b85f4c5aeb67fccfff9147a5c420589d12
 DIST android-ndk-r14b-linux-x86_64.zip 840626594 BLAKE2B 5032893ee34e7167c5af5216d7b1357c3f9dcef136d63fa9a1d6c4849471430ac21a741e1c2439ec62b5cb1fa79af9ff39b46c31073e47e7a6f7c41e1a1a448b SHA512 24435267fc5acae559aa5159f7c895ce5ea0cbb8ef966bb8ff0dadffcadccbe46bc3880d285bf4e411ef78632cf2f862408e7b2b41ebca51078b41eac66a301a
 DIST android-ndk-r16b-linux-x86_64.zip 852525873 BLAKE2B 18f6e602d88ef0a8f1a7f31bc127547c32bc2fb133d5c87ca4d2f7099f79b54d67f578a68fcd59e94c84934ca2006decca5b09eac566f2f99d609862d4036e48 SHA512 94cd879925ee3174a9267e7da2d18d71874173976b362101ec06598a94b6587a33671e54bbbce5778c04418aacbb831e98386c16f6cde04574ea8c8589553dd7
+DIST android-ndk-r18-linux-x86_64.zip 556932539 BLAKE2B 52bde148e142fe72402d8ab6709b1dcb611f74c0cb8b511b3f0e69a2b6940ee5e05b1d4bd45fdff80f74f65ca3d8176de46bd0a3aa28e2dfd430fc07eab23d69 SHA512 7a8b372be53a7d5a008b6cafda451096623af33aea910edd8e98ee4b15682da5d2ad641727ab12eca522ba965073a3eb247cd3cd850c9b602e2c7b1cd6eec708
 DIST android-ndk-r9-linux-x86-legacy-toolchains.tar.bz2 241172797 BLAKE2B c3aad099b68a1a605f06fdb9d93b929374c81481d6ba1502e9ad363c7437032465cd516bc9bdf205a4f9f8ea536865755970046f0f7db4070f32e0f18f65c606 SHA512 4c8f1c9c6dfe264f227959124dc19f9fc9596c166076b8ec82b37f033101285ccd5832962e233d2605869308b2367280665a1f53f4693cb753434b480c49af25
 DIST android-ndk-r9-linux-x86.tar.bz2 419862465 BLAKE2B 2e41071a2b17104cd9b5ceb543ca154936a1358722f5fc33ab221227e6a254954fe687fe7a83e2dee72b189f0ac8ef5a11419297c1a36fb45451f797cc2bb85e SHA512 9c2da6b52df00ff6177ac18314f7c7abef585d2297362d426a9b0a28c8319531d684c1515971066050181178ab205210a7f25ec1de9be843fd0da7c1e897747e
 DIST android-ndk-r9-linux-x86_64-legacy-toolchains.tar.bz2 244427866 BLAKE2B ad7c6e83ff0a8509750bb2ed302eff20dd4c451e5b55ff2be07268f007361a5023e1b4c8a175efc896e9041df6b1def54946a028dca31d432e48105161303171 SHA512 dde193474b46ac2ceb69f5ad3ba106eb840daf18470538d85e147b17dff8b1b1b848d499727e28bb8e76bdd16dd4bb99dc073c06f80949080551ae0437f08eed
@@ -35,6 +36,7 @@ EBUILD android-ndk-11c.ebuild 1610 BLAKE2B da4cb032c6655574f208d999a2fa4820abbeb
 EBUILD android-ndk-13b.ebuild 1657 BLAKE2B 5897883bba07fef24f7955dd96e3733a98d0ae5936b6caf82ed5a3829a2e13ffb3716a118d2c7d2d3cdcadf84763eb200078359e0b2f19223f3a8767474cb29b SHA512 b7391a8201943fbcecb8a061e136214d30ab7a842ae5977550f3ef3723937cc17f7e79f537ef51a302edae7204b949d5f0ec1da19f89efa147649746c6539319
 EBUILD android-ndk-14b.ebuild 1626 BLAKE2B 629a4ae59e8f07d97ebb50c8ae47076253bd7965bb6ba7d77e94a0b3bd67479a2b224689d3f98d9d4f87a7c789edc0ca18d97daf754da3edda4a0bb8e8ab3022 SHA512 b2519362c364bc5a406301c12a87480f25eb23d4a492c715fa514ae9797dd17729a739afd6766fa30e35a96b8f38d06f8094766a1321c4fe79db65cc286ed066
 EBUILD android-ndk-16b.ebuild 1626 BLAKE2B 83960ba8eb48f0833b4ae9c6035bdd9bd317d9d2bac1447cd9423a35708e653c01634957891d9b01754b1803022bf8281738233fb08ccb6ffcf1de061d05227e SHA512 5793f1f26df9e6a9e4da5b44c7047dbc5270669aea32b8a7ad663333cf6fc5dcf48c37c7601db1b5e9475333564c4f761cfcf2bb116b818f5aa6fd8d0a92b444
+EBUILD android-ndk-18.ebuild 1586 BLAKE2B d0c0115ef68ba845d4f57139f834feae8b7b604fee3c59d5ad99b49a3594ef881c9ab1ce6a59839bccbe51b32ad38dceb6695f0b7c323ecb7adc2af1714289ce SHA512 c1317ebfd3dc6e234d46c21c5350f5902815722a105c61c68048719e7ccdfb8395daa99c6ee5d437376a334950b29afe7b3616211ebd9cd168e6628121b93afc
 EBUILD android-ndk-9.ebuild 1807 BLAKE2B d985e58d00574d3402a76c520717fc75ced5cfb4f582bfe3a21c2fc5c98ad516b827ff49c5c43c5ee2e2403f5622079ce587b6c0e2e2f908219591cd19747d4a SHA512 2b4898867cf7b30fdccaee7004ce9b41df1462ac17d90d68a031c12fa36ee428d6115c9921c80625bf0a9dfa2f5444d36c8f6e48e03d6974f31a4f7c253880c6
 EBUILD android-ndk-9b.ebuild 1807 BLAKE2B d985e58d00574d3402a76c520717fc75ced5cfb4f582bfe3a21c2fc5c98ad516b827ff49c5c43c5ee2e2403f5622079ce587b6c0e2e2f908219591cd19747d4a SHA512 2b4898867cf7b30fdccaee7004ce9b41df1462ac17d90d68a031c12fa36ee428d6115c9921c80625bf0a9dfa2f5444d36c8f6e48e03d6974f31a4f7c253880c6
 EBUILD android-ndk-9c.ebuild 1575 BLAKE2B 26dab48031bab81bc817a8bbc921af22f2342e08ca883c777021e99792e5ebc1c73523e8f9663545ff1124959cd04060f874d0d71e29c05a31849011b0a86a0e SHA512 d6c518b4641d72c01bba26b550c03cf6cc5cbe369256fac81acc86eef03c2a6b18be011f96ceaaa34c6c94241258d2ea6c2fec734697e703fe5d8f044cb65aeb
diff --git a/dev-util/android-ndk/android-ndk-18.ebuild b/dev-util/android-ndk/android-ndk-18.ebuild
new file mode 100644
index 000000000000..90339a2f1e32
--- /dev/null
+++ b/dev-util/android-ndk/android-ndk-18.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CHECKREQS_DISK_BUILD="6G"
+inherit check-reqs
+
+DESCRIPTION="Open Handset Alliance's Android NDK (Native Dev Kit)"
+HOMEPAGE="http://developer.android.com/sdk/ndk/"
+SRC_URI="https://dl.google.com/android/repository/${PN}-r${PV}-linux-x86_64.zip"
+
+LICENSE="android"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+RESTRICT="mirror strip installsources test"
+
+DEPEND="app-arch/p7zip"
+RDEPEND=">=dev-util/android-sdk-update-manager-10
+	>=sys-devel/make-3.81
+	sys-libs/ncurses:5/5[tinfo]"
+
+S="${WORKDIR}/${PN}-r${PV}"
+
+ANDROID_NDK_DIR="opt/${PN}"
+
+QA_PREBUILT="*"
+PYTHON_UPDATER_IGNORE="1"
+
+pkg_pretend() {
+	check-reqs_pkg_pretend
+}
+
+pkg_setup() {
+	check-reqs_pkg_setup
+}
+
+src_configure() {
+	:
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	dodir "/${ANDROID_NDK_DIR}"
+	cp -pPR * "${ED}/${ANDROID_NDK_DIR}" || die
+
+	dodir "/${ANDROID_NDK_DIR}/out"
+	fowners -R root:android "/${ANDROID_NDK_DIR}"
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{,build,platforms,prebuilt}
+	fperms 0775 "/${ANDROID_NDK_DIR}/"{python-packages,sources,toolchains}
+	fperms 3775 "/${ANDROID_NDK_DIR}/out"
+
+	ANDROID_PREFIX="${EPREFIX}/${ANDROID_NDK_DIR}"
+	ANDROID_PATH="${EPREFIX}/${ANDROID_NDK_DIR}"
+
+	for i in toolchains/*/prebuilt/linux-*/bin
+	do
+		ANDROID_PATH="${ANDROID_PATH}:${ANDROID_PREFIX}/${i}"
+	done
+
+	echo "PATH=\"${ANDROID_PATH}\"" > "${T}/80${PN}" || die
+	doenvd "${T}/80${PN}"
+
+	echo "SEARCH_DIRS_MASK=\"${EPREFIX}/${ANDROID_NDK_DIR}\"" > "${T}/80${PN}" || die
+	insinto "/etc/revdep-rebuild"
+	doins "${T}/80${PN}"
+}
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 127feab0d484..66a4ede93d2a 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,7 +1,7 @@
-DIST bazel-0.14.1-dist.zip 89415405 BLAKE2B 7be5d4630d024d235a66f6bdf495c282b04a4034dde156c50d37a7e2eb3bf98df0caead7887f421b664fe92486e6baa5cd90e61b1e82b07b1691dc509ab93a68 SHA512 02c7125438f060d8e5e25b91ce3ca76fac6681b4f12033d807955a4ca5a5c22a3508a7229581b7349f35f343911f8408f43f8d78d54601277576dd32539e4681
 DIST bazel-0.16.0-dist.zip 89720984 BLAKE2B be8ad9c94b13dd8d1d1de76ed67a3a695a2541327b8cb8a4d27b9279c065cb351d6b2d5785024d11a163bfd4697fb1375b350c8220387ab79db7e95537def5c3 SHA512 89cefed69df1cae7076673900546199427fab3508aad1f0347b9da38153b6b1566b19a4c205055f41ca431fd9444ec772c86bc32fbff0da0485a5e5f11728932
+DIST bazel-0.17.1-dist.zip 79229870 BLAKE2B 0f149ac881dc1bc02ab5b07590620d19921034d6d5fb88bf46b0a10e0eceac1ba0f33181e9912d342c01e551bf94e38a13e4252762e6b4e7800ec1527a970f76 SHA512 b8c2292baf67b0b8a85811145ac220084975a2bcd2f2a9f461e83589296c56166886f91a32cde343762247a9c3a04100b3f86a8f969d880f641f88183a804e6b
 DIST google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip 1056996 BLAKE2B bf168c41a9958bcdc679a40d1e88911c6af0e47207362204326b712e0129b37348360a855f44af8b76acc46108ac89a707d0c0f793500c513a919070248939b9 SHA512 40cb9ffcaa3c57c69bcbec7b070fad5865e7317817049b7588dd42899054eb97cd17cb0019df99ad2324ed8e2efd8334cd83ace758a4c2d3f453503ccf54a91e
 DIST zulu9.0.7.1-jdk9.0.7-linux_x64-allmodules.tar.gz 53360827 BLAKE2B 2cf000a50950d839fec4a0ff871632a18a67e93ff31a430d8af92fb0bf40f11d0d45a4427ec546618620aa1c1fc1078a9e918c540315ef8e5fb3928c9b36019d SHA512 63c3989b97845d9a019be5f20e667d9c96550738502c148b0dbf6cd9c1553df077217cb6fa0a9517d555c53a7a6eadeb7403d94aebca01f67aee3d97517df4fd
-EBUILD bazel-0.14.1.ebuild 3603 BLAKE2B 3cc3d61b45ea0595ad543d240c13b7f61ff6f76ae5cd34f7f2ba60823fcbb3ad31653fbc09b5a7030df7f0750ae33d3c0c454d162e72911e0cb2944036fd71f2 SHA512 9369b64769351b94d119323f1d506ffe9816b3ab3a2a33f4f1977b2aeede49b85833aa3454a4ce1b0b4a8026fffe731302b60aaab42c326c1ec733cb20aec332
 EBUILD bazel-0.16.0.ebuild 3718 BLAKE2B 95348099ab995f8f93b7d040aa6f032ac84fddfb1f0c0f12881ad15bd238a8fb08d912e6f1f3cb4eff124b43e3c04db25d3b400991ebe5c2eee50734a00f63e8 SHA512 bdd0d7a445b08bc9df7babb2fd04b607d366bdc69ac75623f523f0f6d4921ae094b3fcc328d4ec36d9f6352fddc1121e403f8114105c2d370acf0d62578007db
+EBUILD bazel-0.17.1.ebuild 2921 BLAKE2B 4088b739841036045d100e45904d4ca45e8feb466eed72a4732aa69f1ae212ca5d900d6312a04b1bd5c9caa2717f1e3b0741f51010d31c113dda21767e7c0e20 SHA512 53d8207474d7d0b4301484c7d7cb3ef58ba556cbda6436b430714706e69abfb6be6c49d6a3e6d86b55fdf12eda300551f0e6580ed0fb42f1dc3c94de072c71e3
 MISC metadata.xml 784 BLAKE2B 387004423ccbcb3b2e94cc7824e7a43067f5e455151ad3eaa06baded58ce05ef71203caf8d5a9d89c00046ac0545776bcc6c5a8306a9f76f8a9334b95a92b880 SHA512 188f8323fd19d294e8772391edb87b4a28827b40c42643d6af389f4b3e2d36bc3f0efe637cf572d80dd47a956bd2e51be1993aaf7d080bbfbb6ec4aac2e51ac6
diff --git a/dev-util/bazel/bazel-0.14.1.ebuild b/dev-util/bazel/bazel-0.17.1.ebuild
index b972de19c2d7..79fea4a87e0a 100644
--- a/dev-util/bazel/bazel-0.14.1.ebuild
+++ b/dev-util/bazel/bazel-0.17.1.ebuild
@@ -8,9 +8,7 @@ inherit bash-completion-r1 java-pkg-2 multiprocessing
 DESCRIPTION="Fast and correct automated build system"
 HOMEPAGE="http://bazel.io/"
 
-bazel_external_uris="https://github.com/google/desugar_jdk_libs/archive/f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip -> google-desugar_jdk_libs-f5e6d80c6b4ec6b0a46603f72b015d45cf3c11cd.zip"
-SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip
-	${bazel_external_uris}"
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -24,6 +22,7 @@ DEPEND="${RDEPEND}
 	app-arch/zip"
 
 S="${WORKDIR}"
+QA_FLAGS_IGNORED="usr/bin/bazel"
 
 bazel-get-flags() {
 	local i fs=()
@@ -43,25 +42,6 @@ bazel-get-flags() {
 	echo "${fs[*]}"
 }
 
-load_distfiles() {
-	# Populate the bazel distdir to fetch from since it cannot use the network
-	local s d uri rename
-	mkdir -p "${T}/bazel-distdir" || die "failed to create distdir"
-
-	while read uri rename d; do
-		[[ -z "$uri" ]] && continue
-		if [[ "$rename" == "->" ]]; then
-			s="${uri##*/}"
-			einfo "Copying $d to bazel distdir $s ..."
-		else
-			s="${uri##*/}"
-			d="${s}"
-			einfo "Copying $d to bazel distdir ..."
-		fi
-		cp "${DISTDIR}/${d}" "${T}/bazel-distdir/${s}" || die
-	done <<< "${bazel_external_uris}"
-}
-
 pkg_setup() {
 	echo ${PATH} | grep -q ccache && \
 		ewarn "${PN} usually fails to compile with ccache, you have been warned"
@@ -74,9 +54,10 @@ src_unpack() {
 }
 
 src_prepare() {
-	load_distfiles
 	default
 
+	sed -i 's@//src:bazel@//src:bazel_nojdk@' scripts/BUILD || die
+
 	# F: fopen_wr
 	# S: deny
 	# P: /proc/self/setgroups
@@ -91,7 +72,7 @@ src_prepare() {
 	build --verbose_failures
 	build --spawn_strategy=standalone --genrule_strategy=standalone
 
-	build --experimental_distdir=${T}/bazel-distdir
+	build --distdir=${S}/derived/distdir/
 	build --jobs=$(makeopts_jobs) $(bazel-get-flags)
 
 	test --verbose_failures --verbose_test_summary
@@ -104,8 +85,8 @@ src_prepare() {
 src_compile() {
 	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs)"
 	VERBOSE=yes ./compile.sh || die
-	output/bazel --bazelrc="${T}/bazelrc" build scripts:bazel-complete.bash || die
-	mv bazel-bin/scripts/bazel-complete.bash output/ || die
+	output/bazel --bazelrc="${T}/bazelrc" build //scripts:bazel-complete.bash || die
+	output/bazel shutdown
 }
 
 src_test() {
@@ -115,17 +96,18 @@ src_test() {
 		--genrule_strategy=standalone \
 		--verbose_test_summary \
 		examples/cpp:hello-success_test || die
+	output/bazel shutdown
 }
 
 src_install() {
-	output/bazel shutdown
 	dobin output/bazel
-	newbashcomp output/bazel-complete.bash ${PN}
+	newbashcomp bazel-bin/scripts/bazel-complete.bash ${PN}
 	bashcomp_alias ${PN} ibazel
 	if use zsh-completion ; then
 		insinto /usr/share/zsh/site-functions
 		doins scripts/zsh_completion/_bazel
 	fi
+
 	if use examples; then
 		docinto examples
 		dodoc -r examples/*
diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest
index 5b4fceb6014e..f9e7e2eeb0a5 100644
--- a/dev-util/bitcoin-tx/Manifest
+++ b/dev-util/bitcoin-tx/Manifest
@@ -1,7 +1,10 @@
 DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
 DIST bitcoin-0.16.0.knots20180322.patches.tar.xz 417544 BLAKE2B f14616c81e0694346fd0714032be501ad0b58e82e2a5fcc623b1fdd316759ae7ac584e6c4ab586e8c9f5a402694a36eceac6b2f1c7441da655479f832a8869bd SHA512 9eca9cbae8ce17b38ddb70326760e33e7812db78e79cfe2d1a3518b34eb8fc87fe4c145e46ab60278b14e70a75b3af238342b4e1808a77cbca4b62b8c72fb1eb
+DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
 DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
 DIST bitcoin-v0.16.0.tar.gz 6628305 BLAKE2B 69adb5832e2a708431c06bd8ce695f25cfc2b84e7ccf11e77f40c8ec273146208c70a900d0d32f79790cf67fb359c2731b0cecfc1f27ac2d0c4057228a83aed3 SHA512 7a59de44196a3cd5b75bccfe851e8bd7d5a00ae45b6e771e082326d75846e7c6d1f6d449e18b539b95b25aa12b7b79c462367f1c89438bcd1ca6ec84eb42972c
+DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
 EBUILD bitcoin-tx-0.15.1.ebuild 2470 BLAKE2B 0beaf2e85ddbe60e53efed0fcea6877b9799695fac06da2dad962939a48d1a2bff1f530f1bea92799d3a8001e353cb0f08804d827bc145bca602c503eaadf42e SHA512 aba586d5ef584d1d060668a97117e9602ae1a1626b4e867f42f1a58be918678fece96fdb504b96e04317d3ade34382799100a769e00e5057ebd6f8bc738ee888
 EBUILD bitcoin-tx-0.16.0.ebuild 2432 BLAKE2B ed1721e555bcfa9490b7291e9d9dd0e901ec713ecf7a1316a930c13f337076ca27a0757afd562776a124a2553e3690a383884e850aa1156e2f457681ef4f60df SHA512 fb46d29926d4c7a1058a5452f36087c27d916608e853beb25ae79e13ea38bbd70842467a22a2170a1c73c0f1b1edc40c9f93e5e1643d5c96db9571a07973eee3
+EBUILD bitcoin-tx-0.16.3.ebuild 2429 BLAKE2B 269edff0cfca30b64e12baf834176ca2f237bf0519f3662cd907190676c3dd077b4f0e6ecf7c15c48566bb61208f736f6d5f144d5e5f9dcbaec1f28a1c307c1b SHA512 cc35f4ff20fee11e547079e5024f75960b950d533884555c068d203629f4fa490b1e46c2b96f343851085b53e9d057d83530f75b6fc9691f439ab35a40761ca1
 MISC metadata.xml 620 BLAKE2B e779b6a929a58fad28773a0aba3ef3112df14ce82ce62376b88cbc3519a857faaac6b580d2b5d866b0ec809062cf170e3c29324b03acc005246aea3cef9a0381 SHA512 c253ed29dff90ef2b9cd19b191ad870bd22cbdd371b2f353e724ba950735350225fe6d83c4ca8823ebb395dde9fb5004e781ff78987e2a30c0281ad5e0a4623a
diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild
new file mode 100644
index 000000000000..29b839ab8569
--- /dev/null
+++ b/dev-util/bitcoin-tx/bitcoin-tx-0.16.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 2010-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools bash-completion-r1
+
+BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
+KNOTS_PV="${PV}.knots20180918"
+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.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~amd64-linux ~arm ~arm64 ~mips ~ppc ~x86 ~x86-linux"
+IUSE="knots libressl"
+
+DEPEND="
+	>=dev-libs/boost-1.52.0:=[threads(+)]
+	>=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery]
+	dev-libs/univalue:=
+	!libressl? ( dev-libs/openssl:0=[-bindist] )
+	libressl? ( dev-libs/libressl:0= )
+"
+RDEPEND="${DEPEND}"
+
+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.16.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/2018/09/18/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-libevent
+		--without-qrencode
+		--without-miniupnpc
+		--disable-tests
+		--disable-wallet
+		--disable-zmq
+		--enable-util-tx
+		--disable-util-cli
+		--disable-bench
+		--without-libs
+		--without-daemon
+		--without-gui
+		--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/boost-build/Manifest b/dev-util/boost-build/Manifest
index a29ee9c408a3..f90994c2ce34 100644
--- a/dev-util/boost-build/Manifest
+++ b/dev-util/boost-build/Manifest
@@ -5,16 +5,15 @@ AUX boost-build-1.52.0-darwin-no-python-framework.patch 419 BLAKE2B 1f9544ea26d8
 AUX boost-build-1.54.0-fix-test.patch 363 BLAKE2B b64a87e69df3d4832e5704014a92b4588b60abc5ad361d3daad39a33a92aba2e0368373be26ea10ae2ea4396a18c098ca5dd00db995f03c9a35e2eb1f9002990 SHA512 d349ff3040c219c3a9f9f6182ca3f1fe7e25d8f2975dd04e66d8e281caf10a5b27cab5e6fa6240ed57b24524fa045a88ba1cf9220efcf065726c78c68378c5e8
 AUX boost-build-1.54.0-support_dots_in_python-buildid.patch 487 BLAKE2B 6b01c71e728d03897b1caa1b408592d95574a3723f86a4ac3a750ae8e458891d5c7fe123998b39b7422a84c3698bbe237555dbd6b759f6c706a409a4dadcc9b6 SHA512 41fbe223120452a6ddf7b8ec9f64b2f653ee3d18b2dfccdba90d9040632f911159ac4102947371e12af7e52ca251aa39db2be9b362251ec86c12860867e50e68
 AUX boost-build-1.55.0-ppc-aix.patch 228 BLAKE2B 80e1c943ae11e7ec7730e83a0126ef8fb041cbdf47dd5cb5eb33829166f98ac7f189cf70a73ae0d4835c6914a0041bc628be8b948eddb36ef74c98476088f4c3 SHA512 a320bfb744667312230cf601d034217f72e3a78fe06851678c5810bb47c8239007aaeffb5719513696922ffc2d4c2200e60e140b34e3992dc353ad0fc69177fe
+AUX boost-build-1.62.0-sparc-no-default-flags.patch 2646 BLAKE2B 65a3a5018fed0197fe2bd1f93e5de4e799a201274f7320f4417edd4978a338a800eef1aa911ec7729f4f3b02c9cf85106dc25d466eab0e0c87d7625c4b652936 SHA512 1767c0b72f18ddf7bf4dc9d51c911ce0fe3c775e60cc960f913b218850cae9361728fad192194589929808c6c89c63110810e668fc7f75c79a04cbab1e59834f
 AUX boost-build-1.66.0-add-none-feature-options.patch 724 BLAKE2B c757f0e2d9b096cad74f130ed8219f6d0ff81f7f020cfef7352a324f47167cc4c71f49c8d2781d06f624fec98e973add229ac731bf2f37f9dade907bb9c9fc3d SHA512 9d4149739139d268e54304d73d1ceb0073ca94265d8a84467c890c8f68aac3b0060e847b71e961a92f17813bad651d0515898dd4d0535f5cc6c1c4a024e9b39a
 AUX site-config.jam 688 BLAKE2B e43a7ad1a94d113a7f890e8b634770f5c60556101d428d83f655bbbe72c46b587485886a9941d05a2ae4319fc325f1e0ecfb9b660158b81c5e9fd02e0b1c0530 SHA512 b65bf1be3133f9f66d3139b00f195a288591bb20a13ba35041507c2c33d7d2da6047c3b02dc27bc4eb21798b91e1262a60e294b7fd4af90808b9de0f5af517df
-DIST boost_1_62_0.tar.bz2 84513338 BLAKE2B 00f2ddf93d254183709a5e607d5cec5d135bdcddebac15fc3b1522e37b9e58d8df84f1977fee5b085309db58634861f2014e72822e755dd7789e8489fef19f7c SHA512 5385ae3d5255a433a704169ad454d8dc2b0b5bcae3fb23defd6570df4ff7d845cf9fcbeebccdc1c5db0eec9f82ee3d90040de9507c8167467c635d3b215463be
 DIST boost_1_63_0.tar.bz2 81984414 BLAKE2B 227c4432bd3ca0eb390048ec85047958fcb6ae289996501812cd8b13bf74bbe9b677d0110948265cab59a60deb36c4fc08440af74ac5a5219ea4eaea4fa6918f SHA512 c915c5f5778dee49b8e9d0a40f37f90f56fb1fdb1d8ce92d97bf48bc7bc462212487badfe4bbe30b06196d1149cfb221da12ac54e97499b0d4cb6466813bb4ad
 DIST boost_1_65_0.tar.bz2 82597718 BLAKE2B 0080956d6ad2f14130ce4a4734b1bd1ce83d3651b226653689e02770baa83cf11811ef4e44948ff68a168d9ce5cbfaea4f758970df2b4e9faa2d410181885f5b SHA512 7142650fb8d61e3ef16ba066fc918e087f19e9bc2ad1d6a11fb10bf0d6b1b5ad05ab032f076a5233a1624b3669e952b2cc38b7dc074bbf53018e2970ee90fcdd
 DIST boost_1_66_0.tar.bz2 85995778 BLAKE2B 9ab1fe396b10ab85d7e4084ec7abb8d785ecd892c8f51aea5a401cb565b111c256533364fe028da74ed376534889f43c5ccbdcd703cd236526ae66a064220765 SHA512 0f34075d35391d66876e5189a01a11880a79428e1b267456348ee148dba9dc3abdc74d568f1853be631d20b584b1c804b42443c266f7622164acfc10be3dab8b
 DIST boost_1_67_0.tar.bz2 87336566 BLAKE2B 85ea00fc2197b1bbfc35d69427c87f23ea43d7592f1c9ce66e2afcde8476bdec86f6debdac815b23de59f4665a8e0c7f1519ab66a31d39df629723bc45710058 SHA512 82bf33d7d2c3db109c9d1f12d40bc2d364c8c95262386f906ccd1a71cd71433bcc01829e968b4a13a5003cf0b50cbdf0b435a1d76530cea7bb05725c327411e8
-EBUILD boost-build-1.62.0-r1.ebuild 3903 BLAKE2B 043936d2e52800edb79e6c69180e0c5cef1a237c0e3d2297da3bd70e230bbdd24342f288c959e476d5f38e2f93a5c643fb484878d39719d86fd0fb4535644142 SHA512 5c2ade13e563b52163e9ff072f8c2c98efb2ff95a9c30f1d9c590a02271570db15015e852df297aafecfcdc845d18e15db878d3fa81a4a1619f67808e9411efd
-EBUILD boost-build-1.63.0.ebuild 3827 BLAKE2B dd1f7ad44ffdac1565e7314be8942393c58aed3cd805464c04b7ce6d09a6b15d1c2b391396e45a55725a95b971e1a589a7224acce922e9af4dc63bd546ba0092 SHA512 7108fd0049da3be73d5a0423094ad63b50d1e1209cf0570046a4ffeebb7dd944adf0fb6497a06c88e68af0a61636a8cd48d5a3c3379307eb67cc1c65ed6da3ff
-EBUILD boost-build-1.65.0.ebuild 3826 BLAKE2B a04f2363e055efb59001bdb3fdbb9c1ff20582ec15603dcfb362ff5d679f69fed64cdd80962f57ac4bec3bb32e5390c33ca52d8289df9710ac7484775799e58b SHA512 105be8996c3e88612d803476428981b90ca1f5b891260a36a3707deeda846503473f704f1784f9a29cf29e1d8e1c6c2f9f0e5dd3dc18424dcfe2e03fe5fd31f9
-EBUILD boost-build-1.66.0.ebuild 3896 BLAKE2B c5f6d2b2e9f943553d864928b6f3750679641654bb97b1dc37431190d81bfb560f015e7e36b373997d95891bbe97a72c4cfc456301f406df668e874b2121c76e SHA512 f33deb81bd957925d730b2224df5e27ec24279376bc49d3d6e2d9e538edbcb4c7f89c0de66c38d609748ab7469065bad61aa7a7518b973157f885185e3386465
-EBUILD boost-build-1.67.0.ebuild 3863 BLAKE2B f409a586844fbcc0dc898cfb051682e9ab06f9f9e5e66ecc05c7a9af03c167e52c1650745d518b952a866d52d163c3689796a2611b1dac9cf20f789b4a6cf58d SHA512 27c84fc912d0ddaf8ea3d3a7ded91f3a80994f052652b46272f5ad1482afd1f29979193adaa52715872c27a0afd08d8c7817fdb0a9bcb62278a483731f313cf5
+EBUILD boost-build-1.63.0.ebuild 3884 BLAKE2B 5a60f760d3a0247b486436421da22073e64e979f817ae2f7205fce5ed3457cc3bbf444728405bc9c13ce9457917f3c1447e0580c3830a33fe34332977d1d167a SHA512 df1c108b743acc29791550e50556bac9a36db4762079906ef6f18610d5c5cb5d8c087744de899a80555740821f4ce9578d3cf32c5066e86c14165123df09548c
+EBUILD boost-build-1.65.0.ebuild 3882 BLAKE2B 6beb6f6bce5bf373bf797c2c589331aa21111253b15370254b4ddfec7398f8830d1d05608788de6d6a7ebbb488cac74e94c8e3d9143d46e8db8c3546fa6a72ad SHA512 8e5ddc74ce3d84bb16afb3e105eb3a86c286aef19a2ef62ec7ed02043fb53f5e225be0400c7b1b0f050f745e560e92e39c2c4d5ceff6b2be9ff93174357ed1c6
+EBUILD boost-build-1.66.0.ebuild 3953 BLAKE2B 5683a4fcb771aa3faec78e40aafaac2762fa3891bc299b26b20b226e64a5c8f170d1e6ea7c6db766ed13c26391a5493db966a5afd28cf48d854770f6434b3672 SHA512 317d8880c77aff0b627a5359fbe5d83ca0df856038f7a998d05e5a0769ee6913972d77c7778503f830537ed5897019adcb8a32dd44431a4c09b11e2d5c70370d
+EBUILD boost-build-1.67.0.ebuild 3920 BLAKE2B bf5aafbbf67380119653165caa1dae20be32df035a739cf13c076696adf1fb8a68fe320c3bc144971c208683b7a9786d54c17366a48ffa359234890f268b0886 SHA512 e3d284f7e3912b561f4c0a98067bdc91d0be770357fd72d2ed0b9bd40386e40f2f26e1f8ff36baa700dcaac4d5a493deebb908c424bc2cbb23ad8c0636e84e15
 MISC metadata.xml 334 BLAKE2B 09d121b81646b5e49bdeae195df0aecab1b0ca738a29c7a89e254efca4655a0a74c1a724003ece1e4cd3363c98496a16c38dda9707d6568861590c58049628e6 SHA512 bc1fa12d69f5711c380a938546914a325ac9dee1b35b2b75136144bbf90190fdc7e113a8eedf26a5c23d1564baf71f936141d71ad715ad6f212f32226601706e
diff --git a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild b/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
deleted file mode 100644
index 0178c2e3dfba..000000000000
--- a/dev-util/boost-build/boost-build-1.62.0-r1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-RESTRICT="test"
-
-PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic python-single-r1 toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators _)"
-
-DESCRIPTION="A system for large project software construction, simple to use and powerful"
-HOMEPAGE="https://boostorg.github.io/build/"
-SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_PV}.tar.bz2"
-
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="examples python test"
-
-RDEPEND="python? ( ${PYTHON_DEPS} )
-	!<dev-libs/boost-1.34.0
-	!<=dev-util/boost-build-1.35.0-r1"
-DEPEND="${RDEPEND}
-	test? ( sys-apps/diffutils
-		${PYTHON_DEPS} )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )
-	test? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/boost_${MY_PV}/tools/build/src"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.48.0-disable_python_rpath.patch"
-	"${FILESDIR}/${PN}-1.50.0-respect-c_ld-flags.patch"
-	"${FILESDIR}/${PN}-1.49.0-darwin-gentoo-toolchain.patch"
-	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
-	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
-	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
-)
-
-pkg_setup() {
-	if use python || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_unpack() {
-	tar xojf "${DISTDIR}/${A}" boost_${MY_PV}/tools/build || die "unpacking tar failed"
-}
-
-src_prepare() {
-	default
-
-	pushd ../ >/dev/null || die
-	eapply "${FILESDIR}/${PN}-1.54.0-fix-test.patch"
-	popd >/dev/null || die
-
-	# Remove stripping option
-	# Fix python components build on multilib systems, bug #496446
-	cd "${S}/engine" || die
-	sed -i \
-		-e 's|-s\b||' \
-		-e "/libpython/s/lib ]/$(get_libdir) ]/" \
-		build.jam || die "sed failed"
-
-	# Force regeneration
-	rm jambase.c || die
-
-	# This patch allows us to fully control optimization
-	# and stripping flags when bjam is used as build-system
-	# We simply extend the optimization and debug-symbols feature
-	# with empty dummies called 'none'
-	cd "${S}" || die
-	sed -i \
-		-e 's/\(off speed space\)/\1 none/' \
-		-e 's/\(debug-symbols      : on off\)/\1 none/' \
-		tools/builtin.jam || die "sed failed"
-}
-
-src_configure() {
-	if use python; then
-		# replace versions by user-selected one (TODO: fix this when slot-op
-		# deps are available to always match the best version available)
-		sed -i \
-			-e "s|27 26 25 24 23 22|${EPYTHON#python}|" \
-			engine/build.jam || die "sed failed"
-	fi
-}
-
-src_compile() {
-	cd engine || die
-
-	local toolset
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		toolset=darwin
-	else
-		# Using boost's generic toolset here, which respects CC and CFLAGS
-		toolset=cc
-	fi
-
-	CC=$(tc-getCC) ./build.sh ${toolset} -d+2 $(use_with python python "${EROOT%/}"/usr) || die "building bjam failed"
-}
-
-src_install() {
-	dobin engine/bin.*/{bjam,b2}
-
-	insinto /usr/share/boost-build
-	doins -r "${FILESDIR}/site-config.jam" \
-		../boost-build.jam bootstrap.jam build-system.jam ../example/user-config.jam *.py \
-		build kernel options tools util
-
-	rm "${ED%/}/usr/share/boost-build/build/project.ann.py" || die "removing faulty python file failed"
-	if ! use python; then
-		find "${ED%/}/usr/share/boost-build" -iname "*.py" -delete || die "removing experimental python files failed"
-	fi
-
-	dodoc ../notes/{changes,hacking,release_procedure,build_dir_option,relative_source_paths}.txt
-
-	if use examples; then
-		dodoc -r ../example
-		docompress -x "/usr/share/doc/${PF}/example"
-	fi
-}
-
-src_test() {
-	cd ../test || die
-
-	export TMP="${T}"
-
-	DO_DIFF="${PREFIX}/usr/bin/diff" ${PYTHON} test_all.py
-
-	if [[ -s test_results.txt ]]; then
-		eerror "At least one test failed: $(<test_results.txt)"
-		die "tests failed"
-	fi
-}
diff --git a/dev-util/boost-build/boost-build-1.63.0.ebuild b/dev-util/boost-build/boost-build-1.63.0.ebuild
index 070a8e4d6032..4dbc423b5357 100644
--- a/dev-util/boost-build/boost-build-1.63.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.63.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
 	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
 	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+	"${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch"
 )
 
 pkg_setup() {
diff --git a/dev-util/boost-build/boost-build-1.65.0.ebuild b/dev-util/boost-build/boost-build-1.65.0.ebuild
index 0a977472723e..e7011fc99ca3 100644
--- a/dev-util/boost-build/boost-build-1.65.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.65.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://downloads.sourceforge.net/project/boost/boost/${PV}/boost_${MY_
 
 LICENSE="Boost-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples python test"
 
 RDEPEND="python? ( ${PYTHON_DEPS} )
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
 	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
 	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+	"${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch"
 )
 
 pkg_setup() {
diff --git a/dev-util/boost-build/boost-build-1.66.0.ebuild b/dev-util/boost-build/boost-build-1.66.0.ebuild
index ec3e64b01f92..2fdc1e473128 100644
--- a/dev-util/boost-build/boost-build-1.66.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.66.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
 	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
 	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+	"${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch"
 	"${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch"
 )
 
diff --git a/dev-util/boost-build/boost-build-1.67.0.ebuild b/dev-util/boost-build/boost-build-1.67.0.ebuild
index 87f9bb674395..4dda7f0a6aa9 100644
--- a/dev-util/boost-build/boost-build-1.67.0.ebuild
+++ b/dev-util/boost-build/boost-build-1.67.0.ebuild
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.52.0-darwin-no-python-framework.patch"
 	"${FILESDIR}/${PN}-1.54.0-support_dots_in_python-buildid.patch"
 	"${FILESDIR}/${PN}-1.55.0-ppc-aix.patch"
+	"${FILESDIR}/${PN}-1.62.0-sparc-no-default-flags.patch"
 	"${FILESDIR}/${PN}-1.66.0-add-none-feature-options.patch"
 )
 
diff --git a/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch b/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch
new file mode 100644
index 000000000000..a3f450b0edf1
--- /dev/null
+++ b/dev-util/boost-build/files/boost-build-1.62.0-sparc-no-default-flags.patch
@@ -0,0 +1,47 @@
+--- a/tools/gcc.py	2018-09-07 17:44:59.668796217 +0200
++++ b/tools/gcc.py	2018-09-07 17:45:56.378794314 +0200
+@@ -811,20 +811,6 @@
+ # Sparc
+ flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['<architecture>sparc/<address-model>64'], ['-m64'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v7', ['-mcpu=v7'], default=True)
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'cypress', ['-mcpu=cypress'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v8', ['-mcpu=v8'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'supersparc', ['-mcpu=supersparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite', ['-mcpu=sparclite'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'hypersparc', ['-mcpu=hypersparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclite86x', ['-mcpu=sparclite86x'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f930', ['-mcpu=f930'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'f934', ['-mcpu=f934'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'sparclet', ['-mcpu=sparclet'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'tsc701', ['-mcpu=tsc701'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'v9', ['-mcpu=v9'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc', ['-mcpu=ultrasparc'])
+-cpu_flags('gcc', 'OPTIONS', 'sparc', 'ultrasparc3', ['-mcpu=ultrasparc3'])
+ # RS/6000 & PowerPC
+ flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>32'], ['-m32'])
+ flags('gcc', 'OPTIONS', ['<architecture>power/<address-model>64'], ['-m64'])
+--- a/tools/gcc.jam	2018-09-07 17:45:12.168795797 +0200
++++ b/tools/gcc.jam	2018-09-07 17:46:25.498793337 +0200
+@@ -1134,21 +1134,6 @@
+ cpu-flags gcc OPTIONS : x86 : c3-2 : -march=c3-2 ;
+ ##
+ cpu-flags gcc OPTIONS : x86 : atom : -march=atom ;
+-# Sparc
+-cpu-flags gcc OPTIONS : sparc : v7 : -mcpu=v7 : default ;
+-cpu-flags gcc OPTIONS : sparc : cypress : -mcpu=cypress ;
+-cpu-flags gcc OPTIONS : sparc : v8 : -mcpu=v8 ;
+-cpu-flags gcc OPTIONS : sparc : supersparc : -mcpu=supersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite : -mcpu=sparclite ;
+-cpu-flags gcc OPTIONS : sparc : hypersparc : -mcpu=hypersparc ;
+-cpu-flags gcc OPTIONS : sparc : sparclite86x : -mcpu=sparclite86x ;
+-cpu-flags gcc OPTIONS : sparc : f930 : -mcpu=f930 ;
+-cpu-flags gcc OPTIONS : sparc : f934 : -mcpu=f934 ;
+-cpu-flags gcc OPTIONS : sparc : sparclet : -mcpu=sparclet ;
+-cpu-flags gcc OPTIONS : sparc : tsc701 : -mcpu=tsc701 ;
+-cpu-flags gcc OPTIONS : sparc : v9 : -mcpu=v9 ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc : -mcpu=ultrasparc ;
+-cpu-flags gcc OPTIONS : sparc : ultrasparc3 : -mcpu=ultrasparc3 ;
+ # RS/6000 & PowerPC
+ cpu-flags gcc OPTIONS : power : 403 : -mcpu=403 ;
+ cpu-flags gcc OPTIONS : power : 505 : -mcpu=505 ;
diff --git a/dev-util/clair/Manifest b/dev-util/clair/Manifest
index 0f2b2e747868..e4cb46d66d0b 100644
--- a/dev-util/clair/Manifest
+++ b/dev-util/clair/Manifest
@@ -3,7 +3,9 @@ AUX clair.initd 593 BLAKE2B ec5f50ef2fe997cd0f5e3aa7837be9bb7e39f4a5b766011034bd
 DIST clair-2.0.3.tar.gz 5194681 BLAKE2B b4f809e7699fbf66745c7f528f3f2c249e81541a64c540a8c39b9fa8f5b581d1297abdfe80bdb0ca3aec00010c6c95e8073397df284d2a92a3e95f91049cde80 SHA512 bf2d4ab15efc50bce3e828d0510ceb44463a6c1d978a854b3a05899996203a7c33bb6e60470eccb6e0a1e23b8ff41955cd0fdda4b77a9a7e042e1e27dd2e0885
 DIST clair-2.0.4.tar.gz 5194393 BLAKE2B 631ab14acfcf516a5dd65753fe2088dbabf1c7d13a6b079cb09f0c6a3000b346da948d9c6edd16c999753342d67b9bb2165a1b38956ee8957b48953d10490430 SHA512 fee3b9fe2865c0e352b454767383bf47d67bd14f7d08171197350c20f32bc80eb318db10c9fd4bd9da0024dac97ae287cb8dcc7605c3094f4d567122bfe3f7ed
 DIST clair-2.0.5.tar.gz 5194565 BLAKE2B 19eb49b5b3d4d3c3694c4aefc21abbdefbc5b6d3a53a0f845c587bfc98052be93bb83283b0b3fe42a5ed950e55390810032abb4ae4eba8de999f99f07528b1a5 SHA512 551b006c32f6e0c93f2ace33151864f876a7e32c85cf13d8e1dcf23b91f79c32d4b4a4c9bbb3991ff6955897c8dcdfdcec2d6fbbbdcf0b684522375269abca89
+DIST clair-2.0.6.tar.gz 5195113 BLAKE2B 6044ba36d63d74eaecad5cc48173cd56867fb3004c7a667b9134105815171fb34b99d86f7fbb7b9a3f69ff6061a7419a63ceb23a07280eedba36b9046a401ad6 SHA512 7d996200e9a30fb569243592f88a9ef4b3a7b32852abb953518e3b6b2833bdb8e81fa8528f35feda0a16d514e48714fa60b716d038fdeafd5f3398cbccec145a
 EBUILD clair-2.0.3.ebuild 1064 BLAKE2B 789ad8bf42f99a85dfb47453d2bd2b042ebe4d67235a581678240b46f0fe823adcb00abc2bebc4c3d127893be78ab8b5804712c275d7b7ff7655b86859a15089 SHA512 543dbea35a7de36d1e2cc0a1b3f87b9e91ca647dc642eb0b8cd1f8951b1394149d05a6bafddbdc5c11a9af0f6c6a96cb1a6cdd3a470514f456706a4d2cea368e
 EBUILD clair-2.0.4.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 EBUILD clair-2.0.5.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
+EBUILD clair-2.0.6.ebuild 1051 BLAKE2B fd423983af317557ced44c635bed120ce04dced81b8334336d3d1c0746892fbb2f39f8c096e89ade770b1111ab9dbd84748b1a0df02209defd05e3867e618f07 SHA512 bca22ee73de274eaa86d7442dfbbcc0ba9fdf9daa2cc8d851fff56e1cbfbfdbed5f4c75b186b6c8f1ab12842bb8a587a6d91d6246aecc32ea658f4ffda015c61
 MISC metadata.xml 322 BLAKE2B 0f3b559d05cfd49e83c1b71381ee3775e83420f601ddd1cd47bc9211ff4d08831992418e4869f02fe73e96ff9089117fddce8b980c0282b44e408eed9c3cbcb4 SHA512 7ac0fefec4d71b29fe295ebc41df72ff0d80ba327104ca124bdd700ea054c477ba6a040fcdce6fcae38ec437703ff31ae36a2a7c5683420c39db20d775e52919
diff --git a/dev-util/clair/clair-2.0.6.ebuild b/dev-util/clair/clair-2.0.6.ebuild
new file mode 100644
index 000000000000..1cb27791309a
--- /dev/null
+++ b/dev-util/clair/clair-2.0.6.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/coreos/clair"
+EGIT_COMMIT="v${PV}"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Vulnerability Static Analysis for Containers"
+HOMEPAGE="https://github.com/coreos/clair"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-arch/rpm
+	app-arch/xz-utils
+	dev-vcs/git
+	!!sci-visualization/xd3d" # File collision (Bug #621044)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	GOPATH="${S}" go build -o bin/${PN} -v ${EGO_PN}/cmd/${PN}  || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc {README,ROADMAP,CONTRIBUTING}.md
+	insinto /etc/${PN}
+	doins config.example.yaml
+	popd || die
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	keepdir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+}
diff --git a/dev-util/cppcheck/Manifest b/dev-util/cppcheck/Manifest
index d406818de50c..f197b24f4912 100644
--- a/dev-util/cppcheck/Manifest
+++ b/dev-util/cppcheck/Manifest
@@ -1,7 +1,9 @@
 AUX cppcheck-1.75-tinyxml2.patch 2294 BLAKE2B 78763d10fdddb3d7f0cdaca9271007e97cd981ce1a5a39a91c928def6611cc379b411f9f8380d8f3b4b23554277cfc5a9c6e0797a80378d6e956ee2668dcbc5a SHA512 5eebe4e85649a5e9e0fd312dbaf4284a68327125322f1c6b905ec93b1d445978dd532c4c8c18ad0478f29a50c77761fed1d0ecb2dca3148c0c7c747d391e7f07
+AUX cppcheck-1.84-char-signedness.patch 4839 BLAKE2B 8ee84544dace4ac35a80b7356d44e30a5f9b5a738d2904728f2c9decd744a6230345a0bfd9515c682f7d577c5b100f7d33a43a9e77bf2ae464ce502bc9e7d305 SHA512 2203665c60e4fa121b18af90f390a8810b772d6b608a1d0d4804d475ca21de02b10f6f543443e81e0cc49980d9f71323800c3cb2256064c4519c93b6c8d366f8
 DIST cppcheck-1.81.tar.bz2 1514741 BLAKE2B 2f23dfe4bdb26e203411f0bf9bc569303a4d59f96911b32a8a5f9cc9a6a7fa75e5d87c328cb0bf8cc46bd8f38747a4663c33243b8385355cc5630e1fcf6c891f SHA512 22e7b63c35e71b2784065faca06aec8c286e3173f182ac10995073cc3d61fd0bfaf353c51ad9207d3bd2c6134ab1a3990a37668709505b657c2816d561f8af92
 DIST cppcheck-1.84.tar.gz 2051244 BLAKE2B 8e4b4c71da969addec6d1cb2919c39625054797ae730c85555695e872f87295c20e4564db2eadf536a762ca018882285d5d329f9a5789608e14ef17f1069753d SHA512 7f971f9097db6d2fee7483634afc697bddff499a7b09c4be0bfdc3f8e502d47202a8d4f4fc1a330d0fb1d34a7772065b96419b4b4f4f1467b997e62459304526
 EBUILD cppcheck-1.81.ebuild 2199 BLAKE2B 1eb2f1a4a41981bb77cbb125baca20ced0c3cbbaab514fba64183780f80dfb148cf6c84a4471c20f276a11a79954b52adf7f0d3861e172ec2eea32440b14470d SHA512 b62076fa8e84ddf38a61ed396fab9d4ee91cdc668e8b9ad8ede52f8f7e8451e3e8d38293adb221585baad7caf2ea810dd8add22ce200b9bda499aaf71495a581
+EBUILD cppcheck-1.84-r1.ebuild 2382 BLAKE2B fe170aa38fbef3ad33d396ea74b33edbe7101bad9b7f2dda1779068411045b9f1eb7601fa0b9e1f89207d4162bc8a75d3bfde9a66714e1a5569abe80eeeb7683 SHA512 fd3bf998cc319a7aa2472f8214417ef2c3f1af6e0edc43763acad0bb8f89b02b3be8d484c532a0472d328925c32163a4d4f60b15c6c598e2cd2d40260604f95f
 EBUILD cppcheck-1.84.ebuild 2326 BLAKE2B dede88da8145164fa86946ab19e69aa4a8ab284df9dbe888922330084a383cb3c4f5700e0c7c6d2fb3dffefc154a965d79e5c2a6b02db2a8e021bd2b7ea04808 SHA512 57307a88b07ec02b0b2344f43873547cb9931bee8e6ac987310d9c79bc008f88b04c7e9491dc3b9c828f275427f5f51074ef81bfa4d0e835b5500a0c0913ae30
 EBUILD cppcheck-9999.ebuild 2271 BLAKE2B 8e254632480771a07b58d0c28026801dc20e9ddd864c44a6fb956b86cd2745793f2cb84ee3aed63b72605f6c9a47f91bd8fc94a4d59614873adc7842f3601af1 SHA512 dd14de11d4138d6bc4113c025d033215ceb7a3958f289f113eebf82a86c793fb59901e856748c8da49ae5b8639fe5a09d6bfd938c955ef85484f54c6962af6a5
 MISC metadata.xml 397 BLAKE2B 4ed8f4270fb9d5cccf84c6eaa6feed2ea1bd662f50b85bd39afa0c715e535be35dd67efa462477d43e5b2c118838b11b9b613638d330be7999d4dc3d59193c42 SHA512 63aebce854e81f3fb0584e47f75b416f33a6ff8cae55652d952c89b546ef28312ad44ab01113e9bedaf1b1181137930d066344c11773bb263baff7f27b7a313e
diff --git a/dev-util/cppcheck/cppcheck-1.84-r1.ebuild b/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
new file mode 100644
index 000000000000..82a4ecbe4b9c
--- /dev/null
+++ b/dev-util/cppcheck/cppcheck-1.84-r1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1 flag-o-matic qmake-utils toolchain-funcs
+
+DESCRIPTION="Static analyzer of C/C++ code"
+HOMEPAGE="http://cppcheck.sourceforge.net"
+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"
+IUSE="htmlreport pcre qt5"
+
+RDEPEND="
+	dev-libs/tinyxml2:=
+	htmlreport? ( dev-python/pygments[${PYTHON_USEDEP}] )
+	pcre? ( dev-libs/libpcre )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtprintsupport:5
+	)
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.75-tinyxml2.patch
+	"${FILESDIR}"/${PN}-1.84-char-signedness.patch
+)
+
+src_prepare() {
+	default
+	append-cxxflags -std=c++0x
+
+	# Drop bundled libs, patch Makefile generator and re-run it
+	rm -r externals/tinyxml || die
+	tc-export CXX
+	emake dmake
+	./dmake || die
+}
+
+src_configure() {
+	if use pcre ; then
+		sed -e '/HAVE_RULES=/s:=no:=yes:' \
+			-i Makefile || die
+	fi
+}
+
+src_compile() {
+	export LIBS="$(pkg-config --libs tinyxml2)"
+	emake ${PN} man \
+		CFGDIR="${EROOT}usr/share/${PN}/cfg" \
+		DB2MAN="${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl"
+
+	if use qt5 ; then
+		pushd gui || die
+		eqmake5
+		emake
+		popd || die
+	fi
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_compile
+		popd || die
+	fi
+}
+
+src_test() {
+	# safe final version
+	mv -v ${PN}{,.final} || die
+	mv -v lib/library.o{,.final} || die
+	mv -v cli/cppcheckexecutor.o{,.final} || die
+	#trigger recompile with CFGDIR inside ${S}
+	emake check CFGDIR="${S}/cfg"
+	# restore
+	mv -v ${PN}{.final,} || die
+	mv -v lib/library.o{.final,} || die
+	mv -v cli/cppcheckexecutor.o{.final,} || die
+}
+
+src_install() {
+	# it's not autotools-based, so "${ED}" here, not "${D}", bug 531760
+	emake install DESTDIR="${ED}"
+
+	insinto "/usr/share/${PN}/cfg"
+	doins cfg/*.cfg
+	if use qt5 ; then
+		dobin gui/${PN}-gui
+		dodoc gui/{projectfile.txt,gui.${PN}}
+	fi
+	if use htmlreport ; then
+		pushd htmlreport || die
+		distutils-r1_src_install
+		popd || die
+		find "${D}" -name "*.egg-info" -delete
+	else
+		rm "${ED}/usr/bin/cppcheck-htmlreport" || die
+	fi
+	doman ${PN}.1
+	dodoc -r triage
+}
diff --git a/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
new file mode 100644
index 000000000000..ee1b136c9a9a
--- /dev/null
+++ b/dev-util/cppcheck/files/cppcheck-1.84-char-signedness.patch
@@ -0,0 +1,88 @@
+From 320a957bbc912325363cf86b61108db860195ec3 Mon Sep 17 00:00:00 2001
+From: Alexander Mai <amai@users.sf.net>
+Date: Thu, 28 Jun 2018 22:16:18 +0200
+Subject: [PATCH] Extend TestSymbolDatabase::findFunction19 to outline
+ different results depending whether char is signed or unsigned on compile
+ time
+
+---
+ test/testsymboldatabase.cpp | 28 ++++++++++++++++++++--------
+ 1 file changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/test/testsymboldatabase.cpp b/test/testsymboldatabase.cpp
+index 0dafd2730..28473e8e9 100644
+--- a/test/testsymboldatabase.cpp
++++ b/test/testsymboldatabase.cpp
+@@ -26,6 +26,7 @@
+ #include "tokenlist.h"
+ #include "utils.h"
+ 
++#include <climits>
+ #include <cstddef>
+ #include <list>
+ #include <map>
+@@ -5065,6 +5066,7 @@ private:
+                       "    long               get(long x) { return x; }\n"
+                       "    long long          get(long long x) { return x; }\n"
+                       "    unsigned char      get(unsigned char x) { return x; }\n"
++                      "    signed char        get(signed char x) { return x; }\n"
+                       "    unsigned short     get(unsigned short x) { return x; }\n"
+                       "    unsigned int       get(unsigned int x) { return x; }\n"
+                       "    unsigned long      get(unsigned long x) { return x; }\n"
+@@ -5079,12 +5081,13 @@ private:
+                       "        long               v5  = 1;      v5  = get(get(v5));\n"
+                       "        long long          v6  = 1;      v6  = get(get(v6));\n"
+                       "        unsigned char      v7  = '1';    v7  = get(get(v7));\n"
+-                      "        unsigned short     v8  = 1;      v8  = get(get(v8));\n"
+-                      "        unsigned int       v9  = 1;      v9  = get(get(v9));\n"
+-                      "        unsigned long      v10 = 1;      v10 = get(get(v10));\n"
+-                      "        unsigned long long v11 = 1;      v11 = get(get(v11));\n"
+-                      "        E1                 v12 = e1;     v12 = get(get(v12));\n"
+-                      "        E2                 v13 = E2::e2; v13 = get(get(v13));\n"
++                      "        signed char        v8  = '1';    v8  = get(get(v8));\n"
++                      "        unsigned short     v9  = 1;      v9  = get(get(v9));\n"
++                      "        unsigned int       v10 = 1;      v10 = get(get(v10));\n"
++                      "        unsigned long      v11 = 1;      v11 = get(get(v11));\n"
++                      "        unsigned long long v12 = 1;      v12 = get(get(v12));\n"
++                      "        E1                 v13 = e1;     v13 = get(get(v13));\n"
++                      "        E2                 v14 = E2::e2; v14 = get(get(v14));\n"
+                       "    }\n"
+                       "};");
+ 
+@@ -5094,7 +5097,10 @@ private:
+         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 4);
+ 
+         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v2 ) ) ;");
+-        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
++        if (std::numeric_limits<char>::is_signed)
++            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
++        else
++            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
+ 
+         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v3 ) ) ;");
+         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 6);
+@@ -5112,7 +5118,10 @@ private:
+         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
+ 
+         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v8 ) ) ;");
+-        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 11);
++        if (std::numeric_limits<char>::is_signed)
++            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 5);
++        else
++            ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 10);
+ 
+         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v9 ) ) ;");
+         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 12);
+@@ -5128,6 +5137,9 @@ private:
+ 
+         f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v13 ) ) ;");
+         ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 16);
++
++        f = Token::findsimplematch(tokenizer.tokens(), "get ( get ( v14 ) ) ;");
++        ASSERT_EQUALS(true, db && f && f->function() && f->function()->tokenDef->linenr() == 17);
+     }
+ 
+     void findFunction20() { // # 8280
+-- 
+2.16.4
+
diff --git a/dev-util/dbus-test-runner/Manifest b/dev-util/dbus-test-runner/Manifest
index 476b3aea64b4..1599d414324a 100644
--- a/dev-util/dbus-test-runner/Manifest
+++ b/dev-util/dbus-test-runner/Manifest
@@ -1,5 +1,3 @@
-DIST dbus-test-runner-12.10.1.tar.gz 382108 BLAKE2B 760ed88f089b92ff3d51bc7342f11691e760b2aeb107e2dfcd903f1ebc3acc2e1ad6dfe3768d29329408770f562f8dd9656f7aed8e45d7e6b5334f5d328d5c0c SHA512 6d40d607fdc417ebb9aaa6dc3cdd41a8ff1563cb3791689d17a99d105a0c16dad8ffcaf3da7ab6b8c3dcae17d2eba1bf8a6a5d92dc1d3de0975218220ed3c9c0
 DIST dbus-test-runner-15.04.0_p100.tar.xz 304760 BLAKE2B 0afe953376482276229ddf7a5f8e6b9a79c6ea6003f658b38f292099ec42d65b9c4a913f963bf013a2999066c4ad97bf7bc593074c1d393aa2d000d51d7f7f7b SHA512 4ff94fe022d69c0bc83b35fb14397fb59daa0b6a9ff9d7f0c93582bc5468ba6e495d4b95f9b4d8cb56f0b782d4582dc2cb67fc087aefa59295a3b40ecdbfa34d
-EBUILD dbus-test-runner-12.10.1.ebuild 748 BLAKE2B b5cbba38435ada80f7d75a47ae8cda181a750d3f2d4aea8a6f0f4b8a5e0f1602c11925b37b974600f3d575ea762231eb0ea35565521aed0b640d195f5fd50101 SHA512 9a1f2b4ed8b757ca09a1195d567716620d7ecea9d45e4ee4c31d478c29cc5b2a95941f536a9c59e8c4c61b34f8e55d823d655ebb5641f93e0a41dbb339cf85fa
 EBUILD dbus-test-runner-15.04.0_p100.ebuild 1058 BLAKE2B bb9b2eaccf2aaefb537c80aebed87e559f0ddd0cce091835ba9646ebba33a6e817d5203b8ac2ea410673439f1164e49b09e3315b915848a7edd10fdc9e078efc SHA512 fbd8733b87064272fdd2a7ad48e09d6389e47766805f7953deeb88b976ea4e53c7567ecfd6e568b5ce6f543682bb7ae46c57b0d4abbd4c7169c69a865f91cd48
 MISC metadata.xml 333 BLAKE2B f89765af341d1a643d414c714839c000611842e3c5f5e6e1c2a23376fc08940dd9d791163fc409c0b28884145f6e616d6837100d0a1286e676769421ed81ca15 SHA512 49280112f98ca94c67ad00e21fcf02da3848ec391852dcfe5cc065404449339f5c1f6bfe01825e7da2f58e1134648df630f4c1c292b6169df23f017544bcd299
diff --git a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild b/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
deleted file mode 100644
index c69ab316a910..000000000000
--- a/dev-util/dbus-test-runner/dbus-test-runner-12.10.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-MY_MAJOR_VERSION=12.10
-
-DESCRIPTION="Run executables under a new DBus session for testing"
-HOMEPAGE="https://launchpad.net/dbus-test-runner"
-SRC_URI="https://launchpad.net/${PN}/${MY_MAJOR_VERSION}/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="test"
-
-RDEPEND="
-	>=dev-libs/dbus-glib-0.98
-	>=dev-libs/glib-2.34:2
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	test? ( dev-util/bustle )
-"
-
-src_prepare() {
-	# Drop -Werror usage
-	sed -e 's/-Werror//' \
-		-i libdbustest/Makefile.{am,in} \
-		-i src/Makefile.{am,in} \
-		-i tests/Makefile.{am,in} \
-		|| die
-}
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index 5cb91326f7d7..15bf39fe09be 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,9 +1,7 @@
-DIST debhelper_11.3.2.tar.xz 463864 BLAKE2B cdfce5b74d8af2cedec4f4cdd2bd5dcd21a941c420d6be32a145a5ab83ff9ae9bef7e2061ff011e7ecf941e4d6e017f9bc1413865280f0efac9ae0b00478f142 SHA512 b2172638023540593d8dbf525417c8c07e803919d7c0d481f896cff6d562492d22859deab0522aca91f69bd4b8c3350cbbf508cce6859d5bc04596cee9fd4733
-DIST debhelper_11.3.4.tar.xz 467684 BLAKE2B 8c5bef040c231c91cef1958cf797b8ddcbb40cee5303c3d6ebe26945462abd6ccb09dc905c0034ec3c48c8c725a0bfe1ee567e96cc5495a08a630adad1863f32 SHA512 2d24948b05396767ce303f9ae73e0640e48510830f7113f494ee91825c6646b7420a65a195f9a68cd2ed21d47d4ab7bf122fee7d7ecf6d5d928e3c51b1b45d2f
 DIST debhelper_11.3.5.tar.xz 467732 BLAKE2B b5d035b57057f36bbc1e6e09f7a0acc6fab2141e2d99cfcc963101a6f939b6a46fa2a1aff899f4a4f11b064c79221e3b91dff8a3f541988c39d6f221506abbdc SHA512 7c5b37a6c6683964835609ec9a6ea65e5121af017ecaab79a88a55252eee010aae064b2d89f24a957c431ac345cd43376815c9b703d6e43a2a098aff6836864e
+DIST debhelper_11.4.tar.xz 473968 BLAKE2B 77ca641dfb0b7e10df921ec967e66700c220b6a85588b3a7f6eaccf22b97337e7766d77c06e62de7ee75501dbf98aaf801d7986f88eed8ae03778259135db9ef SHA512 6a6c6ea7cb394381288db8f872ae40de9456a22bf535ae0bc15097b47c41cda799952ffdbbcf6f56d0c3aaa9520a4f3f531106b1a53b329e53a13f8eb70ab1c9
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-11.3.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
-EBUILD debhelper-11.3.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-11.3.5.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
+EBUILD debhelper-11.4.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-11.3.4.ebuild b/dev-util/debhelper/debhelper-11.3.4.ebuild
deleted file mode 100644
index eb7e5fa626c2..000000000000
--- a/dev-util/debhelper/debhelper-11.3.4.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-11.3.2.ebuild b/dev-util/debhelper/debhelper-11.4.ebuild
index eb7e5fa626c2..eb7e5fa626c2 100644
--- a/dev-util/debhelper/debhelper-11.3.2.ebuild
+++ b/dev-util/debhelper/debhelper-11.4.ebuild
diff --git a/dev-util/debugedit/Manifest b/dev-util/debugedit/Manifest
index e9b6bda9e5bd..690267d327fc 100644
--- a/dev-util/debugedit/Manifest
+++ b/dev-util/debugedit/Manifest
@@ -1,5 +1,6 @@
 AUX debugedit-5.3.5-DWARF-4.patch 3235 BLAKE2B 6c12d8dc99b746fb2b5b813fed429f94cc4b0e737a6cb287f4741705b94782ef9bfd2a87e3284a63ddba20961d0a676823ac4145247edc328c46087d95842a2c SHA512 594bed4c2433e15c840316ca132619fc2b65ea5477cfe416ef851414d44932b3f8e75d006025eefbfc9c6cdcea956ff9ffc28dd4ef4fe5858a486ce5d08f43af
-AUX update.sh 1690 BLAKE2B f2f913fbbc3e06f1ee5ae8423253c67080471dfb0176e6c1b4ef3665a7b3b1ab24d7811ea8611c8afbd5b56072c12c0b97b08f87faf176d160ecee19f57f624e SHA512 5b271427d6391f717286289c5ec6eb794e99b7f0bd966100d3db03f84507000bc9256526f4ad6cdf809ff1800d53d5ed64d76bb14733507563d7a6123c9fc422
 DIST debugedit-5.3.5.tar.bz2 27799 BLAKE2B f81b39122502afe66386b962d0e50e9a16a314f31acf2a44c6d53f16d24ac91b62483a67fed43d085c3dd573adcd312cbb5e15c214fd8f00bc5415835c2caa37 SHA512 afac800a8f2e035705fcf997500d8fd2c3dc658850f47754863e8811db97859748721c5a252cc90dc81d07bf08763a9507e2272e983ee3f6bf16d8016fe5b8c9
+DIST rpm-4.14.2.tar.bz2 4151934 BLAKE2B eb7e32dd736a195f2e5effc184ee8f2c700dcaf80477574c2112b6c96504d86a67c81e611f82ea35ce244e95fad339bd262eb51c35ada5eeffa8d306b6938cb7 SHA512 22e309e8be936e6070430cedd6f5ea0c3871db4c6aadd0d567a9c418796c178c8dd45d44920d7eaa66681790cc2821347affe471cb215d7a490fe7947fbf291c
 EBUILD debugedit-0.5.3.5-r1.ebuild 937 BLAKE2B dc741f4fc4f880fffe5775067878d47e357a904acc79bdc69d9d5d7f2f95fcd41f5de34022cf73eb396e9a0d9813ddfe5245724830b069c1cc8d80ab6d462b83 SHA512 7553d4e2fa0ca9c2d65b52636af1ee775eba337bbd7313bb63f6392dd6db140fe81eb513d64b89a4bc07b04b7d80b2f3f24be13b76001f15dff057a7f62de407
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
+EBUILD debugedit-4.14.2.ebuild 1722 BLAKE2B fdbdd4ca1d9b85a1bc63de6eae867bddb873ef499190e7c3626af621cb1be6ddb333ac78f03c1745113f81b09cdd62461e4d313c121a81f6396aeb0a1f2f13ac SHA512 dc3854d27602108bb7db0fb25f3155b3bf52881a2a4991ac4ef24e680c871cc7bd7c56a161dbe9e419de0f5a0ad9379eb8ce66889df49ba14111a0769dfce7ea
+MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/debugedit/debugedit-4.14.2.ebuild b/dev-util/debugedit/debugedit-4.14.2.ebuild
new file mode 100644
index 000000000000..754bbccb0cf1
--- /dev/null
+++ b/dev-util/debugedit/debugedit-4.14.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+MY_P=rpm-${PV}
+DESCRIPTION="Stand-alone debugedit from RPM"
+HOMEPAGE="http://www.rpm.org
+	https://github.com/rpm-software-management/rpm"
+SRC_URI="http://ftp.rpm.org/releases/rpm-$(ver_cut 1-2).x/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	sys-libs/zlib:=
+	>=dev-libs/popt-1.7
+	dev-libs/elfutils
+	dev-libs/nss
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	eapply_user
+
+	# cheat it into believing we're bundling db
+	mkdir -p db/dist || die
+	touch db/dist/configure || die
+	chmod +x db/dist/configure || die
+	echo 'install:' > db3/Makefile || die
+
+	# TODO: why do we need to do this?
+	mkdir rpm || die
+	find -name '*.h' -exec cp {} rpm/ ';' || die
+}
+
+src_configure() {
+	append-cppflags -I"${EPREFIX}/usr/include/nss" -I"${EPREFIX}/usr/include/nspr"
+	local myconf=(
+		# force linking to static librpmio
+		--disable-shared
+
+		# disable linking compression libraries
+		ac_cv_header_bzlib_h=no
+		ac_cv_header_lzma_h=no
+		--disable-zstd
+
+		# fake some libraries we don't use
+		ac_cv_header_magic_h=yes
+		ac_cv_lib_magic_magic_open=yes
+
+		# use nss as crypto provider
+		--with-crypto=nss
+
+		# disable other stuff irrelevant to debugedit
+		--disable-nls
+		--disable-python
+		--without-acl
+		--without-archive
+		--without-cap
+		--without-external-db
+		--without-hackingdocs
+		--without-lua
+		--without-selinux
+	)
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake -C misc
+	emake -C rpmio
+	emake debugedit
+}
+
+src_test() {
+	:
+}
+
+src_install() {
+	dobin debugedit
+}
diff --git a/dev-util/debugedit/files/update.sh b/dev-util/debugedit/files/update.sh
deleted file mode 100755
index 3fed29ad6dc2..000000000000
--- a/dev-util/debugedit/files/update.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/bash
-
-DISTDIR="$(portageq envvar DISTDIR 2>/dev/null)"
-DISTDIR="${DISTDIR:-/usr/portage/distfiles}"
-if [[ ! -d "${DISTDIR}" ]] ; then
-	echo "No DISTDIR found."
-	exit 1
-fi
-
-PN=debugedit
-
-gentoo_functions="/lib/gentoo/functions.sh"
-if [[ -f "${gentoo_functions}" ]] ; then
-	. "${gentoo_functions}"
-else
-	echo "Failed to source ${gentoo_functions} file."
-	echo "Please install sys-apps/gentoo-functions package."
-	exit 1
-fi
-
-set -e
-
-einfo "Getting updated index"
-rm -f index.html
-wget -q http://rpm5.org/
-
-PV=$(sed -n '/Production:/{n;s:.*RPM ::;s:<.*::;p;q}' index.html)
-einfo "Latest upstream version: ${PV}"
-rm -f index.html
-
-P="${PN}-${PV}"
-A=${P}.tar.bz2
-
-e=${P}.ebuild
-if [[ -e ../${e} ]] ; then
-	einfo "All up to date"
-	exit 0
-fi
-
-#tf=${DISTDIR}/${A}
-#if [[ ! -e ${tf} ]] ; then
-#	einfo "Cannot find ${tf}"
-#	exit 0
-#fi
-
-einfo "Fetching latest rpm tarball"
-r=rpm-${PV}
-wget -nv http://rpm5.org/files/rpm/rpm-${PV%.*}/${r}.tar.gz -P ${DISTDIR} -c
-
-einfo "Unpacking ${r}"
-rm -rf ${r}
-tar xf ${DISTDIR}/${r}.tar.gz
-
-einfo "Creating ${P}"
-rm -rf ${P}
-mkdir ${P}
-cp Makefile ${r}/tools/{hashtab.?,debugedit.c} ${P}/
-pushd ${P} >/dev/null
-more=true
-while ${more} ; do
-	more=false
-	for h in $(grep '#include' *.[ch] | awk '{print $NF}' | sed 's:[<>"]::g') ; do
-		[[ ${h} == */* ]] && continue
-		rh=$(find ../${r} -name ${h##*/})
-		if [[ -n ${rh} ]] && [[ ! -e ${rh##*/} ]] ; then
-			# don't copy glibc includes
-			if ! grep -qs 'This file is part of the GNU C Library' ${rh} ; then
-				cp ${rh} ./
-				more=true
-			fi
-		fi
-	done
-done
-popd >/dev/null
-tar jcf ${A} ${P}
-
-einfo "Testing build"
-pushd ${P} >/dev/null
-make -s
-popd >/dev/null
-
-einfo "Cleaning up"
-rm -rf ${P} ${r}
-du -b ${A}
diff --git a/dev-util/debugedit/metadata.xml b/dev-util/debugedit/metadata.xml
index 56c124413057..0319eec4c8be 100644
--- a/dev-util/debugedit/metadata.xml
+++ b/dev-util/debugedit/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/dev-util/glslang/Manifest b/dev-util/glslang/Manifest
index 1c0975ca0938..91636d62dcd8 100644
--- a/dev-util/glslang/Manifest
+++ b/dev-util/glslang/Manifest
@@ -1,4 +1,6 @@
 DIST glslang-6.2.2596.tar.gz 2270084 BLAKE2B 234d7d201c5ddd91fdaeac1a84104b2b635131fa910315b1d14ae169f6141840a1559114fa2e07775120f56f57d59decd689f44609923152a2e15ecdda66207a SHA512 24c6e90c75767ffc2faf3f0868a7357d5f528cae8972c8b690cda0c573eac0f60f6b8795793534f39ccc2c649cb788101715e42cbdf7ca9d59c955f9b37a4f99
+DIST glslang-7.9.2888.tar.gz 2370459 BLAKE2B 9dc5550dce1fd718a8050cec81ad94195b19cc36cc4321fe5def48051dd66de4f9c651b6c34a7363701b52afba9f8c6cd4c2264f38416bc911fd2dcdf5a88ca4 SHA512 9a067a5006596bf61cd20f09173e2d22db37a10413bba1b1bb6e5ad3ecf46701786977961e2da8bfa32b19ccb2cc0a04d765f65ae01b80148e9b3f52dbfa8737
 EBUILD glslang-6.2.2596.ebuild 500 BLAKE2B 8ab8168010867e61588f4c66987c4d9956f67a517355c8558c77be3643a1cd181a4687f4b639291219a01a44dd72a64bc4fea6c995d8445a3e97f2cf0c8478df SHA512 68a655dd11c81e1bde33cf637e0e7220278b7ec13310abff759d8c3b3529e82d2aeb49843074eddba22525dd6bcdcd46dba3251042d8a50c708932db9f026162
+EBUILD glslang-7.9.2888.ebuild 500 BLAKE2B 024680e8b2825053fa6a451db25f29ba89e3722f17efbf656122e6374316254799432a911afbf0e444e7a287097dce7901887771e870c0a1e0851439fe0a0c53 SHA512 2cec8ba89e087df453109f240c3b29deaf01c791ef59b167637521cae5a06c18a24f54ba79781ac862c18e793ba2dbb91fc24f14f0b5b86ff219ee7564bca610
 EBUILD glslang-9999.ebuild 418 BLAKE2B 43bc0590620b8b5f35703369d49aa19b54883e7fcbb4c7953e79bd7fb9a1e65277c35c3f227823707bf2ab87608b6ffa07b9d0c2a732d70873155f5bc5d0495f SHA512 00a9eac76b47c375c755424814315e9227f235f7255945dc3be69c7049d4ddb7acf3dd97ab4f4a47ab080a688b941d79119374034292864c6e8b047c888fb662
 MISC metadata.xml 425 BLAKE2B e1b34c7d88a8c0b001aa77a4ad4a1242e4d9ab45e98c0849cdff45a8cb6d1510e31e358c7e65c2a5d83bc8af7e3651532c69791146d92e4ff6a16ed823d142a0 SHA512 f13cc9858160b65a80fde54a9d3881a371225b1f15a15fe60b8ed066373e80c6e595f2e51fe38cc3d3b6f1f58968390ce419f810f66de8a3e5053d7fc8833b41
diff --git a/dev-util/glslang/glslang-7.9.2888.ebuild b/dev-util/glslang/glslang-7.9.2888.ebuild
new file mode 100644
index 000000000000..c91c892519df
--- /dev/null
+++ b/dev-util/glslang/glslang-7.9.2888.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib cmake-utils vcs-snapshot
+
+SNAPSHOT_COMMIT="7.9.2888"
+SRC_URI="https://github.com/KhronosGroup/${PN}/archive/${SNAPSHOT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Khronos reference front-end for GLSL and ESSL, and sample SPIR-V generator"
+HOMEPAGE="https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/"
+
+LICENSE="BSD"
+SLOT="0"
diff --git a/dev-util/gperf/Manifest b/dev-util/gperf/Manifest
index c145f6902e73..bad205cdf784 100644
--- a/dev-util/gperf/Manifest
+++ b/dev-util/gperf/Manifest
@@ -1,5 +1,5 @@
 DIST gperf-3.0.4.tar.gz 983500 BLAKE2B b83bb45fb88143f2847405efd769472c5b3ea9277af88568bf8860ae653563ff3c23a9705651eac50949fdfad3efd957856f712f7810b21cc6dd32dcf40adb12 SHA512 24a65ac93c9d640670b015a76378eb7e0f167bec685d03f7dc68005d5a6d693d98b2189f7a0ab5bb9e5dc700de7d417c215230f9dbe062ba119240a8da535dad
 DIST gperf-3.1.tar.gz 1215925 BLAKE2B bc4c54ade3f7dce484714d77cb5759dcc02b7a607d7b1aff6bdbcd06ee4c83e9449038a7217d5f25bcbef058ba56e1fce9383b9599de005154e5a9b566ac9c69 SHA512 855ebce5ff36753238a44f14c95be7afdc3990b085960345ca2caf1a2db884f7db74d406ce9eec2f4a52abb8a063d4ed000a36b317c9a353ef4e25e2cca9a3f4
 EBUILD gperf-3.0.4.ebuild 744 BLAKE2B 69c5df156acb2113d3daf39bba3f2b0c1405f8c756652a407740ce184959badf9195642517d4cc7924985cc05d4da35223d54a749d1d39f9c7d8f927f863c24e SHA512 58a8925be516b002495b70878ab9db28f36a9ab470e9cd40b4868261781889d4b0336b79b30edddeac34b0756aa67afccf681e78b7581d8721dd85929e2d709f
-EBUILD gperf-3.1.ebuild 724 BLAKE2B 50394ca3f6667440ef6ec4e6167d6f3b2c2b76e4736a6e003b9ca6b508a6f9d9676d93f1b435d7ca434bf8c1d189ed1e6382c9d5238f28c4e521df26ebb8289d SHA512 bd085403d3098b8cfa3bf7fe25c5229e87d7d86755fe6c19d3578e53ac6c8bbcdf6ad2462b9726671cfbae358fa0091622ffd3e8fb3dcdebfbcee68c456b28f4
+EBUILD gperf-3.1.ebuild 722 BLAKE2B f3ec9469164a411dd9090ce41846aa3a9b4fccb908b992447a11b1fdebe843a657d0e093aa6202a711f8c1e57ab252abf48d587027101234bf6603f0fd3409a7 SHA512 ee85450676e73efcb82d6e42c2cf9a339d2db8e0581f701ccb67917694d9315fe80c237f1cf2555d995376610ddc1c8cccf0631a1068ddcd87861496b100171a
 MISC metadata.xml 219 BLAKE2B 0f485ab3a0acbd2d5cf0a8b2014662a56862057721a4bc34494c2dca52f97bba8d54994461ef33bc965d3470d3e733fec71ed60e9aa4f1b5c565c048d60865d8 SHA512 a1cca99a7d8d8ea9893e7147264184a1605ddbd61ba07971df5a2bd54d6d74ecec39145faa2b303132a31db8fa61484b9224a2748bff4da638b63f930bd394df
diff --git a/dev-util/gperf/gperf-3.1.ebuild b/dev-util/gperf/gperf-3.1.ebuild
index b0aef66a47fb..ab8fc2bbc1a4 100644
--- a/dev-util/gperf/gperf-3.1.ebuild
+++ b/dev-util/gperf/gperf-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gperf/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 68ed7f02af0a..c5f586e0c28d 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,12 +1,12 @@
 DIST lldb-5.0.2.src.tar.xz 19220632 BLAKE2B 7ab97a4e96a2faf6593f5584a5455bc793a50a51370bd32d1595958e5fba9d121832675e6f31cb18a3b77b472eefa8040443b77af3e29c5aa455e2a0dcdb7cdc SHA512 66eaaead60cc908ac061bedb4fac9cb96cecb7f4e5a79a51b6fa080e8f61f718b14e5f3581ead832b495bf10f055d4253d199236a0947dd22395ec80bf2afcf4
 DIST lldb-6.0.1.src.tar.xz 19292420 BLAKE2B 9ec3304aa370781dcbc7c30e47f7becbd99b50f32d9eea36fefbf0e3608bdfe10796ecc14807ee17795de430409315a5dfad02db0fd3ec1a0ad51e9e240e4b40 SHA512 93ee2efea07276f8838bc2b3ff039cab8c7a1a6965647aaa4dee99f55c6465d5584ed3be87b144e2e32b5acc7db9cec56d89404de764a2f53643ed154d213721
-DIST lldb-7.0.0rc3.src.tar.xz 19404260 BLAKE2B a459d480e67267f0dc36b17c4c17f95512cb853d00a718db61e6f1b80d1e678f23767d03e9e5eccd42abcd6d4960d84c9e60a3b6e4e013d5229906fbc031f84b SHA512 d18883ca11b981880aa0eb012df7042bc37382fb44c6dd34937680baf96f3ba59c920abd5d1c25b9b864b80035fa36fb319eb3b46296882981d71f4438600aab
+DIST lldb-7.0.0.src.tar.xz 19403012 BLAKE2B e53f866aeb0151d114c415ed3aecfea9160e72439bce9803d749a648214ce77de74a3fff3d61ff4f243f6a000c41dce0fefe7109ad457f98758abdb6dc9b1382 SHA512 32d93276a07b5f7ca64fc45e7b51004825d1636ec3dff163c5de9f769046a81921c1d82f0aa6eddf3778e1ecf8d4f87c3d5e6bcd3f9ac8cae36278bf12e9e9c8
 DIST llvm-5.0.2.src.tar.xz 23451868 BLAKE2B b7082be2e4ad557b29b9f6869811f262adcf5c73d552faf91b339bede75cf5eab58afefa12fa779a38be71fe2b8f4ea297c3213ee4e8370cc01972c59249d91c SHA512 3588be5ed969c3f7f6f16f56a12a6af2814d3d3c960d4a36ffebb0446cc75f19220bccee7fc605f9b01f5d5c188a905a046193cc12dec42dd5922048b5c27fe1
 DIST llvm-6.0.1.src.tar.xz 25306628 BLAKE2B 60232d4d22f8096b565cc8d81fea0639f24f14e8fc4f66ade69fa15479181f07f655f26dff3fa24bf105762b495da316c5c9352db234bd0af6b9c3fff6d4d881 SHA512 cbbb00eb99cfeb4aff623ee1a5ba075e7b5a76fc00c5f9f539ff28c108598f5708a0369d5bd92683def5a20c2fe60cab7827b42d628dbfcc79b57e0e91b84dd9
-DIST llvm-7.0.0rc3.src.tar.xz 28322024 BLAKE2B 5b034208d9b2b4f1f02466bd446be79b5cacede952f77c1ff1d302a4254410f83420b42ffedbb26c2a87102fdd5dedc37183afe2b8bc23e6b6db01bad3e1d0c9 SHA512 8a19d6cad7bf485d3800ed41a2aadaa3b60eb75c31e984b277756cc5c5eb1a39f12d554d71614d3781cd7f1c85e39de40d9062b77a5299b8ba9659d91bd4c0f7
+DIST llvm-7.0.0.src.tar.xz 28324368 BLAKE2B 10168ff9be8f68536db3b2263c85c1c98213ef03dc542b83628ff176542452582bc496bab236fdf40d4a6463a33f04b27f1458c072ad8b66b641f8df8d494046 SHA512 bdc9b851c158b17e1bbeb7ac5ae49821bfb1251a3826fe8a3932cd1a43f9fb0d620c3de67150c1d9297bf0b86fa917e75978da29c3f751b277866dc90395abec
 EBUILD lldb-5.0.2.ebuild 2915 BLAKE2B 4703008797dc1daf2f450fc70554bc00eb18f80d46c93fcb120b4abca4ae2a0e6e039d7e33daf5b4bee4559c8ce7b9b4c45df94e38e87ac3eb6a1b1b0b0f4566 SHA512 404bff1218a9f196093bb8c22c55641fab5f2499c12978deec9219f3e289cedcf8822219cdab4b621cc8f4ea2ac9eaeaf156350289764d8dc8364dacce79ba1c
 EBUILD lldb-6.0.1.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
-EBUILD lldb-7.0.0_rc3.ebuild 3001 BLAKE2B e1fb09182c4e6cff1cd7451fbd64643c9aa3f3c2c869340eeded322dfaa7d764472093484b3b884de7a675f314c87f62a93b4b8bc3cfe2280a17dcd78518107a SHA512 aea3200fbd380bc96b1f16794dc546f41ed13ead893d6448371f5111007b7e5d8100dffcce6389c1d44880f4d9f56712013af0b6825ba900426063770fb1229d
+EBUILD lldb-7.0.0.ebuild 3013 BLAKE2B 1bbbbf17ae0b3f44bd10b67ccff2260105acba6cf7f17f063bb5ba9b82433bc7c6d17ada5d1974cddbeb5be5cd14edad939b241728250792683bff030c4295a7 SHA512 5c8615cc2a0c80c4c16cbc8a8ce3a2583832b3433d227341d4add0f3d62640fe4c21e96b5208c453ef349b9b093f8dfdb1298cafc612a866f1b99eaae42a4912
 EBUILD lldb-7.0.9999.ebuild 2963 BLAKE2B fe0d92eb2b0ffc41662b7a53ea4ac8893b629e4140be0f03917b2422b894a0c744dfc8f8f3c8de9ca0fef9e82c0ba01ea481c7182e778fba0ab8fabcfdd318e6 SHA512 b5a489457346477a38c2d8e6bad8c54407452ff44777fc63d404a64eb5bdb77fdbcd3f693868362ca195dbac269dab8dbf28590ba47eb4a8310f0e63643ed1d0
 EBUILD lldb-9999.ebuild 2914 BLAKE2B e3a93e6587132df4ab3dd5def2f42df76842c0c0c10ca5509f4aa9637cf864fadc7cf7c49b19794a5c588788f1d6389214583ad13a26c5fbd63aae6a38a7f2d2 SHA512 f75c95ce2ed842b8c132ee192cdde8aab6bbba63089888774f5f4827e2f557e7ddcb0782477a580140806d6b3b62be98684cec66d5c5db74337f888a38653c5a
 MISC metadata.xml 216 BLAKE2B fe5e49887842aa513fbf1f2e09bed09a884d531fd21bdaeb2d389e8bf590b6c0e7063f0af98f66e2db129308ab0f0804ba327c3c752bbb4c900c59ac109d99aa SHA512 3485598147c953e72e1785693a489a7e7d73d59620b76054db9c0ce95d8bfa0e8ffec29da7f7a9d73a32e5b77eac07ca3306c56a972dc57fd89d477edaebf3d5
diff --git a/dev-util/lldb/lldb-7.0.0_rc3.ebuild b/dev-util/lldb/lldb-7.0.0.ebuild
index 4511b5951522..466d0ecf42e1 100644
--- a/dev-util/lldb/lldb-7.0.0_rc3.ebuild
+++ b/dev-util/lldb/lldb-7.0.0.ebuild
@@ -16,12 +16,12 @@ LLVM_P=llvm-${PV/_/}.src
 
 DESCRIPTION="The LLVM debugger"
 HOMEPAGE="https://llvm.org/"
-SRC_URI="https://prereleases.llvm.org/${PV/_//}/${MY_P}.tar.xz
-	test? ( https://prereleases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
+SRC_URI="https://releases.llvm.org/${PV/_//}/${MY_P}.tar.xz
+	test? ( https://releases.llvm.org/${PV/_//}/${LLVM_P}.tar.xz )"
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm64 ~x86"
 IUSE="libedit ncurses python test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/lttng-modules/Manifest b/dev-util/lttng-modules/Manifest
index 090f52451d54..790140bd7bf5 100644
--- a/dev-util/lttng-modules/Manifest
+++ b/dev-util/lttng-modules/Manifest
@@ -3,7 +3,7 @@ DIST lttng-modules-2.6.4.tar.bz2 295609 BLAKE2B dcc0d46c57b53abaf65f499a889d6fa3
 DIST lttng-modules-2.7.1.tar.bz2 297555 BLAKE2B 910720692b8801efd0335963fe8fc504bc9cd08ad772be1418c63f5c3f8aaf8c25aa7d49e0503bd355da64a9441302f14eb0b1a58fc8e76e0c2770b1c4ecb256 SHA512 77609c7b7bc0a8315dd4c635c1be2d84cc1a946438323b362bd25cfcd97f2cf9655aefdbca8b96fceb61db7b733219251d2f9f2e1a46c7534c5d1c622c03b744
 DIST lttng-modules-2.7.4.tar.bz2 302329 BLAKE2B 32526361d3814ff834b3dc152833f610f64189a573e171102b45ef730b5ade57e382f70bbce1a5b5462c7e18e04ac1157f404f2cae260e29a69aceff0a8ed956 SHA512 bdec56c59f282be9a7d191f7799db5b66577f231f92e8fffbc1dad059706fe07c4dd288e74b516e8f6c13cc0da8a54f5e5dd913ae39639489b8eb1507ede08a8
 DIST lttng-modules-2.8.0.tar.bz2 315529 BLAKE2B 17ebcbb9b01b90e276e61e1af5a97719ab26dbf4a20f3bc18891279450e09af393ac3f82761ae67c85ded46e8a61fbdf813f67807d113412f0a9456f979d372d SHA512 760a4417ca6113501f99177eded3dfdf39477a8978894d414c3e2f49c1e86716dc7a076d43f67b3fffb52e1f05ef1bc2671c0e30cfe0cead41c97a8ac1488d8c
-EBUILD lttng-modules-2.10.6.ebuild 1012 BLAKE2B 3d530eb0606499589a5231e411008f536d6970a5bffd5ea5c6fedefbaf63569e1dc62973ead677b8608029c1e46a05ad760cd09a99416d796d9cbdc4b4f80348 SHA512 a68634eb574869fdd8fb0c6a54b8630563dade7fbb09b5d83c8beaa768e162f262bc22061e540d189dd5f6bc2fdfdd954a62187f788d4608edb83ba06ffede1a
+EBUILD lttng-modules-2.10.6-r1.ebuild 1012 BLAKE2B 3d530eb0606499589a5231e411008f536d6970a5bffd5ea5c6fedefbaf63569e1dc62973ead677b8608029c1e46a05ad760cd09a99416d796d9cbdc4b4f80348 SHA512 a68634eb574869fdd8fb0c6a54b8630563dade7fbb09b5d83c8beaa768e162f262bc22061e540d189dd5f6bc2fdfdd954a62187f788d4608edb83ba06ffede1a
 EBUILD lttng-modules-2.6.4.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
 EBUILD lttng-modules-2.7.1.ebuild 964 BLAKE2B e17b9f21fdcf4044f9644573d65e05397c80605b1dc12bae60c5a6cee1e7d16278fc91e0e4562314354795a5109e0b08b9ceacfd0cb2a232f13af3c5e4da0192 SHA512 ae8b58e4d351c9d85b7371a571f4e700e3c9c6ed74ea977ca388cd24e559ea135be96a518eb42bf02bcdffdca1089b2caedebc8b35ba4d7e7135bfc245023d5d
 EBUILD lttng-modules-2.7.4.ebuild 966 BLAKE2B b73b9ed30ce850d4ca49b3ce7fff64d4603fdfe2e8bbcecde008f3c4d8963aa094e5d3c95f29790b70415a52ed4748f664c89b2fde14a07ca52885db66cebbc7 SHA512 b54bd61a9ce611420785c84ed0b7ec6a9e735f982ec91625540389c7198552cdafe3291d9216cb5e98ef132556c2d79a8bb7fb06a9dd311d64ff7700ac4c080e
diff --git a/dev-util/lttng-modules/lttng-modules-2.10.6.ebuild b/dev-util/lttng-modules/lttng-modules-2.10.6-r1.ebuild
index 159621ef8ebe..159621ef8ebe 100644
--- a/dev-util/lttng-modules/lttng-modules-2.10.6.ebuild
+++ b/dev-util/lttng-modules/lttng-modules-2.10.6-r1.ebuild
diff --git a/dev-util/mdds/Manifest b/dev-util/mdds/Manifest
index 244a1973297a..d12ab171c1f6 100644
--- a/dev-util/mdds/Manifest
+++ b/dev-util/mdds/Manifest
@@ -1,8 +1,8 @@
 AUX mdds-1.2.3-buildsystem.patch 901 BLAKE2B 040cf2db28e1c36c28d617b8f56abfca11909267230e7986e4e2439b8e98d7bedb076bad415a75846db038166583c1f3395cd71affb60959956062c293929378 SHA512 bc48b893c0b3d98aa45d7642bbd9bd10ee0f183bcd3da848a0abe4f33547b693e171a327439aba9b76f0683cc15eeb0410be7ed6f834d28483b8f82f8c13678f
 AUX mdds-1.4.1-buildsystem.patch 898 BLAKE2B 716559741402b82537d91698ebe78815c26e47ecb844bed37f0c188efbfa5c9fd7bd9be501afb4d3653840961fa7ace17d215eb035ec9a028bf775589f9dadf8 SHA512 0e5b735232b8409194f6d9fc1b1b171dc333d6388ab858cb79be4908ff1cbdcee276146365b3c6c70b192559489896ba50384b5d78a22fc8c1fa78d683d89b7e
 DIST mdds-1.3.1.tar.bz2 287612 BLAKE2B 476f15bea2ab75ba322139834badaf372026a5e0ce67d5487acc61b38321a21dd6b25efacc91dbb0ebdef274338c909b1c7ac0ff6aaedd8dd899458319d94c30 SHA512 c7ed422c8e0bfb00debd43a12638efc6706d25f9aee0b7cfc15dc711693c4d555e262ae47ff00797c9601c12c0a7eced0f753b263b5f61623470f842814970a8
-DIST mdds-1.4.1.tar.bz2 317460 BLAKE2B 7d76d56448aeb917a0c2afbf76a7f7ae83b2f03569a458f7de257a3facc22dcc9da66fbe1ce40a2f03e38488933a8a054c007374ed84b8fe1e5bd3f3f67c1a85 SHA512 3ad7cf821cd1a0a4b632c5d11cc3bd7bd6da2b14069e142e087dd81c1dfa817a961edbde1d59021a5bd4859eb252d8c461341070406b952a5b46b00eb7444384
+DIST mdds-1.4.2.tar.bz2 318164 BLAKE2B 322b53253cb8796f8def8d470bcbc61e787b25f687b6fbdca927de029f0f9813c863cdc57955e67e40124abccf4e77a16108669fd9a25473d952b7b7361fede9 SHA512 1d58d30c2c65167fda97c790739a2bf36802f72965007a141108320312316df9bf252c18ff84f867f3805eee4914fe748ae066d51b376791a723fd54ec21c3c3
 EBUILD mdds-1.3.1.ebuild 981 BLAKE2B d56dee445b3d1c55fa2d2eb6c742c45574db99784ea41e26d0b24eb12ef439eb6522385f1c9b1e539373d5b88a7361f412cc192b2b7a297fb689d576c06bd3ad SHA512 9564ee7663255f1757c86325bc80b78c6b05375a5a35a9a46b4567c7a307b8c3cc0d7e4e86349fa7074d65bb321bde88e9a625ed2ecb668f0574899d80e48c88
-EBUILD mdds-1.4.1.ebuild 1002 BLAKE2B b3c22ddbc047cf45d72975fdb1fc9963b9a5dcbfa92474ccd52782cf0e258861fb93c70f82ec7bee54d9a02fb143d1cad6ba626577b6e6cb91918284fb37a051 SHA512 3097f8291cb176ef699a7d95575724533d003032631619eb748faf7a9cea56efbf3152a7de938fcf81b4cbd7823e7681332b5f560db62aa02080446cc87164c4
+EBUILD mdds-1.4.2.ebuild 1009 BLAKE2B 20c3dc414fc64ec899a3d6d36a66bcc264b0b50b371187801628a68e30a52bde2759bed4c24ec2e941c1dc0e1ebf2ce8af12fde0d5792895bb78c5b7f0a005e4 SHA512 f4bdd079f5928633624b4147db170eadd6e4952f26e1a3cc737a2355138c1f9a382889996aea245529faf0a8a0b35f007fa355af0f1e8c44376cc53260f85da8
 EBUILD mdds-9999.ebuild 996 BLAKE2B 9c0e219edb41aa5a8aa9d7f0fe38182d0a45322c614932ff0fda9d6888c9e89eb75208b4c6d77b1ac3a082015a81f77d6dd2ab96f312eb69d14c13ff3f3e1278 SHA512 d2b7462575b484f8dd4002addfb075189419495b1e744a4c818f7e87be3768ca39284a3d9579a64ef450b19468952d865c8e2019cdbb5602ed1f99d8f15c8f43
 MISC metadata.xml 456 BLAKE2B 18fd8f49cbbb2b86b19ef2aaa0dcc1ae57c16597e4357c7f18eeb529972931234fa165e3d1a8a65f1f5b004fed57bfb09896a6b5505fd71d2ffe7cd2a2a42f3b SHA512 51aa3106f9bb7b962e7225e88fb56335b0bef35dc1749866a4e44290ca0cac510be348aa6b5542f536a8b3bdc83dbf39c4af6b79dc603047a7a6ba6980842d71
diff --git a/dev-util/mdds/mdds-1.4.1.ebuild b/dev-util/mdds/mdds-1.4.2.ebuild
index f825185f1656..bb6e3ab3edf1 100644
--- a/dev-util/mdds/mdds-1.4.1.ebuild
+++ b/dev-util/mdds/mdds-1.4.2.ebuild
@@ -29,7 +29,7 @@ DEPEND="${RDEPEND}
 	valgrind? ( dev-util/valgrind )
 "
 
-PATCHES=( "${FILESDIR}/${P}-buildsystem.patch" )
+PATCHES=( "${FILESDIR}/${PN}-1.4.1-buildsystem.patch" )
 
 src_prepare(){
 	default
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 9886e91aec21..d510af52dd19 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,12 +1,6 @@
-DIST meson-0.44.1.tar.gz 1136337 BLAKE2B 7391776d2f480f43c6cf0bfae3665c16a61c4a28fc4310dc8659ab4165ef76ad1729a9daf645330ea213aeb59e5ba9d991d021d1ad620f6673cebfd64b085d93 SHA512 3c350d1752ae4463ec47060e051d79cc0855385e9552deff34fad8431175fb5d0f04b51a242f8f8f737726d06e504339d6b02a5aa9558ee673fb867dbb4e5b2d
-DIST meson-0.45.1.tar.gz 1163287 BLAKE2B 820ab763193322c75ebf3a79cd38f49f9fa06f9645f382961eddab9bb088263f5ecc603d3ba6db9e038db1ea150d6897dc202bad24ff985ab1ef2dea3f08b724 SHA512 704731aae28ba5fe4c2040464d42489cfc1946c95c39e28eef170ba5ab929b8672c782ed18798528b59aeb38abd23e4930f38e38f1e8c45f1ccf96071b097731
-DIST meson-0.46.0.tar.gz 1200258 BLAKE2B 8f1fdae2456d262abff6078084c8f3ca7a4163e709fe9cdf99fad4b9f42ee42750e66db4dd66728df5c26f2622b9a55388f6c165cbcc022513622df2ebcf7d72 SHA512 f2985bfd19477c2f6cd773d7cd0453084e850c0924e110261dcfe183d1534d9d1098ca032fac050d3913893c94a20a2277daa1c12f0cee4fe368a91d136a0c15
 DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236babec51fd5f1e70ba4139f13c4e7b6d2985daccf9ef1bc2e33516b1278ab9c9ea4c7fce775d187450c2498dc76 SHA512 beacd5431f9d6abd85a72b2609cbd913f67829b2eef4712a5b9a151e2d0cad6e2c16b5e42819b93f986705305ed874d26211c315aa930b1695552a9e30de8b98
 DIST meson-0.47.1.tar.gz 1250211 BLAKE2B a1ef5852b432e6856733c25a7ccd225f1a9ff2d1a8f65a38375d13c2c1d93d8e756b2cc2d3528783f18b90598e3f056363822d2400773369457d0801a6e3dd58 SHA512 e5042f0553057eb3a723fd2e17994ff05c2856c0dc22f39f5c5eb68fb56281894a5d13fe9f2e0852b4c934f3f3cbc41e0639ff25db4ab9f352eff95e7d552b8b
-EBUILD meson-0.44.1.ebuild 923 BLAKE2B bd78fd51af575678067d4fad1c4c240fb4582607ad1dd0eb9bc2c114ac61942956bc93b2b419bbf95edc0c6c7ba4326833aa01a39036a67bf0ff504e4b9054a5 SHA512 3b69e8a6d79476bc93185865c6795b239eb8c4b91d6aab48b8fe6dfb14288e7c53b59ec2418795270f1901debe0ebdcf1167e5817bffb37b62cb6f270df9a4a9
-EBUILD meson-0.45.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
-EBUILD meson-0.46.0.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
-EBUILD meson-0.46.1.ebuild 929 BLAKE2B c1c6574991faf4f8361ca3a50218888b411015b13d9a5d2117adec2761e5ab8c665583f0872c2cae2c68127bf264fb5b4aeced6b5a8cf094e24f6763432fbd83 SHA512 030552157b1bc5b3865839d9b57a4fe223211e4e0d3f6f410ac8df9ba09384290c0db3c4312a7ec8b46e330cacef37e611c3af9822d117258d8de0a5f659ffef
+EBUILD meson-0.46.1.ebuild 927 BLAKE2B f0b6b44ea26a22027bf53e448bf52ec9467ba152ea547d7222ce7a8fd4cc8f5ac0679621628f95a50a53d62528a10c346822f5e6535559964f43ac2549ae303a SHA512 1a24410ec9b34bbea207abc912a41a4b452f149c490fbaea78c81ddeb84d65679182742ef8685a8edc4ae62fc3b0395d540ce9a2af3dcbe972b0a74f6678899d
 EBUILD meson-0.47.1.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 EBUILD meson-9999.ebuild 940 BLAKE2B de139b0b47bd4e4f6c8aefaa32937a4b24c12334acb470000005a00c55111b9c8cde943f3fa39a2f1203bca18cc3d817bc1386309bf084dfe76a9dcfe762a96d SHA512 882e6b4186e43e4ade97c1bbb037b9722adf0435cc3dd561bb55afc0fdab43d426ea3c1006dd8602c49544176ded0d8049b77461efc30060ab6bafb01616f58a
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.44.1.ebuild b/dev-util/meson/meson-0.44.1.ebuild
deleted file mode 100644
index a645215fdf07..000000000000
--- a/dev-util/meson/meson-0.44.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64
-	~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-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-0.45.1.ebuild b/dev-util/meson/meson-0.45.1.ebuild
deleted file mode 100644
index cabc6b2b4e6d..000000000000
--- a/dev-util/meson/meson-0.45.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-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-0.46.0.ebuild b/dev-util/meson/meson-0.46.0.ebuild
deleted file mode 100644
index a02f93d684e4..000000000000
--- a/dev-util/meson/meson-0.46.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
-fi
-
-inherit distutils-r1
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="http://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-RESTRICT="test"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND=""
-
-python_test() {
-	${EPYTHON} run_tests.py || die
-}
-
-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-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
index 6c28bef689f0..cabc6b2b4e6d 100644
--- a/dev-util/meson/meson-0.46.1.ebuild
+++ b/dev-util/meson/meson-0.46.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x64-macos ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 906d226b5c4e..e49c2b921814 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,30 +1,5 @@
-AUX mingw64-runtime-4.0.1-build.patch 2981 BLAKE2B 10d65cddf96527ef5909106526dc8a5e977ffb3c216b78fdccc55ed9f4178b78424ea455a2cd150c6f90fca62dab0fc4c434ebc9df5662156d795437a95daa9d SHA512 6495f898b736188800b1fc02956cfe021c7668a2d38d8acabc2d035e90aa1d72d761ae15141396f8d3dad8ac7111dcaac5fdb0c59c0d34bd2d820e54ab30c89d
-AUX mingw64-runtime-4.0.1-winpthreads.patch 3142 BLAKE2B 7e70e058aa3e96d638c0f617c912ea42edf3a696acc907b3aef4d39e8207fd60ff8260168136da651d396ab85a6139a02e763dbf176df1930ac0a9fc1282b6e9 SHA512 5a4e34257f0eb9f3f9b51677459111b08b389dbebf3f29d30d99dcccd06e41bf1b82d6d0a1ce01fbfa5c0833bff205679203a0146d77b5416ef277c4c047a492
-AUX mingw64-runtime-5.0.2-implicit-fallthrough.patch 1329 BLAKE2B 597fe524eb50da22f4f034301bba2287a290a0b3125f76943a892bdd65fcc2b319a52791a4adaed18b4ff25040f4f534a1fbfa2686e1e7d478a145bcfb6c3d01 SHA512 9de46f074d42fd7dcc7b9ce01343eae22d803a8f20662b57e309aad5c7f349552048fe2ab39983b5f7e4b7b703617e6e884ef2714c9a67ea47129d4ae6dd1f8b
-AUX mingw64-runtime-5.0.2-locale.patch 595 BLAKE2B 475bb6aef664821d7e1f94c1188774840ff93c00671b6f2ffc2a42c1eced5334f8805d9c718f82550926c50b5779020e57c181d43ec00d4452b48d1cd7d092a2 SHA512 82d1fc293be628f8e967a108001d0e04c53e6c4581be2aa954e05c07e52473a6ffb4cedffc1f27202ea607316e6d38e64997ccc8d3eaee44125ec795d9a30553
-AUX mingw64-runtime-5.0.3-build.patch 1116 BLAKE2B 18ac65c7c7dbc94ca9101f4221407f656702f178ce4d9bfe5647205fccde201d8945a282084e751aef041d37fd72ca041b7f491eb006177e18609b06db7a7b6a SHA512 5f3cebbb246e831617e020e240b8c700be0c31e7fe85a0da30ee36b2e5184fff4061ea205e4e7afa6105d8fcc79b8a956238a6342c314b8c3b38d2da6a8cc0ec
-DIST mingw-w64-v3.0.0.tar.bz2 7012419 BLAKE2B a1c7f4cb1b25bfb8e44ae782895a7f6fd9deb17bcdfae3a6184a8da562fc2f371df693b2a423a58c626a327b3b70b20ae9ba10db0936dbfcc1236d6cc4f2af0e SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989
-DIST mingw-w64-v3.1.0.tar.bz2 7021162 BLAKE2B d7e757911ebedb57c7ad9d4a7926e6fbadc171caad1ad9c3e6117538bffff65e07e3e732a697abc0925293079d863240efbae3d58180052dc33e2eb6346dfbd7 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8
-DIST mingw-w64-v3.2.0.tar.bz2 7053254 BLAKE2B 29ba4837f8bf970a76a1a7159f58fba1058d805d4a6c033ba5d13eebb506dd5ef3d4a8dc11a253fc7b10350a813012194c0fcea9eb234d556e6577fd3197f4cc SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593
-DIST mingw-w64-v4.0.1.tar.bz2 10803072 BLAKE2B 7863b388a9cb011e9ff6e4adec9ef0b3842c7bfabca8812287dc5dff7ba9f2cf35a097322ec8e117fd41a36b7b05d305abd8e7c45747b76ea8fda85f037c276e SHA512 a216a09a460c56c29208aee1e1cdb428e856f9c8d59dd399723ccf6d549368f0a13a6aacb046d211ddec7c0a1f1c227d5dd599e4f0c33ba4b6d9c92bd0a7fa1b
-DIST mingw-w64-v4.0.4.tar.bz2 10812375 BLAKE2B 59180d741e0b4325a4c02690a21f8a04304e46744c5a986ef79a13fe1d68a1d25a7ff7866232e4f09937a3cb8442cb2497c781dd5cab42e11a1bbe2c5b76ddfd SHA512 06de6b592f776676184a9c50c63eb105c82a912965dee5d8217f9b5b325e0258c188f5d7d5e28aaeacf7bad44ce5d36bd837b9f1cbb91358754787738fb15146
-DIST mingw-w64-v4.0.6.tar.bz2 10853871 BLAKE2B a166692d4ddbf740f566abc844d577d38b9cfe436f4d0a55c7e8bca2708bd92c6cfe1be072fae428d88c682215d390ec1ff15b38485540adb2b77dd8724f1837 SHA512 c9ec75b10fe40d80e620b569ca8f452b1f78e9e4dd45ad087a2b69297dc661d06aa30255ea310786f28c042256c35a1d3e709ff7ea8bc19e7f4ea914c120f020
-DIST mingw-w64-v5.0.1.tar.bz2 9160780 BLAKE2B 52964e7ae113d8886648cb0395514067fa054840d153e86407317ccd2f299fccb6d21f76c773e1e2ef22b2c00b53728c18065091125a000750395e96fb601f05 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa
-DIST mingw-w64-v5.0.2.tar.bz2 9107077 BLAKE2B b8e3e614fe4a1ea6a4770efdd029300e923e3b7b39b71731692281da44f468b235d487d38d7e1b4396e1b44a4c60fcc7a67a6c1331fb46e339c13c86bf7de7bd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060
-DIST mingw-w64-v5.0.3.tar.bz2 9160627 BLAKE2B 941b40c426548564e8b2da0af8e917dad34bdbf0b05c63ea2127e39139bcce5d86e80433817483c64cd2a6ef6140a7818a76564ff5d9408614ecaa58f17b41e7 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9
 DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
-EBUILD mingw64-runtime-3.0.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
-EBUILD mingw64-runtime-3.1.0.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
-EBUILD mingw64-runtime-3.2.0-r1.ebuild 1777 BLAKE2B f561aa2e16d977314513aad7255eed44bf86217c710d66f763ad89b63499674fbe221ab156788588bdfefae74d3501d8f698f1b74f8b130d37cc0949593f8c51 SHA512 f5a3baf2bd4dd0a1526db279cd428d6502f8eed03d001b6de7ff5ff582fcb4de14d12f7290cb881a8eb11810f34108b160fcd220d65cf31fea327329ee5c4664
-EBUILD mingw64-runtime-4.0.1.ebuild 2548 BLAKE2B aef0473dfc7211ac19ff4f57e080a881d1c0c7d282ac2432549f5a2ee425c529a419e25009352daa58188a6d4a07b79fb54b5b07ac9643bd9e170814fa60e1b1 SHA512 38c1ce7514a4fa35931d3fc8b97a0bd5f0e1027ee9d7b07326f7e7f2598fa747f94bfb6d750d98fc15841a2ccaa45a9f321e4ef0a2aecb4ba49e7598003c152b
-EBUILD mingw64-runtime-4.0.4.ebuild 2562 BLAKE2B fde901cf5ecbfb20c0cf94a847f41b6eaa4c2b12a308fc754b2f31808e611574168f80535a71ee8ab55a4ead555a109a944cb492f5fb6cd558ee644c4c2a9b65 SHA512 51bcd841320ca40b48453e4cf8832ca494751a5d5c9f7014b326eff92d3e16a2c11d8e8074aa9066cdbc44007c2914d5f3abeed2a0cc1c4f02434504e12b1149
-EBUILD mingw64-runtime-4.0.6.ebuild 2516 BLAKE2B eba545412da47c8d2adfab359c12071619a0f7b10fb925382dcc3ec09b4de52c51db3c633ef923c0dfcfc3cd55cf9c872216da4d6dc5f0fbb18d623c26f5b777 SHA512 a60f10631f26e8eb26aa7ad071af73115c2c7ec84ef39d73d228a4bc038cc2f10788401424d845264f09b0a74682f53d6bd8362005b8c8abc93e16681faf4392
-EBUILD mingw64-runtime-5.0.1.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
-EBUILD mingw64-runtime-5.0.2-r1.ebuild 2615 BLAKE2B fda70d33c5c91481a162f88e431996582fb0da14b6a6c725aa1879780a9b993fa18bd522a9808f71cdf6b2eda5205b073a5e24ff2f605e74327318cc5ccc88ad SHA512 9c6520b42eaa6f06ab03da66284a6648b6d787323367ebd6b0be57c116a7644f131492779023fd1a8708fd8711347247e199a0aee9783fe51b6d11ef76e33528
-EBUILD mingw64-runtime-5.0.2-r2.ebuild 2655 BLAKE2B 1b9cf748d095cc8c7d7683a07462b8c9ea8116418bd549a93d4392f8bfd61b60d70a50bf4d8102f7b271c56b86768f879a745140b29b7b7a2057feae85e44ce7 SHA512 38e16934a793b9c1fe05a4f611682fffbb336e509d49ada6c9bfacb97d55144815177986b892e9650e3842a47699229efc154ff842f4db034bf91f3e21c86b2b
-EBUILD mingw64-runtime-5.0.2.ebuild 2524 BLAKE2B f9ab5353a35a61bc2f41720825ae5329e7b8fdc81e96c8ebfa5bad6ea99e8b09fbf10c51344c69ff17b3f1892ae6ea2cf92def90d458a0523e86581f5ba6af32 SHA512 91d08c3b756d0ec758a02f3180d1f2f7392b7416e843b2645325469f125fdf6eeca9cf4b236930c6ebcdc595c97734c5c19854763e4051e00a3e272a272d916f
-EBUILD mingw64-runtime-5.0.3-r1.ebuild 2572 BLAKE2B 9caca29d8aa7fdf54d3437a3801d7640bac7e4c9becd805b311a7247103d8772b8cfcef553db1175ed7b4973bd6667a5f7715b2179b1e66a0e44f90d366e9fae SHA512 c7b33d49e829790eaddd9739c5077a036a68ec0beae3e9d0a39687870028fc4a757878d6be89900ba56ac08cedfd5e7f90f4c1a26591902332de2b0a23dbde9f
-EBUILD mingw64-runtime-5.0.3-r2.ebuild 2683 BLAKE2B 92ccdb40cc2ebdc49bc903da98384f82a5fd7836f990b861662bdfb338478339702831b1e13c46301fd2329f2718e22357af0edc56dee238a75ff938207975bb SHA512 67946916dcc13cbae20ed39e8d90ad0905fd3179f3aed454e41dc48d417db33db61e374bbe00764ab373972cfd88a405a296950f5e13a4c4e34c73cb7d22f85c
-EBUILD mingw64-runtime-5.0.3.ebuild 2497 BLAKE2B ba30e069818937c620dc436e4a3c8d9e9bc0838620c80372f8e30153c2f3903dbfda3e0c6d157e9cccd94241bc3da47dec7ba3b92a39808b85771fc58dc2636d SHA512 8cf13af35caf3ceb2fc8bafdb6e3f980a0d63bc7795ef8bf12e2b6195bf1bb6e8fe0c0c0b5af45350c3e4a83a14ac4d7b98f1e4f9bf3c6807a29533f6eb1947e
+DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
 EBUILD mingw64-runtime-5.0.4.ebuild 2597 BLAKE2B 500aecb0c6f8a8fe314c18937515438c730e25d6637d0b641d90cbbef8cb0764ffd690c7313c6cbade86bbf8bdf725f2bc075460a1e96987f9c6c043609f72da SHA512 cca85d0666b28bec6abcd4c4d40b89f9fb6c76077b10b8e8111b1fb6a96f78bc3877392c7f03f17a733e421bb242adcb8b2058af82136fc9c32c18b9fb7120b7
+EBUILD mingw64-runtime-6.0.0.ebuild 2564 BLAKE2B 5223ae19f8d1c6f08b27bbb2373d0fca2a9fac958b0fe98d7f7d5dad25a066ec02e1f3421ca800ad6c3a97b951531b09fe3648b39bcc6e3d0371c0e32ad4c465 SHA512 51261358421fca211c27bcfce201b585eea4a9448d1c749d580deb350f4fc3fb4d858712190faa23b50fdaa23c3300bcbf2fcc8c9522be85c9463f055418d1be
 MISC metadata.xml 544 BLAKE2B 5d2a688f8f644b6893efd4f7a2e756d336c569a6a51fc4a0b0df94623ef7f3e8fa317fe6c971f233883b424e1abeaaf03ef92d56434cfea6eab5bdd3798ad6d5 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
deleted file mode 100644
index 6461b98e5044..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 67434f57cbb5aba791e9ca973a86859e0736f829 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 21:31:10 +0300
-Subject: [PATCH 2/2] build: autoconf: enable multiple tools and libs
-
-this somewhat reduces the error checking, but makes code and usage nicer.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 55 ++++++++++++-------------------------------------------
- 1 file changed, 12 insertions(+), 43 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b1..1b59821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,32 +56,12 @@ AC_ARG_WITH([libraries],
-     [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
-   [],
-   [with_libraries=no])
--AS_CASE([$with_libraries],
--  [yes|all],[
--    with_libraries="libmangle,pseh,winpthreads"
--    with_libraries_winpthreads=yes
--    with_libraries_mangle=yes
--    with_libraries_pseh=yes],
--  [libmangle],[
--    with_libraries="libmangle"
--    with_libraries_winpthreads=no
--    with_libraries_mangle=yes
--    with_libraries_pseh=no],
--  [pseh],[
--    with_libraries="pseh"
--    with_libraries_winpthreads=no
--    with_libraries_mangle=no
--    with_libraries_pseh=yes],
--  [winpthreads],[
--    with_libraries="winpthreads"
--    with_libraries_winpthreads=yes
--    with_libraries_mangle=no
--    with_libraries_pseh=no],
--  [no],[
--    with_libraries_winpthreads=no
--    with_libraries_mangle=no
--    with_libraries_pseh=no],
--  [MW64_OPTION_ERROR([with-libraries])])
-+for l in winpthreads mangle pseh; do
-+  res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
-+  AS_CASE([$with_libraries],
-+    [all|yes],[res=yes])
-+    AS_VAR_COPY([with_libraries_$l], [res])
-+done
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
- AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
-@@ -96,23 +76,12 @@ AC_ARG_WITH([tools],
-     [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
-   [],
-   [with_tools=no])
--AS_CASE([$with_tools],
--  [yes|all],[
--    with_tools="gendef,genidl"
--    with_tools_gendef=yes
--    with_tools_genidl=yes],
--  [gendef],[
--    with_tools="gendef"
--    with_tools_gendef=yes
--    with_tools_genidl=no],
--  [genidl],[
--    with_tools="genidl"
--    with_tools_gendef=no
--    with_tools_genidl=yes],
--  [no],[
--    with_tools_gendef=no
--    with_tools_genidl=no],
--  [MW64_OPTION_ERROR([with-tools])])
-+for t in gendef genidl; do
-+  res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
-+  AS_CASE([$with_tools],
-+    [all|yes],[res=yes])
-+    AS_VAR_COPY([with_tools_$t], [res])
-+done
- AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
- AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
- AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
--- 
-2.3.6
-
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
deleted file mode 100644
index 0d3e59dc9dd5..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0adec5d0e1c65fc4ce4f84f3d4bb6738e923e1de Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 20:39:52 +0300
-Subject: [PATCH 1/2] build: autoconf: support winpthreads library
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile.am  |  6 +++++-
- configure.ac | 15 +++++++++++++--
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 26a7606..308b6fd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,6 +14,10 @@ if LIBRARIES_PSEH
-   MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
- endif
- 
-+if LIBRARIES_WINPTHREADS
-+  MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
-+endif
-+
- if TOOLS_GENDEF
-   MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
- endif
-@@ -22,7 +26,7 @@ if TOOLS_GENIDL
-   MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
- endif
- 
--SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
-+SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
- 
- DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
- 
-diff --git a/configure.ac b/configure.ac
-index 4bb3926..468d1b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
- AC_MSG_CHECKING([whether to build the optional libraries])
- AC_ARG_WITH([libraries],
-   [AS_HELP_STRING([--with-libraries=ARG],
--    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])],
-+    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
-   [],
-   [with_libraries=no])
- AS_CASE([$with_libraries],
-   [yes|all],[
--    with_libraries="libmangle,pseh"
-+    with_libraries="libmangle,pseh,winpthreads"
-+    with_libraries_winpthreads=yes
-     with_libraries_mangle=yes
-     with_libraries_pseh=yes],
-   [libmangle],[
-     with_libraries="libmangle"
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=yes
-     with_libraries_pseh=no],
-   [pseh],[
-     with_libraries="pseh"
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=no
-     with_libraries_pseh=yes],
-+  [winpthreads],[
-+    with_libraries="winpthreads"
-+    with_libraries_winpthreads=yes
-+    with_libraries_mangle=no
-+    with_libraries_pseh=no],
-   [no],[
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=no
-     with_libraries_pseh=no],
-   [MW64_OPTION_ERROR([with-libraries])])
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
-+AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
- AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
- AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
-+AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
- AC_MSG_RESULT([$with_libraries])
- 
- AC_MSG_CHECKING([whether to build the optional tools])
--- 
-2.3.6
-
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
deleted file mode 100644
index 859e00243d33..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..cefdd8cb 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -1031,13 +1031,16 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
--  case c_lb:
--  case c_2: sz++;
--  case c_retn: case c_retf:
--  case c_iret: case c_int3:
--  case c_ad: case c_op:
-+  case c_4: sz++; // fallthrough
-+  case c_3: sz++; // fallthrough
-+  case c_lb: // fallthrough
-+  case c_2: sz++; // fallthrough
-+  case c_retn: // fallthrough
-+  case c_retf: // fallthrough
-+  case c_iret: // fallthrough
-+  case c_int3: // fallthrough
-+  case c_ad: // fallthrough
-+  case c_op: // fallthrough
-   case c_1: *aCode=tb1; return sz;
-   case c_lv:
-     if (oper_mode) sz+=4;
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..6a37b1a0 100644
---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
-+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -203,7 +203,7 @@ pass_args (int argc, char **argv)
- 	  goto error_point;
- 	case 'h':
- 	  if (h[2] == 0)
--	    show_usage ();
-+	    show_usage (); // fallthrough
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
deleted file mode 100644
index a7a0a09dc162..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/mingw-w64-crt/lib32/msvcrt.def.in
-+++ b/mingw-w64-crt/lib32/msvcrt.def.in
-@@ -138,6 +138,7 @@ _copysign
- _cprintf
- _cputs
- _creat
-+_create_locale
- _cscanf
- _ctype DATA
- _cwait
-@@ -192,6 +193,7 @@ _fpieee_flt
- _fpreset DATA
- _fputchar
- _fputwchar
-+_free_locale
- _fsopen
- _fstat
- _fstat32 == _fstat
---- a/mingw-w64-crt/lib64/msvcrt.def.in
-+++ b/mingw-w64-crt/lib64/msvcrt.def.in
-@@ -240,6 +240,7 @@ _cprintf_p_l
- _cputs
- _cputws
- _creat
-+_create_locale
- _cscanf
- _cscanf_l
- _cscanf_s
-@@ -315,6 +316,7 @@ _fputchar
- _fputwchar
- _fscanf_l
- _fscanf_s_l
-+_free_locale
- _fsopen
- _fstat
- _fstat64
diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
deleted file mode 100644
index 624a492338e3..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb860ab6fba86f646bcd3bff6cadcc2bdd3c6964 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Nov 2017 21:58:10 +0200
-Subject: [PATCH] build: enable pseh only in x86
-
-pseh supports only x86, no point in enabling it when libraries are
-enabled. This enables downstream to enable libraries without failing.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b19..cfb07362 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,10 +58,14 @@ AC_ARG_WITH([libraries],
-   [with_libraries=no])
- AS_CASE([$with_libraries],
-   [yes|all],[
--    with_libraries="libmangle,pseh,winpthreads"
-+    with_libraries="libmangle,winpthreads"
-     with_libraries_winpthreads=yes
-     with_libraries_mangle=yes
--    with_libraries_pseh=yes],
-+    AS_CASE([$host_cpu],
-+      [i?86], [
-+        with_libraries="$with_libraries,pseh"
-+        with_libraries_pseh=yes
-+      ])],
-   [libmangle],[
-     with_libraries="libmangle"
-     with_libraries_winpthreads=no
--- 
-2.13.6
-
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
deleted file mode 100644
index 3bb7305cf0f7..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-winpthreads.patch"
-	epatch "${FILESDIR}/${P}-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	local extra_conf=()
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		"${extra_conf[@]}"
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
deleted file mode 100644
index f279453e0e46..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	local extra_conf=()
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		"${extra_conf[@]}"
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
deleted file mode 100644
index 2a6523281428..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
deleted file mode 100644
index d013a17c428a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
deleted file mode 100644
index 25df5eae738c..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-	"${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
deleted file mode 100644
index 5141174deb44..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-	"${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
-	"${FILESDIR}/${PN}-5.0.2-locale.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
deleted file mode 100644
index d013a17c428a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
deleted file mode 100644
index 68655a1ed3a5..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	is_crosscompile && use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix="${EPREFIX}"$(alt_prefix) \
-		--includedir="${EPREFIX}"$(alt_prefix)/usr/include \
-		--libdir="${EPREFIX}"$(alt_prefix)/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
deleted file mode 100644
index 225bba7d7322..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild
index e52536087f3e..47cd6c8a3d10 100644
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
+++ b/dev-util/mingw64-runtime/mingw64-runtime-6.0.0.ebuild
@@ -11,8 +11,6 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-WANT_AUTOMAKE="1.15"
-
 inherit autotools flag-o-matic eutils
 
 DESCRIPTION="Free Win64 runtime and import library definitions"
@@ -21,16 +19,12 @@ SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v$
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS=""
 IUSE="headers-only idl libraries tools"
 RESTRICT="strip"
 
 S="${WORKDIR}/mingw-w64-v${PV}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
 is_crosscompile() {
 	[[ ${CHOST} != ${CTARGET} ]]
 }
@@ -56,11 +50,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	default
-	eautoreconf
-}
-
 src_configure() {
 	CHOST=${CTARGET} strip-unsupported-flags
 
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index ac936b3ed81f..9747e3627f01 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -5,5 +5,5 @@ DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752ad
 EBUILD ninja-1.7.2.ebuild 2667 BLAKE2B c0bceb36d03edc78a846331ff9923d2ed6243b807db4a6af66892e25744cf2b09ae3479263b1b71891901a4a82500838600e0f9f72d6a6f6b02a276709d76303 SHA512 579c59e32df4104703b3bc703af7fa44fc8f800c874d2b817dcba646ecc461be5d94576efd6e2979f21e5778e5b2112c75963cf879b7f37180cee0613f1cf224
 EBUILD ninja-1.8.2-r1.ebuild 2731 BLAKE2B b4197d9c861712b1481da846bf949153071b8b5e136f6f2be60066fb0c08c90203faec1db2347704891ea9ac9a5a6d0fb74fd23ee220280c1980f4055e6f886c SHA512 822a0e3feefef7ef77ca471aeca77faa13b165da21bf1175c8329c0104361b36d062f151754c245aa4a565eeeadf858bd8371a133e0fc6eea3743e3bed99c85a
 EBUILD ninja-1.8.2.ebuild 2636 BLAKE2B acfea7108a4a6f83b80f67cd6508a38752fa3e482e78eb248aeb20fb0a7c60bae82baea3357d44a2bfe70c1e6c417289ffc477e274394e70fd9274868b637e30 SHA512 9e132040a4d3c39371c38e7533ec4d4718f013b2894f38162b80038284df72bcc8719571d5403311844736fd521dd38d943880fbf9760ab8d1ac1e3a514c0923
-EBUILD ninja-9999.ebuild 2630 BLAKE2B fc04da58337a300929fe2394beef0b18d2e2633f5c94e508e4f0b8cbaf3999713bbd59ecf2cc65a5ad0860f379b68744ddba5a5c26338c1d1fbd3d87c96247ab SHA512 bacf92b4d5d5c569866b6af4284094e1ac92144c426c029cf3b4959b1a5b8dac73f8f584e5f1313c05716df0d830f90dd6cc64edff9f75e0ee623f6c822ab6a1
+EBUILD ninja-9999.ebuild 2647 BLAKE2B 578d7226bb914c14ee269d249cfd72432f55190c7f31c260182c0fbafd408d5df2f639a24f84b75e3527747945412597b3d675c7191e7085519dd90461c09ff6 SHA512 9e11adf000ea2d8adca7387117a280d803b43cded0437a2056bba1ff61b8aae2580164f2cbe85d391eee1a8acf8ab697a70d888aa5435d586695d1c60f9439fd
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-9999.ebuild b/dev-util/ninja/ninja-9999.ebuild
index 73fb8e30509b..38f251adba32 100644
--- a/dev-util/ninja/ninja-9999.ebuild
+++ b/dev-util/ninja/ninja-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
 fi
 
 DESCRIPTION="A small build system similar to make"
@@ -23,7 +23,7 @@ SLOT="0"
 
 IUSE="doc emacs test vim-syntax zsh-completion"
 
-DEPEND="
+BDEPEND="
 	${PYTHON_DEPS}
 	dev-util/re2c
 	doc? (
@@ -64,7 +64,7 @@ src_compile() {
 
 	if tc-is-cross-compiler; then
 		mv ninja ninja-build || die
-		"${PYTHON}" configure.py || die
+		${EPYTHON} configure.py || die
 		./ninja-build -v ninja || die
 	else
 		ln ninja ninja-build || die
@@ -101,11 +101,11 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax/
-		doins misc/"${PN}".vim
+		doins misc/ninja.vim
 
-		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/${PN}.vim"
+		echo 'au BufNewFile,BufRead *.ninja set ft=ninja' > "${T}/ninja.vim"
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim"
+		doins "${T}/ninja.vim"
 	fi
 
 	if use zsh-completion; then
@@ -115,7 +115,7 @@ src_install() {
 
 	if use emacs; then
 		cd misc || die
-		elisp-install ${PN} ninja-mode.el* || die
+		elisp-install ninja ninja-mode.el* || die
 	fi
 }
 
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 2cb60f6cd237..c5957dc95da2 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-community-2018.2.1.tar.gz 260758803 BLAKE2B 735d3e7483b46a9be8bf0a8fa88a51352b1048718aab00b63c133a408666e151947ded527b4ed754ce15aff17a3da9396e10b9194e61286f0ed0534d51f0eabe SHA512 bcae7f579664aa9b071eef6fedc68dad8c9e36078c258cee6877ada1247f9051c4d542657ef2b01dce087e273623b84d86d786ddf1e922d7c6599725f50428bd
-EBUILD pycharm-community-2018.2.1.ebuild 1065 BLAKE2B 8cfea152ff94162e0ae06ae07fd4c2c9eccf8db137171fce459e79fceeebab72e42d2d6f7bf403fc1b5a2312208f67e72de550950f8a1a45430d4e10ad000b74 SHA512 ef3e04fef80f172a3173c53d1d82a760d0ce1aa14631b01717eb900492179727d8a7c4c94b1814aaf382dda908a11f99e367832c72859a731fa63671243296ca
+EBUILD pycharm-community-2018.2.1.ebuild 1063 BLAKE2B 72a3afd5b6cb81cc3dfc0bdf0fd7e1c052038ae3faf5e7ffed57884040b82cd238172291fc3ea050dab92348a29ebdbbdad75de6b2e4b512eee019b5bbffd093 SHA512 4bdb36f6a983323d44defe031f738953567df7a01f775e02b943336579727808c0ab832e49aa367daa6d26b28eb30edf5a4b110addd172b4e9d898bcc93713f1
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild b/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild
index c37c85ebc8eb..736ca5466e09 100644
--- a/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild
+++ b/dev-util/pycharm-community/pycharm-community-2018.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	 dev-python/pip"
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index 9fb2aae79bb1..b7997f8a4ecd 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,4 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
 DIST pycharm-professional-2018.2.1.tar.gz 343377232 BLAKE2B a8427902b4c7d1909e188130ab3688606ebc40b6eb8a633e9ccc36bf0a5cdd04772eb3cd0e7ba2cf77119f3efc9dfa8373c174db29b643bc9a350767524a4386 SHA512 3bb492932c5622771d39ebb66ee045e0affd2a16130f3a270af74bb75d8925bd3e29be5310f6003e5ff8a6f385b6376b9c77c7bf1e2b1e44c5671a04f86c8852
-EBUILD pycharm-professional-2018.2.1.ebuild 1209 BLAKE2B a0865f4184edbdec76451a2cc5078df72fec809af6ce933e1d41d6b2e99d9be3df11633f4553e9fa71f7e7b6ad87c37fd5bdb1cbf617f896d7eff9337be98a95 SHA512 6d7575cd6e83c452dd8c2de8a0b0f6cdb0e458e6dda8adf4280f4df23768c7306ab45c671783dd7a023ca4f8baf8035d95b8d51fe894e125e50c0067c417ce75
+EBUILD pycharm-professional-2018.2.1.ebuild 1207 BLAKE2B 73368944b29d8ecd98c1c3ca8df7eebc97b75fa4898df225af29d504e0d5a436ec26c8df2fa0bde4ff6d15e03126c70a1ed46ff28d3ebe8fd79aaa413a313bfa SHA512 77986b1bdcdb993d21c7d421c1c1d48291941eee3ea22a8c5a6f143b1eb03e9545dcc7be910335c6465703f56de9a785ba53d42b51fab2cb3f8a6dfc306e420b
 MISC metadata.xml 237 BLAKE2B f22c3926ba75c18fce7667217807f3710a315b12b1341622c949e7bc0056cd1cb403ea6c66d838675f3cb5dcd53d2fc4ec71425ec3f96aaffb94b70b73e99320 SHA512 ae2360aa6b1b00c67e0acea4935c02b64585b9a15e126fec9d5d99637021c542c0a495e5116205f3da287def46fa5b19cb1a7f3042c12c5f7a78d66d92fcb03f
diff --git a/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild
index 5dc7e67e051f..71fdc968f972 100644
--- a/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild
+++ b/dev-util/pycharm-professional/pycharm-professional-2018.2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
 
 LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND=">=virtual/jre-1.8
 	 dev-python/pip"
diff --git a/dev-util/spirv-headers/Manifest b/dev-util/spirv-headers/Manifest
index e70de086636c..f1b3f2d627c6 100644
--- a/dev-util/spirv-headers/Manifest
+++ b/dev-util/spirv-headers/Manifest
@@ -1,7 +1,9 @@
 AUX spirv-headers-Get-rid-of-custom-target.patch 765 BLAKE2B 83faa69afb1a9b60cd7166fdc9d80c207a8f086ac086ddef03c2697025215a1497d07dad28ac9cd7b9c269c4a8e74d684d10550b1f9858afafa3212a08261a52 SHA512 9386f1e5535df5eb1f30dbc053bf047a52f39b5a79c0a8c7c65add87128665e718a97b796f5ca8cdf1fcbeb51f713acb9d63d3ba7015619b20d15b7cddb48822
 DIST spirv-headers-1.3.1_pre20180710.tar.gz 281382 BLAKE2B 9e38c7779af97cae27c595f816d1e1cc99eb29e086dd4b6cb76cb4696f73f1e05f92f022b77639f5a80f517df75996fdbd10d7bb11cc6eccad8144a7b8b776d5 SHA512 5f0c174ea07dccefdd10242f5122e10b11f8975d2fb36f77975497050b10841fcb4a7f19d90c9ef5853a81dabc8d93b91621d07175a1cf3ab8ba7f6c16fe51fe
+DIST spirv-headers-1.3.4_pre20180917.tar.gz 283733 BLAKE2B 6bf0f5c00ae827f8a4b560dcbbe4c42d810cebefe0beecd3e7a022dc1f04bc2ed77f03ec2c0d0e6bf141ab1e4f058362f307c672cf92d83a8d1ceac2a200e659 SHA512 1fab471d07c9e85e75a3de08dccdd4ff7296ffd2cb265cb6cf7038e654c9d2afd8a2ee923eacfd2c47e02c5b139ab49271e489ce1b94f719b063be8910274598
 DIST spirv-headers-1.3.tar.gz 279415 BLAKE2B 77e36c02d072daa3aff7eceda53a5d6cd060564f494986a9a99c52d833330605e67c6f8ba2968d656b955f188da2c0bea18b11c834d11ed334f5c33eb14b4e9c SHA512 c612c4fcffefc3a277a9713712150c7e6b696eb676737b4968809784ef32c004820d9abd22389082203fc0853a87f920754b7c9b6b43d85131e750d09e267036
 EBUILD spirv-headers-1.3.1_pre20180710.ebuild 498 BLAKE2B 991fb177a5dfc150428d0dbaa50ef27a41aebbf445dc9aa9702b9976377f7ee40437999f1786561414c2b8c2a1436348cb1e82d7a6ae05bb371a35255a711af6 SHA512 e43a9fc792aff6fa5a1f07fff4c940d7829d31d80b3a9447a2da3e6a47157dd8d4777a51afbc8dd060c9b76e426fe4154cdf49d19e5a634935ac6ba7f6494d4f
+EBUILD spirv-headers-1.3.4_pre20180917.ebuild 498 BLAKE2B 9918b0e0640e0edcb016cd6dd34899755bdeca05b1c9c4204fe84629e85489be766825f98ddd13d09933989316d3a8f79b7ac211e9c963af336638f9880b37a5 SHA512 65e8b01c81795be8253e9302d7f34d3e3664672849e3c894b62ba2642a9896b922d09035a91ef083aeb18c1a659690fb2650b412bff2c3b8cd5609dc413ed2a3
 EBUILD spirv-headers-1.3.ebuild 562 BLAKE2B b304f69a8b7445e00fb41e162b84256601db218f3a7efd1ea1938d3ee39738a011de48d5fb099b5b8bbabf05cebab6248f3ac33064535da32520d321b8eab8a1 SHA512 0239f7a19a7b9040c33f9b1d4641f7c2fa866c2e5673da98ed20981a8b79b8af3c061c21c2e127a83a58367b2b487d0ad968352c93686df92d1a1c1c6aba8421
 EBUILD spirv-headers-9999.ebuild 358 BLAKE2B 0121eaa0ea8a1706435efeb1e29f81f471774582c4fe3879b3e2cc0e7e36ddaed830e37526660e976bab9710307e57454d460c8fcac1c4e8b19c91ceaffd00db SHA512 c7f16a3613efcd0c34208e7016696c87c7a6ee7761bf4c153e2ef3c0e8ffae98e4f044edc780b24c387eb8521703e2f9900d17c584b4078bd0e84bf119cd6de4
 MISC metadata.xml 431 BLAKE2B 2a03bfd5ff92d23da598ab731032790658e828cfc16c1bb1bcaed0e8e8aeba5d76ca97d5b52f5433bae5391e5f50d2d1028c49689114da7d4fc9703e40f964d6 SHA512 a770e25b42892a5062dc35739c6776d1e8baa22ee4ac9c745b0283fdb3322ae4f6549693045f9125b6a604f4f103c34e52bc069c11f47394373400c522a877c5
diff --git a/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
new file mode 100644
index 000000000000..9427682b1c40
--- /dev/null
+++ b/dev-util/spirv-headers/spirv-headers-1.3.4_pre20180917.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Machine-readable files for the SPIR-V Registry"
+HOMEPAGE="https://www.khronos.org/registry/spir-v/"
+EGIT_COMMIT="dcf23bdabacc3c54b83b1f9367e7a8adb27f8d87"
+SRC_URI="https://github.com/KhronosGroup/SPIRV-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/SPIRV-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index ab266c348632..511d7a65c4f7 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,6 @@
-DIST spirv-tools-2018.2.tar.gz 1039360 BLAKE2B bef1c3e4efa598bffad8f71c4a92cce9db98fd5699ab2f5616a7a4985c15da87f1e246391a2ca5e07affd352c6314896ff1599cdddc117b01655990f9c7b78f4 SHA512 6deed7a36b460135fd7db613b7101d53a87ae5d555f1795aa9a96ab14f437621d4667a41e5f5ae16e849f8e5d66e02611bed21e3110a902feac6c7f376eb5815
 DIST spirv-tools-2018.4.tar.gz 1327904 BLAKE2B 1ed01edf0dd5e8c3ac0d1a866d27f2e2ef377e9c082579291f8e755592ff3ea4f44a597e3e7694977500b9434889b0f741e03d566e777bb0f9af5e2e59374d61 SHA512 6b982efb30529e7f7776d7702f563bb4f874b9be3a7b0d838d77a15813f4177da99c152f40f11854fc3d60791ecf4026e006ff25a216bb44194dfd921c50920d
-EBUILD spirv-tools-2018.2-r1.ebuild 988 BLAKE2B cb11ebd8b27a3d0d287f0dd05e9f8f302b159e94f6c8e470d91a3e48249ca442f916387d95cf5fee72de97dde225ef65a07e04b1b6b862b27d92db7d95ce9d45 SHA512 9ffe6f70f02dc0d288f17f18cdea435487d98a4a2830cbd14640433b42bc638512c0566e12990dedeee0d5da359bca326d6e0e82751e3942fd1eba7252696cf1
+DIST spirv-tools-2018.5.tar.gz 1354299 BLAKE2B a2f74ac52cbcb3881009274c41cf8be48ae91d2d62d9e687d28719e65bb7cd5c0a5104a967e995fc5da066c1e6a278df4bf285fa9bf617660072bd0ee535b9bb SHA512 068a39e15111f24ad2a6b27e7ada786b3124b239aa8b13e187a4d512044db57a8e6a0fccadd0451155e1f57c96c8dec91a2338996c59fc883007cf7be07f2cad
 EBUILD spirv-tools-2018.4.ebuild 998 BLAKE2B 31de8c7235d648b5494b83160ce36aca43a1268f80de79dfafd8535f852db51bfb001f0b98aa879f8d747db0ac427d5e70e4193e2d7ff276d8a20054004050ff SHA512 017eee1ac06a0bd1a2e7655dc1a69ddb733007790c11b58b790f64e3b3d05459b507e7dbad6e9f0660c97bd1a6ba1bddf50e70e67afd86e610319b3c38c45226
-EBUILD spirv-tools-9999.ebuild 953 BLAKE2B dc661ce85207e845ffae6d6f335d6eb0fbab5099a869733aacfefbb132d5ce2c5f5b85c311d0a4fc7d3731e645d19b62700197b7b0fd428c80af27e625e69971 SHA512 85f7a7bb6de6d82dcb949cdac0a48ba8389844ce575e05821f750e2d504c61293206ea6c7d124c4d08fe5c20da9797cd53606d65f809481d20685718a9ba0c2e
+EBUILD spirv-tools-2018.5.ebuild 998 BLAKE2B d81e30dbc3f04a743833437f60d617343d7422b59b9ea52f652e02e9a889176508704630e84164d413c88a3d82aaaf4e7fb601f0206dcf5a5a2ddc041ee7adf5 SHA512 0b4683be044a495348b3040e7728874e14986f64278fe109f5500bb12dfbbaef03a4482ae59378346949968a9cf122ba22c72ff513e79a9bea6d51bf98d2778a
+EBUILD spirv-tools-9999.ebuild 953 BLAKE2B 25768a92be84719a8de0faedde634c1bddd263836db95eb037ac3d0683f4e8da79bb2604650e9d732e6d477a20cc5a05abff81284bc68286f933494fef8d247a SHA512 d86c4d153fb90eed2db08dcb1c86493e334b7905ac9b25a19bff434e92809269749c5e11874694ba6986f30aa941d3e1c46ff3b880972aa4178b46e1bb67b402
 MISC metadata.xml 429 BLAKE2B 84129eb27ea4a745c90ed7eab09723b41b45a696375c41458c45a6163dc00cd15d208d6858ea4fd92280e3ff3bb385f340ec3684c980a97ea5fd46fdc4c24001 SHA512 13b340b0e43ba726370f3b013759adab727fc37e251ec5777d10541976843e3e575be23ee015af83dd2e98a1917f4d2511467a38afd064cef025ab4700f005a6
diff --git a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
index 46aa033b73a0..23339df56f9a 100644
--- a/dev-util/spirv-tools/spirv-tools-2018.2-r1.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-2018.5.ebuild
@@ -17,12 +17,10 @@ KEYWORDS="~amd64 ~x86"
 RESTRICT="test"
 
 RDEPEND=""
-DEPEND="dev-util/spirv-headers"
-
+DEPEND=">=dev-util/spirv-headers-1.3.4_pre20180917"
+EGIT_COMMIT="b4cb01c7c451dd90e26174f6b94ba6a37c53d917"
 S="${WORKDIR}/SPIRV-Tools-${PV}"
 
-UPSTREAM_COMMIT="8d8a71278bf9e83dd0fb30d5474386d30870b74d"
-
 multilib_src_configure() {
 	local mycmakeargs=(
 		"-DSPIRV-Headers_SOURCE_DIR=/usr/"
@@ -33,7 +31,7 @@ multilib_src_configure() {
 
 multilib_src_install() {
 	default
-	echo "${UPSTREAM_COMMIT}" > "${PN}-commit.h" || die
+	echo "${EGIT_COMMIT}" > "${PN}-commit.h" || die
 	insinto /usr/include/"${PN}"
 	doins  "${PN}-commit.h"
 }
diff --git a/dev-util/spirv-tools/spirv-tools-9999.ebuild b/dev-util/spirv-tools/spirv-tools-9999.ebuild
index 029556876e65..593054a38eb9 100644
--- a/dev-util/spirv-tools/spirv-tools-9999.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-9999.ebuild
@@ -17,7 +17,7 @@ SLOT="0"
 RESTRICT="test"
 
 RDEPEND=""
-DEPEND=">=dev-util/spirv-headers-1.3.1_pre20180710"
+DEPEND=">=dev-util/spirv-headers-1.3.4_pre20180917"
 
 multilib_src_configure() {
 	local mycmakeargs=(
diff --git a/dev-util/vulkan-headers/Manifest b/dev-util/vulkan-headers/Manifest
index 371de401c985..71bd8a40edb2 100644
--- a/dev-util/vulkan-headers/Manifest
+++ b/dev-util/vulkan-headers/Manifest
@@ -1,6 +1,7 @@
 AUX vulkan-headers-1.1.77.0-r1-Remove-loader-layer-dep.patch 1337 BLAKE2B e649394daae60a399b2659f666ecb42aa2e6aa65b9eda372d052c6d27915a7e51b0d81d7bf1916dbab442a7ba7cd585a5fd828600cd466039f9c4a7df30d7dd8 SHA512 89c869de7a3ec1c9fe98095e67879c15f5d45337393f680812d8e55d26a970e04baa584b1dc18a5ff9b50f2d9780a7f76607f153d20cf1d5c4085035731a33e7
 DIST vulkan-headers-1.1.77.0.tar.gz 459383 BLAKE2B 4c08cb5264d2cae036e7a5c9260915186ba237067a003f69300ef550f1d944123223dce3c1084cf2e2a44f571b957928771e4d907e5714415841cda60dd5387d SHA512 097d6d532215751715c9ce0d97f4e7793318c5e37633754cda2f451201ef34121e14e99ecbf8d3281a417d1ece11f1065852ac5409d7b16a1370e27f065c3a78
+DIST vulkan-headers-1.1.82.0.tar.gz 472739 BLAKE2B 323635c02909e1713973787812ea94cf14e9d6bbb16359594e2ac3910bab1a8de383674157575ef82f7fe100d78fdfdf1b6e82d75bed5d63abc7d38af555a6ab SHA512 9236db6d3e5c24687ae4ee01237190e4594657e6c6f00b3e859dbf34f6bfccea37a4d56fa7112d3d982c4fdabc1967e96c0fbbd07cc835591e4f48f00518ddb7
 EBUILD vulkan-headers-1.1.77.0-r1.ebuild 798 BLAKE2B f9e8dd53cea3c090bd4fec3db52a74ef465890b67faec0c6cb949ca944a2a5a4c9551dbea3f9b5ddeda5c3047eef3a294c20e9c7150d0d63055f87f8388889f5 SHA512 8be8f391a31ce52ee5eb780972da4cec319e46c01b98ef5cc7e36d500945225c45cc433752f98e5289d0ee1809b0437ff40fbc9a80d25b372243a610a9c330be
-EBUILD vulkan-headers-1.1.77.0.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
+EBUILD vulkan-headers-1.1.82.0.ebuild 723 BLAKE2B 33252fa10738ff3e3f1c88c2078a442e8bd10d48113facc91c51dbea0e8b79c6348d82aa3dcaa557d3310ecaeab92469c3f5a2c033cce385db622a92d16fac68 SHA512 063f32f1dc417f6386f0f68d90e3e27d37f57268ed3d56b1ff1758fa7d6c8997c90d060b347dcc1649437b8f9b152969c33e19acf509ed88851339af40f730c9
 EBUILD vulkan-headers-9999.ebuild 723 BLAKE2B 6754a5857b67a4dacd6d90e356f47b3beecebab79b73a646d5aad3f5f9c02076cc58bde8bc42af9e9bc4d5049992f6bb755ceb56892bce8e248c60c5c3ccb3db SHA512 c21e42db4c3ee0e745c8ede00478ea319004899b44211ea0ed1e3e530aec30e290fb8f1b83b624fe5087f779813eaa612efc88c3893363812d9b24bb469265ba
 MISC metadata.xml 432 BLAKE2B e6c1f4f34e41862d3739bad772b910b21348dce97dbde38cc7fbc9cb42993a493881dd100a0c21be3615805f27d3987259233ae5830ef56e2d1dd928c285c09f SHA512 f4f93b16ad29f813a2c0397ec46c6decf7c9bdb3f4a376e1f24a29724c136feabd230d0558d37a502f2795f71c959833a662e6d2544a78704408b3be9be314fc
diff --git a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.ebuild b/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
index 0e2db9636138..08976482e5ea 100644
--- a/dev-util/vulkan-headers/vulkan-headers-1.1.77.0.ebuild
+++ b/dev-util/vulkan-headers/vulkan-headers-1.1.82.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-Headers.git"
 	inherit git-r3
 else
-	EGIT_COMMIT="b1577d5fbd5424c863710aa156aaafa77cae3de8"
+	EGIT_COMMIT="c4e056d365472174471a243dfefbfe66a03564af"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Headers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Headers-${EGIT_COMMIT}"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 79349c02400f..3e31361d7f1b 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -1,5 +1,6 @@
 DIST vulkan-tools-1.1.77.0.tar.gz 330131 BLAKE2B 3190c59745f6068fc00871f7c7c889ec2e429095d5090b0b02e1d3bbdd8613147febbbe4da3f1d48690a34577bff21bf5fd90bed77a621d0716e1b10dd9e8207 SHA512 e569e1d6da651a9f3c4669de0d4ebd301528036e283ea46049abdabca6b1b993f07e48643f91b29a38859a44770e55c8222058cf1f2a0dfd4838c37f801ba725
-EBUILD vulkan-tools-1.1.77.0-r1.ebuild 2419 BLAKE2B c9c634e4d3af512986c20b1c8e871c7f811f35b2fbb41244cb9bf52d57a16babfb07eebca75c281f54d95bad665df02c85baf2e0d9821c77e4571efeac7b5eef SHA512 e859d13744108b459b2e1434c57e2de8c0838e1eea46978f4afee607c3f9d601b49f0b09df27abcfce580ea08e19760b54f696d8299abef450b27c4d064e885d
+DIST vulkan-tools-1.1.82.0.tar.gz 342321 BLAKE2B 8591e7b16b59a1f839639642b652bcb040d9d1695a7e1cc3ccbc791703504647a517a6632db90bff9a21f7417d2219f2b7720ae1798795b31171e798b8d12ff5 SHA512 214cd30b03bf11310fe890bbcc082e515125a89591a225d113412bc41d302f8bc9a8598faaf8ca7acbd9c9ee3da43431564572e9495d966a13f90d277115d9c5
 EBUILD vulkan-tools-1.1.77.0-r2.ebuild 2668 BLAKE2B d3f677d402b723cdc7ccdda4d33500656a68c1fa83b8bef6a17e8ea2ebc78bc9aaca066beb3f03b756c365a9e791ea723753bd78702b34a6cb02f2792e6f3c46 SHA512 0ad2d536ce9d84a54d52722c8a82dac94d237c0df576e8aed3e2b7910bc226084c421b054806829436c0a6b5d4b4349a112c4e49390b9293be048661483d5b93
-EBUILD vulkan-tools-9999.ebuild 2800 BLAKE2B dc878a77db0055768c025df077d50988d0dc97766595e7e95108c22e1c1604effb7a8d2d56be6271a8ac60468fd2d5532ef8b0f6767901a2128d07d5bbb4500d SHA512 acd8008c137cfbc5a9398862739d6868ddc0079baffe77a605fdea532100e81892292e14c224bee3879a60de8f5d9e210feabad6a564176809b7a43ee4071798
+EBUILD vulkan-tools-1.1.82.0.ebuild 2668 BLAKE2B 92594bfe9057db8ff7c4fb1bcccaefc555b7ac4e056ffbfe52f135793b83d9629887374beb97fe59060259dfe552411198e450c782cf9b8e618406ec416ef79c SHA512 551425dfa25ff5d82364be1add58d45bd5d2aeeca43f69834aaf007205beae9755d93886ef96b5d5be55828c69cd43059792d1e04f22b851737d43a1cf4b2533
+EBUILD vulkan-tools-9999.ebuild 2668 BLAKE2B 92594bfe9057db8ff7c4fb1bcccaefc555b7ac4e056ffbfe52f135793b83d9629887374beb97fe59060259dfe552411198e450c782cf9b8e618406ec416ef79c SHA512 551425dfa25ff5d82364be1add58d45bd5d2aeeca43f69834aaf007205beae9755d93886ef96b5d5be55828c69cd43059792d1e04f22b851737d43a1cf4b2533
 MISC metadata.xml 562 BLAKE2B 0d3fae7aac348ecb5252688443f81be2cd97c5872c9b81cd11a730fc643d4e650132e318311c40b6448ce6dc22f27a4075a0d454e3dde8b05e16aeac4fd06329 SHA512 4e4b8dbb4ddefaf21606746c958b4054340897f5e8cafab65b2ee272b01c03ef642b1000fff33c8a046afb1eb82b2cd7400348b9b284ee0f1eea48e856eee854
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
index 6fa37cabcccd..338431363f27 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.1.77.0-r1.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.1.82.0.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
+	EGIT_COMMIT="2cfddd146d666efe0ed06ef1d2bc5565821df144"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -40,6 +40,23 @@ DEPEND="${PYTHON_DEPS}
 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/vulkancube
+			/usr/bin/vulkancubecpp
+		)
+	fi
+
+	python-any-r1_pkg_setup
+}
+
 multilib_src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=True
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index 3fce8b8e6862..338431363f27 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_SUBMODULES=()
 	inherit git-r3
 else
-	EGIT_COMMIT="384fff68c802a10b5d7f4f352a4bb43b3efe5f23"
+	EGIT_COMMIT="2cfddd146d666efe0ed06ef1d2bc5565821df144"
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/KhronosGroup/Vulkan-Tools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/Vulkan-Tools-${EGIT_COMMIT}"
@@ -40,27 +40,21 @@ DEPEND="${PYTHON_DEPS}
 REQUIRED_USE="|| ( X wayland )
 			  vulkaninfo? ( X )"
 
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/vulkancube
-	/usr/bin/vulkancubecpp
-	/usr/bin/vulkaninfo
-)
-
 pkg_setup() {
-	   MULTILIB_CHOST_TOOLS=()
+	MULTILIB_CHOST_TOOLS=()
 
-	   if use vulkaninfo; then
-			   MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
-	   fi
+	if use vulkaninfo; then
+		MULTILIB_CHOST_TOOLS+=( /usr/bin/vulkaninfo )
+	fi
 
-	   if use cube; then
-			   MULTILIB_CHOST_TOOLS+=(
-					   /usr/bin/vulkancube
-					   /usr/bin/vulkancubecpp
-			   )
-	   fi
+	if use cube; then
+		MULTILIB_CHOST_TOOLS+=(
+			/usr/bin/vulkancube
+			/usr/bin/vulkancubecpp
+		)
+	fi
 
-	   python-any-r1_pkg_setup
+	python-any-r1_pkg_setup
 }
 
 multilib_src_configure() {
author	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2018-09-21 18:00:10 +0100
commit	265dbe5dbc14c199299496c6db8fce3f76647015 (patch)
tree	ab18b5617d138f6684566b619405090989d55a2c /dev-util
parent	586819755b4dbfdffdc8a725ab7c0f86095b8489 (diff)