Merge branch 'next'

45 files changed, 265 insertions, 613 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index f7ec8fe368b4..cf65bb84ae2d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index b3e01cb33398..9261f9f69746 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,6 +1,10 @@
 DIST ansible-2.7.13.tar.gz 11861862 BLAKE2B 3123d84b9f45bb5e50a0d5db5d0b2ae10163e2818d30f29ad5a80c23979a347eb5e17806bd295df547b88a09191918443162cb25d7f339ae76df52e3960954b0 SHA512 8dc19e5c93a90d43ced6628699d2da42d522a020bb2cdd35ba73f6286998c605852c89250af8696e94aba0080b2fab12761a39c3e2eb86d39c212a198f970652
 DIST ansible-2.8.4.tar.gz 14348300 BLAKE2B 8a9b5587411d2366a91643682c0ef82b0aa5b5cd5e6b882f3ffdfa100c4f3995472913bc12e1c2f7077efb69ec8ac3ad168a79fc3d8c127b34ce03c69588a4c7 SHA512 9efacbaf053acb8cf92ebe5bda982794ecbdbf55e33a4a292a68874b637eebe82406bfba129adf839354ee18aa809d45d77502f68b8e8d07358a48c9b5687b7e
+DIST ansible-2.8.5.tar.gz 14352036 BLAKE2B a2d60132e3aeafd7dbdcca13daac1c657e19fc1b7822b33dde35e0fff67fa7093b54330652ba6c02bad710fd2d05fba3081cd0b609f16bccf7e2eba52f9fa45b SHA512 6555b9a3d3d8298410e54f7116d92fc1978bef185a5136cfb809c1942b08b96c562af9e0d6d1a25eee5a4024d309b6713ce27836857b428a7c362e26efb53777
+EBUILD ansible-2.7.13-r1.ebuild 1675 BLAKE2B 9b2c3275f960f0c36be0db1fa01e09c8acb93ae8ff4e606c8fa874d00e20512f57c528ad210a8c375f9173d7484284dce1cd2d0ac3b0590551a487e329752838 SHA512 9ea7ede55cf58584f191ada7f48465af05007d3c8a26ac18b5b06a41794b8f46f9ca46ecd900bef1c61bd433177b516c8b16b01d0eb8a13be511b341c9552798
 EBUILD ansible-2.7.13.ebuild 1635 BLAKE2B 3604fcb446a1f3df3dc8f16cd45edc20cdf773a558fc4c33d8391a40e2237cd1313f240b1a03f6810ee93333fad4ff76358c245f8896394e19a54549d3d18733 SHA512 53535468da383ecfad9ee94281fe84fdef862e3d344b2aa048dd5e231418e2c80e934189a7d376eb699c25cb594049ce2b8eaaa717ad378e8105b0ff3f7af904
+EBUILD ansible-2.8.4-r1.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
 EBUILD ansible-2.8.4.ebuild 1716 BLAKE2B 8ddd4c96e597576d970964d5e9daf4d5f965230f3c42fffedddbd6d20a56b22d98151c0f0f3637304385e02e97af466e18c5cacee258fd93ea7006db5ea14046 SHA512 f70424d820a489d02936f625822ddecab576241d59ab65f8552fa254e4376d2cc0d746af29f3331c6814a45c60cf32f8ac46537a9ae668ebb1dea2d7354a73b2
-EBUILD ansible-9999.ebuild 1757 BLAKE2B 647e72bcd7497648dbc96e5bab87e2a8fd5a2e2f47d407536c9a7785e534adef457a24106769dbe8a4cb121a95a63c2b5dc62ed5315ffca3c7f9b72594890611 SHA512 bc9414c6235bc3706ad95ec016b2632e4a3f46649fd066d981711b3a969d7fdcab303bd3bfbd33ac30e60889304ce032743ec0cad37897812f0e055a990d2c53
+EBUILD ansible-2.8.5.ebuild 1756 BLAKE2B 30327a58804ddf1ee56c9ce618270afa554462123140e2ef6376b1655620289677b69ec6a49da1096cadc09924147f75fadbb7738cb68eb7cdc34ccb0b2f290b SHA512 386092c824fb03e07b89589281e64b4adcd817f1f977b8c9004497fa5b115a053c2789994d1385cf56afe134cad1b67d40ec3d36845989acbbc8cc11ba2b677d
+EBUILD ansible-9999.ebuild 1795 BLAKE2B 0f7288af3da8d075bed73dc9141c64cbecf4ec420bc79e64601d0af162cdfce7545dcb76939bc5b6d425d36b6c8f547082fd3c34b30bbe3ea155d56c00bc97e6 SHA512 3040bba45955f3e58d630222aaa0314506d12580d115fb00162ec2fb37eaaf12e48264164a75ddd5eaf62d61f47eb0ccc0402a05e4b61a47508394912f623a77
 MISC metadata.xml 952 BLAKE2B 53640d081ebb558274f8c10095aa6e477820e28a7fdf62c169f5fb3b82153223a7f8ecd1807d14646eae2ec2262b50341919bbb13255293d379ba017b30b20bd SHA512 03b75d65cd0a4b32021b34d9f7ba21b6c4c6893cf185a36dbe6fc10728e0f18c65fc5b6a4c197be8c2b1dadb7243ddce02dbe2f504034a2df1c621f8ba6e26a7
