gentoo resync : 02.01.2018

21 files changed, 27 insertions, 421 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index ed3dc933303d..5253a612fb00 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/abi-compliance-checker/Manifest b/dev-util/abi-compliance-checker/Manifest
index 2e67099c4827..f66db46deac3 100644
--- a/dev-util/abi-compliance-checker/Manifest
+++ b/dev-util/abi-compliance-checker/Manifest
@@ -1,6 +1,4 @@
-DIST abi-compliance-checker-2.1.tar.gz 229447 BLAKE2B 4d286339d2b1b3d2ab265159f3092d6225da31083cf788b58c28614732ec2658b18376b1e8d5f8d1ad6f22101c4491fa0c813ee57e0a3fa5272fc134a99e22ad SHA512 1621a7862e775c8ffe60d2fca131b002fc8ec3b7370b50c9d6463b539d6b85f504cf2f56cf350d8928cd144ce821b05b37edd3a575d416d167cee237ed96df24
 DIST abi-compliance-checker-2.2.tar.gz 229812 BLAKE2B 8cbbaab1b4063a93a794a6d68acbf4d2c2356eb759b6d5dea2836173887937aca3e23cc3ea54b716a472a43e3e7841f749c2e15286cf5d12780577841b792685 SHA512 4bfdad1d708f2498187a0c06cbabced3c34a05b44900231d453a8dcea88df3f381a180aa2d4cbb4c3df14d0013660b355f630e890e3715c79ce8af3a385759e7
-EBUILD abi-compliance-checker-2.1.ebuild 622 BLAKE2B 210c126f4d2f04911ffea376d8db7d84a2df16496002918179b101e331099b7152db9a24827d46b324056d96500abaa1b24568eb72059e835764810d85e93b0d SHA512 49650e30c2078a5c7c128f92640991342af271acaf833de67bf887ba30e52e2e1d7f053a6ae7f3c018dc99d793102cb7973bfcb61c92b65f187d59cb39d29889
 EBUILD abi-compliance-checker-2.2.ebuild 622 BLAKE2B 210c126f4d2f04911ffea376d8db7d84a2df16496002918179b101e331099b7152db9a24827d46b324056d96500abaa1b24568eb72059e835764810d85e93b0d SHA512 49650e30c2078a5c7c128f92640991342af271acaf833de67bf887ba30e52e2e1d7f053a6ae7f3c018dc99d793102cb7973bfcb61c92b65f187d59cb39d29889
 EBUILD abi-compliance-checker-9999.ebuild 740 BLAKE2B 7a571efbee6057fcc147a3f5dce36452480c13f02e75a6bbd47077489763b4dd445f22e1b186050fbae604a2f50b4c1830009c202981289c093d2ef21b152c6d SHA512 0d7b959e935298a67596b38bffe8ebd03698f7bd823767e43769182bbf6f1b6a530a61d569ef49d1a1990edc688d05ed76c7d635b280d9da587de4db302d574a
 MISC metadata.xml 445 BLAKE2B 4a2c82729f916f7ae374040aa2e4008d45b0623fde7ffd41dbf54906690115441feb930695ee39c01cf3dd440d385414618781aa6a0d8a6e1e7a4256b668649e SHA512 a71d08620d61505c7cf7c6b56503c9275795980c97a1c4897bc20455674c60bd6b09bb5002a5faa0360be992fc775152c95b2a3366966cd7e636103e480d9dd2
