gentoo resync : 03.11.2021

19 files changed, 172 insertions, 26 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e1ceafe60d0f..c6d477d8976b 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 106bed99ded7..cec63a600132 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,14 @@ DIST awscli-1.20.65.tar.gz 2091702 BLAKE2B e8295cf4e859c1e642077f4014fdea333292e
 DIST awscli-1.21.5.tar.gz 2095418 BLAKE2B 152d0ac70e9e0120fb9b10451904af52035bce84168c055695e7dc93e56648bd7689f20ac0ecdbdfc54ccb846d51b33027d2e9ee09c5e5d1e915c0ec05b0fbfe SHA512 e3063252a50fc6033669a0ff80f82d73764a6728d623d75a27f0652e779cbeb452454d887bf5bd70199a7394df40f9758b14619778c6428a164d590e6c8aaa89
 DIST awscli-1.21.6.tar.gz 2095961 BLAKE2B 7c765168604cf98f2c1be1aebf1cacb425124dff51a0a1ba1792634187feab6361d740aa743eda7d41a671300d4196e852640e04f56aa399752ce3305ac1ce86 SHA512 912d81f96cef3ae1c2a0969050e1bce304d1019a98d6bf16e45de50c66f85f6f69a10ceffeae773aafa002227e657861a9f41d123368c1b4a93b5d49747137d3
 DIST awscli-1.21.7.tar.gz 2095914 BLAKE2B 6cb53fab223941a41eceeb8430d7158bc14da670a42609707ee5aea02a7e9d43f32fd7118ef7ab4ede54dd5312a4907eac7aa0e040d775ca7f606049dfc1a090 SHA512 8bf7dd4aaab890e4269a02fdd8735dd918a31783128dab46bc5077310ca385717fe4da913c2fb3c36e1132eaaea40cb7c4f434d6060fe27cd4bfc704581cd1e0
+DIST awscli-1.21.8.tar.gz 2096389 BLAKE2B 5af0d744e243f9251a4d70914db58d2e154959505960fc93de6804951c4f41851072f7431f13e91b0d8ac96e349bdfc67517e2166e33e4224a68f91d9d7749c4 SHA512 3ca4913070ed468ea95376b5e571244af8bc562972c1894b4144b7e5e1c6937f298267d9e4db65549fcd61f6b6b552354070091c5b387b6e10f67f8a36e3611c
+DIST awscli-1.21.9.tar.gz 2096564 BLAKE2B 81abee16a5b901a5d1a297f58f7640b6dcb0bb3471c3303c55e702a3f5f31697902d5826a1254acc4c7688ddcf9169ccef5bce54e0734f6b85ee9e1dee27e8bf SHA512 2cd47efa585a4c842306a2acd3b9f28e39fba12540f792438c3e5bbe32a4ae02a5e6d992358d0717295a7c628b7d42bbec73daa93194da56109821b1fa3e8188
 EBUILD awscli-1.20.53.ebuild 1306 BLAKE2B 1b1be64ca6072a28230aa36c66bea67684784f2d44e040ecdb6694ce5f023168e170a36d3a3e133a9a8559d15dd0aced5e7a78af349f3691a883bc19f7f60318 SHA512 6b9579b86a827d2a4d46568d17899f3a45b047621abec213da57f70603021ab2ac57dbe1e127ee12aa41edc93aafd503db911e13ab744fcaf5ea6d8b5d60ad6c
 EBUILD awscli-1.20.60.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.20.65.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.5.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.6.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 EBUILD awscli-1.21.7.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.21.8.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