diff --git a/app-admin/ansible/ansible-2.7.13-r1.ebuild b/app-admin/ansible/ansible-2.7.13-r1.ebuild
new file mode 100644
index 000000000000..401feb026c7e
--- /dev/null
+++ b/app-admin/ansible/ansible-2.7.13-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+# not included in release tarball
+RESTRICT="test"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	doman docs/man/man1/*.1
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.8.4-r1.ebuild b/app-admin/ansible/ansible-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..b078e69e7bf9
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.4-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-2.8.5.ebuild b/app-admin/ansible/ansible-2.8.5.ebuild
new file mode 100644
index 000000000000..b078e69e7bf9
--- /dev/null
+++ b/app-admin/ansible/ansible-2.8.5.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit distutils-r1 eutils
+
+DESCRIPTION="Model-driven deployment, config management, and command execution framework"
+HOMEPAGE="https://ansible.com/"
+SRC_URI="https://releases.ansible.com/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~x64-macos"
+IUSE="doc test"
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/paramiko[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/httplib2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
+	net-misc/sshpass
+	virtual/ssh
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-notfound-page[${PYTHON_USEDEP}]
+	)
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
+		dev-python/passlib[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/unittest2[${PYTHON_USEDEP}]
+		dev-vcs/git
+	)"
+
+python_compile_all() {
+	if use doc; then
+		cd docs/docsite || die
+		export CPUS=4
+		emake -f Makefile.sphinx html
+	fi
+}
+
+python_prepare_all() {
+	rm -fv MANIFEST.in || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/docsite/_build/html/. )
+	distutils-r1_python_install_all
+
+	dodoc -r examples
+}
diff --git a/app-admin/ansible/ansible-9999.ebuild b/app-admin/ansible/ansible-9999.ebuild
index c35e90491f7c..64bfd8037602 100644
--- a/app-admin/ansible/ansible-9999.ebuild
+++ b/app-admin/ansible/ansible-9999.ebuild
@@ -27,6 +27,7 @@ RDEPEND="
 	dev-python/httplib2[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
 	dev-python/netaddr[${PYTHON_USEDEP}]
+	dev-python/pexpect[${PYTHON_USEDEP}]
 	net-misc/sshpass
 	virtual/ssh
 "
diff --git a/app-admin/certmgr/Manifest b/app-admin/certmgr/Manifest
index 6130ee8f0975..53e833b5e6da 100644
--- a/app-admin/certmgr/Manifest
+++ b/app-admin/certmgr/Manifest
@@ -1,5 +1,3 @@
-DIST certmgr-1.6.0.tar.gz 31187831 BLAKE2B a1269aac2817f077fa2aae3d14f692aa5c83b0f53ffe041b9436754a93c7970dcc24bed94259e05b99105de5400b3b8c5e22bde087fe365a1c21b8eaf4b3e4a3 SHA512 65b0cb8d5b7a3b76698b3b3aa8c2b9db88d08fed209044668cb19f13eca69714a7a4bc8a20bbf60af05f5c9e39b221801a36e90c8b1c647dbf07952ac385e6ea
 DIST certmgr-2.0.1.tar.gz 2696154 BLAKE2B 0267c82dcf89297495bd46930bb53a176b0329aa933dd8a8b8a96b377133741f45e1a16e0beccb36540ef3c25d28f2af324a976ccac7c769c0cad06d2fb4d20c SHA512 b0de0fff3af435631b26ad4f3b0c1178b3f2e784545939b8dd4a90ee29918c879aea1afc774a23655e7e10526d7a8d13f95cb0740e407eb60110dabc56fdeeb5
-EBUILD certmgr-1.6.0.ebuild 636 BLAKE2B 04c13ebf4349cb36bd4df1b5f97775d6614e7666168f29b0ece03cb020d0dccb6759c4d0c77c433a789a93eb92891f720d2a06e90370cb3e09210037d7ef96d3 SHA512 6268aae4ca61265579e263ca766a6fdac438e5ef79730e10dbf467384c6040113fa31600bc149794151f7fff45c63587faeee17a33480e6761ae012c4688b5ca
 EBUILD certmgr-2.0.1.ebuild 633 BLAKE2B 33de20ac15a1868da1fb3ba6b40a63280f3d1dee05ccf86e3a9799dd55fb4336beaf42910cc032dbfaeb033c1a2dc11fe27d803d0b8519b03bb49b1b50a495fb SHA512 0b1604bc0bfc31410f8e3d33ecbb970e8b774ccdb6cdd39369ac8cef5ea807037fa4e00f2cb2f62127c5d6444e7ad341b4f524ec465082f2690f99994255a042
 MISC metadata.xml 250 BLAKE2B 267d35ba6d759d93dba62b94026d1f4219bef12cdd930e75b1bbc88e4603fe53602b0de8fb1dee62d4bf2ce778cf7ac2e241c5dc117900bb8086902a4a404df5 SHA512 35c362c6a4c181cf124fd1e86b9a06430beae594982b15bd53f6fce2c958189ff5c9cd778bb9fd9a2e9c9675af9e8efb1d5d037059b72f16ad6e6db502f886d1
diff --git a/app-admin/certmgr/certmgr-1.6.0.ebuild b/app-admin/certmgr/certmgr-1.6.0.ebuild
deleted file mode 100644
index 6951be522070..000000000000
--- a/app-admin/certmgr/certmgr-1.6.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/cloudflare/${PN}"
-inherit golang-build golang-vcs-snapshot
-
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Automated certificate management using a CFSSL CA"
-HOMEPAGE="https://github.com/cloudflare/certmgr"
-LICENSE="BSD-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_compile() {
-	pushd src || die
-	GOPATH="${S}" go install -v ${EGO_PN}/cmd/... || die
-	popd || die
-}
-
-src_install() {
-	dobin bin/*
-	pushd src/${EGO_PN} || die
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/dxf/Manifest b/app-admin/dxf/Manifest
index bacc9e05ca24..73fe2769ad9b 100644
--- a/app-admin/dxf/Manifest
+++ b/app-admin/dxf/Manifest
@@ -1,7 +1,3 @@
-DIST dxf-7.4.1.tar.gz 300216 BLAKE2B 53452e73a10912a09e912fc0710fcdd1b0a6be4f78e95c704526852deacf5a7bfd2d3b73bc165f178f732249a64547e13bf9f58f77159c31908e954d6d3a4161 SHA512 a7a2ba4da675f1dea73f2e3d7db63804eb2b68cbb859e43235997b3bc5b8e7ef209705935182ae33d4b28cec5857d2ede738375e19df72134a5695190fd609a1
-DIST dxf-7.5.0.tar.gz 301822 BLAKE2B 33f2356cc6e3567b11d48b63ae9951bdbf5e77726e7f6081b3d299b0560646fd775060b3fe2766d3de69b33cedf4c3f21810bbb4429402a1d9c616da2f7c0ba6 SHA512 82a4a4d2b8baaba242f82b2c01ae47adc4856250bf558d28e0582e6a92b081ff9512e33d3b02d022232880003df40dbd62b7a6401aa5bac83cb673ebb9c85435
 DIST dxf-7.5.1.tar.gz 308004 BLAKE2B 6f8aaf39fbf3a9ef813d5af502361fac3827db17fa5279c3a53e8b87826cac15ef59cb41b2682c9eea065e0a30d98c2b22f72b4922869a012eab76274b1ff325 SHA512 f1a5082d70c115da9f01385e40ed7d2c1ce82af6fb9e55c8f3173e544a9ff3e98c8c565c9e6a2ca1e9a688665944ec0d9dd873f621914d5b746ef4a145f308a0
-EBUILD dxf-7.4.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
-EBUILD dxf-7.5.0.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 EBUILD dxf-7.5.1.ebuild 724 BLAKE2B 61250f4858f4fb4fb55992851d579d1e98dded4cfd4eb0771a20413a807c228dd12014737b71e6119c5ac6656c6f0592bbaff3092c3871d1f1c88e06acf70360 SHA512 d5ecd23f03d9c3d7f80e30fdf249a8a399585d6bbf4d8bc6c5f8fb4a5fedd9e69f015d477bf391072a180a7e7a81d4532d47f052b086702bfe95ee7b0f6c75b2
 MISC metadata.xml 295 BLAKE2B b3270ada06f2998a84e5484b6b063cb5e1c397be2bb266ba10352e811f35e25576469488cb42eb49ac718c6e788861b706aba3e1cb673cbbf176c576fc5745a5 SHA512 99b0deb01ac0e00d6f958c41a9ad8a68bf606a178924c0f052a656d0bdc2638b711e4fe10ab49e1a943ce7a8c29fc77b94abd4a91f6f65a3debd892d8a099339
diff --git a/app-admin/dxf/dxf-7.4.1.ebuild b/app-admin/dxf/dxf-7.4.1.ebuild
deleted file mode 100644
index 2b55ca80585a..000000000000
--- a/app-admin/dxf/dxf-7.4.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/dxf/dxf-7.5.0.ebuild b/app-admin/dxf/dxf-7.5.0.ebuild
deleted file mode 100644
index 2b55ca80585a..000000000000
--- a/app-admin/dxf/dxf-7.5.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1
-
-DESCRIPTION="Docker registry v2 client in Python"
-HOMEPAGE="https://github.com/davedoesdev/dxf"
-SRC_URI="https://github.com/davedoesdev/dxf/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND=">=dev-python/jwcrypto-0.4.2[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.18.4[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/tqdm-4.19.4[${PYTHON_USEDEP}]
-	>=dev-python/www-authenticate-0.9.2[${PYTHON_USEDEP}]"
-
-RESTRICT="test"
-# Require dockerd running
-
-python_test() {
-	emake test
-}
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index 0d2528923da4..ec3522184179 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,7 +1,3 @@
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-DIST gixy-0.1.5.tar.gz 32594 BLAKE2B c92b95e4c17e07b2367337ab8dfa742d0eb995b6c979c4ba25e9f83e446d95dc8c89013b6f45e467c0dcad275b8f0ca4a163a7eb6ae0c2867e4102fe4765a8be SHA512 63c41a16f1a1d16664c660150bf1603b87d2a2b474db58bb13af79e123b372a666b94aa96ef081af89fb5608c7f9a43e03750afb80d52c212c06d3407c413e38
-DIST gixy-0.1.8.tar.gz 35176 BLAKE2B 3e875f63044244b19a7b881c0082c6ce91a2cdc9d0245c741e1b3f4cbcff70e0787d212c09ce2ef157c5a37942a87f9868975c43102df54f79f0b29721cd4acd SHA512 fe45522dbee238282f05f11fc22bdff6f04df117d9b909aa3a9c7ff0aef3c376e65119e91e8e562a2ea5d9c2e85a1e43462eb3ce14f30c171235bd44097c7a94
 EBUILD gixy-0.1.20.ebuild 967 BLAKE2B 158d4ee112fd46ee9abb7ba5d5d29a596193b898373a2bf2b49277079ffefa8df733d92f48af904db1fb5a478478c91614110395dfff631b4ef662da9f421f69 SHA512 0cd185ae489e58958935c04e19228f1de330e9ddedd1af862db5a1a8c62a100d0a6662695ee63eb748b9cd82468d5d559fccdc49f0b7b2f92e68d9d3bf30ef6d
-EBUILD gixy-0.1.5.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
-EBUILD gixy-0.1.8.ebuild 788 BLAKE2B 40f8bca747a06fbbca06aeeeff196a0d0674e6fe7060b2bc1410ce8fab59821c9e331b0c2fcc9ff721dd13467b18f4ce0b1396a50584112d88fa3f5c3b54c29a SHA512 558ba5a26aeaaaa75717ca22d133fa2fc63d7dad47335105982d8e193bab49b3b7dd0b30a3a135a53417c7ba86da0eeffeb25982f06419fdb062233e3f9890fd
 MISC metadata.xml 248 BLAKE2B f2e59d4d05a017ebeeed31b36a72a279974f8fa64886873d23671f1fa91bcf3152acf9652624f2b1a2f5d9524bb24ec7dab734ce43e8cb6475ccfef67af40697 SHA512 c0d402a47544d8f31d1fc9f23fef5d84bf000f2a9a8a07c8b23899306818152aa71844f1d9310e0c32a354189be1f53ae8c89cde90464176ab9b861e62084822
diff --git a/app-admin/gixy/gixy-0.1.5.ebuild b/app-admin/gixy/gixy-0.1.5.ebuild
deleted file mode 100644
index 4ade6ac258d8..000000000000
--- a/app-admin/gixy/gixy-0.1.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx configuration static analyzer"
-HOMEPAGE="https://github.com/yandex/gixy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-python_prepare() {
-	sed -i -e "/argparse/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/gixy/gixy-0.1.8.ebuild b/app-admin/gixy/gixy-0.1.8.ebuild
deleted file mode 100644
index 4ade6ac258d8..000000000000
--- a/app-admin/gixy/gixy-0.1.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit distutils-r1
-
-DESCRIPTION="Nginx configuration static analyzer"
-HOMEPAGE="https://github.com/yandex/gixy"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	>=dev-python/cached-property-1.2.0[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}"
-
-python_prepare() {
-	sed -i -e "/argparse/d" setup.py || die
-	distutils-r1_python_prepare_all
-}
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index f89bc9a52a71..f0889aca081a 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -7,8 +7,8 @@ AUX gkrellmd.initd 345 BLAKE2B 922967be33dcc733c55cfffa59addc01bbe2ba0298be14541
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.10.tar.bz2 782794 BLAKE2B c0aac7df866d40c79667551ca4b25346da4267a0aad8853776425a08097dcfe3a24082e7e5d17db6d3936b59d10c29afa11e8a425319c19696141c02f7d95f25 SHA512 3ae0baa0d51729e1bac7b8f10e008bd7ed9d93d48cd894630e3a027565266e6458df0dcb3171fb271ca7766f4030149e3e6aa234ec191e8e223ae4dee1feb295
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B 621c5b2210a1dae150216d1e2f75ba537ac9dea5e22db9fb2722e642f6f8c05b8611b4a572567b88d5e75e3446d270a367ba1b61d2c04d50624c109186c96e6f SHA512 2391488443ac81a5024e3bddb7097b5819c703545f3146519fd572be76f3bd161c5a83f7879cedc6ef3cdbc971db94d8ad2f693d4c69f5486321254973cf34d9
-EBUILD gkrellm-2.3.11-r1.ebuild 3350 BLAKE2B b74f6c06cc63015c7a0d13dae0b884fe863fad7643f08ec629696ef484c73a509cde929374b6c84c77d9733a80addc33191efda805ec8d72daf580e75b91a60c SHA512 ab55d3b94fa2a95911a43dd6d6bd66e148dd0e0e02f515b28e16f7f1dfedaa3c63d856d337993d4a5b7c1fa4b0300bf98f66b66f88f1bd75329f49a4e3dc5fa2
-EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B bc12fdade844680c79dd3212081ee9bff5b6a8f270f6320dd1f96c939b97e9daeb4f955f66aa1f48f5f00d13ceef9a06c61685f64baca9bcee99dbf8a50ad0fa SHA512 65b89fadf2bc0ccc50f27fd70040096d14c460f90c8461198653ac37509977ed68155c48f19adc56249a47fd14ba27610b9b92b6d925ba5e9d18275a2a1699e3
-EBUILD gkrellm-9999.ebuild 3350 BLAKE2B b74f6c06cc63015c7a0d13dae0b884fe863fad7643f08ec629696ef484c73a509cde929374b6c84c77d9733a80addc33191efda805ec8d72daf580e75b91a60c SHA512 ab55d3b94fa2a95911a43dd6d6bd66e148dd0e0e02f515b28e16f7f1dfedaa3c63d856d337993d4a5b7c1fa4b0300bf98f66b66f88f1bd75329f49a4e3dc5fa2
-MISC metadata.xml 917 BLAKE2B 34cca38c9abfdd920abe9bf75e8569d652f3575e3c9f81e40f90255464021cb9f1768f742f30a8e6469a9e74342231380b9bc465a95ee1963e03d87238725e86 SHA512 8896a7f487c9089202c78589eb62c47f1705d41000a562b40a08eea660d0fe4fec422026329dedb4a33bd0dd63da5249e8dfd03590cadcf7088c0b31d55a34af
+EBUILD gkrellm-2.3.10-r2.ebuild 3276 BLAKE2B fcb5c7222e306fec7d2a3936617ee19606f0cdf95d6cbfb17291669c77b1dd5942401b72355aadf5a2a1267aca4a1e78c8256d80ed8d78f93135e061d30acbda SHA512 30b6a8c19d6f848276372a4c63d4cdfc91b27cdb276bbaea41773af4461da7c39e18a00684c6d6fc24e25d6df9b8d9e2d071fe6ebb407b143460e2188079a77d
+EBUILD gkrellm-2.3.11-r1.ebuild 3350 BLAKE2B 9ea403477a4987e1fdaf3c3325a5d8ac59ab9e6d66c275e30d1015368bf160ed2d288d5b855dcc31a766d65dc5c52423d16bc3fa0694c771016fcfb2df727b01 SHA512 eb4402414885b31ef605a91cd79a3d5cc82cb7fb75bd01531d8023481cb6bdb2735116e30a55fc6fc453ea6afefc73cdecb5410681944cc5c12418d5de41c9ff
+EBUILD gkrellm-2.3.11.ebuild 3390 BLAKE2B ebf9593c76124df73379b39d679711ecb537fd7d7a70168a3d8312ba162a8d027ec617be46ff6aed8c76b6c5aa19c957336678d67bc4d94ce17f4eee2c5afb1e SHA512 65cdfae09c0f1fbe39c45fb08985397387ed815c706f7c548d777f4d15b55f937ccfbe5a917f458b322a42d966cedfde5a0718d26b272fe0efe82ddc18cb2692
+EBUILD gkrellm-9999.ebuild 3350 BLAKE2B 9ea403477a4987e1fdaf3c3325a5d8ac59ab9e6d66c275e30d1015368bf160ed2d288d5b855dcc31a766d65dc5c52423d16bc3fa0694c771016fcfb2df727b01 SHA512 eb4402414885b31ef605a91cd79a3d5cc82cb7fb75bd01531d8023481cb6bdb2735116e30a55fc6fc453ea6afefc73cdecb5410681944cc5c12418d5de41c9ff
+MISC metadata.xml 917 BLAKE2B 88567611e5ddaed8c1f81e639c7e82a120f9201f56b9e512bca08d948c78a967e57490e754f7e3b2c9a4a9a2c216b1288c8059593589378b5404b51db50a9644 SHA512 8b880d60459e4cba922f2fe586f0dfdcc4b0f8054e5f5cf8650ab10bacb30380b67f81795c671e28bf0c51bd6f3379c3b653bc78c0ec954bc7456dccdad274f0
diff --git a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
index 2a8dc60efddd..6deb89dbedcc 100644
--- a/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.10-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 LICENSE="GPL-3"
 SLOT="2"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -26,7 +26,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -89,7 +89,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -100,7 +100,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index c54518d26368..42065f550af0 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -32,7 +32,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -95,7 +95,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -106,7 +106,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/gkrellm-2.3.11.ebuild b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
index d205ffcda8a5..c129a3783e30 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11.ebuild
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	dev-libs/glib:2
@@ -30,7 +30,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -93,7 +93,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -104,7 +104,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index c54518d26368..42065f550af0 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -18,7 +18,7 @@ else
 fi
 LICENSE="GPL-3"
 SLOT="2"
-IUSE="gnutls hddtemp libressl lm_sensors nls ntlm ssl kernel_FreeBSD X"
+IUSE="gnutls hddtemp libressl lm-sensors nls ntlm ssl kernel_FreeBSD X"
 
 RDEPEND="
 	acct-group/gkrellmd
@@ -32,7 +32,7 @@ RDEPEND="
 			libressl? ( dev-libs/libressl:0= )
 		)
 	)
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 	nls? ( virtual/libintl )
 	ntlm? ( net-libs/libntlm )
 	X? (
@@ -95,7 +95,7 @@ src_compile() {
 			INCLUDEDIR="${EPREFIX}/usr/include/gkrellm2" \
 			LOCALEDIR="${EPREFIX}/usr/share/locale" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes") \
+			$(usex lm-sensors "" "without-libsensors=yes") \
 			$(usex ntlm "" "without-ntlm=yes") \
 			$(usex ssl $(usex gnutls 'without-ssl=yes' 'without-gnutls=yes') 'without-ssl=yes without-gnutls=yes')
 	else
@@ -106,7 +106,7 @@ src_compile() {
 			LINK_FLAGS="$LDFLAGS -Wl,-E" \
 			STRIP="" \
 			$(usex nls "" "enable_nls=0") \
-			$(usex lm_sensors "" "without-libsensors=yes")
+			$(usex lm-sensors "" "without-libsensors=yes")
 	fi
 }
 
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 5e32bfdba9d3..1e171c786064 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -9,7 +9,7 @@
 		<flag name="hddtemp">Enable monitoring harddrive temperatures via <pkg>app-admin/hddtemp</pkg></flag>
 		<flag name="gnutls">Enable SSL support for mail checking with <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
 		<flag name="ssl">Enable SSL support for mail checking with <pkg>dev-libs/openssl</pkg></flag>
-		<flag name="lm_sensors">Enable monitoring sensors via <pkg>sys-apps/lm_sensors</pkg></flag>
+		<flag name="lm-sensors">Enable monitoring sensors via <pkg>sys-apps/lm-sensors</pkg></flag>
 		<flag name="X">Build both the X11 gui (gkrellm) and the server (gkrellmd). Disabling this flag builds the server only</flag>
 		<flag name="ntlm">Enable NTLM authentication for mail checking with <pkg>net-libs/libntlm</pkg></flag>
 	</use>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index ea877c540c63..a70afd15e96a 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -1,8 +1,4 @@
-AUX keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch 249 BLAKE2B 52875492ce10a1ee9c33d213a4c72ac72ffbe9fb9ba46cfb57d7de9d97011643ad9bcf4b106a7cc909c81e55542740c5ad3626789f3d0de12ba48493b43cb955 SHA512 8734ddcbe9f5432939d6d0c1a9c16ef9a192b00efab20bb5f50a1dab12b475090d4028625194978872dd801a0b7ceb6bac4102401b054eeca15054667b9aa9b9
-AUX keepassxc-dont_call_mandb.patch 792 BLAKE2B 3154b6624a2e5923a3b3ad9edfbaedd5c0bba77f47108913d8eece63cbc4df571f516a41d72db0287a7a4d8741ab309cc7e09c8fcddaec0bf39ed09479607329 SHA512 21bd27e713357f5aa522a2263a1d03b8a595fb0d51ea10c034358169cb2f72c70585b04dde8f0d8e9af30c9ecf055b528b975a9701372d4f726a8f50b347d8f4
-DIST keepassxc-2.3.4-src.tar.xz 4137176 BLAKE2B bbf8dbef5fb365f3c0d9332454b2b3bce7d4e411f43939ae683428ca669a459f1662bb8b1a1da228bc9447ee15349a5cd558e4fdfcc5194f22401f56003fd0f0 SHA512 edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8
 DIST keepassxc-2.4.3-src.tar.xz 3301944 BLAKE2B ba95d5d48049367e7d3c39b5fdc9fc9816dfe2b257530068f229d1b5bd4eb9c137607f63bcce0aac4bc67ed41ee00c0385be800720acfdc3920c44444cade180 SHA512 893f1d18ab8051143d29c568ba87adcc42a13d28d0c3a7af04396cd91d6724f8a98d76d2e20ca15138c4642ec060d48b9e957857251f3a0df6066af08cd0765d
-EBUILD keepassxc-2.3.4-r1.ebuild 1847 BLAKE2B 4de124b498c9d101b56a9c966170d6bfef024ac8853b166c82e42244a209956f062ebe3f1cfa99d6b62fc2ce3569b884ede3cda338bfd6d92ca5575f18a30f33 SHA512 bbcaea1ebd466a585375cb29688761202bdff37fa4ec18f40134e933d8fa7036d8be422b822b3dbc307ca16fbc8a509f04d6f29c2e7b442143fcedd7b662eb6f
-EBUILD keepassxc-2.4.3-r1.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09
+EBUILD keepassxc-2.4.3-r1.ebuild 2135 BLAKE2B 499b397116dcde99805b4afa4b38b4c25a8b3121e4cd8fe473cb584e295a77ad6ab36a47cfaf447cf09bfb0d12f45bd649e7cb4e90c031ab4dd68b9b04565787 SHA512 9f2651697c320325e7dc9aba2cbb9cc6c01173a2c82072b9df13b9a8292e841bbcd059ef95c21b52ffec1c0155b3c9787cd303512139a9db38b00274edaa9c36
 EBUILD keepassxc-9999.ebuild 2137 BLAKE2B 58f0826e47b23ce6c2d142c315f7c86ffef47d7752627363b4218d58b5ac414cb2f75cb36c8aeef4ad829223ec054e7fa08e4151bc1bb6c0e1d867a420d77da5 SHA512 2b27245a7d84f720b3dd28eecf75a2d5b36ecfb41c67138bca189ded563e03ddee03ab87d7229fce937f22696bf1f4a792f3924854c75b7f8a9406e57559dc09
 MISC metadata.xml 960 BLAKE2B 63a61f81e372efa1d1a4118f8353818eb28f4d9b0e7c87c5cb6e7a4ee8c9856ae3c7ee981e2777d3263725338581834f294022d052397dffbe98db2b5ba36895 SHA512 85ad2302913936ce51a455ae15e2d9ca7a68d26fc16819f46ab494b6aaafecdf32f74596b47c1b5a3cea56bfc49bf7021dbb4b770efb8f362386a67c88ea2404
diff --git a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch b/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
deleted file mode 100644
index c382db5873fc..000000000000
--- a/app-admin/keepassxc/files/keepassxc-2.3.3-qt-5.11-edit-entry-widget-includes.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/gui/entry/EditEntryWidget.cpp
-+++ b/src/gui/entry/EditEntryWidget.cpp
-@@ -32,6 +32,7 @@
- #include <QMimeData>
- #include <QEvent>
- #include <QColorDialog>
-+#include <QButtonGroup>
- 
- #include "autotype/AutoType.h"
- #include "core/Config.h"
diff --git a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch b/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
deleted file mode 100644
index a3ff5f7244d8..000000000000
--- a/app-admin/keepassxc/files/keepassxc-dont_call_mandb.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7789bed0f29e0067eca7a40f604262d18611cdb0 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 8 Mar 2019 14:48:13 +0100
-Subject: [PATCH] Don't call mandb
-
-There are other man implementations beside man-db so it is not even sure
-that the "mandb" binary even exists on all unices. Other than that, usually
-there's a cron job running "mandb" on a daily basis.
----
- src/cli/CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt
-index e59a911a..c3f97a2c 100644
---- a/src/cli/CMakeLists.txt
-+++ b/src/cli/CMakeLists.txt
-@@ -94,5 +94,4 @@ endif()
- 
- if(APPLE OR UNIX)
-     install(FILES keepassxc-cli.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
--    execute_process(COMMAND mandb -q)
- endif()
--- 
-2.21.0
-
diff --git a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild b/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
deleted file mode 100644
index 742ca5d1e1b0..000000000000
--- a/app-admin/keepassxc/keepassxc-2.3.4-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils xdg
-
-DESCRIPTION="KeePassXC - KeePass Cross-platform Community Edition"
-HOMEPAGE="https://keepassxc.org"
-
-if [[ "${PV}" != 9999 ]] ; then
-	#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-	KEYWORDS="amd64 x86"
-else
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/keepassxreboot/${PN}"
-fi
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-IUSE="autotype browser debug network test yubikey"
-
-RDEPEND="
-	app-crypt/argon2:=
-	dev-libs/libgcrypt:=
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	sys-libs/zlib
-	autotype? (
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXi
-		x11-libs/libXtst
-	)
-	browser? ( >=dev-libs/libsodium-1.0.12 )
-	yubikey? ( sys-auth/ykpers )
-"
-
-DEPEND="
-	${RDEPEND}
-	dev-qt/linguist-tools:5
-	dev-qt/qttest:5
-	dev-qt/qtconcurrent:5
-"
-
-# Not a runtime dependency but still needed (see bug #667092)
-PDEPEND="
-	x11-misc/xsel
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.3.3-qt-5.11-edit-entry-widget-includes.patch" #655844
-	"${FILESDIR}/${PN}-dont_call_mandb.patch"
-)
-
-src_prepare() {
-	 use test || \
-		sed -e "/^find_package(Qt5Test/d" -i CMakeLists.txt || die
-
-	 cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWITH_GUI_TESTS=OFF
-		-DWITH_TESTS="$(usex test)"
-		-DWITH_XC_AUTOTYPE="$(usex autotype)"
-		-DWITH_XC_BROWSER="$(usex browser)"
-		-DWITH_XC_HTTP=OFF
-		-DWITH_XC_NETWORKING="$(usex network)"
-		-DWITH_XC_SSHAGENT=ON
-		-DWITH_XC_YUBIKEY="$(usex yubikey)"
-	)
-	cmake-utils_src_configure
-}
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
index 20cd5799cdeb..b6dd4fd2a017 100644
--- a/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.4.3-r1.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != 9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~x86"
+		KEYWORDS="amd64 x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/ksonnet/Manifest b/app-admin/ksonnet/Manifest
index 777b0d078b55..6b3f39d27615 100644
--- a/app-admin/ksonnet/Manifest
+++ b/app-admin/ksonnet/Manifest
@@ -1,11 +1,3 @@
-DIST ksonnet-0.10.2.tar.gz 9312418 BLAKE2B 5e097250a8f1c7887d1949a84d6b768619508b0557ae15220cb31b933a40fcf025200a1d5a60e3fed8e37226faf9b5fdfaa18c87ac56ff4187968efb73b8cef7 SHA512 d4ea1b9b5feb90b345997d8546df276c3e9b171cbe6b648133615ae89fd0fadedb6f98128f4c8b5a40005de3f08ccd0a4de46c7d9c7d0f20e62baa5727c11065
-DIST ksonnet-0.11.0.tar.gz 11228264 BLAKE2B 2c5be1124f2976b6f38b23c9f871bc67a1b88fdf851339893525a4f42a8b3a8ac37b18454e2d281ae3ff71008744a60683910d4864b158fd428b76d28cd73e9b SHA512 4b80b16e4b2cbf79f043e38c6668fad51ec958264a85262f16b1f44c66af80f93d51809c713360758392d4689f350748b5ec55bc2bd3bee01bd42ce4030ffeeb
 DIST ksonnet-0.13.1.tar.gz 12336756 BLAKE2B 1952c02a0dbefc0efdcde1728348e62b23e9ef92fedb8444f98dcc0e670090be56aa001ee50f5e6885752e565863b3813556b091dc614a766677ea4d6e0722c4 SHA512 be16e986c27da358df27d632d1191837d3c16a92e702f3bc29d504de80128870dd4d97752db07c06bd5a11b517e69d6690b9608125d702f809c181d4109622f4
-DIST ksonnet-0.8.0.tar.gz 5260937 BLAKE2B 3b14618d9e40e0f71f966a0acd1ac121040ddfbd378b363236f98c4ecc6d2a2b688988816cd56801bc127b41ac56f4a8446bf152b0ffbdc3f64bce879bfa7cc4 SHA512 c80bbb0d6959045c2de0bf3a21b8a869b53a397e2e31b4b273ccd4f16afceb4038c6263a34d8e0934234cea5997949202e58dd7603902b221a140be737924aec
-DIST ksonnet-0.9.2.tar.gz 6552479 BLAKE2B 46aa62fe5c647d87f11b0c35db1e494d7c045d65bd98a0cc81bcb9c5a1890739a6f782dd04735781cb11aff70e4ec6f04ab97ff51b567385fa1e72bd2d835f15 SHA512 fd9c3c966ed27799f5c7e29e031270406e901c16089f354984d5aed62ebc53f1fc3be0f7623c1dff4231e7a5676b3bed879448845e35d6c1db5104ec28669a48
-EBUILD ksonnet-0.10.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-EBUILD ksonnet-0.11.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
 EBUILD ksonnet-0.13.1.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-EBUILD ksonnet-0.8.0.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
-EBUILD ksonnet-0.9.2.ebuild 864 BLAKE2B 4c3b521802b69028b39d7a51138568cbe22deff9fb1fab2922c44eb60a7841d529e7e9ad28cabefdbedffff4ba477e39ed0dbd68c918369b1660b85430979e42 SHA512 9c7197bd2c5e91a816c197a8665ffbddfa71d5da78a88b64158d665377d89dfc6a637f2b36d6e29ef39d7257ebc1627d5109202b038b40766aac1cfab943648d
 MISC metadata.xml 246 BLAKE2B b7d647c23d2215c6d61312a66a7d3521c8c16f69cf801328c67e9017be2809c2d16e29d61f190837c9fabce655dc69a506311a7781f7aa57c320524ed1bcd463 SHA512 bd98d2c774eb61947df8860a6948cda7148264a3bc86b52d317b3d805e2ab17fe81fe94ffc353ecdda86ad56bbfa17a044c9a789a878e15c5cec13c8e6eeeb70
diff --git a/app-admin/ksonnet/ksonnet-0.10.2.ebuild b/app-admin/ksonnet/ksonnet-0.10.2.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.10.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/ksonnet/ksonnet-0.11.0.ebuild b/app-admin/ksonnet/ksonnet-0.11.0.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.11.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/ksonnet/ksonnet-0.8.0.ebuild b/app-admin/ksonnet/ksonnet-0.8.0.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.8.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/ksonnet/ksonnet-0.9.2.ebuild b/app-admin/ksonnet/ksonnet-0.9.2.ebuild
deleted file mode 100644
index 0c4bbcbd400e..000000000000
--- a/app-admin/ksonnet/ksonnet-0.9.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGO_PN="github.com/ksonnet/ksonnet"
-
-inherit golang-build golang-vcs-snapshot bash-completion-r1
-
-ARCHIVE_URI="https://github.com/ksonnet/ksonnet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="CLI-supported framework for extensible Kubernetes configurations"
-HOMEPAGE="https://github.com/ksonnet/ksonnet https://ksonnet.io/"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e "s/EXTRA_GO_FLAGS =/EXTRA_GO_FLAGS = -v /"\
-		-e "s/VERSION =.*/VERSION = ${PV}/" src/${EGO_PN}/Makefile || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	GOPATH="${S}" emake ks
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin ks
-	dodoc README.md
-	popd || die
-}
diff --git a/app-admin/kubectx/Manifest b/app-admin/kubectx/Manifest
index 0bd058302d91..85e61f24105d 100644
--- a/app-admin/kubectx/Manifest
+++ b/app-admin/kubectx/Manifest
@@ -1,7 +1,3 @@
-DIST kubectx-0.5.0.tar.gz 398389 BLAKE2B 6eb5a91667e62e029bc9810e4e5833acdb99a73201713f9eb3fcee991001546fbcb7a381e3b1a568952b1a224975a238c41f65382cf384ea266f3dad55a79949 SHA512 0a587a0260960dfc69c3a30c3e73d2b2ac83937ef8a05df345445f1dc64adc725d42f7652ec2c65a02becdc40a7de3e49b402d7991f8dc970ee60b913b3ae5df
-DIST kubectx-0.6.1.tar.gz 481134 BLAKE2B 2e7476dfb4fe0296abfbfd939af53438692a4efb7f899b659aa8578f2b4610c0cc87ad0eaa142276b32b5441febde211232ed39f2306af5fd232fea8a5cc688d SHA512 cb4616777a090625cba892b8f73c06a8c5e182d1373c636576a8ae6937bb9817c2546ae1ee3f56a9473f0b04a93965a1a857fdd2ba10451ea0e0509c9f765a79
 DIST kubectx-0.6.3.tar.gz 483452 BLAKE2B 9f74a5df0c30e8414bfba0c2934ed0601dab249a78e8083179fc129dfe288b596f8f0932c3daf84b89ebb740a9c6694189f596c7a944bb6a584495a999d08192 SHA512 63054b51e3d2f52e895aa5b15162f67c81970c0d27e974f60f7f6641156d04cc4b590894e7eedcba3925f344009e65d04189c046f67d1edaf7f092ffe8d5dba1
