gentoo resync : 23.06.2018

35 files changed, 347 insertions, 250 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a45da4080755..62922212b841 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/aruba/Manifest b/dev-util/aruba/Manifest
index 500b2f6a8a7a..6135081794f9 100644
--- a/dev-util/aruba/Manifest
+++ b/dev-util/aruba/Manifest
@@ -2,7 +2,7 @@ DIST aruba-0.5.4.gem 69632 BLAKE2B 77e0c739681d4ff08430a63db9614568346328c1c0594
 DIST aruba-0.6.2.gem 75776 BLAKE2B 569af009cc20b644878fda25b5e7f79bd2f7c6f5fa9ef2503a5e730b8eb5938872563dace27031d31847bacfbb7e4764079da74fa2a917cc3d98a596cf2248c7 SHA512 ad859aa34f6e6778d9eb92b7e8f298180250e0690b21285e48b85dda88c09c74437ed0dff4e07ea8a02e8c784841ef89504219aa844457273349b8072ebc761e
 DIST aruba-0.8.1.gem 121344 BLAKE2B 0b601a4d4bcd19159bb23b22b7975d1275ed2ab9c06e9ab550e11a151e953eba9ec4cc05280e69685a54b82996b4863b485a74f91d64270cc058f43272f6df6d SHA512 9d65778828ac1915c56862acb1db0faf6214b102eb892317b390f451aab55750067519fb6cf6e08c55f58b865eaaa78921402d745addf2d3b0038527eb5d898f
 EBUILD aruba-0.5.4-r1.ebuild 978 BLAKE2B 87b1c5200542713b1e1aff8c42146bdc3cfa5984f9d44a358444a24554b88388b84d60ecb4abdb63198e64af0c6d7f3c462c2e39c11a54152936cb9af039ffae SHA512 6064116cef51005229e016cba328b1b63c96e5279c52f09ca76a89c1a62bb0e2e134d5cdc10a484ea37d849ac34d98763bf0fbf9a1b8f82ae53bfec364e5b1cd
-EBUILD aruba-0.6.2-r1.ebuild 997 BLAKE2B 1dd08f3196bb3e07c686684ef766a7fd8c6e79b55423bedb391430aa45d0b74409d45cd0cfc16e1dad6f3b47086adecb06062ddeba01ba4edaab07cac2be0858 SHA512 ed621f77a4a3dd461fb1f1ba83770b31887a0f5061d99248ee11bc2e6c442281575475e9a1683aaaf5c104de7de7d5dad1895efe6169fc6469a155cb125f180d
+EBUILD aruba-0.6.2-r1.ebuild 996 BLAKE2B 80620a5bd3bdbc01901142c5feaffba15e3c95e2c55f38316af6f990c035e49dddcc76e15f11532dad444acac2aeb57151f72c22bce29d619382522faef064e5 SHA512 fea9848ac20fca8837763665d6771af000ead36a4552a24a55f42912374131b1f44999a3db2cb32716f3bbec50dc31f9baebe647edba1e003ca17dc8b0193171
 EBUILD aruba-0.6.2-r2.ebuild 985 BLAKE2B 157b93d1d0e018a7c58f07a839d06d4386392cc36df235880009ffc409b5c0dd9d17c78486f7512f4febf33000a33e6f9ddc6edbc08bda152655cbeccdac6d15 SHA512 5cee45c56b5118a10e681828d9e72fb3c81f4f9e67abf300b5b62210b9a456a0a9ea5264b47ee110060c5db1aacea7a6464a20ac5f96f43b3f0eaa20b9aac618
 EBUILD aruba-0.8.1.ebuild 1666 BLAKE2B 9aff62c204cd99a32b631cd3765d07fbe7a9751bdf2460085ad08102145159be2a5b5923c85aecc69c54584a8519f4cb046ff7639ccf3f623a7bfeab9aa55608 SHA512 738cbf69940544392993e84fdfa1d5f34423818e34e7fc301ae4c2378d03a5641c6783e83b6f71951e667f050f6c24c84e6075b30959e463508733004db9bdb9
 MISC metadata.xml 296 BLAKE2B 5d13c2f0fdb1a3a5e8278e93124af9b7f8e069ccca8ac9327132e8aea862aaee163d778260bd0ba6cd0d6488372b04b4330cc2838447fe2d075ec5fdcb28cadc SHA512 6add4a1a905857c1d96e347089fa8f47643f990a153f6457c4d424978bcf76b89607c89f60d3e312365525b1d0dbd17db62b4baf48ee3da9a0f2ab77435d68b4
diff --git a/dev-util/aruba/aruba-0.6.2-r1.ebuild b/dev-util/aruba/aruba-0.6.2-r1.ebuild
index 05b5da859d1b..da7f77095675 100644
--- a/dev-util/aruba/aruba-0.6.2-r1.ebuild
+++ b/dev-util/aruba/aruba-0.6.2-r1.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="Cucumber steps for driving out command line applications"
 HOMEPAGE="https://github.com/cucumber/aruba"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 705fdc07f434..5a054a7e0c49 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -14,9 +14,11 @@ AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b54345
 DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4
 DIST cmake-3.11.3.tar.gz 7954155 BLAKE2B 949ee8c3dfae9d15eecdcd5c2a35fc278e84d1215858714112aea13aa5772f925a2a1b89bd39360e62b8638166038899e80ab48b6917e2c046876283d15d0218 SHA512 a91301bfb51bdf6a6c6ea71a26f05b6017eb375a4fc9c14934a83f2231d7af758bc67d8d9656111d1de56ec3df41dbcd61cb3cf50471bc0901f5bcccdf5267dc
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
+DIST cmake-3.12.0-rc1.tar.gz 8089283 BLAKE2B 5ad24f6bdaa002dd4f70570bf36d5187bb0cfbdb58cc038bf816e17a035d44ac2c66ed30700d77948c7b824cb93346f8427818ba71b54698a4e6931661d1790e SHA512 9836aabe4add0e61b15e32c550a5f4d875e82593108c65d9ed277c08fbc0978849acdd2f639a206c83d3c8219d6b348da343639f7394d5cd054de61f657b1517
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5861 BLAKE2B bdbeccdd90de52f183d7a23bc70acc9bf181aec56d1d6515b0fb83d671f653acd24e847ca2eade51a083a31e2fade346d15922fba91e509596c0b312711f8115 SHA512 8661df8a255c2c7ead3c063bcf60504e587b8dde21e505e1adb5881890b4be47e18c67aa65ad14de514a2884459510405ec9656c77341d00dfe76dba4ee9a9d7
 EBUILD cmake-3.11.3.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
 EBUILD cmake-3.11.4.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