+EBUILD awscli-1.21.9.ebuild 1308 BLAKE2B 954123736f61e3243edaf3df49a217a2d71bd060adb3f01193256df0c2a67c439666c38dd4687346ed9380c4b18f92b796f1ea7b4511c5a45bee0bad9fb3498f SHA512 acfa378c3478f288c30250ee9b914aefe6a2987c0d6ed312cc0147f38a22965a9a47046bd1c47812b1e129492140e07af40acb89ab70135b9d720f58db2611d5
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.21.8.ebuild b/app-admin/awscli/awscli-1.21.8.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.21.8.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/awscli/awscli-1.21.9.ebuild b/app-admin/awscli/awscli-1.21.9.ebuild
new file mode 100644
index 000000000000..81d5997098c2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.21.9.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 distutils-r1
+
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="https://pypi.org/project/awscli/"
+#SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+SRC_URI="https://github.com/aws/aws-cli/archive/${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/aws-cli-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+1).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.4.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests --install pytest
+
+python_test() {
+	distutils_install_for_testing
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index 68513df00ca8..2466b5831075 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -8,8 +8,10 @@ AUX lnav-0.9.0-bug713600_1.patch 914 BLAKE2B 407c737471d4cda95c12aff862dbd3a1709
 AUX lnav-0.9.0-bug786456.patch 12017 BLAKE2B 0200e3b741e9b5d62cdeabf83c96d94be091f4895db492990404dfc0f41d8017aafe1afb8492688061c497e98bb0ea62bd96ed8c36f365782868ffed04904281 SHA512 94ae1e0590dab749923ca51bb407efc37db555c891df402f07143901077e8907b6bf90c1a6a7ec2d8365555d22e38d772ad39d7d4db86f0e76fbf98f5c10cffc
 AUX lnav-0.9.0-bug792582.patch 3148 BLAKE2B 8392a375e0d47996a9e2afd6d34a5c0b38efd5ad187e83ecfad9d4badec3565cff549dbe5ad64ae7417e1c2bedeb4f5461dcf96f54e6301b3ac0496a1ae7326e SHA512 4bf60c52f8678189f6e61415d5ca1859122f67603ccbfddd991ad4f825fcda4c01ae4992f2696e93c726f19d83488231da83b02c8d20bf6ee3f7def022e73547
 DIST lnav-0.10.0.tar.gz 5678120 BLAKE2B d64957e94cc5415e663db8ab5722e6424381aa83a2c9430397baed782b47064ed8f460f27bec6256206cabb43f20eba9318aec1991115b577fcc9c37585dd932 SHA512 d07f4e594b9b905453f4c0ac54db2612e3bed533b47f4fd5b6b0da4e27a2d3bb611cbdf9801c12b6edae045c58881ff1f458f144981fe3d8a41f8d113e847efd
+DIST lnav-0.10.1.tar.gz 5707151 BLAKE2B ae82b705830c6ea38e2fa4f3832a2fd1d8ce8b5ef00d6a3fe750e4f5e7080ae29fde845f2c5055e2684aad1959368ff90abdc130130f8d6f0152426487e7396c SHA512 fff9632c1acbef80ba9d4214fd3ef485727792353fe493cfa4f2e9412bb371f50f2e1a735ded3d7bd8b16df5e93e03b0f3def296770e7dd0ad2206fd9f94690d
 DIST lnav-0.9.0.tar.gz 1094734 BLAKE2B 79d6b035d9fc1efba618dbbd0924dbac2c8a2b3316849164c8c1a3782c7e8b85f12ade02a973d0c4fabff64b38e26fd579f1931aeafb05396ece7e75608cfc5d SHA512 4f03c83003b262c6aa1d1e87d61b4a3ae8f1ccd33a2df1b451f263d3925791d3b46285bbe276d89733a2bd464be9029e7100ce12fdfe3e009a089f250e601151
 EBUILD lnav-0.10.0-r1.ebuild 868 BLAKE2B 21f7e1abdb467c1dcbeae316d3d8f96fe844ad9ff9dd13ae2208ef4e81688664e71918217ca0010c88082a536807dfe7dfa540ada306cb46f6a6e9c134ea49bf SHA512 b01777e82754e0300582edd9037ccd1c478b97ccf51f1fa51756bb305d0cad62a0b29fc0a3df5d001eb13c6a86738413677a6ef23df794997be6ec0aaedbb29d
 EBUILD lnav-0.10.0-r2.ebuild 1869 BLAKE2B 258ea8166f16e92c9f5673b25beaa9d10d61a0e8189e8cacace55995879f7895162c8696d60ac50d241ebcde70955b883e9ee7bc7b62fa44efdd664e9f8b1037 SHA512 b3f853d1b5e9636760a9c754c88d0c50c722c41d4e4b043f45e0b14b2372c161a40397354cb845296d8591adb6a76d21b0801528e33b7ef9b3e000b58d2948d8
+EBUILD lnav-0.10.1.ebuild 1042 BLAKE2B 44c9fa4fff39daa2d10397ebd91029753b6f5b92d72e8ca954f7dbdf06b5008cf8e3c678108b19bab224cc417b97df7ee89c4669f00fe0142de90fc544d05e8d SHA512 5d90a380e4127e0933eea885cc7fd93567b77c04df2c8008948cf52a51943efd6268821935abc0717fd66d8b48c6bff938bf03ce64b0aa23c0678fcc3405b0d4
 EBUILD lnav-0.9.0-r3.ebuild 1129 BLAKE2B 28295e39ddfdb4fb151132c61e0928dd9ab53853206d6f1cd4bd378d45ca07826eb8fa7c64efeb44d6cd1c8af252d050e36eabffff3bd9232b6825ba977b627c SHA512 2801635eebd830873063750792af5b4d441166432bb064cecb562f9f5cd27ef2249574dade33e53c066e3b044f0cf00831d9246e2dab350ed9c0a57d8e298e6b
 MISC metadata.xml 781 BLAKE2B 6c7ff3da9a9dc1a5369ca51771ac4f11185426296f806e674a67a95a341ee5b466261387913ccc96e1d9c1b10c3719ae52f529f24004f5a464cb3f6d884e9fdd SHA512 b928e1a51306e3e48dfb27a50b240f2d855380988b6bbd4650cc04583b73385cf052f947cbd7ed089efa4e1131d23503f4c3fe539c20c724dd29c6e43195a48f
diff --git a/app-admin/lnav/lnav-0.10.1.ebuild b/app-admin/lnav/lnav-0.10.1.ebuild
new file mode 100644
index 000000000000..77d3aaffb0b6
--- /dev/null
+++ b/app-admin/lnav/lnav-0.10.1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="A curses-based tool for viewing and analyzing log files"
+HOMEPAGE="https://lnav.org"
+SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2:0=
+	app-arch/libarchive:=
+	>=dev-db/sqlite-3.9.0
+	dev-libs/libpcre[cxx]
+	>=net-misc/curl-7.23.0
+	sys-libs/ncurses:=[unicode(+)?]
+	sys-libs/readline:0=
+	sys-libs/zlib:0="
+DEPEND="${RDEPEND}
+	test? ( dev-cpp/doctest )"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.10.0-disable-tests.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# These tests use network and expect a running sshd, so we'll just delete them.
+	echo "#! /bin/bash" > test/test_remote.sh || die
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_with test system-doctest) \
+		$(use_with unicode ncursesw)
+}
diff --git a/app-admin/salt/Manifest b/app-admin/salt/Manifest
index 67469b5a3705..1e22369e22e8 100644
--- a/app-admin/salt/Manifest
+++ b/app-admin/salt/Manifest
@@ -40,13 +40,13 @@ DIST salt-3002.7.tar.gz 15792124 BLAKE2B b4cb4a6d73c45f3c2183a7adfe8196bbc5788dc
 DIST salt-3003.1.tar.gz 16010476 BLAKE2B 3cd141061d8fa6ad00fe60615e8d36fda9fb26264adb2722d34e0b93c626fe09d78c3b9280ad8fe98924469a1ede1ad93cc06bde24a121c3db8c957be0ab7d75 SHA512 bf5ec7f1d16c776be5c2e90bff30e11817f369c3b08c0fe8bd991e7be31179b10cbd244048fb08c05aff30d7b6037c0575c311da4a0f300ce02bcf677aa6616f
 DIST salt-3003.3.tar.gz 16017984 BLAKE2B 9cd1e33a7b6dff4d3c6c5a87e1204f7f113b6190da8301061e26fcec178aba597a9e17ab60a54a67b52a895a9a8aef58bec70e9fdd8d8edc5a42945f6de21a58 SHA512 4fe50922833fce48fcc679adb16a0e1fe893531b2feb08b235a1461c58b8d9a72af2acd89fc0f712207fb0cd215d6b446e31a40001b46c43d0cc4ac827ce29e3
 DIST salt-3003.tar.gz 15830910 BLAKE2B ea4f02eece951c3fb4fcc480d00f7b531ac549b2e23ff9a210b73f749f9ba83e0402e02a59028f41f94958d17512e417b7c1b7015e8ee3aeac55be9b1374fe6f SHA512 7f631466372f303c03f2852a5cfba1ee5c6ba1636a6fe1e1622e90d0b1376ef9f670aa1b4754f3d9c8c7fe1b99fe1b4c49e140dc86d90d157a1ec1e73ba43c38