-EBUILD kubectx-0.5.0.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
-EBUILD kubectx-0.6.1.ebuild 695 BLAKE2B 7d577b4d94e9deb6ce514fc3997052526670ce9c4d9df60d90136388b04f80c360957ed46d3ca83093d73fe6ab696433d099ad853e3299ad897cd4d7460d2419 SHA512 ac6b600bbdb46ddb0bb2d4d4fffe25bd41217d231ccef053169bac0e5f5e8b0ff0ec85fa67bc73996c590845b6768dddea4cbc2b3afa53077a93a5f341597a40
 EBUILD kubectx-0.6.3.ebuild 692 BLAKE2B 12a53742c7e79321ea3a3e2f534ba525e65d8d3968494908eae813933aa4de9f07310f2c151301eed696e15da27d6c1f1b444a5dc191ec479c0aeac0c3870915 SHA512 d672947603b0f6c3d2783082b25a3c5ae595d471251df46e8b6ed533c371211c781bc0b6330f14b7659bf88f285207cf74131e879823a600af9708a2576a6a40
 MISC metadata.xml 247 BLAKE2B cc3ffec52f77e1ce57763359a7fc71a3225e3a2cda5cb797e98661c354fb9ee896033b1aa38c3a22c3587467da2833a801b710c8f43b3dffb2e9de327c48ab45 SHA512 a47289a415c6b8ee6759241cbaf42a851208f940432451a4b893f336d2c980aab922f8bb37de656465758532321dcbdfb372d1ee85739da46ec83ab89fa3f046