+EBUILD cmake-3.12.0_rc1.ebuild 5937 BLAKE2B 79adde6cac284852d5c1d8d600f3a9b21f5baa02c6f78b91b99eb279b7adf71326e4af0fd88d9a44eaf764009e189c3a3931ac7a0dc624ceb4408a70fdfb90ce SHA512 6e38533cfe49696464d130a0761b2b52d7e18e201ad447d2eef9b93f92cff2834d2d46e45920dd4c8d29acfba805d3b65e556b294fb7cb9831089a70cf88e219
 EBUILD cmake-3.9.6.ebuild 5952 BLAKE2B 2b0c0bb6a20b30aa3b2bb5f28112423253021ac94b36ad8a1ac9bcb62a1da4fa53fb4693f460f47cc374cb0915b0e5c4e7b1f8e7d98a2b3254bb225ea2ee0fbb SHA512 4517b5a521bd3ca9dfd0b6085637a5591f6728b291bdebc4f1ae1fd37d549365866573e51803c363e3199db46a8677263054b01daeb98efa7e10009ff95b485a
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.12.0_rc1.ebuild b/dev-util/cmake/cmake-3.12.0_rc1.ebuild
new file mode 100644
index 000000000000..050883851f5e
--- /dev/null
+++ b/dev-util/cmake/cmake-3.12.0_rc1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_REMOVE_MODULES="no"
+inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils cmake-utils
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="Cross platform Make"
+HOMEPAGE="https://cmake.org/"
+SRC_URI="https://cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz"
+
+LICENSE="CMake"
+SLOT="0"
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs system-jsoncpp ncurses qt5"
+
+RDEPEND="
+	app-crypt/rhash
+	>=app-arch/libarchive-3.0.0:=
+	>=dev-libs/expat-2.0.1
+	>=dev-libs/libuv-1.10.0:=
+	>=net-misc/curl-7.21.5[ssl]
+	sys-libs/zlib
+	virtual/pkgconfig
+	emacs? ( virtual/emacs )
+	ncurses? ( sys-libs/ncurses:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
+"
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+"
+
+S="${WORKDIR}/${MY_P}"
+
+SITEFILE="50${PN}-gentoo.el"
+
+PATCHES=(
+	# prefix
+	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+
+	# handle gentoo packaging in find modules
+	"${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch
+	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
+
+	# respect python eclasses
+	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
+	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
+
+	# upstream fixes (can usually be removed with a version bump)
+)
+
+cmake_src_bootstrap() {
+	# Cleanup args to extract only JOBS.
+	# Because bootstrap does not know anything else.
+	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
+	if [ $? -eq 0 ]; then
+		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
+		par_arg="--parallel=${par_arg}"
+	else
+		par_arg="--parallel=1"
+	fi
+
+	# disable running of cmake in boostrap command
+	sed -i \
+		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
+		bootstrap || die "sed failed"
+
+	# execinfo.h on Solaris isn't quite what it is on Darwin
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e 's/execinfo\.h/blablabla.h/' \
+			Source/kwsys/CMakeLists.txt || die
+	fi
+
+	tc-export CC CXX LD
+
+	# bootstrap script isn't exactly /bin/sh compatible
+	${CONFIG_SHELL:-sh} ./bootstrap \
+		--prefix="${T}/cmakestrap/" \
+		${par_arg} \
+		|| die "Bootstrap failed"
+}
+
+cmake_src_test() {
+	# fix OutDir and SelectLibraryConfigurations tests
+	# these are altered thanks to our eclass
+	sed -i -e 's:#IGNORE ::g' \
+		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
+		|| die
+
+	pushd "${BUILD_DIR}" > /dev/null
+
+	local ctestargs
+	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
+
+	# Excluded tests:
+	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BundleUtilities: bundle creation broken
+	#    CTest.updatecvs: which fails to commit as root
+	#    Fortran: requires fortran
+	#    Qt4Deploy, which tries to break sandbox and ignores prefix
+	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
+	#        debugedit binary is not in the expected location
+	#    TestUpload, which requires network access
+	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
+		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \
+		|| die "Tests failed"
+
+	popd > /dev/null
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# disable Xcode hooks, bug #652134
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
+			Source/cmGlobalXCodeGenerator.cxx || die
+	fi
+
+	# Add gcc libs to the default link paths
+	sed -i \
+		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
+		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
+	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
+		cmake_src_bootstrap
+	fi
+}
+
+src_configure() {
+	# Fix linking on Solaris
+	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
+
+	local mycmakeargs=(
+		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
+		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
+		-DCMAKE_DOC_DIR=/share/doc/${PF}
+		-DCMAKE_MAN_DIR=/share/man
+		-DCMAKE_DATA_DIR=/share/${PN}
+		-DSPHINX_MAN=$(usex doc)
+		-DSPHINX_HTML=$(usex doc)
+		-DBUILD_CursesDialog="$(usex ncurses)"
+	)
+
+	if use qt5 ; then
+		mycmakeargs+=(
+			-DBUILD_QtDialog=ON
+			$(cmake-utils_use_find_package qt5 Qt5Widgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use emacs && elisp-compile Auxiliary/cmake-mode.el
+}
+
+src_test() {
+	virtx cmake_src_test
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use emacs; then
+		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	insinto /usr/share/vim/vimfiles/syntax
+	doins Auxiliary/vim/syntax/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/indent
+	doins Auxiliary/vim/indent/cmake.vim
+
+	insinto /usr/share/vim/vimfiles/ftdetect
+	doins "${FILESDIR}/${PN}.vim"
+
+	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
+
+	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	if use qt5; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+		xdg_mimeinfo_database_update
+	fi
+}
diff --git a/dev-util/creduce/Manifest b/dev-util/creduce/Manifest
index 9a3fd7dec367..24b797495711 100644
--- a/dev-util/creduce/Manifest
+++ b/dev-util/creduce/Manifest
@@ -1,6 +1,8 @@
 AUX creduce-2.7.0-llvm-5.patch 2491 BLAKE2B c2f7fed04c8da9095ad4c4995119181575c644231db6eed46fcfd7097e3ed5c85e46af52accfa8b78c59a3f8e61715df929e0d60c7693a7542fa83eecc9b05ce SHA512 31808043b9a9727632b76a81041a0ddffd318fb5ae8190b7e4cca70b1117c8c938dd7dda9d9785a841c3d62d51dc876a53dce63ab45695ae77d40f834073c08c
 DIST creduce-2.7.0.tar.gz 768832 BLAKE2B ddc471b658a7feb8591dd4e402ac51d7c97a1705ef5b3787eec0b652bba64fb82cc39db21fa7c87ae0104977514f792b77802b6b35cf7afecb79b4cde16a5b52 SHA512 0ded47fdb4303d84619d63fbedd7bc12141b4857679dda8438683199dbdc98b985f848e797b9dc25a31dda591ee54bcb94580285890b23495fcf151aa3636226
-EBUILD creduce-2.7.0-r1.ebuild 803 BLAKE2B 051af5639098a78c93c666c4d3df9f1cd720e9438d81b9b5e81242a2a45c34eb060a247bb99cad6ceb7b2d0a4b8712ca99dc7539b0bb57a4e32fa34d09c80812 SHA512 ffd1803f88caa11a1720e99cd3f8a7382d8574e6fb7ea2b5600d9ac8c70614763bb55f7d29df9d0f3ebd9eb233fb3a4fa2f2756accca4bed82aaf4c65db9928c
+DIST creduce-48e622ba74bc35c5a81299d3a34b9b14038d6a70.tar.gz 720872 BLAKE2B 031104f5e7ca3d3cfb41087f432ec0cf1b1c125171ffac31b6f3b0a9a4483b5ca8a667331aacae7f5acdaaf99e8b688bb62b332405c1266d2b114a4bdceca9cc SHA512 36cc12015d85acfa99f0d04440184517da1f766df7a804ee02719f1208f67aff4f4db7af4066817b17efdc89a6d2cf7ab62b0c622a611bc9b03a89b8d1b68d01
+EBUILD creduce-2.7.0-r1.ebuild 831 BLAKE2B 90b54fbd845dbe404bbb18cde38882f2fdc7adff440d7da52ee23941f538bc8bc95608af410a0b9a7de333387750095b733cddd57829cf4381cdd17a4b7cbe62 SHA512 5526fc208eb9c6d1c3e30db997a0787a80868723443795230f178a3227d4aa5d964f4e3813a76915ab38ed56ef48573671ed976edead59ac199ab24696e3a513
 EBUILD creduce-2.7.0.ebuild 703 BLAKE2B 9e1bb8170ce619ef3fb23a67c8d5987a202a2608e4a366e6eab765b33f960ddbaa55299a4fb29fc79a2cada80809b66bdf58af7a3869c69e1dfb70fbc62b105f SHA512 dc9bb094eb8d54ec90e74a8031289936c0bd3fc5a5e5520bbedb7d457f73aaa458bf0c094542b94a4d32f508df4163b98651c1ead335a91f032478f498d1e0da
+EBUILD creduce-2.8.0_pre20180411.ebuild 905 BLAKE2B a9d06624abb5e882c827048dc2f78fd4ac545bffb0fa356c6a2000e19850c64fe92efdc0f41f605fade209ad9dc3135b7dc77d84f9c44324df831835735e8892 SHA512 3cde436cf4de037d3ddb2885f10252dea84860d33f95f7f0025b4e04078f5031b1bef9ced855f77610f64dac7cf326b3d31fa73065db12fe76584c7ad23822c4
 EBUILD creduce-9999.ebuild 765 BLAKE2B 36967f9afcf36c7b72645f87c58c8edd795a49c69b457be719ba176a6416526592bf33503c7b214d17fa2ca391526c3ede457a7ad8f30d1214b8e964327d1d6d SHA512 26e023880d1143b27d11971f2f95e937f210630c9f2899c239d7f7076ac7741e9cde7e9ba2661c08f2b42e8c71f0dc6e4075f6421e927601ce1276616fe51da8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-util/creduce/creduce-2.7.0-r1.ebuild b/dev-util/creduce/creduce-2.7.0-r1.ebuild
index 04a42e2a9401..85c8633fbf6e 100644
--- a/dev-util/creduce/creduce-2.7.0-r1.ebuild
+++ b/dev-util/creduce/creduce-2.7.0-r1.ebuild
@@ -15,9 +15,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
+LLVM_MAX_SLOT=5
+
 COMMON_DEPEND="
 	>=dev-lang/perl-5.10.0
-	>=sys-devel/clang-5:="
+	sys-devel/clang:${LLVM_MAX_SLOT}"
 RDEPEND="${COMMON_DEPEND}
 	dev-perl/Benchmark-Timer
 	dev-perl/Exporter-Lite
diff --git a/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
new file mode 100644
index 000000000000..10d19d7cec06
--- /dev/null
+++ b/dev-util/creduce/creduce-2.8.0_pre20180411.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+inherit cmake-utils llvm
+
+EGIT_COMMIT="48e622ba74bc35c5a81299d3a34b9b14038d6a70"
+
+DESCRIPTION="C-Reduce - a plugin-based C program reducer"
+HOMEPAGE="https://embed.cs.utah.edu/creduce/"
+SRC_URI="https://github.com/csmith-project/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${PN}-${EGIT_COMMIT}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-lang/perl-5.10.0
+	>=sys-devel/clang-6:="
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/Benchmark-Timer
+	dev-perl/Exporter-Lite
+	dev-perl/File-Which
+	dev-perl/Getopt-Tabular
+	dev-perl/Regexp-Common
+	dev-perl/Sys-CPU
+	dev-util/astyle
+	dev-util/indent"
+DEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT}"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 7a685089eca4..bb0841350545 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,7 +1,7 @@
 DIST cucumber-core-1.5.0.gem 45056 BLAKE2B 39c56fd48386556f36921694940d8d8be7e2345c81bec83e7a47b4a07e96b22f4d30898cbdcedeebc44be671c166b42cb52d55c36b7196eb05b9cb82333a76d3 SHA512 544d2c5707bde46d0c12dc975b3858e663776d9bc87ef044681525a547ef2de171a74ba0c53fb28dafcbdf90a153bea5357ec1a129f11b2c0dfedd288c5def74
 DIST cucumber-core-3.0.0.gem 52736 BLAKE2B 8c46b6209ffcea6c4840c038f956c90b0cbf4ab6e227ff0d0bcd92202f4bc233c9815bd270baf8d01a9cf15ef32cda2ca9fed172571fa2d8fc00ac024667a725 SHA512 2991bc8e2f3f5042b10cd430273dd1fd4c851ee444defbdfdf16ba920f93c6523e1b503c562438691947a969c95c8f65416a69c4fdf1fe876ad0c274982b9e75
 DIST cucumber-core-3.1.0.tar.gz 49335 BLAKE2B 92b82661a6fb49ebff987fc5c729fee894509667d2a9600dcafa305235097249381b51ba4549f6c465dd7d8733e125d891d7c04e204fd683f68f08792e862a8a SHA512 c50186288bc855e30611dd25956f343bb97c7fc75e0f3341917e5816db2dcb7ea76a189fda7399c1304db7a643d8c10b7a76e3bf98a775e1ef2356a389e3eb7d
-EBUILD cucumber-core-1.5.0.ebuild 734 BLAKE2B 9bd3508c564cc270268fc10e15d9a12a60bebaba9381e9c2d86237d2904d1e15c6ed9eccef71266d1cb2bf18c9f85386374c48a1e5d9e73a0dde0dfdf5472eb5 SHA512 743330dceeca01e455cdb6405050a48d4463f9e2a105355b4562e6dcdb727803c2768415292257f345036d367649a92d50a2824dd864dce212dab3a837545302
+EBUILD cucumber-core-1.5.0.ebuild 733 BLAKE2B 217c3b09430a5fecbca7ed945fb3189113fca5e6bb3ee61f04681c0f7f6cb64377c07ef957dadc4c0dd1b88713aa08fe3309181a118644f0c677d59476424464 SHA512 2ba20e7e2f6b6d33c34cc88f0cf7e816d9d5ef3c060f067a1e2e10df0a61a60e482c20dffce7a7d896bdfbf91709a7f77d06a3a1e6401a099edb3c546ef45189
 EBUILD cucumber-core-3.0.0.ebuild 795 BLAKE2B 89d7da70e3509ada352d8e2644886e193319b5d3ce2c0587acf7dfe3c5089b55ffe6cc91687a51d3ed6745eb1dbf8f884c968d94127ac19aee3db29cb5c1d7e5 SHA512 0d5d991e93b2b1f15bab9e4a59ab6aeac39249582f10071331548f202e0c88dedcdd427d9889ded3b337e62bbe65de73cce0cc0a87c31173a9fadd9375eb09e9
 EBUILD cucumber-core-3.1.0-r1.ebuild 969 BLAKE2B 551931a309ab1d21d8276521d854f39d3836cb90db96fe09cf80ca965b79af262fabfcdc570e200ca3f17b0df6c769ccec1bb891d6b26e788f3f043b155aeb72 SHA512 c9eb4b3f284a32fa9f8c924d41db54a48ddc42721c8064356970daa8cd93c2cc172ab6007133f58d73a3a40a55a977d9a43fc30b86f6f1d0317d730ee2052c1c
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
index 70caf942ed2d..0e0b55d4e916 100644
--- a/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
+++ b/dev-util/cucumber-core/cucumber-core-1.5.0.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber-wire/Manifest b/dev-util/cucumber-wire/Manifest
index 6fa74840ff40..b8615250ae8a 100644
--- a/dev-util/cucumber-wire/Manifest
+++ b/dev-util/cucumber-wire/Manifest
@@ -1,4 +1,4 @@
 DIST cucumber-wire-0.0.1.gem 16384 BLAKE2B c35f478bbc8a8bccfbe1022d5b687a85c087bcadd5f494b807fa530d20b7e14f327ca2ab377c3f9abc28df60c7986576b59a246e5fb7537daadb016bb21420b7 SHA512 c6bae727814f6a2d1dfa8cfee9bc9e63e3bfa755f6bb070f907a24d52009dd29652ab21ea7719527a5423ddf4471208f91a388ec53555d7021abac7769b2109a
 EBUILD cucumber-wire-0.0.1-r1.ebuild 516 BLAKE2B aecf7b1742435703fb954a08a33f06ba9dc580cda3dd81a16b3535a360855b3f97a4f221de200d8b31c696bddcb1d0d9fa2a11fed60de09d8300633408c5722f SHA512 fc57e20e5776f624fba2521da9b5b484f07066f0cf7e6f2d95dd6b5a5ce082330908fa9f01fae613416f43d6a708d5a7efd61a6ab3ed6af6bb3eacbf1458aa45
-EBUILD cucumber-wire-0.0.1.ebuild 523 BLAKE2B 60a9fcbc7f151d12204327b1a13647d9e8b0e8816c7809cc89b674e29670e326ca05fc5adf104ab485966ee53abe89f87c3565253ccadbe2585a25c5b17b2169 SHA512 8776e1f33e135aea2b4af64948647a13bff2a861df8029a9b3419ff04a37cec0174b210f3bfb3477f6b3f885b054fd50f16c5232e66691163a6217e3cabf5708
+EBUILD cucumber-wire-0.0.1.ebuild 522 BLAKE2B 649204a8b9a48f5e4009cf10d18e0c67b538e718f1887f88aaabf9ba778fa210b77275f70673ff904f6f121b7071854b206231ee6f7771b95138cbf5d98a57e4 SHA512 272aa3faaf6f654acdd283927b6793fb7ba48613b1c6d4078ac860930a812bd79b7a9e5ac3154fd7514d56e00cd04a6d415683e1e12b2e9c41654216c6e4afae
 MISC metadata.xml 304 BLAKE2B 1f2a69030fdeaccf7280372ef0e8abc7e1ab0456951e88d6f1839ba3615f8a6588bb3a96d05bffdbe343cf3a4b89fc32fdbefc83faeaf2a54e0cdca9c68e03bd SHA512 1e0e844510269d137017ff7ecbe1b98c9542f7264ec0e5b8858119f06887720645c0d968228825d91fcb69016b78d7f7c7d344482f08c3fe0dd6cc3df4f52902
diff --git a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
index 61795e63fd92..54901eb96507 100644
--- a/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
+++ b/dev-util/cucumber-wire/cucumber-wire-0.0.1.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="test"
 
diff --git a/dev-util/cucumber/Manifest b/dev-util/cucumber/Manifest
index cc0536f80370..2ed0933b081e 100644
--- a/dev-util/cucumber/Manifest
+++ b/dev-util/cucumber/Manifest
@@ -4,7 +4,7 @@ DIST cucumber-3.0.2.tar.gz 267557 BLAKE2B 0ce098d9c747a6291e53c647f0e6da7adbcf4c
 DIST cucumber-3.1.0.tar.gz 267954 BLAKE2B e309c20a63621859375549d85cd85a89ec399821d7412932337b9d2d39c98204484297ce136b0023bdfb20b0a5844d27901663d5864007609657ca53c59f6572 SHA512 ace42faa4830740e09f484af65eac092cc5f5ac0607d3aaf6b6df1b2a27f16b9647d8759edf15c636f87177ce6b545a07bb22befff79b74234cb0c08c92ea9ca
 DIST cucumber-3.1.1.tar.gz 267901 BLAKE2B 19e24da4022103de5a65140d19ed7c1626f46fd050e1917f19a912fd89818f29c530f14efe68b82cc853c4388eb212bb44ae3584aa6b5ec6e2065f094e718dd1 SHA512 3a1267119ba6cb2f7ee0961c7a78521fe10c00a0c4e5ddab8364d5213bd09c4d4f5875a2897df853bb981a101cd6bac77acad1e9377eed234c082cce9330112a
 EBUILD cucumber-1.3.20-r1.ebuild 2165 BLAKE2B 1030d687efe56f2e7dc3b8dc9f3869ab89d7ea3fd79dd33fc06a9495425f22d9b5979467c2875a41bcb4ec43d41db486ec2c0da752ae8a6e9e409f7cc177b76b SHA512 7d468eaee8facf0cf1e1a1272e12e55ba14a927a0611de734f9c4e328dab9b12b6211239b6112883d36769352f216d48e0e253548227b4b80723a8dd544b7831
-EBUILD cucumber-2.4.0-r1.ebuild 2478 BLAKE2B 616fec059aa5d4546c73eefe7b41b4dd058791ee1bf70f8eb16df78919f1023d8c49e912f0cfc554804e001cc1aaefdc3e7dc1a574c79afb76a55ce7daab5a41 SHA512 dd402e3a7fd794cb6a73f9787520132eb189670f306858f556c5c00b9b43118267e6804289906b1fddc9e4eb631b7953109439dd0720954d7a1c69e12f8b3e50
+EBUILD cucumber-2.4.0-r1.ebuild 2477 BLAKE2B a460408873217510715ffbd842ca3a2b53d24a88b6c53b3e403f2bf1648e75d7fb32737214aa0b5ecbaeeb4db4849b6dbb20e497689d5853b000f251f2713bc3 SHA512 12d5d76a13a278b4d0249441294ca5a69bff6c334fd9db1482649e0acca0d8c83aa4a239ce930d4bf2a89e827aa42d993693a517afaf064bbef0e8bb1a20f795
 EBUILD cucumber-3.0.2.ebuild 2640 BLAKE2B 575206b7bbee67cb9a3e3d0ce269784fe08eb3698ea1ac18ec3a24ab86a65c856c55804f7ce134d4ff634b5f31f24d74b7cab6a59fc629cda81a15ce627f550a SHA512 66d405edd35ff7de97b9ed05994d602e0363d2d92c2370259336fc162a3d91c5aaec4e59e3efecd7be17d075e82c620f972c31aeb85a70d17f19df8566ab4784
 EBUILD cucumber-3.1.0-r1.ebuild 2640 BLAKE2B 6153fd69023f41de353be99be0a2dd06f83b72da4b598e7c41af68a2613ed4a94886c9272256d5cf4191b37a9ff6228a0f4e51a49fd212e14c833f11a2af84ae SHA512 05c022ee6a27cc814aa7e2acdda3da8ec35b9f0e2ac50b9b9d2ad0f38effc43da82dcbffccce4d2e0f0c0d0516dee8ef3874644627549a71cf1e4607ccc4e781
 EBUILD cucumber-3.1.0.ebuild 2640 BLAKE2B 73ed0d1eef2e67fcac273f1c616af5666e5c06791b37690d01e59a79cea8bdc1536b7ba4eb29accba2d6966aa65dda500b8271f4f193b8b805fe2f2b0ce3ca6d SHA512 6317b921eb64ff878fadbb48dcccceae1fbbbd7867afa85839af7d3cf7031a210fbfbe1763530bdd00f3978722ef327d478b8fcf25bc9049c543693b9a206cd9
diff --git a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
index 7dd7fb70ea75..86915e9f5a72 100644
--- a/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
+++ b/dev-util/cucumber/cucumber-2.4.0-r1.ebuild
@@ -17,7 +17,7 @@ DESCRIPTION="Executable feature scenarios"
 HOMEPAGE="https://github.com/aslakhellesoy/cucumber/wikis"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86"
 SLOT="0"
 IUSE="examples test"
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 48519dd4addf..bfc3d7185abb 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -1,8 +1,8 @@
-DIST debootstrap_1.0.100.tar.gz 72269 BLAKE2B 76cb0268d3401463bd4ba72f0bab6b2d854b762df092c7fd6320b15d0de17d6a53ca1beb32df0cbe6beffe0a85909611a8b5ff8b9356fbf61501360cd2eeec98 SHA512 36bdf55207d73f9b5c259b1d9c19c36918778ca35478bf654a97d82d5e98fb6293fbf68adfa2e0a113e0d53ec48f19173232587fb1f727068b2516e9e51436d3
 DIST debootstrap_1.0.101.tar.gz 73074 BLAKE2B 293cd1016af3bb65229cc1fdf1a26a500eea099badd4d94db22d0013b878e6e054d38d2cadf7ddf87f32f1bea0c37a91718b6b20f0bee782c4e99a376ccdbe04 SHA512 692db9d6dcaa7e440e37b4c90e00c56933235f7462ebdfb640588c6cb1c08f7197997066529d2a03f1f3e857c390a693832c625a4de23dba1dd08801adfcfc9a
+DIST debootstrap_1.0.102.tar.gz 72977 BLAKE2B e5253a1317f586855cb33b56458ba7fec18d9ea330c999ad5d48830cc39311ad9a66b1f4fe7b8ce6bf0a7d0ccca50c00ebc07eb0aaf49ad9680ada46a66e863a SHA512 2ffb2f7d1ee19ea34c5d5f5a6951d6d5b4a298cea1438302cc0cc20cffeb1affa5774d7f77e332c5eb3f45698c9a10232415c89ad0aa34abec533768ea4a2dc2
 DIST debootstrap_1.0.89.tar.gz 69020 BLAKE2B 9175d0936b6c9a28a29ee1b24bd835c41aaf807bc24a029201aaa45d07789206ee06e38b0a70c1e507ab448a3ec9c0fded2838bfb868334270b5159b34cbe9eb SHA512 3f230ce3eff6359353d106c806ce395861fb47fc1416eb0b498af7ce12a45ce7572b18284633d6d4d07b73a4a203e03bc205df3eae0db6f637237d25d0a69b1a
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
-EBUILD debootstrap-1.0.100.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 EBUILD debootstrap-1.0.101.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
+EBUILD debootstrap-1.0.102.ebuild 1182 BLAKE2B 879d1438cb0f4d6ca5e524437563814e70cad8935c4fb4d5ef293991416c4a5bbb5831b69d846f6ca4c7acead6e2760c16fee6eb41764a6478ac9b39fc85b327 SHA512 e6e600bf357e44b4a01c0068240788e3a2826b358a268baf6377f0ec2fa320bb19fe12203ccdb22938e9fb6cb07299bfaca2f32676c713566d2d7c9f38ae68de
 EBUILD debootstrap-1.0.89.ebuild 1193 BLAKE2B cc444d24b614d76a8e57d1cb9fbadf86c2d541d3426fd68e75306bce4e4326905200a46a580c355e38cf3ebf45fd74c02325a36123abe193c6d37213ffe15cea SHA512 495eb8eaaee17ee6766b6e9ab5a6021c055be48cd2798baab428ff98ce4ee72171714d39f28e1a8d6a983677a1a849a925958a469fe18e05d40fd4a5cb163b7a
 MISC metadata.xml 258 BLAKE2B c36fff5f8f795a075268afaf56f3ca4d8c75dc6997bd32bf2dade7b1903a27eb31a1f3c248b60fafcf77024a9300e8d0a6f8b5a6ace6aefbbec9374a295c430b SHA512 07739557f72a6f241bb1d2e4f61ca138e5dab6996ccaa4b4072057f0aa3ad2adfdfffe65683becd9d467729efc574bf158d846a8b3a7782cb180a13f0033b6b0
diff --git a/dev-util/debootstrap/debootstrap-1.0.100.ebuild b/dev-util/debootstrap/debootstrap-1.0.102.ebuild
index 93ffd5d2d1aa..93ffd5d2d1aa 100644
--- a/dev-util/debootstrap/debootstrap-1.0.100.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.102.ebuild
diff --git a/dev-util/hadolint/Manifest b/dev-util/hadolint/Manifest
index 28337844bb04..84fffecc0aed 100644
--- a/dev-util/hadolint/Manifest
+++ b/dev-util/hadolint/Manifest
@@ -1,7 +1,7 @@
 DIST hadolint-1.5.0.tar.gz 31002 BLAKE2B 889885192f8ae12c468b90923948970d617bb5dc0156efa615e8ef750b3940b66d84215a21d0dca11ee7176f12b32c47a35a763035c9c2023bb8dc83b2b0af69 SHA512 19e246d82670e27751729394ba73ef03260525eedb0dbe26a605dd2c30e95386bafb85f9063a94d3a3e8b47fb05c248bdd6fda0ef9cf95285b1ec0ef54ad6d15
-DIST hadolint-1.7.1.tar.gz 33520 BLAKE2B e66b76135c0b69a906e8a4cb0f08b9eb53e8c5d15140f20c31894155cfdc97cdc2899f1bbf575fdbed9feea99884d88b604d0bdfd2daeed4efd6064a9e28e453 SHA512 44e952665a3fbd592397cfb251935f0129900c5c87f34dc884cdb83e668e369848c0c0c403f8d7f31fd786de84e64b5e8df4d3935309acfe8266d5621f7966de
 DIST hadolint-1.7.2.tar.gz 34960 BLAKE2B db1ff9df439e3dbc0e36a47749d0013e76abadfecfb87abfce9e4e41f654a3955bdff2804c92a60e1e399b0e74601c80a7a96012de93bed48e0425afee359e39 SHA512 1562ca9e2b81d6840bd89b98ce706372e32e93505efd6eecef613ddcb089306653da09ef09f8876fe19c6effd1520784ae05c83bb2460975628389ef80f5df93
+DIST hadolint-1.7.4.tar.gz 35187 BLAKE2B e40892f739d7714f62b322d1d3bb6d5cb285e9e6f3bc9c35d21a8d0eef837f32966b6292ce3e20ff461e2775777b2bf6192676ab76d32a558a8242dfe12c697d SHA512 ad92d1f6a1efee2b853613ec078396847e7ee2c525d6069d3cf1708d1af229133eff35e0dee6f0680433a2c6781839beeda02f8cebb52e360c622e6b05ac5925
 EBUILD hadolint-1.5.0.ebuild 1064 BLAKE2B a4001c12da3c75c033a7efb686005e9fc7fdbf532dad9bc36db569371c82a604b4563cd24b7c2130f13ccbd7612ae344ae8c50443d7828d89156de04d00c7658 SHA512 9934c3ac41e0764c87b5ea4ca0c88853751662a84a7f24e5aa6357e92edb6cb8ee23e6416cd67ef400897f39bcbb9f47ea4802de6b8884def844db8562b6a88c
-EBUILD hadolint-1.7.1.ebuild 1106 BLAKE2B a6742842b4e7215a627d1d4602a65b21ef2b9212174589b5f43c3a06bb7f5f0acc226ba3d8b7eb12beb183d4613754c7baafd8ccf79d1a727a9942273527300f SHA512 4d7ab4a23ca0f17dd0bfedb75c61937006002bd6a403f686c800f1dc8e512cfa49c80e8d6bd52749ba96326ff658ca9f7a97fca79bc26715cec52e6e879f6d33
 EBUILD hadolint-1.7.2.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
+EBUILD hadolint-1.7.4.ebuild 1137 BLAKE2B 67e11fc0f94683b2382fe875c4b3626531bb3d8d2c054e04da76b1cf9734ee63f7936332fb1ac53af2e8ee6fca0bce4c6ee6c88beb53f8d2ec2a0b0efdef70f0 SHA512 b3feca48b6a4342417513789c7aefd02f5ef3676e467a4889a639a7279c90aa1ef2336d5d1f4c3a84c05c12a85b66e42cd811a69eb382a613599a8f6a549ba4b
 MISC metadata.xml 364 BLAKE2B 960f838518131ef8088bd574862e5ee91f7d57f7b6925718a1249d46ffcb84a70200a160915284073e24b54fd8fdbc3a479cac5d91c03d5ddeb1b55c570f995f SHA512 2d359c79cbc3ed17c447453c06cf92026edbbcd3da98108b560b25c9d69b8f576a9645ddeef02e05c3e492729a9c7a78746a69aac319213b32d5037c2be23247
diff --git a/dev-util/hadolint/hadolint-1.7.1.ebuild b/dev-util/hadolint/hadolint-1.7.4.ebuild
index ee88be7b441a..7e0e70f87627 100644
--- a/dev-util/hadolint/hadolint-1.7.1.ebuild
+++ b/dev-util/hadolint/hadolint-1.7.4.ebuild
@@ -21,7 +21,8 @@ RDEPEND="dev-haskell/aeson:=[profile?]
 	>=dev-haskell/gitrev-1.3.1:=[profile?]
 	>=dev-haskell/language-docker-6.0.1:=[profile?] <dev-haskell/language-docker-7:=[profile?]
 	>=dev-haskell/megaparsec-6.4:=[profile?]
-	>=dev-haskell/optparse-applicative-0.14:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/optparse-applicative-0.14.0:=[profile?]
 	>=dev-haskell/split-0.2:=[profile?]
 	dev-haskell/text:=[profile?]
 	dev-haskell/void:=[profile?]
diff --git a/dev-util/meld/Manifest b/dev-util/meld/Manifest
index 4ee42efb411b..477070556d58 100644
--- a/dev-util/meld/Manifest
+++ b/dev-util/meld/Manifest
@@ -1,5 +1,7 @@
 DIST meld-3.18.0.tar.xz 553772 BLAKE2B 9a481f18147a767e65cb6d58bd4770232e9d2f8e10261f8fe19d305ab44c19b8728dd5f7e7b77e4607fcdc4e6b47a0464ba5dbb4491ddc9d91ae8c1a10c1e409 SHA512 1d9f07223f33f2156e6821a567b7f3b28c942adf62b2948504301ce8788100bdac525fc4626a59c9c03cba63fa590407910abdcc41d627da5b4c8fa6ccfd2582
 DIST meld-3.18.1.tar.xz 563516 BLAKE2B 2463fd6c2a74d9eb655c6e2d531ef69950d8f7a275c01a0dbacf48a8c236a860b27dcc79a137a56241183a1b000d36503c33112c7dcb55055a931f4c415f178d SHA512 ca60c8ea9a5b95b228bd72fe3f8c0d4a8aa004bed27c2b29cd8ff647839973f1808df81dcb5c85cb5420ab2ad4413b0ab31b617494fe6eb366b2b9ad3a83eef1
+DIST meld-3.18.2.tar.xz 568292 BLAKE2B 379ec993e7e2ba79d5ff8ea0e960c294fba390d3ba4276bea7700ebe1e55820b07d00d2a88ec5b95a8eae0549a976af0a06e1b7cb7f211aa5e77b0afb266a0d4 SHA512 6a3e47c472b12cbebc392e964b30ac80d344e0a82d0dd25a43df3eeba185e40e6ae5245b09e79ad9d789618b91ccec1ccb0f1c5e6c0ae1d76bb6b4fcd9446574
 EBUILD meld-3.18.0.ebuild 860 BLAKE2B 02dd86bf5d95762f40dc79bcd04d1fee260b0fb20526745a129ff5a32a12e416b25ac8d9fd2249f4429614b0bcb8860d5917255d4c1461b6e2096c8e6dd90073 SHA512 5d4541c603a549fc1073e754f1b87c06d4deda1c4e7cf99b302f720639f32d4b411dbeb7009f3a7d433b83978ab3bd3d945776e61499903d9d56746dbba08541
 EBUILD meld-3.18.1.ebuild 900 BLAKE2B c1c40f9016cd1b8fb25c286dc3b0e7cd91ac040381e8dae320c1f2087e60ccc7b4aec554d02e6ee42a29b3c735257e546376cbe8b3dc8a63fba1cd7238427956 SHA512 16882c06aaa92c778ad93c80bf42923364512496a7991ac2e7dbaad64383fb31f7bc610c74870c275b34d629def2cf21cd8cb2b575b6837d32fd0e3e9b15b155
+EBUILD meld-3.18.2.ebuild 900 BLAKE2B c1c40f9016cd1b8fb25c286dc3b0e7cd91ac040381e8dae320c1f2087e60ccc7b4aec554d02e6ee42a29b3c735257e546376cbe8b3dc8a63fba1cd7238427956 SHA512 16882c06aaa92c778ad93c80bf42923364512496a7991ac2e7dbaad64383fb31f7bc610c74870c275b34d629def2cf21cd8cb2b575b6837d32fd0e3e9b15b155
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/meld/meld-3.18.2.ebuild b/dev-util/meld/meld-3.18.2.ebuild
new file mode 100644
index 000000000000..ea18fe9d5a84
--- /dev/null
+++ b/dev-util/meld/meld-3.18.2.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_REQ_USE="xml"
+PYTHON_COMPAT=( python3_{4,5,6} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit gnome2 distutils-r1
+
+DESCRIPTION="A graphical diff and merge tool"
+HOMEPAGE="http://meldmerge.org/"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/glib-2.50:2[dbus]
+	>=dev-python/pygobject-3.12:3[cairo,${PYTHON_USEDEP}]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/gtk+-3.14:3[introspection]
+	>=x11-libs/gtksourceview-3.14:3.0[introspection]
+	>=x11-libs/pango-1.34[introspection]
+	x11-themes/hicolor-icon-theme
+"
+DEPEND="${RDEPEND}
+	dev-util/intltool
+	dev-util/itstool
+	sys-devel/gettext
+"
+
+python_compile_all() {
+	mydistutilsargs=( --no-update-icon-cache --no-compile-schemas )
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 650834c0e45d..ea0cd84e80a1 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -5,6 +5,6 @@ DIST meson-0.46.1.tar.gz 1203731 BLAKE2B 3b6b78e24a4d1ff3166db5546dda80e8b29236b
 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 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
-EBUILD meson-0.46.1.ebuild 923 BLAKE2B 6d7723e1e6e15cc53032b367aaae44309cf0a5963478802db2d438d3673b0c07363ac552603594cd76be254e8b24905ccef4ee01eed0871e36c3d98c6af6dcc0 SHA512 358f2c36de1dd29ae5afe3cdef73260a1feb89afb2ded1634ca5764eaf7b924736b27ee923e452db27a037d3d9a4853c9f99107b2c7df89cd5bfc85bae14ae3a
+EBUILD meson-0.46.1.ebuild 922 BLAKE2B f523f208c53d469214ab173611df0fd3a8cb38172da7284908500f53c6247da923829edc2581654c967d7ac7fca6378ac68b69ce6c8f12312d15f89f1fd1545e SHA512 e701708fb030b4c66bb327931f02efb603c2bec48629e914fb8c7fbd581397a5f4c7105d28f2a1eb2736dbc7b3dbd4a90e17030de46f14d766e06fece5d64745
 EBUILD meson-9999.ebuild 929 BLAKE2B 522fba88c9e3d16680c76f6190b89b49b2261a250f762034965ed17fab29c1b3df1ead39e9bdc7114a496494f2dfba8ea2b7796eb9972cba95f1b53594a544d5 SHA512 d04a4d8fa0cbbb3aaa1a5cd485198d58734861eddf695dd37cb81c0541c3f4dabd955912f9bb27b9433a2e5d38f26523bd03548b3945f825dcdf7622d8c262b9
 MISC metadata.xml 423 BLAKE2B 3dc99d370f7c1f4e9d9e47b3e472c1cb26ffedf4dacf20d84a27c4bddb9a47aa09849cdb4d1307f6980cf63511584f71dc3c1c9f20debb32134e004bd57130fe SHA512 417736194719d102e906ae6efcfa37930d4706a8a1e94b09a266e044ee806ef25ded2f935fed76a2d29f6443c0387b2ebd37f9d084887bce30a7079e2ff76467
diff --git a/dev-util/meson/meson-0.46.1.ebuild b/dev-util/meson/meson-0.46.1.ebuild
index 239b7fce1856..7f4ab42481e4 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-solaris"
+	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x64-solaris"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/radare2/Manifest b/dev-util/radare2/Manifest
index 9a78768d8d27..9c61ceea97a7 100644
--- a/dev-util/radare2/Manifest
+++ b/dev-util/radare2/Manifest
@@ -1,7 +1,5 @@
 AUX radare2-fix-syscapstone-2.6.patch 954 BLAKE2B 9dd8ebb65f8830643a46c2302e769018ea78045eb18da7ca98adff00ebba63975b5c97eb2398d0eb33970a4102090fdee19734115170f4cbb0c4cd3863c74bbc SHA512 4412c99facdcf15bb6f3202c15e7c0a581df6eda67e5476b70f95e21540d253fdd2dd5518009c139cc7723d589f0d903a2a98f3d6ed33578b0bed2e5c2bf4242
-DIST radare2-2.5.0.tar.gz 6272646 BLAKE2B 44c88327b544d03bd464f1ecb72a51b7e3fa86602aeae9055b6f2d41763be9ed9d63be4c7b959e1f920605feeed998c1f56ef0ed3a6a7213b4d5265c057b1213 SHA512 a29e0e61aeee6e08a99a1ed8a8bc428ec8b0474b3781475db3091232353d03d39d8750f774a266e01bb7565049269ee5f43b666b3b69bfadafb75cdb35f6cc4b
 DIST radare2-2.6.0.tar.gz 6306317 BLAKE2B 213ed0ac92f5b4b9cfc2ba93c5cda9168746cffb0016e1368c4c3939d694bffccf689764c60e0e59a52b70b6b7d49407516c9ecd6e62c59ed0db37c6f72867f5 SHA512 44e7d0c10e17b40d4d71af851cf462c159b03b3242dfccd786bd54d3cf9f92441084f26694166dd1385e84c00626f45dbe09d1fe713595721723c468ac47b01b
-EBUILD radare2-2.5.0.ebuild 1128 BLAKE2B 1d1afb7c82e61eca36fb9ec37bf3efe5569c2812c86040982b020dce996db8c9eed5fcbc9d80c6d819cf82df37bd0e3bba3a8414df8be513ebde955490d2a622 SHA512 60b78abd86656f51d5b4fcc89ef7594c0b9007f012bc8fd50446895f55b7ddcbb8e81eac73c3bdbeafc6bfd83ee13fba7d13e0cf21006bf3dbd63f6ae4fb16b3
 EBUILD radare2-2.6.0.ebuild 1187 BLAKE2B bc87ba5b9e174de19a2588bcd567ecfacd53cf8c3852242d9eaf23258369f4fee7484647c3753eb52b026117b596c2cd261f164d93b647bdb486bbb26955067e SHA512 c22851603eff958ad681d981631a58ca28dc3f4ed704d0c516c542d43a2d09a47509fee62055da4e864c2b5d258cda5c31368f52137fd7b3d7653ea49e8fe79d
 EBUILD radare2-9999.ebuild 1187 BLAKE2B f526fc8a5b74fd80de3291aebe2a3805bbf7bceda29552772b50fb1ce3a3dab0dbdbbbe2c1895f596dbf79f52ce27445efa43bffcc18a333951b2367db1510a6 SHA512 358c0f8116b15555cb34aec3ccc4ddccfd6c6211a1b9b882242c779f6ea0ac358c7e5dc946bd4d82ed871bfc7a01d45c621eb59ded303ad6a3cb23c1b18c8f56
 MISC metadata.xml 472 BLAKE2B 9eac8a52ecd7dae41e0cd32ff13bc02d7c936d0d36bf52309d28b9d03168ec55655ce3588df2c330c08f0779fc8c1a095c972cd6ee3deecb68a9c333d4811421 SHA512 110f9ec2d6dddd20703b9cf6ec8cd77e2459f67aca74065211dc30888cea9c9154128da8a2f15810063de9c4867e3e1a31658d3c5cb27be44824342784b67365
diff --git a/dev-util/radare2/radare2-2.5.0.ebuild b/dev-util/radare2/radare2-2.5.0.ebuild
deleted file mode 100644
index e054a7433d6f..000000000000
--- a/dev-util/radare2/radare2-2.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils bash-completion-r1
-
-DESCRIPTION="unix-like reverse engineering framework and commandline tools"
-HOMEPAGE="http://www.radare.org"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/radare/radare2"
-else
-	SRC_URI="https://github.com/radare/radare2/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86 ~arm ~arm64"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="ssl libressl"
-
-RDEPEND="
-	dev-libs/capstone:0=
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-src_configure() {
-	econf \
-		--with-syscapstone \
-		$(use_with ssl openssl)
-}
-
-src_install() {
-	default
-
-	insinto /usr/share/zsh/site-functions
-	doins doc/zsh/_*
-
-	newbashcomp doc/bash_autocompletion.sh "${PN}"
-	bashcomp_alias "${PN}" rafind2 r2 rabin2 rasm2 radiff2
-
-	# a workaround for unstable $(INSTALL) call, bug #574866
-	local d
-	for d in doc/*; do
-		if [[ -d $d ]]; then
-			rm -rfv "$d" || die "failed to delete '$d'"
-		fi
-	done
-}
diff --git a/dev-util/rebar/Manifest b/dev-util/rebar/Manifest
index e2472e988e74..94a120b3b5ab 100644
--- a/dev-util/rebar/Manifest
+++ b/dev-util/rebar/Manifest
@@ -2,7 +2,7 @@ DIST rebar-2.6.1.tar.gz 191063 BLAKE2B bf3407007957c2cb67f47c0c2a049d9b9f9e51e6b
 DIST rebar-2.6.2.tar.gz 210775 BLAKE2B e06a6fb0c29397dfcfe83de60cdcfb8e89f4a8e4287a41e0102ff972a93c8632d760c7bb6cfe669d98d324bf3afa007198eec773fde9991daa9964a452b5613c SHA512 410129defbf98af00f5040f9d3956299a70a0a1a21d28c42db32350b922e207f8af5830d8c322e9d3cfed8697ddcb228d5a98b983995414ed32662659a5c4c96
 DIST rebar-2.6.3.tar.gz 213146 BLAKE2B 1e74281de629b7f007a718af3d9f5afe7bbef72562f07e7df8f4ee996593b428d84030c8ef50e0a8f6b694b104fac01783175b5f3c6a0c113e263d3de3d8852f SHA512 451f18cec02f9b23ab1e522d4e9bc2a43cf5ace5fea6a7543874a76615cdb55e3d705ad2be94e7c28e6e1acfbc519eb3452588880f0846b928f8a28369623dde
 DIST rebar-2.6.4.tar.gz 213158 BLAKE2B a71c525948697f9ba44a7faa9183f1aadce031b8b85857da87c5b2376f3b7511c78d02c183b115836605a6d3830e9b9ceac754ab64ec11d9d1bb66f37ea78665 SHA512 4e53d1ab7db296c60fb039443da7e3b31b63410fc614690c6faa7ec330d9e9393dbc1c8507aa4aea2c99397e1b443ff9d25e4d57ec57f616ee748aa97d055ffa
-EBUILD rebar-2.6.1.ebuild 626 BLAKE2B 7f5e7e6d83b186bdfd103e238a1b057e1b025dce6e414a3f3b368221d18267653a654c496e36da0c1c4c7687e6f3071688c26eca03e5e7d503cfd97f842c2cf7 SHA512 5ad031fdec579dd3bd352f03ed32ee561a277fea02a945f58dd74a0bce101852a5f54e345f069b7755a4b593426203ebe142f77fa030c3688d7413a612d5f2bb
+EBUILD rebar-2.6.1.ebuild 625 BLAKE2B 5bddb2b81ac9adffe34e4ef00b7b1f6b7484633043419c7947878fb53b50bf2cd06ed34521aaa28dd1bddd25ede8bb30c68ee7482df91a2d44a668f6498213eb SHA512 27bc9e2d1d844f66c26ee1cb649c18860c77a8ff28d42058bbb76bc08f3f16a87e39d3606ae049e57e2d6ce1d2f28c13f1b87dabdb7f1de9bb5910997d608916
 EBUILD rebar-2.6.2.ebuild 630 BLAKE2B d87812a6f7ecc61dac7dd67614adbaab35949b5daf4ceeabdf22a1ebcc27a5ac1adf02646017e069e21e3be054231cf61d42a1c0177d56332804d374707f6743 SHA512 ecb5f24a95aa823ceb1d0bce71306238ec07a0d7285bb7941102a1b21b3f9855c0429730455e2783c84d0f7d662aeab863cc9bf07c2c670f027647dd3dc78512
 EBUILD rebar-2.6.3.ebuild 630 BLAKE2B b40491513b9af0575404a09408f824af1aef080abdb267689df21c944c5b8e47983dc50c9c9d22b9be29092779e143c2c9f65abea1f8dff2dd0a8711db4cc84a SHA512 c5889bebd569f588134f0146ab62c7292cebb197a19478e89d3073d5afa364984a03674dcbe4f5ba481dd01be5d87c7e3ff0ae27903d5df3f0953a55103931cd
 EBUILD rebar-2.6.4.ebuild 628 BLAKE2B 2c2b910d62cb1723fadb51995f5dd65fbd1949b2e4cf4e021a414875ee4e03dd8060e772dbfecccdc476d6289cb1954db8fd97ba243fa1a6e04780b802409077 SHA512 c7e7e67bb27f2668207ecede86ca78162a54021397e96ab3649d4778dd56d0a861958977be90e2ca09a37da0648920eaa4da425d4e8db77c32201983f6757849
diff --git a/dev-util/rebar/rebar-2.6.1.ebuild b/dev-util/rebar/rebar-2.6.1.ebuild
index 3ca90ef6ba83..aeaa19a8f9c3 100644
--- a/dev-util/rebar/rebar-2.6.1.ebuild
+++ b/dev-util/rebar/rebar-2.6.1.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rebar/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/erlang"
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index c7f3347d4a92..27487728d6af 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -1,7 +1,6 @@
 AUX scons-2.5.1-respect-path.patch 1351 BLAKE2B e7bb7662394d6f5c6354b1616f5d4f36d65da8404916aea72c95bae5cfd9e1e3fb4286dc912ae55ba8c0863599223d68b3935ce18f5144f77006e6244e97f7f4 SHA512 6cc0d3b6dd711804f90af9b275e08071e6b0bb370e59aa5caadf3e192e096708f90b373de6ffba2ddaaffce0e2b5013df06f4e9259452bfcca8adcfa6b485618
 AUX scons-3.0.1-env-passthrough.patch 1507 BLAKE2B 9e21e0b14a3b6c95e2c501b5d264915a10c4c5908de98719c9a73c37f5f7de32824dce6df32a0884c4aeb53658d05cda5dbb9c6102ecd6307c085719d4e568c2 SHA512 07fa387b9ad50cd1e92495a414973acddac8c062827858b44867ff1da0560c1493d29992fe4ac2c6de8eb37ab218967df9a6d9ffa2cb26be772324a637fadbcb
 AUX scons-3.0.1-respect-cc-etc-r1.patch 3470 BLAKE2B 4302f7f6448541ba76aa1e66a51535603b4ea7a4c47cf9ed59c23d559f32668604a2b7250ef1d7e6c40e34c93d02ac4858bee1f3b7196c8eda05c4cb8fd464b0 SHA512 6154b22c677176d8644a392ad68d63da04a2f3616c6861471b7ea397f4542aba63ee30b1f14e2ad2f183ef78e3ccaf8ddea8c712b46f18da44881b20ea8c1497
-AUX scons-3.0.1-respect-cc-etc.patch 3339 BLAKE2B 14ba11c4fded9f0f1e9e151cf059b65e7aa1617c14d291ace2206a9dc6f567ecc566cbdd5ad9c1e264772fc6ad5e2e0bdb13007a882b4314aed33565509d1b2d SHA512 f8b523d5a1721fb6fffcb6c6972bca77670638121f8d20912510ebe7e9576385e3d5d5328d8f6c873bde6a8fb28c8d3b89123f7f6e411ff9d976205494842a1b
 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
@@ -16,7 +15,6 @@ EBUILD scons-2.4.1.ebuild 1703 BLAKE2B 1fffba6edc3540869ce1af6c0a2e199614886610a
 EBUILD scons-2.5.1.ebuild 1603 BLAKE2B 2469be4adae61636d044e2beec6bba28cb62bc81c6381d8eb1228a8907ae05c248ca042490cb4af0ef94bd1e081b950dfff064d07e194cba347e01c5ad647624 SHA512 1609e0aa9c7ac60e38aa92cae29d15bebec7583656d9f18cd545745f8fd29677fbd00643e617408866df88b42949c47de3405e2c57ddfde1e608a88a8ea83611
 EBUILD scons-3.0.1-r1.ebuild 1967 BLAKE2B ae9dfc2809576dfa427c386d3943a15d39710f6401ea86ecc99f68420b11b07df817873b801df0a1802f0f51d973ee90bf7af2eceb79faabe39c70aa7972011b SHA512 58e7761c68debf79f1740f02800e94271b7339981696870411b8179b4e4e0156d8921b08c758f31ebf085da89fd4f0e880472787835ac2bc464c50a17df9a3c6
 EBUILD scons-3.0.1-r100.ebuild 2078 BLAKE2B 44634da960c7a30c9a0b8923cf163ea0be4ce31308d9b57d6705dc9baacd8661d62b317ad622f058cdfaae29728d781708df22021038281b83e9e9f0dda1db71 SHA512 f34c403ac05b2f42f3e1de1dd4ab3a3e22c3377f68ac0781da2a04280123cd218c912f5ff784876139b78cd93fe9b0dabd8d3304a4f3341f01645459a154f766
-EBUILD scons-3.0.1-r2.ebuild 2063 BLAKE2B e2112913d1726903f0852585e3d93c029104fd83c5a598ebef1562e344e9c804d495669e74a2b9fe2f2e05362308fae60f29d3315ab028b72ee25a16830191e2 SHA512 a359c4f0dc2daea7dc12200d8dfeb91bd3e7d4768de2b807f82e863dd468251264e250061ec1088550d096a18005947a5f0f622aedf1eb721ce7cd920758d67c
 EBUILD scons-3.0.1-r3.ebuild 2066 BLAKE2B 177a52afb4171023de660f6afdc0d895f5cc499b619c2d427354f8c99282eece6567c6b08c66b8dc9f644ca2b7d1ae216471c289c1030dbd0becd875c972108e SHA512 b88dd6016af45be90e31c761b276cb354bca00e28b3939bbe7f2b0a704620f46e71fc5b58dcc5553e10565413501c22d5c6e19d9a67cc99d267bd474493206e0
 EBUILD scons-3.0.1.ebuild 1738 BLAKE2B eb1430c2c64fe79b36cf776b1df482726982e7b871393e5f1e829e2e5e02c21a1db129248121435b97bd8288f4aed5cbde3a0f167041d8a0c26fe86575903062 SHA512 1454bc63720c78d58362ae72d311d3fd4b81ef8b01900cb36f6cda2aab235d06a4fb6c2631927ac4efcee0fc761c6a672a925bda248a7def5d49b43529d042d8
 MISC metadata.xml 704 BLAKE2B 448bfef70e4f230008c21d8e542618a52f9761295ed33f1c7385a2a678bcb29d1028792e221441f9ba61fecb34646f5ef0f04795e28b17e8d4aeacbabf8751f2 SHA512 62e5c8c23f1c67c218ff6b33c1f941ac3c258b39a5b2d799bedceb734aa5b2e29a718f90823ab5bf199e9d1eb8236aefaddcbff99c6d03f58987fb4936b10aa6
diff --git a/dev-util/scons/files/scons-3.0.1-respect-cc-etc.patch b/dev-util/scons/files/scons-3.0.1-respect-cc-etc.patch
deleted file mode 100644
index 345f39ca548e..000000000000
--- a/dev-util/scons/files/scons-3.0.1-respect-cc-etc.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 7dca875d157f477e05a652f4f1dd1b6903d9dc0a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 10 May 2018 08:01:08 +0200
-Subject: [PATCH] posix: Also force common toolchain vars for Gentoo
-
----
- src/engine/SCons/Platform/posix.py | 17 +++++++++++++++++
- src/engine/SCons/Tool/cc.py        |  3 ++-
- src/engine/SCons/Tool/cxx.py       |  3 ++-
- src/engine/SCons/Tool/link.py      |  3 ++-
- 4 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/src/engine/SCons/Platform/posix.py b/src/engine/SCons/Platform/posix.py
-index af34650c..ee7f96d5 100644
---- a/src/engine/SCons/Platform/posix.py
-+++ b/src/engine/SCons/Platform/posix.py
-@@ -93,6 +93,23 @@ def generate(env):
-         if 'ENV' in env:
-             new_env.update(env['ENV'])
-         env['ENV'] = new_env
-+
-+        # Furthermore, force common compiler/linker variables as well
-+        envvar_mapping = {
-+            'AR': 'AR',
-+            'AS': 'AS',
-+            'AS': 'ASFLAGS',
-+            'CC': 'CC',
-+            'CXX': 'CXX',
-+            'CFLAGS': 'CFLAGS',
-+            'CXXFLAGS': 'CXXFLAGS',
-+            'CPPFLAGS': 'CPPFLAGS',
-+            'LDFLAGS': 'LINKFLAGS',
-+        }
-+
-+        for envvar, toolvar in envvar_mapping.items():
-+            if toolvar not in env and envvar in env['ENV']:
-+                env[toolvar] = env['ENV'][envvar]
-     else:
-         if 'ENV' not in env:
-             env['ENV']        = {}
-diff --git a/src/engine/SCons/Tool/cc.py b/src/engine/SCons/Tool/cc.py
-index 590ec5fd..5f9229a0 100644
---- a/src/engine/SCons/Tool/cc.py
-+++ b/src/engine/SCons/Tool/cc.py
-@@ -80,7 +80,8 @@ def generate(env):
- 
-     if 'CC' not in env:
-         env['CC']    = env.Detect(compilers) or compilers[0]
--    env['CFLAGS']    = SCons.Util.CLVar('')
-+    if 'CFLAGS' not in env:
-+        env['CFLAGS'] = SCons.Util.CLVar('')
-     env['CCCOM']     = '$CC -o $TARGET -c $CFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCC']      = '$CC'
-     env['SHCFLAGS'] = SCons.Util.CLVar('$CFLAGS')
-diff --git a/src/engine/SCons/Tool/cxx.py b/src/engine/SCons/Tool/cxx.py
-index 430851c8..ca5ab563 100644
---- a/src/engine/SCons/Tool/cxx.py
-+++ b/src/engine/SCons/Tool/cxx.py
-@@ -74,7 +74,8 @@ def generate(env):
- 
-     if 'CXX' not in env:
-         env['CXX']    = env.Detect(compilers) or compilers[0]
--    env['CXXFLAGS']   = SCons.Util.CLVar('')
-+    if 'CXXFLAGS' not in env:
-+        env['CXXFLAGS'] = SCons.Util.CLVar('')
-     env['CXXCOM']     = '$CXX -o $TARGET -c $CXXFLAGS $CCFLAGS $_CCCOMCOM $SOURCES'
-     env['SHCXX']      = '$CXX'
-     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
-diff --git a/src/engine/SCons/Tool/link.py b/src/engine/SCons/Tool/link.py
-index 07e92507..614d1779 100644
---- a/src/engine/SCons/Tool/link.py
-+++ b/src/engine/SCons/Tool/link.py
-@@ -292,7 +292,8 @@ def generate(env):
-     env.Append(SHLIBEMITTER = [shlib_emitter])
-     env['SMARTLINK']   = smart_link
-     env['LINK']        = "$SMARTLINK"
--    env['LINKFLAGS']   = SCons.Util.CLVar('')
-+    if 'LINKFLAGS' not in env:
-+        env['LINKFLAGS'] = SCons.Util.CLVar('')
-     # __RPATH is only set to something ($_RPATH typically) on platforms that support it.
-     env['LINKCOM']     = '$LINK -o $TARGET $LINKFLAGS $__RPATH $SOURCES $_LIBDIRFLAGS $_LIBFLAGS'
-     env['LIBDIRPREFIX']='-L'
--- 
-2.17.0
-
diff --git a/dev-util/scons/scons-3.0.1-r2.ebuild b/dev-util/scons/scons-3.0.1-r2.ebuild
deleted file mode 100644
index 78842609b21e..000000000000
--- a/dev-util/scons/scons-3.0.1-r2.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Extensible Python-based build utility"
-HOMEPAGE="http://www.scons.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
-	doc? (
-		http://www.scons.org/doc/${PV}/PDF/${PN}-user.pdf -> ${P}-user.pdf
-		http://www.scons.org/doc/${PV}/HTML/${PN}-user.html -> ${P}-user.html
-	)
-	test? ( https://github.com/scons/scons/archive/${PV}.tar.gz -> ${P}.gh.tar.gz )"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-S=${WORKDIR}/${P}/src
-
-PATCHES=(
-	# support env passthrough for Gentoo ebuilds
-	"${FILESDIR}"/scons-3.0.1-env-passthrough.patch
-	# respect CC, CXX, C*FLAGS, LDFLAGS by default
-	"${FILESDIR}"/scons-3.0.1-respect-cc-etc.patch
-)
-
-src_unpack() {
-	# use the git directory structure, but put pregenerated release
-	# inside src/ subdirectory to make our life easier
-	if use test; then
-		unpack "${P}.gh.tar.gz"
-		rm -r "${P}/src" || die
-	else
-		mkdir "${P}" || die
-	fi
-
-	cd "${P}" || die
-	unpack "${P}.tar.gz"
-	mv "${P}" src || die
-}
-
-src_prepare() {
-	# apply patches relatively to top directory
-	cd "${WORKDIR}/${P}" || die
-	distutils-r1_src_prepare
-
-	# remove half-broken, useless custom commands
-	# and fix manpage install location
-	sed -i -e '/cmdclass/,/}$/d' \
-		-e '/data_files/s:man/:share/man/:' "${S}"/setup.py || die
-}
-
-python_test() {
-	cd "${WORKDIR}/${P}" || die
-	"${EPYTHON}" runtest.py -as \
-		-j "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" \
-		--builddir "${BUILD_DIR}/lib" ||
-		die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	local DOCS=( {CHANGES,README,RELEASE}.txt )
-	distutils-r1_python_install_all
-	rm "${ED%/}/usr/bin/scons.bat" || die
-
-	use doc && dodoc "${DISTDIR}"/${P}-user.{pdf,html}
-}
diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest
index fd3b730576ec..933138535e8e 100644
--- a/dev-util/shards/Manifest
+++ b/dev-util/shards/Manifest
@@ -1,5 +1,5 @@
 DIST shards-0.7.2.tar.gz 30398 BLAKE2B bf89f978cf9d4687902a8de4222f2c2121a52574c7f1ce46130a97c5770889693efc5d3fcc35208d6b1f23930f83fb98ba8f10391920ff0418c6d28eb810d6a8 SHA512 a99648ae292095278578e47971b556a0da90743db62689a76aae9eab986ad2185ad7adc13c4340f12fce835c5383d8aac93e35258d01fa658e521314eafaf942
-DIST shards-0.8.0.tar.gz 30813 BLAKE2B 1a5ce7d2cea896dd8576ab5a6387138627140a0e40ec85ad0c77cf6f6187c34bdc69d7e7403779dcbbad36f2d28b8d3942f5c917919e80ce557e946e9ef26eab SHA512 c366dec216676975cadfd8210a89c407ddc6335859b323736da8e950cf70b78456b3802d2b65d1f6d71a196946a06264b97f60bdc057b6f376e191559a78584d
+DIST shards-0.8.1.tar.gz 31388 BLAKE2B 3442faad4a9a1bc4fed9193b7e17369913025f0c1be840de15d563a3da4f3638884ac2dbfd0610dafec5af0680f39e9983f076962c2a1167e3ebd39c4b1eeb4a SHA512 c0a8a8531a37e033c6d96ac36dd30dcd3d005c6b1bd7c94dbeee7f6ea9b34a08ab2e14b826c3c18f60dca991f60ec6780df090cafc32403a7272e39dc07e99df
 EBUILD shards-0.7.2.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
-EBUILD shards-0.8.0.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
+EBUILD shards-0.8.1.ebuild 518 BLAKE2B 55bdec0a59b3dce9f655856073d8301cba302ef184fce902580dc7f5eace74f39b0da535e4e81a03e21c9644774f85101129a3f24f041097468d06664428c694 SHA512 4c0f4eaf1640d4088813eca7c6f6b1cede8134d14b49be37d21b0e7360c1d38db188cecac39abb6a50f485c439407161e31b8b5bc95517de59b7f6c25d7b0ab1
 MISC metadata.xml 429 BLAKE2B 4c4fe0bb93f3fbcbdbdac215ed36c90a1c3706409f62e4d1d5398976bdb2bb15a178c050f616b908c2cfe87ca0b3b63697620c3ad3ba95e0f836048263ccaf41 SHA512 c5ef30550acdb2b7e8d3179e42db4f0c3c7b7ab6cc5475992c21b6b8c79ac7949cccc2070c278a04c13c62fac2e63c34a39d8c607809731567927ed306905e95
diff --git a/dev-util/shards/shards-0.8.0.ebuild b/dev-util/shards/shards-0.8.1.ebuild
index 43d89d4cedbf..43d89d4cedbf 100644
--- a/dev-util/shards/shards-0.8.0.ebuild
+++ b/dev-util/shards/shards-0.8.1.ebuild
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 9175a7f33e4c..f7bfe8adf85c 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -3,6 +3,6 @@ DIST strace-4.22.tar.xz 1232884 BLAKE2B 4053d1923ad1f942c3887be1716b400e426b318e
 DIST strace-4.23.tar.xz 1379128 BLAKE2B e1b680774172ba65190acc201a00f36ff608eb5a8239f8a6665b9f0eebfb7715eb3469d45c2333e4fac9a498ad3b448b1f39716b92cab91b035bc1e4125382eb SHA512 b54df972dc86e27668784ea4619e8c55230816b249e0a7fcca99a37b7f9ec37710742aca08c9e39b508522accb654a83c98207bab9ccac1197bb8e73e51ab116
 EBUILD strace-4.20.ebuild 1938 BLAKE2B c5ac6fcf26c6d6543fb58624114f3e034d32df958b1a98a57abcdb1a07d2a994c5c3e8794b3f43ab4862605bc0190d2717abe57599333dcd7610a5dd2721d5be SHA512 d6d66f647dde209d9677016bcc231f2edfcc0cdf83875b2df1c063e4b3a7921783e522fd5708655de97127fb17e2ddb877acefbececae6348bffecfdbc7c3b8f
 EBUILD strace-4.22.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
-EBUILD strace-4.23.ebuild 2146 BLAKE2B 8757643432214c86a8fef908b4cfc5b39789b79909ab988f9abe270d50e8714f2fe7012ee98742b2bca45461a46dbedffa8d1bb4a010a0b3174d2324663c7837 SHA512 127424395cf4abf513b07c7bc93e5310e1bf410417c4898889120e65ce97b67495ce00cce856f3be421ab3720cc115fdeef7c9effa63a2ab2fb94b19b123fe1e
-EBUILD strace-9999.ebuild 2150 BLAKE2B c9f5b515169763de2bbdc32ee6bb875391839a474d333977ae1f5022b380a09b232d79897f42c2f2e6e8404c643096bb733ec3ad1391dc80bccfd5e1b322f0f7 SHA512 ed67dd4e6dd1c35267ef6472cae76eabbb46cfa83ee674068d62fdf0c80f43cb3d6841ee22771f1eb832c147b621a2bb4f2f056ac9c072977b9f4ac026689650
-MISC metadata.xml 593 BLAKE2B 8ee093aa497166817f6dc6086494cd01ea3a232d8d62fe36228cfb79ff8e5c5cc10a7880a6b2f3559cc2d2f190607d83228acacc77a44a0831202418dba64c44 SHA512 67300cfcaba830a47e49cd327bf2d8490b084b016a321fd6e19e52d8dc28968395b3ffc114675a7d4dc723a9ddd7b57c3ede10207a226d60a2225f88aceb59e4
+EBUILD strace-4.23-r1.ebuild 2277 BLAKE2B 0d14908ceda437cf5fc4c2883fb343fcddfb7191c729f72ce99d5b2f4eb41a18c55aadefc6f72510dd3992d6d7efbba6547b2dbc59037fdd6d40a681aa2a9b3a SHA512 917bb1f3c8c015f768d32899a724c5dda2a23d05c8de5c38cfdcc452c3b1b58aed5f7d8bbbf76834e419b23727b4d3b65c6e5fa7b6ea1c1c1537565a5b867296
+EBUILD strace-9999.ebuild 2283 BLAKE2B cf962151854597584f0fae1b649379c2ae6b7f448acc11042c56750ce401670f32ade92d142a2124c69a027d8147b8a5610877c5e3928826fec66447329a5b8f SHA512 0d200822ace7b03abbee2b03d2c997c129877400eea8828c4bc27d22e6b2131be04e5ae822241e633410059c531c67b5fff2bb8232d8a08a5585a40dea0e243c
+MISC metadata.xml 705 BLAKE2B 5bbeedc586ec794a2839988f3691780c8b9d00b3279423216d57621e71c562357d4df7df3b359408779ccc0856852f7183c62c2c269c77bfb466b2d456414ad3 SHA512 b0d51447db9f1c34bb31bd519a27082d9e94d14f5ba8d19d9a9a90472f8b27a084f79e348520c92bffc2dfc408f5f45d35df2de94d13f8cf3242e042b66ea048
diff --git a/dev-util/strace/metadata.xml b/dev-util/strace/metadata.xml
index 869980f0195f..ed202ff2ec68 100644
--- a/dev-util/strace/metadata.xml
+++ b/dev-util/strace/metadata.xml
@@ -12,6 +12,9 @@
     <flag name="unwind">
       Enable stack backtraces (-k flag) via <pkg>sys-libs/libunwind</pkg>
     </flag>
+    <flag name="elfutils">
+      Enable stack backtraces (-k flag) via <pkg>dev-libs/elfutils</pkg>
+    </flag>
   </use>
   <upstream>
     <remote-id type="sourceforge">strace</remote-id>
diff --git a/dev-util/strace/strace-4.23.ebuild b/dev-util/strace/strace-4.23-r1.ebuild
index 216395c678c1..a16ee1f785c0 100644
--- a/dev-util/strace/strace-4.23.ebuild
+++ b/dev-util/strace/strace-4.23-r1.ebuild
@@ -18,9 +18,14 @@ HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="aio perl static unwind"
+IUSE="aio perl static unwind elfutils"
 
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
 # strace only uses the header from libaio to decode structs
 DEPEND="
 	static? ( ${LIB_DEPEND} )
@@ -66,7 +71,8 @@ src_configure() {
 	# Don't require mpers support on non-multilib systems. #649560
 	econf \
 		--enable-mpers=check \
-		$(use_with unwind libunwind)
+		$(use_with unwind libunwind) \
+		$(use_with elfutils libdw)
 }
 
 src_test() {
diff --git a/dev-util/strace/strace-9999.ebuild b/dev-util/strace/strace-9999.ebuild
index f9e3966c500e..bac8d4b752b0 100644
--- a/dev-util/strace/strace-9999.ebuild
+++ b/dev-util/strace/strace-9999.ebuild
@@ -18,9 +18,14 @@ HOMEPAGE="https://strace.io/"
 
 LICENSE="BSD"
 SLOT="0"
-IUSE="aio perl static unwind"
+IUSE="aio perl static unwind elfutils"
 
-LIB_DEPEND="unwind? ( sys-libs/libunwind[static-libs(+)] )"
+REQUIRED_USE="?? ( unwind elfutils )"
+
+LIB_DEPEND="
+	unwind? ( sys-libs/libunwind[static-libs(+)] )
+	elfutils? ( dev-libs/elfutils[static-libs(+)] )
+"
 # strace only uses the header from libaio to decode structs
 DEPEND="
 	static? ( ${LIB_DEPEND} )
@@ -66,7 +71,8 @@ src_configure() {
 	# Don't require mpers support on non-multilib systems. #649560
 	econf \
 		--enable-mpers=check \
-		$(use_with unwind libunwind)
+		$(use_with unwind libunwind) \
+		$(use_with elfutils libdw)
 }
 
 src_test() {
@@ -80,6 +86,6 @@ src_test() {
 
 src_install() {
 	default
-	use perl || rm "${ED}"/usr/bin/strace-graph
+	use perl || rm "${ED%/}"/usr/bin/strace-graph
 	dodoc CREDITS
 }