-EBUILD salt-3000.8-r1.ebuild 6619 BLAKE2B edeb4e38aab16c71206a6fea80e6e72d89659e427af66961235a854368ee785963a4cf1800cb4a725722fd433a56349b4e5fbb58626ee563c489de2c1b4fbc13 SHA512 439fca4963d8ec8f840c4fc2a3d49c04256ba53ef4f222887188b3c877bd0cdbbe24a081bfbcf75d02a5a6e39c0544bbb634fc6aacf850983825549b84cf372d
-EBUILD salt-3000.9-r1.ebuild 6661 BLAKE2B 0234da9585d1606983d13022f59878394d47d4b3389655568164d22a45f1de52af53c8f1ff9978f4c41abc2c3531d1a25687ed7300011fb9372756836093e8c4 SHA512 08d14c253e18b99cd85b07ae3eaa1f5161881badf4fb9a744093704b5f3da1f693a81f415c6a95360bd3c54762657a3be549a45f4f3c9743d6e893f8c6482b6d
-EBUILD salt-3001.6-r1.ebuild 6242 BLAKE2B 570ba5f2830435467db7eb562c58f3f45199b2519ce0f88eee298e66b3b05a9d5f111dc399709bc70e97d6c109275a676dcb2b8fb0a3eeb55fffb4a053974ce2 SHA512 06a37ac98911040244f18b562affe9732315ed8feb0944f00a5c82e31061966d173cc33e138be8ce852da755532e436742f778130c5a61aa9e38b966e8d2c811
-EBUILD salt-3001.8.ebuild 6231 BLAKE2B 78d78cc0a2a17fc6febcd1afa8a7b9b63f44e9bc09c57f24bb7038762ca66af04887fdf480b91bc259ef76f4a6db1779fb7f9b4de6d09e37cf3ba7934f068a3c SHA512 d0dd479fab9dd1889d26fd53a1044a2a2ceb78dae7da6504f1d5d3435f3639d71f422fff25adf18fe87135323225adcb74ce72af4bac578e3e78fbaaa2f402f5
-EBUILD salt-3002.5-r1.ebuild 6273 BLAKE2B e9768ac7fcd7a11c6c05bf8b9900428af79aa63cd1332208ec15295cfc769945bf77e16afaa696e26efbdcba525df1ab520838bffce7319470a742133544a759 SHA512 ceee568eba9776ccb8bacbabf914899f1bd4d27fdcc777a2296b046169601cdb269c2e32e2dba7d052dc780a5990e0d1deb5dee2c4180f6383ea9a45922e33c5
-EBUILD salt-3002.7.ebuild 6504 BLAKE2B 0633314b7c3b2ffff780c7b9d2aa2bcc329b5591e910ae5b98c03cd5a4174058dd79e2a0b5abf807153fed62c3c520cdaf028301bac223551888787105bd5ce1 SHA512 e5adfabfc656bcd479e9c18627ed42f2206af26916714ca421c3b552feac4e0180dcc3f939c768d98e69824211257baf8d80d418476c3a8e436da4bd45c70eb7
-EBUILD salt-3003-r1.ebuild 6578 BLAKE2B 3741769a693c4d2bd6868c0cd3ef47697e25a97675336c08c2af482702d48c43e6a54ed71092f1ba754c52938533d8dc8a94e6f5e678c77419824b2b51e04924 SHA512 c5bb47ee8a74e07bae14a368ad48f7ae5906a738ee04a48c4d2efea32f6cf65475e1d4db4107d61fd9fd267cf105d36a682171ae4af4745eed51e587a78514a7
-EBUILD salt-3003.1-r1.ebuild 6810 BLAKE2B a66ce2731f94e3a870a0ffb5ba0e2627a7c6cf345009b33b1095bd3e7439fb12450abc2d9aa858106bf590cceb198fbe449dd50b32e3bb2214bb96e9bc560309 SHA512 009ab916c2f44a7e99bc5fbc1e50709a361eaf395d26babadf88f5e05322a0b44596911cbd310fc4089928fbc1f100923b274307f759d169a40c604c6b377a31
-EBUILD salt-3003.3.ebuild 6800 BLAKE2B 2edfd7f0486a61384ce11c8b51f3db03150879ee170a1747d9d42d438c11fb4164d7f5572c94958adc36ef5f2ca506f24564e231b65a6c31702d55f049112741 SHA512 51774230b25d51aa7b887662635540943c137b4066745a50f56ca7464aa804d5e35250d71cb7ec73a37186a6a97f8d6615f40a3cbe5a12d669c05ad58957bf4a
+EBUILD salt-3000.8-r1.ebuild 6621 BLAKE2B 07886dd10693134d3e01db34e6847f96272d3510854e1b8130c999ae1fd026bce5024cd6d311a8a69eb60ee8a0cc39284aba640162ecb0ca22058e1e21810a7f SHA512 d044a41745e400cfc7d9d976ff78b736ef3c630e9df89502eef78867e57a628d78f032366e0e4d68d63856d453cf13e034597c1f6b3a30279f5edc89dc781d37
+EBUILD salt-3000.9-r1.ebuild 6663 BLAKE2B 257266c6734f4c859234e73e654bb2ce8c685c4509b1d49e4e60b4f6e0cc3b08be0aa9be70746f1f114d498e00d25111753e5297a63e71d3b39bfe7c7173f1b1 SHA512 b892b57e2aecbd6e521c3f6973c0e75e037b1a310ddfb1c1c107512adbdb108c4e9e47a1d8542734883fe74e6e951aed051abe35e7401d6ed70e6abd23f9f11f
+EBUILD salt-3001.6-r1.ebuild 6244 BLAKE2B 464d3ab8f791d67b9e0964a34a9b516dca8733e49d13c848fde451f5bdc5b7cad8eba0ca7ab0303e6c0bfe13489080b112c10c3e2dc183d1327bb794a71efd4e SHA512 8adeba357f9a824d7c5ee68f0a157720aa67b0715938f2967ba4eaea41054ab9c7f3d1a4616cd2af5666080325a5e372836de6ffb84d71778a6dde2ae3844d21
+EBUILD salt-3001.8.ebuild 6233 BLAKE2B eda71511e995977e91fdd0a1b323a47fad5a6ab9b2969ca696f410066d859db205c12ca7ce00154a562b83e8542c5445cb27e8ac72f33bf4615b2fb234899496 SHA512 790c10e9770a8b859cb6e721e962d0e992f2bf3d0d11db2fbe2811b7f4c122218b317f64172d3a65175d62511db5906f1d3873a98336d726d089493796defef0
+EBUILD salt-3002.5-r1.ebuild 6275 BLAKE2B 1138d07246b4c41419af18af9acdb3332c88815da20c27d46d3ccf68882e5c389f1bc8f0b40c429b6c7afde4427f8289eec9e5277510f559858e228d6b1a010a SHA512 8d07d275808b8b052269848dd6fa6e030d7f78ffa575b798d95598761d6cfa4542310f5b960bb9ef8a88183eb97a8f830160ce78c6936b259496b613dbd86afb
+EBUILD salt-3002.7.ebuild 6506 BLAKE2B 225e4b18c276e26f7d9dffb06920f6ad7990b9b7de7c3e838325c8582e6408ce483e284e03b549dd62b87beb778c2742c12e14e6f65e89c890cdab912e138525 SHA512 0b06ca50fe3f0b943a7270f617e61eb4d73fb0a3187068d37495987ee267f53e499abd638a88c098bbcf07ea51ff46f2ed9ba7c0717069239b81cfbfa82ac92e
+EBUILD salt-3003-r1.ebuild 6580 BLAKE2B ba2d5c5a2461694213918dc4d7cb88600235b1b1428ffe77282e24aa21f69b95194085e785e59ad2d51f0319b1da29ea21181d55ff5be7ac9314cc8da5cd8196 SHA512 45f17a2d32ea81bbf01552d9efb2804093b5cd567cc17b23e591a89a692b2ed719676c7d5ecaeee6d723e0d1443f2873d02b4f35e945c5270c8709f0c106c4c2
+EBUILD salt-3003.1-r1.ebuild 6812 BLAKE2B 4c7cef012fb1fa832f12571b744e4336913a381c64f282edbde0415368c96086022f7eee077f58f57d8b966270536588580b1eeb32114c9318fed6fa918d4bfa SHA512 009e12efd0ed72ba24e4ee5c9bd12a1626d61ea3a5a41b34b1fecc857c3665144217e27255f6349f7de8c07d60fb37d0af25645e0429b366d38931ef9d54697f
+EBUILD salt-3003.3.ebuild 6802 BLAKE2B 080b7c57857d24b6e51cb50aedf85900fda69c526d3ee7128cdda1ed945192d34a81e599a95e578c62e8db78a5b5bdcb80d140986f7e13c7a3b49e4c99535111 SHA512 1bbc8f2f3d441955f3520b968c343c47cc9ad8892987b7e8636c4a60971bab9ef476e1b831ac0d6bba02399e64db5180c113768701d970477b17aebb1c88e90e
 MISC metadata.xml 2362 BLAKE2B 60fd7a02823e610b4d12b1d4c6a066cf16f8ef4094397553381d62bc027715164f02ccad4c86e431a30822d5c4c25e4eebd814f99e43b7a45bc08a3fd885cfee SHA512 4aa7549a76e69233949c68841bfcdba6630eeb78a507f20119469f7835a6532b737f41d117c09b1e4c7574f95dec759deacf5d5482be961755d63a19b9eee9a7