diff --git a/app-admin/kubectx/kubectx-0.5.0.ebuild b/app-admin/kubectx/kubectx-0.5.0.ebuild
deleted file mode 100644
index bcdb869a0ef6..000000000000
--- a/app-admin/kubectx/kubectx-0.5.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	dobin kubectx kubens
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/kubectx.zsh _kubectx
-	newins completion/kubens.zsh _kubens
-
-	newbashcomp completion/kubectx.bash kubectx
-	newbashcomp completion/kubens.bash kubens
-}
diff --git a/app-admin/kubectx/kubectx-0.6.1.ebuild b/app-admin/kubectx/kubectx-0.6.1.ebuild
deleted file mode 100644
index bcdb869a0ef6..000000000000
--- a/app-admin/kubectx/kubectx-0.6.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit vcs-snapshot bash-completion-r1
-
-DESCRIPTION="Fast way to switch between clusters and namespaces in kubectl"
-HOMEPAGE="https://github.com/ahmetb/kubectx"
-SRC_URI="https://github.com/ahmetb/kubectx/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-RDEPEND="sys-cluster/kubectl"
-
-src_install() {
-	dobin kubectx kubens
-
-	insinto /usr/share/zsh/site-functions
-	newins completion/kubectx.zsh _kubectx
-	newins completion/kubens.zsh _kubens
-
-	newbashcomp completion/kubectx.bash kubectx
-	newbashcomp completion/kubens.bash kubens
-}
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index 654df8777c6a..05c03abf361a 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -38,6 +38,6 @@ EBUILD syslog-ng-3.17.2.ebuild 4920 BLAKE2B 2ee995d29e470961d08a0ed8dfeba52eb3a0
 EBUILD syslog-ng-3.18.1.ebuild 4897 BLAKE2B e6159007fb47bbe44110bfdda23250761901deb7a071430bd7a37df197375d5f079f8d038b064961eb07cfb6e6bbd044e5bc96c94809af2078652418b07f6da7 SHA512 c1b00c4cc864f145097533d0a6708e1daf3d840c1aea660c149e970fff099b0d3fc83eb5cc4b480c37e5a0325c97a3cca14d1a869f3a14a3eb2055f9127b9421
 EBUILD syslog-ng-3.19.1.ebuild 4920 BLAKE2B ad9cb81bc112bdbb4ae9cf36e53cd11eaa7380e180d2f44f025f46291a8c41c11071ad275d77a063e03ce0472c88c2341d3400a312988ebecbbfa173ad6b76bd SHA512 c937db23ab18b175b5f622a95701531ee43d42b9ca480778608e05fa57bf91635a8517b4f1b86a967d93815b7d77e7f45bb800a6cdb04db9e734a1cf3b0700c2
 EBUILD syslog-ng-3.20.1.ebuild 4951 BLAKE2B 45ad3ab6ebacbc0b0d2da1ce090d53e1ffc97d2c18648bf6763e6b7e4c0c9f8fa7bf6e746f85553aeeee144e3bf8997d6e0534357ee900fa26408b94ff815a7e SHA512 1164b8784d1061af518017698e71ce7ff48ecbc1a964eba9babe8436af141a2be119a9bd3553d1d3b90026df27f051c3a70dff23a1c7614752627f8583d1b028