diff --git a/dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild b/dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild
deleted file mode 100644
index 1057874dcfaa..000000000000
--- a/dev-util/abi-compliance-checker/abi-compliance-checker-2.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A tool for checking backward compatibility of a C/C++ library"
-HOMEPAGE="http://ispras.linuxbase.org/index.php/ABI_compliance_checker"
-SRC_URI="https://github.com/lvc/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-util/abi-dumper
-	dev-util/ctags"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl --install --prefix="${EPREFIX}"/usr --destdir="${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-dumper/Manifest b/dev-util/abi-dumper/Manifest
index a0734dd3ddf4..aa3292abca2f 100644
--- a/dev-util/abi-dumper/Manifest
+++ b/dev-util/abi-dumper/Manifest
@@ -1,7 +1,3 @@
-DIST abi-dumper-0.99.15.tar.gz 40265 BLAKE2B f890ede6fff57ba69155aa8d44021789730c40fa446d533e015e0d88f334388a8c76fa622a67da609a153da13c34833aaf725ed3acb92b5ed9b845f1804993d1 SHA512 695462c8972e7f5abcf3415652ef6bb52d9770ae5fc21aceb44b0eaadc087f23d6c1cd92d6e29961141cfa863b0bad7944cee826df2aa8c83f3be7e42d098e61
-DIST abi-dumper-0.99.19.tar.gz 44380 BLAKE2B 2fb98ae3e7d41afc0bf9a3a949cc9c26d0920caf3e6e715b73f68c710c39964e6935e03e03a7d2cca93e7696a666a1bd6ee8f7903f7f620f8818aceca0b99817 SHA512 4afbaf1b15e61d67f25849ace34074fb21f09165cef04f2a554c8d0c6930912cd890384ce3949f6aeee60cddf6b100b5bbc34f8b21f1e5d611fb31c06849040b
 DIST abi-dumper-1.1.tar.gz 49012 BLAKE2B ec86c073bccef5022376acf10b7e0b13d34bac8394277ae53c5ea9b981c4008c5895d3137e3ca0a5cfd64f2d2425cb13a0912f6dada048adfa290dd144ab58ed SHA512 28b791de74dafd0b3d78314c1c722d03bfeb0daa5cb702def9268e4c64f49c79b4fd92d4adf89a20f79c745ef70bc18d2b1143fbe0c7ad192b2f64cb1551b371
-EBUILD abi-dumper-0.99.15.ebuild 587 BLAKE2B 904f7e7f433a83a182470755698b5304c5e4a95762c941a6d47575f33f570ed49cacf92991b1250decaa9f1d816fe395ff52e70f78504dbb06504f1c1281e2f9 SHA512 50824fb0bb6af19507c262a3374208bd1068ce1ada7b555e0e2ac20319ed3363667f42a63ecae6ee693935d605e9f3975708db87858e08c2865ef7bc28369b72
-EBUILD abi-dumper-0.99.19.ebuild 587 BLAKE2B 904f7e7f433a83a182470755698b5304c5e4a95762c941a6d47575f33f570ed49cacf92991b1250decaa9f1d816fe395ff52e70f78504dbb06504f1c1281e2f9 SHA512 50824fb0bb6af19507c262a3374208bd1068ce1ada7b555e0e2ac20319ed3363667f42a63ecae6ee693935d605e9f3975708db87858e08c2865ef7bc28369b72
 EBUILD abi-dumper-1.1.ebuild 587 BLAKE2B b3362c46859c331740304089106e36b1ee8cbabc0874febf7a524ab5c0e7d7dc80633d971dcc5a5c2da59a3a933b92593d5e56e2f201e1fc4ac6bf7513d892df SHA512 d9b0ed3d94f6bba83e949e4e3ee309d544d53efe58666e69b37286f879201ed6d2f00e62ac7d8994c711571c6a65a3e02115066a8edcecefdc14fa8dd07ce873
 MISC metadata.xml 433 BLAKE2B df4920a06673222e81e4142dbfe44e7aaf8cef4793ee72d512f6cc28dd02df6c8e280b722860ed5ccd3e1bf96a26190ab8be81ae76c305190c5b5e053abe1d0e SHA512 1d2b626dd625e2469efe07130c1ccb1d3727f61226a7759d8a9c4eb942c37f992bc8d7bddcb54869b4316af8442c92ff56b76981fcd7bb779920e8da4bb1116a
diff --git a/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild b/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
deleted file mode 100644
index 1a4ff5dc50af..000000000000
--- a/dev-util/abi-dumper/abi-dumper-0.99.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
-HOMEPAGE="https://github.com/lvc/abi-dumper"
-SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-libs/elfutils
-	dev-util/vtable-dumper"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild b/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
deleted file mode 100644
index 1a4ff5dc50af..000000000000
--- a/dev-util/abi-dumper/abi-dumper-0.99.19.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Dump ABI of an ELF object containing DWARF debug info"
-HOMEPAGE="https://github.com/lvc/abi-dumper"
-SRC_URI="https://github.com/lvc/abi-dumper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-libs/elfutils
-	dev-util/vtable-dumper"
-
-src_compile() {
-	:
-}
-
-src_install() {
-	dodir /usr
-	perl Makefile.pl -install -prefix "${EPREFIX}/usr" -destdir "${D}" || die
-	einstalldocs
-}
diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest
index 0bd99830ee44..d9dbd00eb749 100644
--- a/dev-util/bcc/Manifest
+++ b/dev-util/bcc/Manifest
@@ -1,7 +1,5 @@
-DIST bcc-0.3.0_p20170913.tar.gz 1736513 BLAKE2B 1ed234f3c74e3cc9f47a26f97a8e296499eecc30442a59a3da7b4a5bdb0d628033f01c9ba038a0f2c2de13dd381a627590d387d0c77361e82c10e0a4f5d145b2 SHA512 8298d98fcadc95a2f5f27e1f656f392634c0940cf6ea03f432135477790e770f58dc3e3e0b434391eff8d4e3df6671c250252a29a7344c6adf7606251daef4dd
-DIST bcc-0.4.0.tar.gz 1752520 BLAKE2B 3fdaafebc0ceadbdc5ab2ce0fc7e154ebe0242adb1fec912f517cbf14065a0e79d21794b47a82c4b29c8a618882f75b0d22a29799387c7c250ec54ac7ec5f89e SHA512 d4bca6ab30ed2d398685a5e142bc55ebd70d29b494ce9fa28d85aceb1843111de8f1c61049712d8be9ab827b65866db07b6be27e82bd243e182b7bbe6fb2014f
 DIST bcc-0.5.0.tar.gz 1764775 BLAKE2B e1e059b83846115347f225e968edd2823408c26f4f25a89e26c663147ca9c379222c4f1d97578f7cf981fbbb23307deab408bcb278cb26fde5399afbbceb1e39 SHA512 12de5ef04185dccd0847fc97ae855b386e0c81b545ae497af797667925ebedf97164c17fb99468abae3f87fb3ddfdba5200070f80b3bbcad63c2355497012f0e
-EBUILD bcc-0.3.0_p20170913.ebuild 1128 BLAKE2B 4a22ee3ba191a54a7b958e689100576c3bbfe788e8d261fbfe764388280e70fe3a4cf44ea6cb33b174376329788ff7649b6bbd647c47dfb0269a00b179a34617 SHA512 3d76907e1322f352b52b4152854ab5d6401a8a23431766ab1238483c5835d5085647cdcfd3507d33eff1d6397f641cdb9666901a0bfa974d9af264f0a4c62a8b
-EBUILD bcc-0.4.0.ebuild 1094 BLAKE2B fd1c7b5e5fc687b69dbd94c4402ffc810d9296b935cf04acaea509570c059ab072b9260614308fd7430b5912e0b2d369a823b806e5fcce0a2dd0050f4ed3a838 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a
+DIST bcc-0.5.0_p20171230.tar.gz 1773522 BLAKE2B bc5ec32570cf230f071c10d2925a8c8a777c60c22d31bbf72f3cad1718e59dacd604e45a326ff2a941aa519a2b3544bc7376dd40ceafe154c497b488e0ec1b9b SHA512 d8e810768b5801c0beef98a13ee23eb8aa756f7f8a3e35f6a391958e30affc5a8622a9b75c785f66d86761105045cb2b1c7ce284f3ac3b482a4605987bea9f30
 EBUILD bcc-0.5.0.ebuild 1094 BLAKE2B fd1c7b5e5fc687b69dbd94c4402ffc810d9296b935cf04acaea509570c059ab072b9260614308fd7430b5912e0b2d369a823b806e5fcce0a2dd0050f4ed3a838 SHA512 c670c31428c55d670c7a2af790e10c143fbc02fc2d6a60056018e89d1fcea7d1bac35d855e4bbef6a8961ab2852e1b6e7823ec249d25dc3be711a7dea3b5888a
+EBUILD bcc-0.5.0_p20171230.ebuild 1128 BLAKE2B 2b43727b4b2008ef6e3480f5cc2b94a3ec8947ab23bd14c0ae67a9c6a9877300b451950aec402f0a5dc593610b909f7c831bc1994947c5d0ac5313cfb7671c2a SHA512 c50cd6a6bd11d05636c47621ce154af4ec2ef146b509fd772e717eac506744ecf7c93a3a827825eff92100647affe3320af48b77828462a21e062da3afd37090
 MISC metadata.xml 302 BLAKE2B 1c06a0a2737ee7f574578ffa657d131a6c296e7f21dbf79f77f47f77814779b82fa6d2d7e21aa6700e11ce3c11daec48595db4a82d06e11eddeaacd377cf8fe4 SHA512 56eecad64a95bef18df26d32d87911e46c8222079387c946b086c38be9b22ec07dbd715344f373ca486758dadf65d84f1ec289af065f964adcff8b2e8906b6ad
diff --git a/dev-util/bcc/bcc-0.3.0_p20170913.ebuild b/dev-util/bcc/bcc-0.3.0_p20170913.ebuild
deleted file mode 100644
index 1aaafa79153e..000000000000
--- a/dev-util/bcc/bcc-0.3.0_p20170913.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit cmake-utils linux-info python-single-r1 python-utils-r1
-
-DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
-HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="488c119ee7aa7598c11be876acd6761342874e68"
-SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-RESTRICT="test"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND=">=dev-libs/elfutils-0.166:=
-	sys-devel/clang:=
-	>=sys-devel/llvm-3.7:=[llvm_targets_BPF(+)]
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}"
-S=${WORKDIR}/${PN}-${EGIT_COMMIT#v}
-
-pkg_pretend() {
-	local CONFIG_CHECK="~BPF ~BPF_SYSCALL ~NET_CLS_BPF ~NET_ACT_BPF
-		~BPF_JIT ~BPF_EVENTS"
-
-	check_extra_config
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DREVISION=${PV%%_*}
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	python_fix_shebang "${ED}"
-}
diff --git a/dev-util/bcc/bcc-0.4.0.ebuild b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
index 0e8e32826953..5062f45dfd85 100644
--- a/dev-util/bcc/bcc-0.4.0.ebuild
+++ b/dev-util/bcc/bcc-0.5.0_p20171230.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit cmake-utils linux-info python-single-r1 python-utils-r1
 
 DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more"
 HOMEPAGE="https://iovisor.github.io/bcc/"
-EGIT_COMMIT="v${PV}"
+EGIT_COMMIT="82ef5a0d999b687d26059e5adfdaac3e605f2339"
 SRC_URI="https://github.com/iovisor/bcc/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 RESTRICT="test"
 
diff --git a/dev-util/docker-ls/Manifest b/dev-util/docker-ls/Manifest
index 9ded2e244c8c..e38f0059d313 100644
--- a/dev-util/docker-ls/Manifest
+++ b/dev-util/docker-ls/Manifest
@@ -1,7 +1,3 @@
-DIST docker-ls-0.2.1_p20161102.tar.gz 20313 BLAKE2B 5dd9fa07934327851d60accac653ab05353c2d919811e7d7b2efe740b1e31915bf76659af6f96c76ff41c73e98adf5d70d67aaa6f1cfa8a1431266e8efc90fba SHA512 fd44fcb21db696e9565b8e4e84ef4aaeee7d1101fc0e1f2978a452cc8ec8016fce47508afe201b7096f06066b030eedd9d78c8d3408ca82d2e96431661857e3f
 DIST docker-ls-0.3.1.tar.gz 7308660 BLAKE2B eaedd07cef81da01c2d0c629867f5c3841900f839cecc9049c81b11bbbcb864ff4e8048068688832660961221b499710db45cbe417f326ec019f473dff0d6a4a SHA512 8ae831222e03b7dcb90121c2e6dea7bdc442418aa6dcc3905db82f6fd1ceb78a048d6fc2a2ef9bf0dea21a6e9d601ad77e25c077de7632057994f614d484fb99
-DIST github.com-go-yaml-yaml-a3f3340b5840cee44f372bddb5880fcbc419b46a.tar.gz 60814 BLAKE2B a77b7d72e2937af71a0734c21bee7a1d7770157c27f1ddfa164c66fd5461f86a2ef46e002087092ef011caae572838bcc9537a8290cd54dfafb7f54423e47c48 SHA512 184a0e658a4eac3b867533cd0e494bd84db94fbe10e8df0d0b755c7ffc95bc99e2f84c0157183ca74cdc79289a85dcf7f1dea8a4c89a253565baf473b3627eae
-DIST github.com-golang-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz 1317212 BLAKE2B 00078092ba94d76ef3111401707de65c254ad13a2737b63d00b123aee9020acc83d016781e65bab4dc23a5697898498e744f0c2f6bd58c0e6f73b47af4b1c9e5 SHA512 163ca4b00188133d5c4d82dd685deaf2b889ae76b97021697d96dd8f11675a57361352e204d774a6fb7941f45dc8027ddb324abf0a4799ed19c3052181536992
-EBUILD docker-ls-0.2.1_p20161102.ebuild 1170 BLAKE2B ce06a50d5c034aecef7d93f6f0827c66d6bfb3247cb179cffd3e9c1aa70124ffc942d5d01b5eb806171341447feaea0d2b2263e7daa02fe1f9cfc4156040b8b4 SHA512 2408f1dd3b151ca426d4d7471dbb3a27e9818d265b51bc88fb101a62dffd6a65d10701816117a93bdf8f3cca8b9f4d5a8bcce5efbd7cc8e99e02adc337b43a9b
 EBUILD docker-ls-0.3.1.ebuild 1347 BLAKE2B 0f3795a9d68db30770000123e0bcfd24f695eea8642ee69ceed114636f1eb41befeab3916f41f7672f5f5eeb5f20b11b41240e7172c7faa87cbbe5290c899d39 SHA512 dc20c433d8696b0b111630d0bce4a976f841b116d06d89fef96e543ec5faf86ad5af3ee523f4592071c28ca8ada0efe540445501cfc5f5279aa7e6bb15907fea
 MISC metadata.xml 323 BLAKE2B 509388c3e74b1791db2db40b4386f905d811ed9a8e8b4ec374e78a7479e67b0f0b3c39c56d5070e9eee0070ef86c9dcef71c6668cacca6603416bf0792fb03de SHA512 bf430f00f6338c4790ca536314d722968a2325a46714212c122ac4ad56c401acc88bb593a19c4df4042d4477a9607c73af06e7d1d26fefbfaeeabbccbaeec14f
diff --git a/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild b/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
deleted file mode 100644
index 127c5f1c57e2..000000000000
--- a/dev-util/docker-ls/docker-ls-0.2.1_p20161102.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/mayflower/${PN}/..."
-EGIT_COMMIT="3c5e2decd5c6717d4f375a2588179758d62bb591"
-EGO_VENDOR=( "gopkg.in/yaml.v2 a3f3340b5840cee44f372bddb5880fcbc419b46a github.com/go-yaml/yaml"
-	"golang.org/x/crypto 728b753d0135da6801d45a38e6f43ff55779c5c2 github.com/golang/crypto" )
-
-inherit golang-build golang-vcs-snapshot
-
-ARCHIVE_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Tools for browsing and manipulating docker registries"
-HOMEPAGE="https://github.com/mayflower/docker-ls"
-SRC_URI="${ARCHIVE_URI}
-	${EGO_VENDOR_URI}"
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/\"git\", \"rev-parse\", \"--short\", \"HEAD\"/\"echo\", \"${EGIT_COMMIT:0:8}\"/"\
-	src/${EGO_PN%/*}/generators/version.go || die
-}
-
-src_compile() {
-	pushd src || die
-	GOPATH="${WORKDIR}/${P}" go generate ${EGO_PN} || die
-	GOPATH="${WORKDIR}/${P}" go install ${EGO_PN%/*}/cli/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc src/${EGO_PN%/*}/{README,CHANGELOG}.md
-}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index 3e47b5b6229e..8cfafaeefdcf 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,22 +1,13 @@
-AUX scons-2.1.0-jython.patch 427 BLAKE2B f2ea3445ee54bac5b9867a8bc3491cb96f29a8f0bc0e1d61f7e5e6df43409f48e660745fc853a72f1c5d42e4603a5b7a32024932ff369d477eb654961d5689f6 SHA512 5ffe6ee08e2dbf7dfb92e67a2b4ac75a5566a34680dbe86eae749c67709e8ddf585ddbd4549c0151c022567f171240c329cc546ce3d0bfb76efd2c8bd6f185e1
-DIST scons-2.3.5-user.html 1280097 BLAKE2B 8739b670a9d1f8351b6c7435adb8016af52f5b802942161b18ae217478dddc778d624c59aeef08b948a3a1cd46afaa1765020bf8f3aadd26696c649c46f878f9 SHA512 e2c80beacd03f4071e33f8084e499e54c8529e68ec02b972d0d0944b6e096437fd70f59339ebba652cc5539475e1b4eb8b80e4a3d188413ca5181af9ae5b70d3
-DIST scons-2.3.5-user.pdf 2505997 BLAKE2B 4df89d653fe0dff18676fd0ead12c994bf90aa5c3b450b97dbb156c00a14175f7df0cd11208e6de2ef8a9b6a5f7324bbcd0ee484b84545432925ba3c3a44c058 SHA512 137ab2d3b1cab6821f2d8a8fde33406e2a7d46a4c26eec9de1073d3c03f49e1d485ae7884ed3cd2e41a0e3d2ef457e103d782dc1deb01a280c48e4f5e7e68f1e
-DIST scons-2.3.5.tar.gz 631619 BLAKE2B 4725c274b53751dcbd6bc20b05798565fca9401755a1f40b6dced512ee34a6cd21d796b55a4c8ae22c9521f7d80688e16e3d5d921e1bd8921fbd3c6cc95529a3 SHA512 aad0213d70c06b02d647a4de4a4fdcd9970e7bda6f3ba0b33e9ba05677af617302b3a557e7cb13560c9057c3b11fbc27cf5e8e7511297058ad9599a04c8381a3
 DIST scons-2.4.1-user.html 1110981 BLAKE2B 3c2c7c3bb283e18e63b5dfe64928c2821ceb74ac6d5f4c4fc08f0ceb98ef25f6114308d02d65be0ee8231e367556bdce0f76f1f37bb9d3c1ab813a653fda2f54 SHA512 e73caa3daedb5da419a417dbec73a3958da162311e9ad09a7d5e9d6989686b24cf5c1b34fdb1d547a43de1da36e99566e6c367fde05af032a2d1000a7e12270c
 DIST scons-2.4.1-user.pdf 2527773 BLAKE2B 16c9a90fd57af7552f8d05fcf018ed99b76d29c148169dee4fd610aa40e439448f5a7a6e8ba8d72830a605a26141927f5dcd1643f99a1bfe9433d87350e96569 SHA512 d53d41e51096d1923e168054d335da1498e9ca338e39aef7985967f839656d368b65a8b979dac701ca1c529deeff4a79f402f058d23ef4e658f849ce0784eb45
 DIST scons-2.4.1.tar.gz 638990 BLAKE2B 44084dd396d8cbe63da59aed706cda7342bbe51dd4f78bd324ad6ce822ae45b9da1099400e1dfeafdb2e4e8f1906e88be423598cc2c2915a1544f37285b31297 SHA512 bd0830719dfc0c2e8620ec767ee6342af74a170cd895acda2995761eafe52e1efa9471626fcaedb0dd9a779ef9bb9b4306bd6cd3c2a5bd7bd2500018b40653e0
-DIST scons-2.5.0-user.html 1111090 BLAKE2B 80a4c7230861a52678610df382f31f6d03a2c6b3ff016921b971b52a9960e2e57c922f3b0afdb4a20429cf1f6056f8de4a1727ac97b41f7196a99ccb5573aa46 SHA512 650be28d9be4322b51d31c001ffce339aa926dd3aa2b59c4e16e34151c26f0aa62f9d7a7407d0bcf1ae0e5f10e2e31a5adb66a7a189afac084101c6b0dc209e4
-DIST scons-2.5.0-user.pdf 2527810 BLAKE2B 1f94dde46c828f3e1ac44f90c78dc95ed7aa644393c9def5d3f1f009c6fa8b445685cdf07d91b2b9b81978a39d5ef77bd6a121966c37a699f2efd6f4587412b0 SHA512 f8572db6d2fb4e6c4814d785fcde0a2c0bbe647265bf8b8904c315cf46af60636f273843d757f630b9a70f33762cca7010c4dc475143be670ee1c008e6be9155
-DIST scons-2.5.0.tar.gz 619991 BLAKE2B 3bbf5b1411bdacbad821076ebff859f229589f62f771d1e4e6f4010c539ac9c863f6705b8be36c3e63a64e3a5fe325450787754e39adedd728987de6f7073d1e SHA512 abb0069976390182b77dbf6f20819c30ccf5fe9f58032eef7694ef408dceb63cfd1d1be69e7c0bced8a179297243b1a93924dd5064cd7c123ea118619bb53572
 DIST scons-2.5.1-user.html 1112180 BLAKE2B 93df42b296d1be6ffcb73143c5ec9f46225e3e9d07154cf8f703d5f624d2996d85569ff302093a7a73dc0001cfeddf49ee9e57d9a1939d3c6b4689f8773e3ede SHA512 5be58a6bba4b92fc51f0b271fd7e08b820dda10775aaa40a012c0e54d485e02ebf6d0d0be379bd90980a9b496e86a951c8760a4a90107fb3b8f422e874e46046
 DIST scons-2.5.1-user.pdf 2522755 BLAKE2B 0dbf4ec98cd1dfb4889595762fdf57c2988a6784d75f8c3ac53e79d686b745ae4dd7b674ce34d61255c798e203fb6de93eaaf936a4842b27990350fa73b6bd46 SHA512 0bd7f67a1355ec33125bef87ce1bc352bda5b0befd9809673a427851c843191d74930b4ca9add705152393521f81d926595d173b0101013da216217dc5b64397
 DIST scons-2.5.1.tar.gz 620909 BLAKE2B 021e02583dab06a859e46d164be79dcaa49a1a383c5d3fb9baa64afabb793e049b7ebefff1bbbcc8be1f364ca5c64e1a9c7ef937c32407853e39f4d84a91e51d SHA512 0e39f7f22a6c4ecc13edcd843b050754da5ded5371b3a8b406395f7b53dd280f95f804707eec271f8de3624d06f5b4ba3cc788dc4eb891cad224a163544f51b9
 DIST scons-3.0.0-user.html 1111001 BLAKE2B 99a4994b161522535386ea7c0b60755653e782fb67eb725336f5afd3101efcece3036e729c1282f6006c1e291544641a4e2d4f1887fd1ed2378be424bd9a6ca4 SHA512 fb03770d2ca37d33acafa79a76db2fe5378b16f7717bcbf2c80bb8f8244678bf4418ba2cf8631bd5abfb782af2e22e00a77e889cf4f9a69fa1c49d7dc690d5b6
 DIST scons-3.0.0-user.pdf 2376928 BLAKE2B fed5b4b43f4ce387f6ed0a7ca9017e087ba9bd341bcf02e93c223f4fe1e60935b70dcee73e048e206ccc663bd9413231e05266656623c32d97536116e1a5db88 SHA512 826653a8d6700b8faab6e22451fbf0839b2d639db1492334fbcec39f224d19b2d076f49d6cb167c085e8285e4b7022329042d805066922c2edb20db3322816a4
 DIST scons-3.0.0.tar.gz 630418 BLAKE2B c700ebf316932993540c52735af5ae9a2044a35cf2a1c7324d213059f16e0cd45370432fa32b96fd2e4f328add97ff8d608f73da85ae0b952fd97ba0a727b876 SHA512 e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
-EBUILD scons-2.3.5.ebuild 1728 BLAKE2B f66dc2ad04cc529027804e9a80399df6a18bb09fb6d269389522b9d41ae138941b5f6c3c5de9b5f68e370f866f2ee0754fe084fc8b903e424b3a333942e5cc1b SHA512 e1a645980bb9e096c558a0f3925f7019ddfb6823792e81bffc632a76e45b6724866ded80502ef806a921bdc99661b3ad6f2c1809823300b7b897662cb0b975c3
 EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a464031395dd72e8f1311b703a398d9abb56eae9a67d4654529ec2fe06b8465f00fe83c442e251875dc53317 SHA512 69f7b513981e51bf547aad20f31af7ee98b77bb11bc10257499f92ea32d4a664cf83d77cabea81a56b068f2c18a40503567611e7ba78b987d4c6de1d52648b90
-EBUILD scons-2.5.0.ebuild 1713 BLAKE2B 39a4a520b0c9b8c06abe1570d6036bd25891a901b4e72c605f7ea2fba9b6bf352405a5fbae31a19d51019ed67ed330f5549f11950467d7e3a11f65b642742687 SHA512 223a1b338295c4e1aecfe8765344ba026367ba0d2cacfb269c40a9cf880baba1cd51932c93ee70b78d3666dce97c9047fb49df0c55f74de1525b46356aadeddd
 EBUILD scons-2.5.1.ebuild 1725 BLAKE2B 30886b9cc82f13a772e1308680dc2e2cfa419a0fd24ac35610dcac89afcaf7cceb91e5c9af0103e9bf9d6e899af7c6855c5e7abc0f027ed962509a5f022503f8 SHA512 a5fa3ee3607112a4985b60c1b8cba91430b46770d5bc9161b344a697bb02af5d7d109c16e268a716eba80098a0743816b6afa6abd1f38fc17736f726c14f26e3
 EBUILD scons-3.0.0.ebuild 1745 BLAKE2B d70c095a6dc1b176b838d2f2b837f8c2ae10f91effaa66695161d2c5b318b5f7e9787cd692b8e3f382c9a1f9e44aa53e5ba1f058075be94fa9bfb513eb11d031 SHA512 f9431d9fde567661f8e3e3d101cda45be797ee2f24276c7d3b91a47bee6bf15222bfc61b213e56ac27ad18ad0038188b583f167aa85c626cc92e21fe0c593970
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-2.1.0-jython.patch b/dev-util/scons/files/scons-2.1.0-jython.patch
deleted file mode 100644
index ca04e12031e1..000000000000
--- a/dev-util/scons/files/scons-2.1.0-jython.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-http://scons.tigris.org/issues/show_bug.cgi?id=2791
-
---- setup.py
-+++ setup.py
-@@ -325,7 +325,7 @@
-                 self.copy_scons(src, scons_version_bat)
- 
-         # --- distutils copy/paste ---
--        if os.name == 'posix':
-+        if hasattr(os, 'chmod'):
-             # Set the executable bits (owner, group, and world) on
-             # all the scripts we just installed.
-             for file in self.get_outputs():
diff --git a/dev-util/scons/scons-2.3.5.ebuild b/dev-util/scons/scons-2.3.5.ebuild
deleted file mode 100644
index 2c581c3b0cbf..000000000000
--- a/dev-util/scons/scons-2.3.5.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="doc"
-
-PATCHES=( "${FILESDIR}/${PN}-2.1.0-jython.patch" )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/scons/scons-2.5.0.ebuild b/dev-util/scons/scons-2.5.0.ebuild
deleted file mode 100644
index 1229463da8c0..000000000000
--- a/dev-util/scons/scons-2.5.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 pypy )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? ( http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-	       http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc"
-
-#PATCHES=(  )
-
-python_prepare_all() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=361061
-	sed -i -e "s|/usr/local/bin:/opt/bin:/bin:/usr/bin|${EPREFIX}/usr/local/bin:${EPREFIX}/opt/bin:${EPREFIX}/bin:${EPREFIX}/usr/bin:/usr/local/bin:/opt/bin:/bin:/usr/bin|g" engine/SCons/Platform/posix.py || die
-	# and make sure the build system doesn't "force" /usr/local/ :(
-	sed -i -e "s/'darwin'/'NOWAYdarwinWAYNO'/" setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--standard-lib \
-		--no-version-script \
-		--install-data "${EPREFIX}"/usr/share
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	# Build system does not use build_scripts properly.
-	# http://scons.tigris.org/issues/show_bug.cgi?id=2891
-	python_replicate_script "${ED}"usr/bin/scons{,ign,-time}
-}
diff --git a/dev-util/shadowman/Manifest b/dev-util/shadowman/Manifest
index e94335427e8d..a46489a56b81 100644
--- a/dev-util/shadowman/Manifest
+++ b/dev-util/shadowman/Manifest
@@ -1,6 +1,4 @@
-DIST shadowman-1.tar.gz 3337 BLAKE2B 6253bbdef18f3b48adfc04553b08d63b81fadb531ab3feedd328a4d084e57837af11fa18feec3f9acbc9d11833aed481b175cfce6897fe4d7607a73e5a85df62 SHA512 9ec41c53444a20ba3e3d69c33f1ecdce46dbcd911de5b024cab84f2573ccb772b508b5c79f6f9cafda0cc4ab5a8de7414fa8d893a1ca5b86fabd0b2cfb62f6d2
 DIST shadowman-2.tar.gz 3349 BLAKE2B 2881c0487205c00114967be7600ef5483cc64c7ad5ed5cac60fe8bf2ca17e5b06d5df6e39148d90ff68a51d3e918ca616d0c5eedf11366df90c788a07e4c63b0 SHA512 eeb10248c7f76116352bffa671ab7c761b2f79cb943de20dba327b0d7bf1126d15021508c9e9389b9f0c37cf5049ad2c67bad93f6a03340fcfd27e03c4969110
-EBUILD shadowman-1.ebuild 584 BLAKE2B 5e6a1bfed7db2d7dba4f0f60950c4dc0512eaf6a053501a3c1b0f31ce0f8ec2065ed052cfd1bae727933a854c1567eaef1bcba0da3d117af8a8ca1e787f5b599 SHA512 0000f3bc020f31120634282069c19107c814f20030797bad94a3588579a9bd0ce434569974e9a1352a67b95c3d2446cf4becafc49373ef78a4623056c266a631
 EBUILD shadowman-2.ebuild 607 BLAKE2B 1f9fe593a50a6c29c8d02764e64f64d231f06a1b3fea1a2a9c8ed84d892dcaa55d7013ce4e36c988f9cf6f1a5d0acb46b9d60bd440d365a5009f420fa806440f SHA512 196522ec2088b917ddf865f48b0f1c32ae0a17b228ed2d5ea84927e823d492d677de7f98855b8c7bd2843ebe6a67d0643bd60e9a31ef799ccae0b2133c9d131f
 EBUILD shadowman-9999.ebuild 568 BLAKE2B 199779d69123dae88d3024a00370b24a898f40ce7aca43257e0dfd3a9747f5b969133cffce9aa70ff1fa0555a18442e4170829df7d27d397ea10b96136a76524 SHA512 4325db35429e59387690b10c09e86268e79e3a4a5e968075f36155fbcd5af7e0ec0a79b6a08b6e9e74ea5cad6727be0697abebcc63ba48c7449cd54141edd794
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/shadowman/shadowman-1.ebuild b/dev-util/shadowman/shadowman-1.ebuild
deleted file mode 100644
index df3f6d1f3b81..000000000000
--- a/dev-util/shadowman/shadowman-1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Unified compiler shadow link directory updater"
-HOMEPAGE="https://github.com/mgorny/shadowman"
-SRC_URI="https://github.com/mgorny/shadowman/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	# tool modules are split into their respective packages
-	emake DESTDIR="${ED}" install \
-		INSTALL_MODULES_TOOL=""
-	keepdir /usr/share/shadowman/tools
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 88751694f08f..6e9df23fac4f 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,8 +1,6 @@
 DIST strace-4.16.tar.xz 966668 BLAKE2B b3c593b2fc17d540ca04a05886fc0d37b3445a4e88f5e93035bc9dbeb6fe21678b9018f052ba8e356a51d0a5013ec8863a50f8fcd5dcfd1d8b9ac4a6363f2d71 SHA512 d1a7b782cb8196eb95b431b66f9b0eff7886869a7e3a4618d985f73b2eed7590ba73150b9c33e55ee5c65fc8f863588b64c5611dca7b5d7a4183110eaf4451d5
-DIST strace-4.19.tar.xz 1113124 BLAKE2B 7018df9a1efd5e732cbef9eb3907e9cff8eafcee0b69853c54627d244ab55bae1ed295ac06a36314f3e88ce9e623fbe147a59f3519352e8d4d3a0d552d0bc884 SHA512 91d57f58ac0e70ff4dcd69fda3cb835de7f40a9152817427e9c264773f99015badbad7bab047ce7f69001b689b1ce54af9522a9738060823de8873bee1e0c629
 DIST strace-4.20.tar.xz 1132460 BLAKE2B 2e0e3080008ed1d5fd87572df740af8c62ebba44e0ece3c6b5ab581f246e79d8074a7fc2d0857abe158a055042fccbd880e11c9567beca1aeddc23f92d763c2d SHA512 869b3b9c48401619073a021e20e80cce37d8884f615bdb52dac9e6a2903df11507d7a0cb0ccad75bcc03d8dfafead0e68d14267e663503e94849079c9a2ebd4c
 EBUILD strace-4.16.ebuild 1804 BLAKE2B 3b572e70ba3f15553e3824eb39ed66cc21972ab0a9c98e2b58eb82de9639b8a14aea7506013256fb5c08f58cab143e33715dd21bede0aff9173b0196a66f28c4 SHA512 cfd07c1a3cc8794c4eb518b41ee9ba256e5019b68c0b8cae5dbf3c395731b918114da43289bd5c29ff0d06b2f169d23fbe76fcef2f5364a6dd72942f24ebbcaf
-EBUILD strace-4.19.ebuild 1817 BLAKE2B eb572e07f4fe3dd676d15c70ba43228d123dd192a358a248de418bc92b3da7297acfeb28ab411939c3360102c68ae2801170877d1a1f742c896c8c85c1cd497b SHA512 93dbae7968097b2283344eac1fa152d3d279d358f025b647c49c250e045a46fd85243a79463a619d80a0748bbee67f8051dc8b640f0f187567d24f8609a6e24e
-EBUILD strace-4.20.ebuild 1807 BLAKE2B 338dbc774d412c49960cfc6b036bd704582b7c9d345afa87796f4619f6bbb2b03f4dcb07a6b50b7a2f3b05d836fddd79493800dfd3a78f7899199c5c31590e2b SHA512 59bb42f86b4fc9c40cfb8c0ba7e5eae44984eec4cf0ea6b1c9cdf6928f67f0fe57fa142da85f91e4d11a7581616fbfc40b48e744ea737c974117da3f4b10368f
-EBUILD strace-9999.ebuild 1807 BLAKE2B 338dbc774d412c49960cfc6b036bd704582b7c9d345afa87796f4619f6bbb2b03f4dcb07a6b50b7a2f3b05d836fddd79493800dfd3a78f7899199c5c31590e2b SHA512 59bb42f86b4fc9c40cfb8c0ba7e5eae44984eec4cf0ea6b1c9cdf6928f67f0fe57fa142da85f91e4d11a7581616fbfc40b48e744ea737c974117da3f4b10368f
+EBUILD strace-4.20.ebuild 1973 BLAKE2B 412b8994c819e0e13e9e98f5b2e831046f77a48fff782deeb3f4715adcea979ffc1e51aa4fca4d8d34bd29ced21c7a729cb2c3281ba6e968d1c130e50a276e0b SHA512 0329814e518cab45d476d6fe4244b5b3a2bb9449f5cc4a33fa1a17e6af39624c6481b114ffebe5264c9e34bf78f32918a1e9070d37d36329fec96b95d8a29012
+EBUILD strace-9999.ebuild 1974 BLAKE2B f3315727c093ae27f58cc89a3b349e6c85863b09e8a2595890916b0bb4956aaa90b3f36581904cfe5c5ebb942243a63b504b3c3e085d9625b00e28f20479458f SHA512 bb5f51ff496c447567594ad51fca30114344f961a3efc55f27ab62279fe27ac3b2446582cc95b0572efe3d1a4e63347a9dd70ecb599ea6879a0141049fe57040
 MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
diff --git a/dev-util/strace/strace-4.19.ebuild b/dev-util/strace/strace-4.19.ebuild
deleted file mode 100644
index 24bc92be859d..000000000000
--- a/dev-util/strace/strace-4.19.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit flag-o-matic eutils toolchain-funcs
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.code.sf.net/p/strace/code"
-	EGIT_PROJECT="${PN}"
-	inherit git-2 autotools
-else
-	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
-fi
-
-DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
-HOMEPAGE="https://sourceforge.net/projects/strace/"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="aio perl static unwind"
-
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
-# strace only uses the header from libaio to decode structs
-DEPEND="
-	static? ( ${LIB_DEPEND} )
-	aio? ( >=dev-libs/libaio-0.3.106 )
-	sys-kernel/linux-headers
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	perl? ( dev-lang/perl )
-"
-
-src_prepare() {
-	epatch_user
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		./xlat/gen.sh || die
-		./generate_mpers_am.sh || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	filter-lfs-flags # configure handles this sanely
-	use static && append-ldflags -static
-
-	export ac_cv_header_libaio_h=$(usex aio)
-	use elibc_musl && export ac_cv_header_stdc=no
-
-	# Stub out the -k test since it's known to be flaky. #545812
-	sed -i '1iexit 77' tests*/strace-k.test || die
-}
-
-src_configure() {
-	# Set up the default build settings, and then use the names strace expects.
-	tc-export_build_env BUILD_{CC,CPP}
-	local v bv
-	for v in CC CPP {C,CPP,LD}FLAGS ; do
-		bv="BUILD_${v}"
-		export "${v}_FOR_BUILD=${!bv}"
-	done
-
-	econf $(use_with unwind libunwind)
-}
-
-src_install() {
-	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
-	dodoc CREDITS
-}
diff --git a/dev-util/strace/strace-4.20.ebuild b/dev-util/strace/strace-4.20.ebuild
index 458e7d64d80e..e445febc7869 100644
--- a/dev-util/strace/strace-4.20.ebuild
+++ b/dev-util/strace/strace-4.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,15 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
 src_install() {
 	default
 	use perl || rm "${ED}"/usr/bin/strace-graph
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index 458e7d64d80e..cfa22a181d7a 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -66,6 +66,16 @@ src_configure() {
 	econf $(use_with unwind libunwind)
 }
 
+src_test() {
+	if has usersandbox $FEATURES ; then
+		ewarn "Test suite is known to fail with FEATURES=usersandbox -- skipping ..." #643044
+		return 0
+	fi
+
+	default
+}
+
+
 src_install() {
 	default
 	use perl || rm "${ED}"/usr/bin/strace-graph