diff --git a/app-admin/salt/salt-3000.8-r1.ebuild b/app-admin/salt/salt-3000.8-r1.ebuild
index 13ed8d22824d..a7beec09126f 100644
--- a/app-admin/salt/salt-3000.8-r1.ebuild
+++ b/app-admin/salt/salt-3000.8-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3000.9-r1.ebuild b/app-admin/salt/salt-3000.9-r1.ebuild
index 5be41e9acbe2..5a4ddb137b9a 100644
--- a/app-admin/salt/salt-3000.9-r1.ebuild
+++ b/app-admin/salt/salt-3000.9-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3001.6-r1.ebuild b/app-admin/salt/salt-3001.6-r1.ebuild
index e6a695ff300f..f7f0572e44ba 100644
--- a/app-admin/salt/salt-3001.6-r1.ebuild
+++ b/app-admin/salt/salt-3001.6-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3001.8.ebuild b/app-admin/salt/salt-3001.8.ebuild
index 6e4d6f481757..f5be15b9f74c 100644
--- a/app-admin/salt/salt-3001.8.ebuild
+++ b/app-admin/salt/salt-3001.8.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3002.5-r1.ebuild b/app-admin/salt/salt-3002.5-r1.ebuild
index 45c6151ec8e8..f5d17b9155a1 100644
--- a/app-admin/salt/salt-3002.5-r1.ebuild
+++ b/app-admin/salt/salt-3002.5-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3002.7.ebuild b/app-admin/salt/salt-3002.7.ebuild
index d20e3e59a373..ef104ec4d6b4 100644
--- a/app-admin/salt/salt-3002.7.ebuild
+++ b/app-admin/salt/salt-3002.7.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3003-r1.ebuild b/app-admin/salt/salt-3003-r1.ebuild
index 0d4ef8fc9027..a41257f8685b 100644
--- a/app-admin/salt/salt-3003-r1.ebuild
+++ b/app-admin/salt/salt-3003-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3003.1-r1.ebuild b/app-admin/salt/salt-3003.1-r1.ebuild
index 5c542bc2bd47..e173766c185d 100644
--- a/app-admin/salt/salt-3003.1-r1.ebuild
+++ b/app-admin/salt/salt-3003.1-r1.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/salt/salt-3003.3.ebuild b/app-admin/salt/salt-3003.3.ebuild
index 1611ed310b5b..96b2c3b05e60 100644
--- a/app-admin/salt/salt-3003.3.ebuild
+++ b/app-admin/salt/salt-3003.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.saltstack.com/resources/community/
 
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="git://github.com/${PN}stack/${PN}.git"
+	EGIT_REPO_URI="https://github.com/${PN}stack/${PN}.git"
 	EGIT_BRANCH="develop"
 	SRC_URI=""
 else
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a0734f687e34..66b0626a260f 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,6 @@
 DIST sudo-1.9.6p1.tar.gz 4119888 BLAKE2B 02bdb551c46cff11ac56e64937c64e6a29ccd8e0af34ea2f6b33c223bee8f7ad958d0fc3d7ef8ef12bf5bc82565769b923ff112a3f3d6bf6999fa4f6ea55e38e SHA512 632dfe72f04ce9a7a5a7236fcd5c09ce4535e695ced49d24dd848e3a7b1bea7380df44188b9e475af4271069539b5a5816948a98fbb0649ebebaba8b4c4b7745
 DIST sudo-1.9.8p2.tar.gz 4302256 BLAKE2B ba40df539b3466bebe0d876ef4f1809867125e83983609eae0447f933fbd499b2eda88d2f6c475779654e68af9580a2998eca3c3f7953129ff73c923e1c88ad9 SHA512 899b252e8c219226f658dff3dd34c97b07d42004998b45175b4c0c4de42a6bf9f909598e99b4056fa1171e63378e203854b0f8608b0f5c1b00e9d3677818f6d3
 EBUILD sudo-1.9.6_p1-r2.ebuild 6725 BLAKE2B 620c20c144bb7fd723e3e46022dd3e6152084978091e2e3af0a95a961dc027defeb5d20dcee4b0e36959e04124586a2c53d65c8137af9d1f52a6044392c08aea SHA512 fc61898d795187d7ab0876001c725bdb2c5f0c98ab38adc8427f69abc1da8b33be6ef8ebe1353ead193f10f48ed042fe12a13f90c181bc3a0d3cceed352bc262