-EBUILD syslog-ng-3.22.1.ebuild 4951 BLAKE2B 246f528243cadb3b07b48450df8b24f56edc73f481c0ed5fae0f2853c698f8e2690371e783d536a6279b7da2a5eecafd7332482493218c604622d892036b719c SHA512 fc497f0dd6e92f67d6d015e89ca6722dcb862ad40725abc3e1595e29af58432bf34ab606545219fb2eddb161acb0c649cc2de13f11d5c8f18dda159e3b094326
+EBUILD syslog-ng-3.22.1.ebuild 4950 BLAKE2B 8f357d97832fa2b34281ca0db58afbd648d33d9cb9de955edfe6f22fa442bd0a1a9661ea398ed2d7d964de416d73d338ca8237d881348f9e5a6438454a11c504 SHA512 8c91d2a427f451eb6fead571a9101615faf2f8aa29c0938fe491662ddda4e073efd2efb029fb1b56abb56985e2defb2e56b9ef16c46f77a38c06197668c90890
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1252 BLAKE2B 08f7e05955fc5e4690e2cbe78046c4aa3d298c2f20fe98b32eb49916c1fbb428febe7fee7cb3595b76190b90375eb2816b82379c4ceb690428bcc9b45cabad3f SHA512 a85893da037c9917697bd901825a304da4010208fcb5b0682a47d17bb0ce60677604955847d68c18792fa87cce42e19019aa08e8343e0a8799997894ee5f6158
diff --git a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
index 585f6092c7df..8be775f7d03c 100644
--- a/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.22.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
 IUSE="amqp caps dbi geoip geoip2 http ipv6 json kafka libressl mongodb pacct python redis smtp snmp spoof-source systemd tcpd"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 # unit tests require https://github.com/Snaipe/Criterion with additional deps
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index a5c4e40e4459..a112d2a00cb1 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -5,9 +5,9 @@ DIST sysstat-12.0.5.tar.gz 711967 BLAKE2B 96aa49d82e71407dbd99d840ca5f71af83f54b
 DIST sysstat-12.0.6.tar.gz 712148 BLAKE2B 1118ce071e06c2853ffdec2be1b8b3bf060571caf988e17e04ff62cbf43e7111c5951a131d176b49ad35e1da75d2b8936e23f1a385e1c83a013b802a0fc36003 SHA512 e8f542b26c2b0b7b3aadbf34dce640879d27f8f1659447f15ffb5a210987c74840418046409403da85a9eb4c01484615d230ddc700611b7c0088d72165bffe86
 DIST sysstat-12.1.5.tar.gz 1032031 BLAKE2B 9fbc0c0d132983daa334345f1f83ac8a46092cf52f35bafd443febd8ce40e4ab11b5b9b05b92e4074ecf9feab682035b2e08094ce10f3287036821be57db0800 SHA512 9dbc44b0226efc2f219ff71d2f0b83c930263fe8d6d0b451ae8404b3056558de04c76c16f2e8ba62083cde3a37cabbcd466d9247bd61ba5921dbc2ab6a1f686b
 DIST sysstat-12.1.6.tar.gz 1089333 BLAKE2B 3a3c3867b6b78ca1da7d5ef5838f5aad490e6d454aff3e8db266136ce7666112bcd1ad05b727c2455c16e53f6c84e0e75e32e8f4cc9318300aa9076921f68c1c SHA512 9c03e911fd6843b1719e080fce429e0d33f73f01619251f425dd4bbcc9d2764cd9beb8f8ebb4406b9540634d36c83303c10abcf682b079d35045454b1541984d
-EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B 13fe90d234884fe0e164ac2e2e69643383b6e2dd6048d8886f2871d5fd5e77dd81bd4e9a2b83f0e2e2a604d71cbbf1cc44eb1f320ef7c4d7114da1b3359999f0 SHA512 b072840085d01d79dff0b65988f54425dc900f7c2d98c9e3ed20fc91ab3e886fc117ae6d0d3327d2fa3ec40c46ff1dd25bd6f9a9005e52c4b845dc1429d10d15
-EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B f17e881c4322bd2ac87ce15d19f3dab84dec949c7c5c6fb25d1760546a116ff7191dc6904f86fcb835fd92b08edac261ed8888eb37fb7519f6ba9f161dd6af44 SHA512 09e75c118e1557209e51191efa50af6269b50416d0f387d518a5a3916f3e0d1d522049dcd631ebcdc39a72861209b48e4715989d0b764bae9c9a630bcdc649ec
-EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 3ba833b6ff81e4a5599367e15bac6370ef91069ee909a05c22b339faee931c8f6b84cef9795585b3b1f94f09bbf7f99624047fbcb814ba3581176d4db48ba0d0 SHA512 960934a753749b6a82368da345402c434810e1e8eb98575ef3363b95f9f99a918e70b1882fda51bb9bc349dbffcdf53e55553318c85eec97484a62bc03dcbf93
-EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 8158defd39b0bee0414fbf72509c687cac2138f06d5db309b0d4b52d729a66bff4f9f59048150eb69dd93377aaef9deb78d263a87e0d7a9eeea1c882d8ca98c5 SHA512 8b63f4400cbfd2ff99a9e73aa377a5fe01a5fd9e730839e4b1b2bc469d5400e772bc27e89dbb3387c25e23c665f6a8f7441e87df27433b6764b490646fdce7be
-EBUILD sysstat-999999.ebuild 1597 BLAKE2B f7f0260cfa097d792c587b41148bc300c1ee20e0b2b91f3307e0bbae32f8eed00d2a3e925967b754d3e7f5492d56b604a7fe417d633252a573acd4c8244b720d SHA512 be8c3366fcb833b47dc82076616b6ea95e87592bb62377d0c07268ca0fe8651130eb843374c965f519bc1eddf3fe2a97c119c2a29c2de9e9e6384d3fc5765ba7
+EBUILD sysstat-12.0.5.ebuild 1693 BLAKE2B a70bf736b6ab9884abcea8a31b01494b4880fa6c3cbf2911f00660e704ad6ede2059debe19c858f58106543651bae91ad6c9d339a45f109cb126e371b848d2ed SHA512 7b94c3b44265af2e49d79b2738343f60dec9b31f315be518507e0245995840b3a84d5ca5ee3cfbe286c4c22815adbb6b1a8ece9f3452ef8e3f201e8f3a28e330
+EBUILD sysstat-12.0.6.ebuild 1694 BLAKE2B 0a56fa763a3ad76df9b73f857da77153b6ee3af3d0b92a02c79bddae3c462b9d66a7a41a5fc6a7e32f32d949e06fd83878663dc7de7d2157d7ecb30d0ca99bea SHA512 8a3e2accfbcc3fd818d0ffd77d8a0ca53d302aa96d1320504244730a5b2c95628551c7cbfa08e291ada1071ed6b029c16f657e3a2a0505636f032f6f2b1f5478
+EBUILD sysstat-12.1.5.ebuild 1708 BLAKE2B 19bba927cc5d2f9227eefe2e647eba6fc47617b80b5c8e1967d05c6c181af69a80dfd33d4d47f6f54e55a671a53723d3c4ccde21780546dc14147c978dd94f3e SHA512 c2ec3fc831b52727d7c46e8675f266dd7309756748765a0cf1bb8a2e4cb5397fd008a98f2e016c1aae430c34bcf810dd70bc24f5ad59f1a5b320ca3af715eb5f
+EBUILD sysstat-12.1.6.ebuild 1701 BLAKE2B 195658f4a166da3df50865bc7a4f4883a1ba8ffeebad23f9e0c1d76503948d66bf95857590d5296072a34876920ad8c57d34f1ede20f6bac287881eca46d4954 SHA512 71c2a6d7269c1e7a472689f9f09e0def12b167b06f1c1ea3fb1ef79aa51e6ce0af05c3a97ab5365ae16f6cb81c4ee43f388f593d53e0c97fb8d0cddc3078b06e
+EBUILD sysstat-999999.ebuild 1597 BLAKE2B 3b18ae2364877c157a2a3c26bd36a270ad27c2a886ab9f0ecbf63ebc6ca1bd4b874606657d27f65f592a12c22fefab192ec691fa1d9a7b7354fa940f6e538226 SHA512 3d7bc304bf0d618e56a7552b4e88207c6e884be5464ad239e171a268d6fe5aa79c2f7929db0835c57e95f829b8eb9eae500e5187aad85316220a996c6be583dc
 MISC metadata.xml 238 BLAKE2B 72d4053d28bbf82c9a08a88b354321a782501542b5d506fc6d9f4034839f302761124d59445c0414a0fd38b6401cd5fbe06670802abdb1f25c7cb60919ea5d2e SHA512 b0b981ef72f4d295f427f92dc9931553b4fb7a91c8ed63fa1f28bdbe8bc61d6f0943e1217eb7b61b8d85d9685cbe759db49f094a18a1461cb48429affe76d993
diff --git a/app-admin/sysstat/sysstat-12.0.5.ebuild b/app-admin/sysstat/sysstat-12.0.5.ebuild
index d28c04c0297c..bad60fba75ea 100644
--- a/app-admin/sysstat/sysstat-12.0.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.5.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.0.6.ebuild b/app-admin/sysstat/sysstat-12.0.6.ebuild
index db640d7d5f9e..a0e5561580a3 100644
--- a/app-admin/sysstat/sysstat-12.0.6.ebuild
+++ b/app-admin/sysstat/sysstat-12.0.6.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.1.5.ebuild b/app-admin/sysstat/sysstat-12.1.5.ebuild
index 88dd13ade1dd..2938a1a2fe44 100644
--- a/app-admin/sysstat/sysstat-12.1.5.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.5.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-12.1.6.ebuild b/app-admin/sysstat/sysstat-12.1.6.ebuild
index fd3a1dd527e7..79183431381f 100644
--- a/app-admin/sysstat/sysstat-12.1.6.ebuild
+++ b/app-admin/sysstat/sysstat-12.1.6.ebuild
@@ -11,11 +11,11 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/sysstat/sysstat-999999.ebuild b/app-admin/sysstat/sysstat-999999.ebuild
index 62f6cc193b2b..fcefb54fdf3c 100644
--- a/app-admin/sysstat/sysstat-999999.ebuild
+++ b/app-admin/sysstat/sysstat-999999.ebuild
@@ -11,11 +11,11 @@ EGIT_REPO_URI="https://github.com/sysstat/sysstat"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="debug nls lm_sensors selinux static"
+IUSE="debug nls lm-sensors selinux static"
 
 CDEPEND="
 	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors:= )