-EBUILD sudo-1.9.8_p2.ebuild 6733 BLAKE2B 368f23a2b355e4603ebe96ffca348fdc8c7cfe88daf60c5ea14f84dbfae13fd6f95c5189ed697e4bcb3044d1678c51493ff3d39417d4128ca8e5222b898d645c SHA512 98627c6bbc5e9752b9ea143ff8fbb9056f9b2b3684583d2cfeb54b32b9d5be0d04e115e65824e2e6320fa40ef3534a70078f50d8ea9d0c45c0c6dbfcf85f21ef
-EBUILD sudo-9999.ebuild 6738 BLAKE2B c01463d07ac685ef4b37f375793999fa88a8fd75a89ad98d01aa86f87d7c766f6d6298e369e7f1e212304ca1a8c8a1dec5c4d308577531d88cc6f8c634093876 SHA512 3f1124da310c815250ac216dc8f9999c23235faa76704793edced96a3825a91ed4ed3e6481fa10fd8c6695fcefdbd8e53cfa472bed7e5463a470ab9945df1b26
+EBUILD sudo-1.9.8_p2.ebuild 6793 BLAKE2B 2d6d88032ac334355c5d2c0b403d093797af2d8131b60b10fb49d3935e63cb3f2baa98c3b643ac213f04a25ffa69af0f50ce6f67edb81f28e28bd44de4ab34f6 SHA512 c6309d2571a36bb459676ff2827ccd0b7353ae98ae30010010fe357495a7ebb53c8807d043326961efedd290e119f7071c1c7fd14707d5761bc960eb574f2147
+EBUILD sudo-9999.ebuild 6669 BLAKE2B 908e75ad8b33fc74a3491c77aa184e6f1de8629b13fb6bc704f7b9980b43fb313591667b58c9583f50392d44e852dcd7f3e65c5265b3eb5d32c8e970370b9d9e SHA512 f415714f5b28550b5f7b3b3f79b28a95db5738f3b2c65720d911c8fcabc4b8099f58e510c17af6194ba76cac53157fbbcb7688d35ae99b2633973bcf50799089
 MISC metadata.xml 1050 BLAKE2B 4027c8a5941e8e12bb6c9cd9950187965b01e236ddfc073ba0dd98be8e3e98225ffbca1c05b3153d72e5507484f966e01c7b44e9416bbedecd88ae8f4d52e359 SHA512 8033bd4649190c3c6bf0d07dab2dc99a708b81a74b0d154b1f4d56bdfbc115d4889b3a78e6b2f3eebaa91bf0252e8fd043bf2bc850b8f6b4199b38ea751b7174
diff --git a/app-admin/sudo/sudo-1.9.8_p2.ebuild b/app-admin/sudo/sudo-1.9.8_p2.ebuild
index 6e918224c11b..002fccede0ff 100644
--- a/app-admin/sudo/sudo-1.9.8_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.8_p2.ebuild
@@ -22,7 +22,7 @@ else
 	SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz
 		ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz"
 	if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
+		KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~sparc-solaris"
 	fi
 fi
 
@@ -161,6 +161,7 @@ src_configure() {
 
 src_test() {
 	# See bug #667600 for TZ workaround
+	# Note: drop this after 1.9.8_p2! Should be fixed upstream.
 	TZ=UTC default
 }
 
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index a35ba589af05..de7fec385553 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -159,11 +159,6 @@ src_configure() {
 	econf "${myeconfargs[@]}"
 }
 
-src_test() {
-	# See bug #667600 for TZ workaround
-	TZ=UTC default
-}
-
 src_install() {
 	default