+	lm-sensors? ( sys-apps/lm-sensors:= )
 "
 DEPEND="
 	${CDEPEND}
@@ -54,7 +54,7 @@ src_configure() {
 		conf_dir=/etc \
 		econf \
 			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
+			$(use_enable lm-sensors sensors) \
 			$(use_enable nls) \
 			--enable-copy-only \
 			--enable-documentation \
diff --git a/app-admin/testdisk/Manifest b/app-admin/testdisk/Manifest
index 0e01fb776768..a73b94397e0f 100644
--- a/app-admin/testdisk/Manifest
+++ b/app-admin/testdisk/Manifest
@@ -1,5 +1,5 @@
 DIST testdisk-6837474129968d7de13d91e5454bd824c9136e73.tar.gz 637265 BLAKE2B 7d7a2c875db9d34ad5be687ef0ccc8122759c645b30faf6eed7967747e69ac988078ab6c1909007c32c6bf5a879a5bfd00dff3d2d268e5b50e3b60a8b660c636 SHA512 b494e23ccd8f913a9b22f4b803b02af66e94f6971f45e6aea8a0e1dd8549996e7bdd3fafcf70078ebc242f262d064cdc5674d99cb7a367b810c45c0b1c40336d
 DIST testdisk-7.1.tar.bz2 742006 BLAKE2B ad67cbef73e502df39cd04537bae9226d043a0f5ed824ed24d5a5ac7c3262060d0c78bfcf38159890ee0c270e1cd7690cbf276eb919e1b4721357fffc8679c61 SHA512 ad6531eec45c1ed8d4a0ce6132692bb609c4c269fbca57f788ce808214e0b00b5fb1187745a859c5da8a3cb8de18b29904792d3246b15cedfa24bf24cbfe3df5
-EBUILD testdisk-7.1.ebuild 2333 BLAKE2B fbfe0ee753b893c872f3a04b8557b0e7a648bcbb769d3d2a5963fe760101b2a6ebafecc618fdfdcb0be13f8441d969d4439025c102306c3179372b4185053442 SHA512 aa0210fcc2150c2d7d096b1b78d7152bc245f9c6af0b7f97f6935469b9f39daf74fd3093654fe346a4cdcfb6b46ec5363cf61e56b3f92be8fd7184258dffaa44
+EBUILD testdisk-7.1.ebuild 2331 BLAKE2B ef6479f36a829488f5238199d556517e3c667323d64753752fb55e2b4906d770ca564ebe9c1a8fb4d4174c6e3dfa7fa9a2172200f5d0317b0f7c59edc3771979 SHA512 b8d75536122cfd62ec5ad82ecc2bba9fc84fd665ee16d4869cb8fc37411d73e19b6cac5f3311dc403885ad9b7651ceb30e1a1c70415822d0ecf1541a3dc24ed3
 EBUILD testdisk-7.1_pre20180922.ebuild 2517 BLAKE2B 2335b1e92f1b9d90e0d3e0f4e0a4088fbd4e60b1a39c6eea0cb248a8f2c51e4b083a36404904ef24357002d2dafff914ee3014e1388db0154492f7be7ed9df85 SHA512 9b9f99e977056372bb89d49e35b44f06edbc6f18edff5e555b99cbc91183422ec965e8e0f396d4e03387c15c719a74c1774b8ef3a8ff2543664ed02349b92601
 MISC metadata.xml 555 BLAKE2B 4b56bad0ebd1af77d90c4fa650adba5ae59d06940dff5aa346cb0e9dc9ebfad5324f774cb1afa646e15731b41cb09d7020ee3b6a5a0d941452099b6b7884da75 SHA512 3c47ad35d151d92e4be40cd91c7f0ced271f7b61a00280f536cc70a700d25ae36426593fcb8aec76e9cf1c24ae76dc8290b00bbcb73fa4d95182210fa680562e
diff --git a/app-admin/testdisk/testdisk-7.1.ebuild b/app-admin/testdisk/testdisk-7.1.ebuild
index cbd57b54dca9..c76b3239eb3f 100644
--- a/app-admin/testdisk/testdisk-7.1.ebuild
+++ b/app-admin/testdisk/testdisk-7.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.cgsecurity.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="ewf jpeg ntfs qt5 reiserfs static zlib"
 
 REQUIRED_USE="static? ( !qt5 )"
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index 13d27bfcde22..e6ce0c2b1eb8 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,5 +1,3 @@
-DIST yadm-1.07.tar.gz 34240 BLAKE2B 11952a693c38aac2f2e7fa3efd469dc640941ef9c75a8a1e70974b4eea37c506df7480b2fce84ca8482c932295923ece4ff52cfc13bf9b52030dab0500f07c86 SHA512 9bbe33c82a137375cb27916ae5b5a06f06c25a75ae05688be473103c29154309d3472accc0aa0670a80a4714bc6523ab85c41fd6aa8d1909586437c5778b9144
 DIST yadm-1.12.0.tar.gz 47340 BLAKE2B ef710f56c96244c082bfcc887cae4aee00aaaadec5e7466500dde263c5e4f43df046e11742fd275e989bd9704b39a123f17248cd70d64f6ca552b28db6c44814 SHA512 402a67770154ce3ae7ab947ff4d4e26ca5040d343110fb749195ca5c3f4ee435aba1d8cdf02d4ecf4a81d3f331c1b891bed4fb3fcfcc893867e0fce45b9c8cd8
-EBUILD yadm-1.07.ebuild 895 BLAKE2B 30f232a9b56113aeb38d9b500fc4964e21d705095a3e74214159854a4b2613635a29cbc0ffed322a627805de7b6d25b41b4749e4a5fb38a652a919b9410a5b56 SHA512 7313f9adeb78b32db14351ddead4d8c13cc81c49ec3cc7ea9d78ed4318bee9704d99890a9fc403679069e830583acbe8e37d32bcf91cf4fc25839f9715a239fa
 EBUILD yadm-1.12.0.ebuild 1234 BLAKE2B 73b60da066947ed5ff45950e5809695be1b234e01005103eee4076efcab65fc3acb193716590974caca0a5c209dc13fff77ef85f778c5aa2f8c65d1c67e9ffbe SHA512 9321ffa59728389909b187a1da4cf230467ab180f9ecc24e3137dfc1909329ab68e40066c622ad1c411ff5ed3dfdce9c6b2c1f69ec77f248d7e2361e38f99218
 MISC metadata.xml 825 BLAKE2B 6fbf4554179cf6141396b8e21be3dada54c0eec7c5c5bd1e18860b73f1d170044006b92010f7dd5d3c2238f8545024ee43dc2c86305e8bc91871acdd497c8749 SHA512 0c8facf902245118eab0d6c4b48eb5a2fb63aa6cb7fe4581cc0353bd164912b7620eb2f42984b45410065d3a6e1af1cffa5028f5c26a4ecd38a9983da6b34feb
diff --git a/app-admin/yadm/yadm-1.07.ebuild b/app-admin/yadm/yadm-1.07.ebuild
deleted file mode 100644
index 7c5907088202..000000000000
--- a/app-admin/yadm/yadm-1.07.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A dotfile manager for the config files in your home folder"
-HOMEPAGE="https://github.com/TheLocehiliosan/yadm/"
-SRC_URI="https://github.com/TheLocehiliosan/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-DOCS=( CHANGES CONTRIBUTORS README.md )
-
-DEPEND="
-	test? (
-		dev-tcltk/expect
-		dev-util/bats
-		dev-vcs/git
-	)"
-RDEPEND="
-	app-crypt/gnupg
-	dev-vcs/git"
-
-src_compile() {
-	emake yadm.md
-}
-
-src_test() {
-	# 109_accept_encryption tests are interactive, thus fail. Skip them
-	while IFS="" read -d $'\0' -r f ; do
-		bats "${f}" || die "Test ${f} failed"
-	done < <(find test -name '*.bats' -and -not -name '109_accept_encryption.bats' -print0)
-}
-
-src_install() {
-	einstalldocs
-
-	dobin "${PN}"
-	doman "${PN}.1"
-}