gentoo resync : 16.01.2021

41 files changed, 757 insertions, 275 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 6bfeddad92d3..a7f856b7cdae 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/ansible-base/Manifest b/app-admin/ansible-base/Manifest
index 962a505e8d72..2ed06bed5270 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,10 +1,8 @@
 DIST ansible-core-2.11.6.tar.gz 6999232 BLAKE2B 5105928881297226e982e42c8027a370ad31869d92ca87d338cdb6e72504a22cf3fe7843921905599c7126c840197fb7799a72c261a007437a437b85c4a65c68 SHA512 d14686afb7b2802be3bca3baf6f3840d33f7994b7c48fcb4d42f871e13e4eb54ffef413e124dbe614a55041c23b509f5e887b687dbb6c4868425957cac45910a
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
-DIST ansible-core-2.12.0.tar.gz 7405927 BLAKE2B 9256d88910bf13dfac87ba509f0b1478305f9a07d8f935479b1a23ea1b9b3e8daf33030aee8ea3f9251cc858ab04bcf189f9226323157a1a2ae1fbcf5c4fb0a1 SHA512 c3c8c0e2f14c30cecb6e693fc57d2bd686221efaf42f09773bd4606031e4fed68a216be17c040d51601f2059d0f4a44568cea309c3bd2a1c02957c6a4cd6d25a
 DIST ansible-core-2.12.1.tar.gz 7401160 BLAKE2B 2bc412bade7f7e5dee0e51c78a74b4dea286aca1b82e2217012f168cd529a06887f11d672ff883af6a71c3af6ea1596f6720bcde9ed3696f87b8b5def1a1172b SHA512 89468d172dca502da42b94d0a781906578322ac531b3dfc3cece383b0e93fbec0f199d7b76abfd80d24654d5d939ee66a15b74565f50cca0c72d427aab9f4e08
 EBUILD ansible-base-2.11.6-r1.ebuild 1648 BLAKE2B d9fcab40038acc1ed0fcb8165dd0a5588a8a2f2778970d7deb9bbef18db20ddb9be3c16116b2efe57ab7e6ca2546996977233ee81a2fafa67ad2f89e1da32c69 SHA512 30bb64ecb491052d3e8bec1d1b8c12b18e97475286e7652207389a7cd9904b996728c524d507ac8ff1a5d3c407a7aba13ee64e3900e74f5d4acbb1b42d09f4ca
-EBUILD ansible-base-2.11.7.ebuild 1651 BLAKE2B f2be092cd9d9470f0e54b5ccb1f306797ad333cff3bcd6608524e59dffc04cecb0a3d6d3657a42cebc100e1e1fbbafc430eb48209f4e45d5a640f8ef9129470b SHA512 5ed5eaccb613833c79febba889bd10e36869acf8a7799652c92e3d284dc1f8670e5d042d5ff5c69187f219097f307c82a485d427360a3fb1c5106d1d1d14dac8
-EBUILD ansible-base-2.12.0.ebuild 1652 BLAKE2B 849152be60d0b0975412fc9139d6a5b9647aa2179fc216acb0afecd9d6f6650273f25336c314fe4d467e5d9b4971245e430459a04116b303c95e26350d9fdfdd SHA512 be468e574cd76a323006ef5c1e12fb791aa8703363c82f276e1cb1a2ec97e2c2abe2b0060f97e4ce196246734dbea31da4201a0da92d8fc67de5cace941a3679
-EBUILD ansible-base-2.12.1.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
+EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
+EBUILD ansible-base-2.12.1.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-9999.ebuild 1652 BLAKE2B 790486ad0a49351a7c12ad6ed3661bf16503423edaa8fb7e128dd8cdb06c1dc4c19aa3e538faf16e51c244e83ab000d33f2892dd97b6f53a8d49d4a0a1a15dc7 SHA512 d4fde99d65fc48702f6def192b0c8bd042fe19659e98a0cca4c3f4567b5f8f86cdd12d81ec62dfd9f828c03ac71bdc6e42adec695fe0175b37f420a47c35abab
 MISC metadata.xml 1040 BLAKE2B c516a3b141924ad21424220f2a9df134d428156283f00f01a6c953ef837bef941fff9f345b48aae23a4af29c938d5053f6147d2e7c43b24af16c1c68b79b9d5b SHA512 6e99c597f3d16d8a5173da3334639e0beed6c95235082b152a3ca256de4a10907c083a646d69152fad23816ac2fb81d0f8d3188fe1713f4030a638cd225e3f61
diff --git a/app-admin/ansible-base/ansible-base-2.11.7.ebuild b/app-admin/ansible-base/ansible-base-2.11.7.ebuild
index d343cc2ca2d2..3b6b3c0d41e6 100644
--- a/app-admin/ansible-base/ansible-base-2.11.7.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.11.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/app-admin/ansible-base/ansible-base-2.12.0.ebuild b/app-admin/ansible-base/ansible-base-2.12.0.ebuild
deleted file mode 100644
index 13e3e74b56b5..000000000000
--- a/app-admin/ansible-base/ansible-base-2.12.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_SETUPTOOLS=bdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ansible/ansible.git"
-	EGIT_BRANCH="devel"
-else
-	MY_PN="${PN/-base/-core}"
-	MY_P="${MY_PN}-${PV}"
-	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
-	S="${WORKDIR}"/${MY_P}
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-RESTRICT="test"
-
-RDEPEND="
-	dev-python/paramiko[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${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}]
-	>=dev-python/resolvelib-0.5.3[${PYTHON_USEDEP}]
-	<dev-python/resolvelib-0.6.0[${PYTHON_USEDEP}]
-	net-misc/sshpass
-	virtual/ssh
-"
-DEPEND="
-	>=dev-python/packaging-16.6[${PYTHON_USEDEP}]
-	test? (
-		${RDEPEND}
-		dev-python/bcrypt[${PYTHON_USEDEP}]
-		dev-python/nose[${PYTHON_USEDEP}]
-		>=dev-python/mock-1.0.1[${PYTHON_USEDEP}]
-		dev-python/passlib[${PYTHON_USEDEP}]
-		dev-python/coverage[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)"
-
-python_compile() {
-	export ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-
-python_test() {
-	nosetests -d -w test/units -v --with-coverage --cover-package=ansible --cover-branches || die
-}
diff --git a/app-admin/ansible-base/ansible-base-2.12.1.ebuild b/app-admin/ansible-base/ansible-base-2.12.1.ebuild
index caee1ffe1113..e8c2a3cb1c45 100644
--- a/app-admin/ansible-base/ansible-base-2.12.1.ebuild
+++ b/app-admin/ansible-base/ansible-base-2.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,7 +19,7 @@ else
 	MY_PN="${PN/-base/-core}"
 	MY_P="${MY_PN}-${PV}"
 	SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 	S="${WORKDIR}"/${MY_P}
 fi
 
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 0a6f32936063..59b82cd99cbb 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,5 +1,7 @@
 DIST ansible-lint-5.2.1.tar.gz 356071 BLAKE2B 70c54114a667ba63c1d285ec8a73a7c3332f89cbdf1b8d4866de86aa2c358e41759ac69188806c715cbd3893a2d0b1123e6b679ed208ce4c40141a40b9f54681 SHA512 9ae1aa775572485aaa68ef127cb2ea2d66cd1057878ac396b1644244a070f05b7920eceec3cdb16523f9fadcbcb5df971f3513d7e4d9cbd6ace1ec4f4d861451
 DIST ansible-lint-5.3.1.tar.gz 356514 BLAKE2B 3ae30c357ed03c544773671af94763bf76d3544f30b1c7b7081db9a67feaeaecfb678d4b194c05b45fc8c7e75cc1c057ad9612ad4aaf364cfd4904200ac128f5 SHA512 2d46b1cf2605c68765c67e7d7e90a049e9253b058ac01c833ed0afc67ba553a8855f3d9315eec440bfc08c0d9e7b0b0f5e0151021708ad1e05fd895c7f679c43
+DIST ansible-lint-5.3.2.tar.gz 356870 BLAKE2B 4af11f760e30945e066a9d160438bbedd5a4d39799009bc6d30614baab0b88a21cad088c0b758529aaa5fbb54a9f2a1f636ab6d642a37297a27c8ba5240f53ef SHA512 4ff2d36de20b2e6982d0cd1bca6a3f886307701dfa0bf880d2d417387191d90adc9361afb57f8ed26239cbc110e5f05f52a186950d7d3b4b0a8e4406e4695acd
 EBUILD ansible-lint-5.2.1.ebuild 1516 BLAKE2B 2506a58802c30dff8193c489b893954e99c4d2328a886e7fe7933dbec463ddaa43982acaff09a1e022da975804af4f73b7f8235dced49a1e63940cf5b439476b SHA512 b6029f18d328dfe5caf4e68a2b2c3d869181643f5cfe15b3a478098d618b48393b92c3ee73bf8b02a54185483963f92fd3f6b60f3008c1275d87316352d87217
 EBUILD ansible-lint-5.3.1.ebuild 1556 BLAKE2B a6e8a4ea6e984535de2e47490e409001cc4fe020a286fd86e555aca7fdf9f955b6146a2d69c4c3af9446105036f714b0bda7dc85f2f6c6c1052f743112fa0790 SHA512 2578255ba9909d6befdd254eba015798ad516c31d99017f06c0402333358d77e6d293d466a654106bd03f3fe16cec1dc8cf1db2cdd9392902f4eb37ea400f1e6
+EBUILD ansible-lint-5.3.2.ebuild 1610 BLAKE2B 515be157424773917f842f0e7a03425030721324544365546491af15be989b8a938f0b5433b6931b84cc520d9589c1fc9501e875e03244a040df86a793ea4c38 SHA512 3e93f473e9dffb2c2c47c50360c8ab658f44155c71ae829575b64f6bf23df1ad69aa14f0184ef4e43dce5876ce5ea5a3f7ae9c113ae48713a2c58da88b1d7e67
 MISC metadata.xml 581 BLAKE2B b2032b06ec9ebe63385918be612a0ee1c351943bfc05a544670a78d87bb2836eb2143bd80da6542c140ab16d33f4b79fa0f18cce3291833b34e43ffb6fd3e737 SHA512 912848e5c37863ed0b04062210da0e925a2d71f1766dd43bb746e7aa364a86ff501e4a6e9762c584ca6d37d4f38b7418a32f3a02b30a7ee4b3f7b828f84f6646
diff --git a/app-admin/ansible-lint/ansible-lint-5.3.2.ebuild b/app-admin/ansible-lint/ansible-lint-5.3.2.ebuild
new file mode 100644
index 000000000000..bb484dbbc409
--- /dev/null
+++ b/app-admin/ansible-lint/ansible-lint-5.3.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO: py310 - blocked by <=dev-util/yamllint-1.26.3
+PYTHON_COMPAT=( python3_{8..9} )
+DISTUTILS_USE_SETUPTOOLS=pyproject.toml
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
+HOMEPAGE="https://github.com/ansible-community/ansible-lint"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+# 14 tests fail due to usersandbox denying the executable 'ansible'
+# access to $HOME/.ansible. More importantly, some tests (6 as of 5.2.1)
+# fail even when run manually with tox.
+RESTRICT="test"
+
+RDEPEND="
+	>=app-admin/ansible-2.10[${PYTHON_USEDEP}]
+	>=app-admin/ansible-base-2.11.4[${PYTHON_USEDEP}]
+	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
+	>=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}]
+	dev-python/tenacity[${PYTHON_USEDEP}]
+	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	>=dev-python/setuptools_scm-1.15.0[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-2.1.0[${PYTHON_USEDEP}]
+		>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]
+	)"
+
+distutils_enable_tests --install pytest
+
+pkg_postinst() {
+	optfeature_header "Consider installing the following optional packages:"
+	optfeature "letting ${PN} run YAML checks" dev-util/yamllint
+}
diff --git a/app-admin/ansible/Manifest b/app-admin/ansible/Manifest
index fdd728ae3da4..e9081ef19e19 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,5 +1,5 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
 DIST ansible-5.0.1.tar.gz 38449873 BLAKE2B 1b2cfab6f851c3eb9cc124c7178d9a156a4279fa539e960213289a6e7c8e6b4efcde009fe8484259150ffb8a2ce90080c7e9356308bea6f46e51645518593f6b SHA512 ade29442ed12f635161b2a98dabce75c125b8eac855b33cfc484f35624e55f51534a8a0c414450db60cdf3d8f25ae6ab66946a1cd2c3468f921d7a2ced38a2de
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
-EBUILD ansible-5.0.1.ebuild 705 BLAKE2B ac5deaa667687693d525310f060d02a9d4797fee4cbfb85e06c0ba92ff133fca914aa617c96061868c0a2c6231a7aa4b7e3f023445b6444baed28ab4585079c0 SHA512 e223a1fa7487917367ed194b9b9df1bd208720be8f25d197ea23a684d93738a63c483d109716f94a1cf0a60dcc00446f983515de9fda1eb97c89dad16129b886
+EBUILD ansible-5.0.1.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 MISC metadata.xml 726 BLAKE2B 92c09d65c38a346db34eddf78f75aba7d914df678e37dcd54b1a47cf3d7f043604fad89b435fa08877bb0c7254fb1a99db32bdd298f2b12af6f8089828f1e67e SHA512 40b712fc2055cfc60fdcb33705757509adc97feb893c46dab1e6e7d8b88ab2026b3b0ada66d7504f86b25072a4d3bffee023a5aa0e8b5286bcf58a8cb18c5ac3
diff --git a/app-admin/ansible/ansible-5.0.1.ebuild b/app-admin/ansible/ansible-5.0.1.ebuild
index 5efc642e8678..21e85e45cd01 100644
--- a/app-admin/ansible/ansible-5.0.1.ebuild
+++ b/app-admin/ansible/ansible-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~x64-macos"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86 ~x64-macos"
 RESTRICT="test"
 
 RDEPEND=">=app-admin/ansible-base-2.12.0
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0509451f7d75..9c1a64a243a5 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,12 +4,24 @@ DIST awscli-1.22.24.tar.gz 2128390 BLAKE2B 6b23a629a66e6f962b953fdc89ab1e8153080
 DIST awscli-1.22.25.tar.gz 2130417 BLAKE2B 1c150feb135d662cbae1e51cd0cd41744472d8a33ff84948ef1a1d6e49ea36ec5e9d85a6f8176d928dc3d1a74961bf6116e4bb01e4256c7cf01059bfb7e3db66 SHA512 0055805213057247fad6a13cb9cd9a90796723411999a55aa7bcd9f7b014709127654313877833a1257a14a2a61770232d142943c5dfae91ee1d9de91efd81d5
 DIST awscli-1.22.26.tar.gz 2131318 BLAKE2B 87651dc3a75bf0ca57142fb394b90ff3f60fbde724b7f6586c213fbf03169d5f4638133362b925a32235e518d7c8b56dea54a0bd224d4562a482e6303c7f81fb SHA512 276a137a3826922dc56316c59f46b1a741f57b5037a0a6345ece3732d31715e3fbf36faaa09b8969b161be2d54ef106c0cfd7bd6c3a3a31a540b8b42f9cf364c
 DIST awscli-1.22.29.tar.gz 2132978 BLAKE2B 67dd83bfd9799c3a49bc2439b29b581e21cd57c6d4c93f8b3073bfd83b0d6ebbc95abc074b6257407f03b2f98253ef099dd1a2a853c093338b2435a17bf9d02e SHA512 61b2117125031e945a2aaa4d20325d8cee0a56d7b5cdb9726f0d951b1bd0eedefc6264be8a1a890c9dfa4869500222a15a9b62f2935cf59f168bdd3d0022fba0
+DIST awscli-1.22.31.tar.gz 2134102 BLAKE2B e1918352146b3176c8fc60cc6338a69b04a28023bb46c6c4a9af6cfdf1304a3c4813dfa798a990123052c761f64929b07d7e25d13f04d9e8bafdeedc04a6e28e SHA512 57a18437aa7780861257499b810c72c49dda7d9db391f3b5ac8c8509c153075e216e1dabaa67486b8ae08e008fafe400b865a20d32c43136d6af987a315cfb9c
+DIST awscli-1.22.32.tar.gz 2135177 BLAKE2B 1e99a887e3b90c8fa81547677b4827f50afdad26136a02f225c66702f2f705ee140616cb3ebf407fc4c9bfd242df5cdefe35cf582c565ce1715fde229246173d SHA512 2df81763fbd2314fffe392b35e61f55451063d440a9aa8a62e36977faa49b808d2c0db9bed71c1d73696e53797d8f8f689942e9dd4636a4b6aec3e8f1f16297c
+DIST awscli-1.22.33.tar.gz 2146397 BLAKE2B d78f92b077141d7204b2e3c7b2eda589e4430f633c469eefa10f59e2b801d67fc833dcffd55efed379136ea050dfe03f72ef3061e1e3e98a372e61d44f0879cd SHA512 a3474eace16aa90017d985d6f9fc4d927ed27e727bb2e4bbfeda48f0be7d63c9d3648e95904252739a2a94a5d5822c855e2b6b840dad3b6c88da273ec92c9bb7
+DIST awscli-1.22.34.tar.gz 2146588 BLAKE2B 794fc2b579126e9c37eaca6aeb8f750cf91769e05ef7222b579e286ef6248d05d49e372abb5af63e1827f804127bfbd78cfe767b715a7f907e26e9c0af6f08a2 SHA512 5fc5f4f929fb64b494422db794cbd4dd2e8adf3d0a3436bc2368a2e9d036bac42e29beab13ee5f00c46b97bc875dbb3f1a7af684006a9dd96be7fcc61ff282fc
+DIST awscli-1.22.35.tar.gz 2147435 BLAKE2B 24fdb6d273dfeddeb7ef8adb15fad843a25edae0cc6dfd37465c294421de6cda0c0c0d49c931f5c2b28ac337d44c3be63f6fd15e7ce84ed493baa0a5c5aa8cc7 SHA512 64f297981987f8f6ab75c43f645624f1794b411f82885e3784c3dd55da0e0ed98ab6395edea7319cbc2c7a320451a6722bd558431a3acb1b7aaf94c2521b4c2d
+DIST awscli-1.22.37.tar.gz 2148283 BLAKE2B 0355bac3b0710af5ce6938a59c1e93115fb109f5aa6b05fe7bd2b5341a11c9e4bf35b826addaa1a7f8e404fd58c15cd2056802c192abe6d5acfc4ff4facd42fc SHA512 3cb1acead139329774565a5aed818eb2bc1e444627d6448c1c31eb431a6aae1e07af273c8b24a1910522764d5898946629197606e0b2762fb89d1bc163641d73
 DIST awscli-1.22.5.tar.gz 2111679 BLAKE2B 970e472e8de43664d060023fdab9f54ce848c5655d8aa417efeae1b1efb52989fd021817521db9dc9cd64580cabbf0c30f3d0178034bdb1edf41feebbc690f46 SHA512 9177fe9da0fb8e9e28777bbf8f2c3fe089a08851b57a49fecefab43417fff187584638d17394289bf6df3d18d9052fd958bd3fbc8064327120af04a0cbe30494
 EBUILD awscli-1.22.14.ebuild 1548 BLAKE2B 508ebd790a86db2071d22b2397d2602f5fc10b28ac748152f67f4edf0daa61b6272fb50c071076cc044cb49aed6078f4e982df0726fa64c903f491e8a95f716a SHA512 2017e2ca92709c4b9d1a204b99c6447a8a8a626824647f10e2e75d9163dcc2fbbce4c89b5aa8617793e806aac494e392f076451ea0bb0a7d37111506deb95a03
-EBUILD awscli-1.22.23.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
+EBUILD awscli-1.22.23.ebuild 1653 BLAKE2B 35b3764561e364a6cf1d0f5156102732e442915c3502ae4c10f9e9c11459d855bc96c4a0c484c57ae10f7e709d9e3b9d2639128cbdec2205fc522ddf724d61f7 SHA512 896ef21b47189c5dc605fd2a87728f62387766d081f07bfef380295a2b1d4a73b039ddc88c064377953c0fe7f580ec19acfc1b8bb5fbe145f1557081d492c799
 EBUILD awscli-1.22.24.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.25.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.26.ebuild 1655 BLAKE2B ee9944f9ad9a462cf8b142e13eb91b4b327944b273e0e659383d7dfc4cde857df01391781b3e9c075c39bdd70df388d98a3c3e4aeafae78609c687e7ee8f65ce SHA512 59118c7bbdb5ad788d0a400b15d88c4fac7359d3b83526ebc79e1e7faaabe4e905f5bc3aaffde14f78c50d71fa637c302a236d7ecfeab030fadff8ce023eba46
 EBUILD awscli-1.22.29.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.31.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.32.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.33.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.34.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.35.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
+EBUILD awscli-1.22.37.ebuild 1655 BLAKE2B b937e4237ece1c8f7ee585176fe6657eb0f7278178dfae86f02f11ba36da5cae6cdcd462d4838f412fd702b7cf906fa256a9d9308132a55fed7f6120682ba335 SHA512 dde81ddd8a0f2795a002df8e049a645777399de52973d93fef2b0d37ddc489e7d070c9fd77bbe129bf0c56664a531639c13c7198f0afc1faf33ac7f0b0d49320
 EBUILD awscli-1.22.5.ebuild 1546 BLAKE2B 7d465d3ae8da32c1d1ba98b059be12fb7b3401a2d843043ad23823ab80a56bdde0575dcfe48efcf91112c4a8d8f12d19f800ae4f6cc4efa841466994b3835b5f SHA512 61e24518229ae0d07f46c3b06efa3116b8fbec78efdc489d4e74d89a29b3e307ea89799490d4149b718066e93e55b7801c49c3da8bc2d954fe4f0deaa898056d
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.22.23.ebuild b/app-admin/awscli/awscli-1.22.23.ebuild
index 85073515ab9a..7decc9d63a2b 100644
--- a/app-admin/awscli/awscli-1.22.23.ebuild
+++ b/app-admin/awscli/awscli-1.22.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ S="${WORKDIR}/aws-cli-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 
 # botocore is x.(y+1).z
 BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 1)).$(ver_cut 3-)"
diff --git a/app-admin/awscli/awscli-1.22.31.ebuild b/app-admin/awscli/awscli-1.22.31.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.31.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+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.22.32.ebuild b/app-admin/awscli/awscli-1.22.32.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.32.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+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.22.33.ebuild b/app-admin/awscli/awscli-1.22.33.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.33.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+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.22.34.ebuild b/app-admin/awscli/awscli-1.22.34.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.34.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+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.22.35.ebuild b/app-admin/awscli/awscli-1.22.35.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.35.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+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.22.37.ebuild b/app-admin/awscli/awscli-1.22.37.ebuild
new file mode 100644
index 000000000000..5327b8227ea2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.22.37.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 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
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+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/eselect/Manifest b/app-admin/eselect/Manifest
index 239db68b891d..1f92f59f227c 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,8 +1,10 @@
 DIST eselect-1.4.16.tar.xz 178660 BLAKE2B dae97ee324cb67983c5395b5dc54c4b84d2da43f6a0c5c8ab81ff402ab211e9d1f1d3fe5c174b130ac1e11d3dd19e3812056274145415ee029e649cda880cd95 SHA512 264fb6122f5f7c9e73bb2250a94c3c0377e5263e2e5ae653ed58e08ebf6ed1b4aa165ae5c1d70b0156081c4db5672d1ec9d379782919d5b40a2f3e862378ce62
 DIST eselect-1.4.17.tar.xz 178980 BLAKE2B d905ac88bc009080912af75e64c7920d745788866fa3cb35466d68a652efbbd6984d6e1efeed76d9a344aed94705b74c85aa43e9c037d4d548d2e24afa69bd7a SHA512 35dc4c52f44c4f64db9c0dc2aec57b3055a6d36760b1bbbd094ad11b3f9e71a731444802632817b89c3b511f1dc9bb92046b59322d177e13fdc501ed767b591e
 DIST eselect-1.4.18.tar.xz 179968 BLAKE2B ce54e54dd406c0d5a7a012ff7cf111709e7a51c510aaaa1d0145dade7bc9678e5f67081dfaef0743c86324adddb5468b093f9612e9932198d1bc9428a2dc93f6 SHA512 8e7afae4d383ddcc38c51f947fdaff267cc7ed87e26d236ff84585e4037764fd553f61c205fdc412ebc5170d80fa60a83cd93aa6fe39230ebff10a903af12ae2
+DIST eselect-1.4.19.tar.xz 180240 BLAKE2B eaf1cee4cdca7963f4bdf0ceaab7431e1fd2fd07a05747db7b3437841602b302224701988b6cbd24ffa2ee30a58e6f4b34810b46f272e4d2bb032aec0a1512cc SHA512 18e0e769ad95ce67904e3ae95351463f00f1b255f390da7d54383d04f27e76cd32616b79c0fcd60d3f3aaab40c7cffd34a9348c55a1484224713f72a55e072d7
 EBUILD eselect-1.4.16.ebuild 1549 BLAKE2B ffd77bec2d576b75a788537ebfc5741ba0da79a7244a4b45382189f13b6c2509852e6a624c255b8cc55acaad23192d54706e987ee25fbec7d74fb576cd24d9f1 SHA512 bba3c48b699820ab4334e91d13da83122d2d8ac792b532c4e0dc3c81a8a83b18e212b1f3f9fc38a169ecf68e34808def0dedf1b64dfb33f9d480b0cc552d4eab
 EBUILD eselect-1.4.17.ebuild 1535 BLAKE2B 279bff17e818888cf1111fd94d4d79deb6a39d2cbc5a9f5456c5ed0df964b95985191431a0949db376345b3f5528860fb0c3328ca48d0db173f19a8ba6b09f5b SHA512 050011d552f1a2b50d78e0568f047f13f27e46408d87cb51d1447117a5f1cedb57ff3672d21903b558c690be2fcfdf5104a8c63e61bc55bed24e86da3f2fc9e3
 EBUILD eselect-1.4.18.ebuild 1543 BLAKE2B 209d0e4324070ca448aabe290e6fc017aed72951fd8469edf4659ff6c719267bc7006c947dffc816558c423720466ba5977d7cd57399625f3e1fb7092f3b34a0 SHA512 4ac01a2cdc0af8ef4e85bf80df4c5c372d8f181d1f20278c6c172495d7ba36bc002af81075cc897ad1aa48e4cea643c7eeaeb8a74ce7c207892c5cd2147e0b9a
+EBUILD eselect-1.4.19.ebuild 1543 BLAKE2B 6b6494c72f8500873e734a933ecbedcde982be045dddc647f8bb92fc1e0a07dd59d6195095baf7ad66029dc262806d13dc31ee26a331894c56e0ba160c554384 SHA512 d1c87f2f225de03c829337134f5ed5d99f043c1abbb0b97943b96f07721e8222a2b32f8ecf18c827d827440a3af1c3dea2ea94959148f8d5673c6476fc7b4e78
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 273 BLAKE2B 9264ca72e36905ad1d6a5ebee0b72f8f11019ac4f957bbc58189fee60aea1aa1a8a2ad33bfafa67f1451bf37318cb5771f32465958bcd9152895ee5adca714aa SHA512 63e78fe95dfc95415c72fdff09a46ff58c4944b4d945e89b8c70834ec46a6e3e57ccbfa2766f1dff2c4abcf299e34652115ae062b63a695dabecf29481f49ab6
diff --git a/app-admin/eselect/eselect-1.4.19.ebuild b/app-admin/eselect/eselect-1.4.19.ebuild
new file mode 100644
index 000000000000..c72f843451a8
--- /dev/null
+++ b/app-admin/eselect/eselect-1.4.19.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit bash-completion-r1
+
+DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
+SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
+
+LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs vim-syntax"
+
+DEPEND="sys-apps/sed
+	|| (
+		sys-apps/coreutils
+		app-misc/realpath
+	)"
+RDEPEND="${DEPEND}
+	sys-apps/file
+	sys-libs/ncurses:0"
+BDEPEND="doc? ( dev-python/docutils )"
+PDEPEND="emacs? ( app-emacs/eselect-mode )
+	vim-syntax? ( app-vim/eselect-syntax )"
+
+src_compile() {
+	emake
+	use doc && emake html
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newbashcomp misc/${PN}.bashcomp ${PN}
+	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
+	if use doc; then
+		docinto html
+		dodoc *.html doc/*.html doc/*.css
+	fi
+
+	# needed by news module
+	keepdir /var/lib/gentoo/news
+	if ! use prefix; then
+		fowners root:portage /var/lib/gentoo/news
+		fperms g+w /var/lib/gentoo/news
+	fi
+}
+
+pkg_postinst() {
+	# fowners in src_install doesn't work for the portage group:
+	# merging changes the group back to root
+	if ! use prefix; then
+		chgrp portage "${EROOT}/var/lib/gentoo/news" \
+			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
+	fi
+}
diff --git a/app-admin/filebeat/Manifest b/app-admin/filebeat/Manifest
index 0ff288397a4c..766ea043736d 100644
--- a/app-admin/filebeat/Manifest
+++ b/app-admin/filebeat/Manifest
@@ -2022,5 +2022,5 @@ DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.mod 106 BLAKE2B bd5d8af6c5046c6de9b171ea29
 DIST sigs.k8s.io%2Fyaml%2F@v%2Fv1.2.0.zip 20937 BLAKE2B 1bc20da34d11c6704b2d34eb93b06fd376d1b0932626c7dcbdaf43df8c8eb14e07529e84e028576bb67ce1961c3c86d0303d375d8d0aa372ded259c3561b9291 SHA512 52a52b3d380ae6e2cbe1b2c849d3089f74aa876fb3fadfbd02eada97446e0f2cf387f10ddb527f2dfefd57dccba8c82b0b349efbecaa0e6e3d00dc2b5d4fc21e
 EBUILD filebeat-7.13.4.ebuild 61936 BLAKE2B 027b64824f4b67bc568932cc7422a7fe97c8558ffcaba040c8c4a99f580aa8cfcf4981c49f72386f225e3ec6c8e9260b639e5593cf07ce168cc1e17d89ff1443 SHA512 f73c540f5d4f20970ea3adf8fcdd1b468e2b01b485451bc36d2e5526d6c67d59f13442cf0b812039705ae6787749911c55dce99d0e736ad62c3ea124a363dcc8
 EBUILD filebeat-7.15.1.ebuild 58359 BLAKE2B 4abf43667650d4da3a392799d9bef5c45beda91042bc64dc9760743aa86da2c1d6bb087b4d5eb35e0a0f8717116e22d0df7f1ac288120f48ab7f2430f5a13f6e SHA512 0252899ebaf72dad960cb244063ad4119cd03179428173f4e1aa134a130afa24a6d8c77855c83c159fce011fb81d1e2ffdbb916d37c87b94a721db0d6c7e2c58
-EBUILD filebeat-7.16.2.ebuild 97015 BLAKE2B 557ae5a26e5a58db51653a63b5999710ee4eba2aa33a3ee73cc78decebd4c593e80a11f4b3b47a6527998189300895edf5bfc10982c726efb61007e63d752f7b SHA512 06a9c3bc89a60932495c6388f1d6e4215b1f9adb8dbb77caaa4f879a730a40ca4e45d1f142c23e3c398ba96806f72a71bd1d1fb0a91f8edc4ed8ee2f11a2ddef
+EBUILD filebeat-7.16.2.ebuild 97014 BLAKE2B c72d68b906a0739a69c8684f1a10733a3541a30c193b60a2de1b55b29484fc290482a9028b7b02095e5dddfdc669af68db590ed4f0e6615f940b972fa5fe4ba1 SHA512 13d6c9f5d0fa9637ad72b37f4002932d6a1104592c591741457bf4f4a7b040368bbd7008b26cddbd9303cd3d6e3d31a95a80852002793639b029bdc72e9f7492
 MISC metadata.xml 492 BLAKE2B 6b16876306316f37d59bf32aac33a2ff918c63dbf2ca0f71448249b20e99e5576f20dbad997a227730cb836c7f244ea8301dae62603e1961127bd755ab87f5b0 SHA512 c42a8bc75fd53383ea094d5049ba5f294cb8a2f0b0fe435eb74427bc82751bfbe4e4bfe076abbd052946ae6b0cf2f7129040a47b439a704629c6846ce6b7fdec
diff --git a/app-admin/filebeat/filebeat-7.16.2.ebuild b/app-admin/filebeat/filebeat-7.16.2.ebuild
index cbe1f4c32dbb..c88859905bda 100644
--- a/app-admin/filebeat/filebeat-7.16.2.ebuild
+++ b/app-admin/filebeat/filebeat-7.16.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="8"
@@ -1748,7 +1748,7 @@ SRC_URI="https://github.com/elastic/beats/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 RESTRICT="test"
 
 S="${WORKDIR}/beats-${PV}"
diff --git a/app-admin/graylog/Manifest b/app-admin/graylog/Manifest
index daa5671750fb..a6e4cd4ec00d 100644
--- a/app-admin/graylog/Manifest
+++ b/app-admin/graylog/Manifest
@@ -1,9 +1,5 @@
 AUX graylog.confd 521 BLAKE2B b776c8c834358a426aab6e67b894ab3fc8e07b5d6d24f506312f41e76ea36bd39398d1eb424cf9f3fff633a26acb8af54dccd4a19642b55bf18d91fe92aff31c SHA512 3d8c3b6128f839809f14c7a1f2683ed5ac273efbabb1e0f50a2e9e90ef6c7cdc481bd84ef3372bf10f288b08f2b850a80d917838e057545851d3113c8f877512
 AUX graylog.initd 836 BLAKE2B 936e5e3c811fb01bc80dde2bf8bf67dd75b6a4a20fdc7fabd53789fca977dccd7aa2664225d848e4b63819d15666e6913058ce0a769413c58784e891366bdc36 SHA512 a6d63077aac5d35621f355811bd6380b34eee952f34446faa26250c0e83a6649673550e51169103a6735fb0002f808fed0e8764459e129027700c3849b3cb0e5
-DIST graylog-3.3.16.tgz 129430640 BLAKE2B aa50a101c9aec9d0e32fe7dfbc0a1c29a7473658ca881f4977e6cc18c4764dde44991af35c19451e5452c0fd832b098743c01eb460d733ba2b1da7d2c5c42865 SHA512 bd6fcc71ad437293500359563662253ef7a38f5961a4dd8f5bfac67ef38ae7025593a69dd160bd8fe5efb48648125c0d441b2c7533e7432927069d6d68e0a239
-DIST graylog-4.0.15.tgz 190661423 BLAKE2B 2c651ba3aa539090cad2c9110b45f1f0faaec30571afa7e225d1c3b3dd3a5379d2cb5176ae708b9d2fb8e1704577966622f0e6fadc5463a152fb93873be31f29 SHA512 a25c1648b7b6237a9cb15801d4ca18a0a2e17c3140684550ffa11bb15e5ab34792a3dbea7241023fcef9aa436670ca9a582f05d1c145ab320006f8686ed6fc1c
-DIST graylog-4.1.10.tgz 197206255 BLAKE2B d92891a9d746b39f607ac736e60e8369a5dca59144b096ee12421f5d05d350e8e05cc3d73d90bf4dc045b2b76273d8ad67c85cb8f5436b1e1c4ae1af3907525d SHA512 2a7e0c7ffaa2f2508f087c807d9b248346ecb399b824410090ea7c59a6341e02a7bfedf6b4956e1def721535857de18e379673202f722384451653dd12e7bf3e
-EBUILD graylog-3.3.16.ebuild 2235 BLAKE2B a78ff8840cd9421ac47198c4c718352df4ada68078d279a8c693990306e69ab8f73ac744207772a5d46f6620e775842be7e99515e5f32b353d00b1790288782f SHA512 aff0a2f59f9b1f93f4297470a14fe8b633aa771039cae539baedc17d1e5d8150bc4b8bb0c1abb6547b3709fb6d270bc263302de1e90641e7f9d3610ac2cbb587
-EBUILD graylog-4.0.15.ebuild 2088 BLAKE2B f52ff49d0c44c68690e432433319b71359524a073a64a031fa726509b2e42f799f00d2d51d7b22b257432c1a536858f0dfa9a5b70f0aad8e32e9ebc980284242 SHA512 4fcd6a8fdbe29243ed029ef9919c0331dfd95e7544fab5033ea4309d32a0b6faabbefc12e71643782701b0c8590523c99edcfa94638614ee3ab286b6aae4a72b
-EBUILD graylog-4.1.10.ebuild 1298 BLAKE2B 9110b8f0bb1bc12952e80ba0c033b6ab303014056a1f5e513e1756d03048806bec85fc123758e5bbb5d9860c8e16079e9668e1821460d08cd0e75d1aaaca6dac SHA512 f9e2321002a4c903b0825b0b75dcf56b54906eef2fba91144bb8b93f325467bd01fe37173584f7fbf8785d357c0650e8c61f9d1497df5f834cc2e844c4f282bb
-MISC metadata.xml 503 BLAKE2B c1828b4532a7e459cfc1d1ee7f4a479eb2636e2e7800a881c8641b9ab6e8928e85b2994b5c1050a286c71784144407a1fa643814b51812bc2ccc8cfd28e85385 SHA512 c6bfaaeee805d018860113a646190bd27d66762bc8c650cc4328d1406fc13c53cbf7d4e58b4216f4406d90035c0d44c1437c4518f86b747e11bb151919550204
+DIST graylog-4.1.11.tgz 197190151 BLAKE2B 10e8006c967861aec826768ada2c965729e992eba3701e1475ad68aec5c31ce35c0bbb41ffa8f4a0735cdeb85c8502d462f9925918d568ccbc669e935bc31de4 SHA512 4f903ec470d60836be720f59c24b8454d0689b961af84623eaeb061d4e719cfc4fc0bcfde7074de8e6a3c6d1e3f608cdc6713b50f2d9031d298660c08cf4e219
+EBUILD graylog-4.1.11.ebuild 1298 BLAKE2B f87c415b6edfd3fb37beb12df4c4968805ccc1789ec14665d6b030259e3cbfd868981c5a5f596bf7c12f52bc089a302db1105767f558d33d8c3187c7d7d97a72 SHA512 b7f39ed4c88f190ad5e0104976918bd93b6d6db6427327c762f33661cbda80870f14b68909124cc3ac64e3a427d428a11d66982837b02138cc7561b93859dd45
+MISC metadata.xml 262 BLAKE2B ea8755cbf5828a491d701767c55d0d283290857851214abbba044d08fa91641f1313e8f21bf5154d503f48bfd2778e9a5a10960ebc85aa92235237b021c9bf32 SHA512 d16b03c42eb70dd00f56458b7bff6bc5063debcc09dff66674ee021d61a26136580e91aaf2d988ed6f7cf549034c774ce4d27ef59269cc77807c32ccc3b99623
diff --git a/app-admin/graylog/graylog-3.3.16.ebuild b/app-admin/graylog/graylog-3.3.16.ebuild
deleted file mode 100644
index bf3420b1de92..000000000000
--- a/app-admin/graylog/graylog-3.3.16.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="!app-admin/graylog2
-	acct-group/graylog
-	acct-user/graylog
-	>=virtual/jdk-1.8:*"
-
-DOCS=(
-	COPYING README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
-	default
-
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm lib/sigar/libsigar-*freebsd*so \
-		lib/sigar/libsigar-*solaris*so \
-		lib/sigar/libsigar-*hpux*.sl \
-		lib/sigar/libsigar-*macosx*.dylib \
-		lib/sigar/libsigar-ia64-*.so \
-		lib/sigar/libsigar-ppc-*.so \
-		lib/sigar/libsigar-s390x*.so \
-		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r lib plugin
-
-	keepdir "${GRAYLOG_DATA_DIR}"
-
-	newconfd "${FILESDIR}/graylog.confd" graylog
-	newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
-	ewarn "Graylog does not depend on need.net any more (#439092)."
-	ewarn
-	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog"
-	ewarn
-	ewarn "Graylog requires Java >= 8"
-	ewarn "Elasticsearch 5.x or 6.x (does NOT work with 7.x)"
-	ewarn "and MongoDB 3.6, 4.0 or 4.2"
-}
diff --git a/app-admin/graylog/graylog-4.0.15.ebuild b/app-admin/graylog/graylog-4.0.15.ebuild
deleted file mode 100644
index e0b3f8d98a4d..000000000000
--- a/app-admin/graylog/graylog-4.0.15.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Free and open source log management"
-HOMEPAGE="https://www.graylog.org"
-SRC_URI="https://downloads.graylog.org/releases/graylog/${P}.tgz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-RESTRICT="strip"
-
-RDEPEND="!app-admin/graylog2
-	acct-group/graylog
-	acct-user/graylog
-	>=virtual/jdk-1.8:*"
-
-DOCS=(
-	README.markdown UPGRADING.rst
-)
-
-GRAYLOG_DATA_DIR="/var/lib/graylog"
-GRAYLOG_INSTALL_DIR="/usr/share/graylog"
-QA_PREBUILT="${GRAYLOG_INSTALL_DIR}/lib/sigar/libsigar*"
-
-src_prepare() {
-	default
-
-	# Stick to architecture of build host
-	if ! use amd64; then
-		rm -r lib/sigar/libsigar-amd64-*.so || die "Failed in removing AMD64 support libraries"
-	fi
-	if ! use ppc64; then
-		rm -r lib/sigar/libsigar-ppc64-*.so || die "Failed in removing PPC64 support libraries"
-	fi
-	if ! use x86; then
-		rm -r lib/sigar/libsigar-x86-*.so || die "Failed in removing X86 support libraries"
-	fi
-	# Currently unsupported platforms
-	# QA warning galore but testing/patches welcome
-	rm lib/sigar/libsigar-*freebsd*so \
-		lib/sigar/libsigar-*solaris*so \
-		lib/sigar/libsigar-*hpux*.sl \
-		lib/sigar/libsigar-*macosx*.dylib \
-		lib/sigar/libsigar-ia64-*.so \
-		lib/sigar/libsigar-ppc-*.so \
-		lib/sigar/libsigar-s390x*.so \
-		lib/sigar/*winnt* || die "Failed in removing unsupported platform libraries"
-
-	# gentoo specific paths
-	sed -i "s@\(node_id_file = \).*@\1${GRAYLOG_DATA_DIR}/node-id@g; \
-		s@\(message_journal_dir = \).*@\1${GRAYLOG_DATA_DIR}/data/journal@g;" \
-		graylog.conf.example || die
-}
-
-src_install() {
-	default
-
-	insinto /etc/graylog
-	doins graylog.conf.example
-
-	insinto "${GRAYLOG_INSTALL_DIR}"
-	doins graylog.jar
-	doins -r lib plugin
-
-	keepdir "${GRAYLOG_DATA_DIR}"
-
-	newconfd "${FILESDIR}/graylog.confd" graylog
-	newinitd "${FILESDIR}/graylog.initd" graylog
-}
-
-pkg_postinst() {
-	ewarn "Graylog does not depend on need.net any more (#439092)."
-	ewarn
-	ewarn "Please configure rc_need according to your binding address in:"
-	ewarn "/etc/conf.d/graylog"
-}
diff --git a/app-admin/graylog/graylog-4.1.10.ebuild b/app-admin/graylog/graylog-4.1.11.ebuild
index 9acb16a593fa..da395124a8bb 100644
--- a/app-admin/graylog/graylog-4.1.10.ebuild
+++ b/app-admin/graylog/graylog-4.1.11.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 DESCRIPTION="Free and open source log management"
 HOMEPAGE="https://www.graylog.org"
diff --git a/app-admin/graylog/metadata.xml b/app-admin/graylog/metadata.xml
index d06e3db3af44..99e835a30bb8 100644
--- a/app-admin/graylog/metadata.xml
+++ b/app-admin/graylog/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person" proxied="yes">
-    <email>hydrapolic@gmail.com</email>
-    <name>Tomáš Mózes</name>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@gentoo.org</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">graylog2/graylog2-server</remote-id>
   </upstream>
diff --git a/app-admin/logrotate/Manifest b/app-admin/logrotate/Manifest
index 0276e9db90a3..dc64d21125b4 100644
--- a/app-admin/logrotate/Manifest
+++ b/app-admin/logrotate/Manifest
@@ -2,5 +2,7 @@ AUX logrotate-3.15.0-ignore-hidden.patch 566 BLAKE2B 1739e0d175311eb2a3692826830
 AUX logrotate.conf 740 BLAKE2B ade43681e1929aa8b7e167a2be0c8569f3842680687381c202ac04b5cf97cd85481f6ca7fbf6f0dffa64caa3b1d9cb0f1e2154af8882a3ce7008337f2a5ede6f SHA512 6411acd842fac1a8af72142cddfa76b567f6ba859bed91dab56f1d26b48f3dcaa3ffee6c8094860fe9c43f9b6bc398199c8f4047856b91d6d12333d0fc7aef96
 AUX logrotate.tmpfiles 16 BLAKE2B 1f7925d6d2d4bc120d5202f49887b23e2eb633f5c369fe8d0bd1703e5075671dd1e13a030ec06fa269214bff9552670d3e0932e3dbde2e3673d59b7a50a2458b SHA512 f51852b1d5708a8fc48c6fcfd2fc4f34f3cd88d9119c607c0cb47f0cc0dc7370bd3399a9ebf781943cdd16a25bb4db0d81337140fc179faa72e18a848f3d8c36
 DIST logrotate-3.18.1.tar.gz 225226 BLAKE2B 6f40dfe89f9c6202263f16204a9cff07b921abc9a298b58649bb4968c9f498626741be334c47d4092da564ed75642b687ff6ef8781f69f5e25364f8635646d9d SHA512 c40f920686aee014c652f087c64f2a85e9e866a8717d1bd3f32a9dd7959a02962e6174de28ae685428b442e12079d0c8d91485611ca34a873ffae872a54ec9fe
+DIST logrotate-3.19.0.tar.gz 228089 BLAKE2B aa5e932fe2056d150cc632134d80e160883b62e9f92a010bd5f5cded40a0362e28b966d006305b07030a8b07eb35a8e0c5b65b8d4bc87c278286b326cced1c46 SHA512 68bca961608565687a9ccb18e72f0627b405aff95286e508fdc78926d2cc172c56e1523a24ca81a161f683c2d568312984e2757edd291d144e0e4b982433e119
 EBUILD logrotate-3.18.1-r1.ebuild 2259 BLAKE2B c24e5e395434a367bcfb58cd2dfc010f9d425c0b625a8e17b60ee2c79462f9713db9fd327bfad16c9219cc41de7f28df39e803494cef73f8c07d8e0bf18e67a3 SHA512 f58fa43a2710ebfea68f2568a935d4cbbcecf36df5db55d43910c68bea03f446693e1b4a0c615c9f23f686095682dec98d09caeb6c5f6aff98bfc4ee903a282c
+EBUILD logrotate-3.19.0.ebuild 2265 BLAKE2B f35ecd8332c1bb503a7cf9e110b2b3c9f6ebca8267dedbdd12252b055d5f0b3a8ddc4ebb9649d4af4bab4eb9653f0e21b33b9590f4d755b7b0309d4c2f40f51e SHA512 75bb941a6197e942e4c812044f86688baceaac813ecd35a22c040048924446dee29f71125279ca74ada9b0a3ed482a7eb26fabb6f5ac0b93951e477ffc4dfd68
 MISC metadata.xml 1207 BLAKE2B 0d2ebf29e5ab5a01b2a8ac76ce1699e175d8fdba393ad97abad9cd3fbf9162042f253ab3551cde9273053c35b703e098d0501b67203da519b12258437d898f50 SHA512 3ac710f21ade3bb31767ea3e26b120a19a8ebfbfbcf5c66d30c888093428b0df026417e69d3823a2feaa27408b6015231f624b354df87ff50313edea39a0287b
diff --git a/app-admin/logrotate/logrotate-3.19.0.ebuild b/app-admin/logrotate/logrotate-3.19.0.ebuild
new file mode 100644
index 000000000000..00e473b5ae60
--- /dev/null
+++ b/app-admin/logrotate/logrotate-3.19.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd tmpfiles
+
+DESCRIPTION="Rotates, compresses, and mails system logs"
+HOMEPAGE="https://github.com/logrotate/logrotate"
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="acl +cron selinux"
+
+DEPEND=">=dev-libs/popt-1.5
+	selinux? ( sys-libs/libselinux )
+	acl? ( virtual/acl )"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-logrotate )
+	cron? ( virtual/cron )"
+
+STATEFILE="${EPREFIX}/var/lib/misc/logrotate.status"
+OLDSTATEFILE="${EPREFIX}/var/lib/logrotate.status"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.15.0-ignore-hidden.patch"
+)
+
+move_old_state_file() {
+	elog "logrotate state file is now located at ${STATEFILE}"
+	elog "See bug #357275"
+	if [[ -e "${OLDSTATEFILE}" ]] ; then
+		elog "Moving your current state file to new location: ${STATEFILE}"
+		mv -n "${OLDSTATEFILE}" "${STATEFILE}" || die
+	fi
+}
+
+install_cron_file() {
+	exeinto /etc/cron.daily
+	newexe "${S}"/examples/logrotate.cron "${PN}"
+}
+
+src_prepare() {
+	default
+
+	sed -i -e 's#/usr/sbin/logrotate#/usr/bin/logrotate#' examples/logrotate.{cron,service} || die
+}
+
+src_configure() {
+	econf \
+		$(use_with acl) \
+		$(use_with selinux) \
+		--with-state-file-path="${STATEFILE}"
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	dobin logrotate
+	doman logrotate.8
+	dodoc ChangeLog.md
+
+	insinto /etc
+	doins "${FILESDIR}"/logrotate.conf
+
+	use cron && install_cron_file
+
+	systemd_dounit examples/logrotate.{service,timer}
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}.conf
+
+	keepdir /etc/logrotate.d
+}
+
+pkg_postinst() {
+	elog
+	elog "The ${PN} binary is now installed under /usr/bin. Please"
+	elog "update your links"
+	elog
+
+	move_old_state_file
+
+	tmpfiles_process ${PN}.conf
+
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		elog "If you wish to have logrotate e-mail you updates, please"
+		elog "emerge virtual/mailx and configure logrotate in"
+		elog "/etc/logrotate.conf appropriately"
+		elog
+		elog "Additionally, /etc/logrotate.conf may need to be modified"
+		elog "for your particular needs. See man logrotate for details."
+	fi
+}
diff --git a/app-admin/monit/Manifest b/app-admin/monit/Manifest
index 810c3e7ae81f..58f62ece8229 100644
--- a/app-admin/monit/Manifest
+++ b/app-admin/monit/Manifest
@@ -5,7 +5,9 @@ AUX monit.service 226 BLAKE2B 3b3041900987acd5bb6faa770c6631f6554b2e436052025236
 DIST monit-5.27.2.tar.gz 1463790 BLAKE2B f00733261fd941f47ec04e63ed9e3617991cd8a069a14e59941e85d3a342537892019864d4716f821428adb57979aa270fcba9d57f573d49e897dfcd77cc133a SHA512 a45cbbf0905b165767e21d66103b460ea48948824d043881aba3de752e34a67bfb3b97f75153e3672d87a34a702d66ceee28160110654aa52fb82c668aa135b9
 DIST monit-5.28.1.tar.gz 1470342 BLAKE2B 134f63f4560cf26a563cb8e1f063b291dd6d87159878a1918aef62d8ffe6138a64b4e34c1713b46cb80bfd04eddb0abab725aa7cbe59331dac9e41d0f286f883 SHA512 2683084aea88567309b4693247c27312e1cb4225175cb8643a1f980ed8fc8ecd549818e157e1bb6c0feafc306bc9217bbd2c0c501cb75ea2425b646955076e5a
 DIST monit-5.29.0.tar.gz 1476102 BLAKE2B a4037c61e8d893b194317dc3c79d37f9b449d3524b91a06c0ff36a9c39016b12b0ce970c969fc10421412e6406c680714522379780cd80897a7a467f7b08450f SHA512 a69125bfa6fa9ea837f396e762a45e0cb41258c175d120c2af999ae1b500ce5cf5b57d774cc89299f70950a25ced5368c85455fffafd75677311c7912f86c49d
+DIST monit-5.30.0.tar.gz 1476979 BLAKE2B deb3d58770e2cd33cd33094bc43a9375df567d389542439920f16ed864c743c348915ed37730a3ceb217c9e435d4fb3ba42038406cfcdf52c1382e83ef31ca24 SHA512 4d73eaf3785f40de2789bd1feceda5363cbdc8cbeb4431b14d09d72c65483afe09f68257cef4492304ad87314cd3e5e631bf1165d69abea93a9f70f73767655f
 EBUILD monit-5.27.2-r1.ebuild 1162 BLAKE2B 71b1d1a5e10520af69bebfcab81f17c7a72e43753d7fe1f0c421c4d2e738d20248638f6860baa9bcddff82294d0855cb004d974430dcff6a5de6cf2d6546f753 SHA512 70657c77855021896681345dc5fc4d654d356e559bd83f7ac92561e5e154aa5ec12234699a7e85551e92cf19a6eff54bba956a41f0180f5af909c1515b0465a7
 EBUILD monit-5.28.1-r1.ebuild 1231 BLAKE2B 1de7222521a60adfaf6abc1a2fc8b3e75bfaa669d167734a4c0058aead6f419f38b63dc01a9aee6ddd8b9934a0e87cb7bc0d50ef454ab80792bf117ee5eb3e7a SHA512 cf682f1d976b4ec006ad9429c4e06948a7857802f35f767d2b12728186320053332a2e59b74cdb2f2b91ee54eaea5c19e770329e95e89e6e3c5c21a080c4a854
-EBUILD monit-5.29.0.ebuild 1251 BLAKE2B c1beee2163460ccdcb62aa22b462fb32d4edd10de5a227ddde3cedbe3d5e280948a06137fc731da4d5ccee782bae8be50d0b0889327eb2ee3920b29902c18d51 SHA512 061d52bd2646eb76f8e96106279e7868b582c53212579dabea609bbf8039adeb3b0057382283f354ef26ae6067f3e11c69b35c0515b9a1fe14089a07c740f72f
+EBUILD monit-5.29.0.ebuild 1253 BLAKE2B 2a440a6e6097d2692265a17d332c5c14cf548207db9a6a5fb5541c1a3900150ea06f5b7282ee9a2fe697ea48c0ddea07431eea374ae17e98cc0230c883dc56b4 SHA512 e56de12294ab8ff06183191c1b0853302238237de38ffc5c63a61054f7324bce60255a54e607ab6b4f81200646ef2204e9071c9cfe9cf93228017f2c08df2a85
+EBUILD monit-5.30.0.ebuild 1256 BLAKE2B 23d6723791ffea29983d02e23a5bff87d71ae430a0cdada931c5aa4f981c207f7a13064bfc9dc609c6ed37544d0c5207eabff5c98cf4c16e4442ae56e2be6b8f SHA512 64d923cb2e93375852406630cf745182cf88621eb96773d3d5a4b220c6f325bbeb7dbbb9dc854d990e8cd3677cfd9c6e878cf05ce8cca79a9e32dfbdb3fe3d93
 MISC metadata.xml 360 BLAKE2B a3f81501eab241aa1c3450f92d97af3560fb1fcf37a8faf864088abf58da5421486b4634da20773484acfe72d8d289a8e902f03db8206a798fd2e5e518313896 SHA512 69c092cbe229b63fa3154ab6735d327ed939aaa205bca9ec4c7b0b3994054f39714d2197fba0fe89710911a382e70680d20b4335ec70e233eeaf0d01da3ae342
diff --git a/app-admin/monit/monit-5.29.0.ebuild b/app-admin/monit/monit-5.29.0.ebuild
index 7a4e6534b1a4..d388c1122d50 100644
--- a/app-admin/monit/monit-5.29.0.ebuild
+++ b/app-admin/monit/monit-5.29.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2021-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
 
 LICENSE="AGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86 ~amd64-linux"
 IUSE="ipv6 pam ssl"
 
 RDEPEND="sys-libs/zlib:=
diff --git a/app-admin/monit/monit-5.30.0.ebuild b/app-admin/monit/monit-5.30.0.ebuild
new file mode 100644
index 000000000000..54708e6c5d9e
--- /dev/null
+++ b/app-admin/monit/monit-5.30.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 pam systemd
+
+DESCRIPTION="Monitoring and managing daemons or similar programs running on a Unix system"
+HOMEPAGE="http://mmonit.com/monit/"
+SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
+IUSE="ipv6 pam ssl"
+
+RDEPEND="sys-libs/zlib:=
+	virtual/libcrypt:=
+	pam? ( sys-libs/pam )
+	ssl? ( dev-libs/openssl:0= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/bison
+	sys-devel/flex
+"
+
+src_prepare() {
+	default
+	sed -i -e '/^INSTALL_PROG/s/-s//' Makefile.in || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with ipv6)
+		$(use_with pam)
+		$(use_with ssl)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/monit.logrotate monit
+
+	insinto /etc; insopts -m600; doins monitrc
+	newinitd "${FILESDIR}"/monit.initd-5.0-r1 monit
+	systemd_dounit system/startup/${PN}.service
+
+	use pam && newpamd "${FILESDIR}"/${PN}.pamd ${PN}
+
+	dobashcomp system/bash/monit
+}
+
+pkg_postinst() {
+	elog "Sample configurations are available at:"
+	elog "http://mmonit.com/monit/documentation/"
+}
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 64c81e3a54e4..7811967de532 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -2,5 +2,5 @@ AUX puppet.initd2 758 BLAKE2B caf8c2e3563f24d9d313e790498dc362fcd14467ca2b6329cf
 DIST puppet-agent_7.12.0-1focal_amd64.deb 20971412 BLAKE2B afb9af877e578b6ae24566e0688d14fa67fdb133a3fd9e15dc2473ea76f61a6551bd69a6fad18b6b555eea2afa8fd858a005f2c1cf6681c28f4422129211dea9 SHA512 f5fdab728baa7813f31ba174b0ee7e9dee3f5f954ed46a2f6740cf6ad075c8f36a1b6cb28e7c6223eb4aad02400252114a5dcede0085f7a7e7ba079bad2aedf9
 DIST puppet-agent_7.13.1-1focal_amd64.deb 20985856 BLAKE2B b5e3a2ac94af1f45f0ea5131cff74be1ded6efd9d0951624cec49fa00bc98fb4711e1593be46871c96cac130a636e3d217d6e7515082ca5c409858d982f25a78 SHA512 b5a8ebd99028b859a5100b8cc64684c2fa8257b27259f0ee1c87ddfcbfd9d3c2af48bafbdad524ffeeff743d8da6e46979a84555942ca9b9e4d93a12c08bc552
 EBUILD puppet-agent-7.12.0.ebuild 2475 BLAKE2B fe0abbb691d683c9edbd966eb3676c2b0c0a05535f179af030a1392030aef2a0ae9da5aa1948f79390b364c64befc90cf785cf656f504e315a5d86ddac278f21 SHA512 49117ad9d47ea1d293db51c7cf4fecc68700aed007df48a76b3585fd195fadca8d0e3a6341c8fa586bbab35359b1ccffde4020eb734d8f06644105eb6dfa4b2b
-EBUILD puppet-agent-7.13.1.ebuild 2476 BLAKE2B 61b7d8647f55e8324a77cf28394e4ff755017d66da20ff782303c829dfba9d0831bd5b17dd3a498acf1578053bce7d5e5b4f070a5e5b30887fc555258627fa17 SHA512 c99ee3447e1b5e93ae41551b99b9aef4c16c911a8a6f8a25847e45c5135550405ca6e3f0dd5c39f954e786b567e14ed5619b0c2db25cdcd09f41dc8d87149196
+EBUILD puppet-agent-7.13.1.ebuild 2475 BLAKE2B e1c745a1ddec31aa829f2236512d07032fd17943fefc411e054a7b7c22d279263cc44852b4024b97165a174f3ced504a550a41f4dc292976f4719260eedb5c72 SHA512 27b5971f3b673a590e04e73e936d2b4cb1224e634e619f73787fd9b5da9a4321212c882e119bb05fec7b5c27fe6bb24c52dab9f17faf2871b1fc0e3f28bd3d02
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.13.1.ebuild b/app-admin/puppet-agent/puppet-agent-7.13.1.ebuild
index 6e7e8d74150a..85746bc58b46 100644
--- a/app-admin/puppet-agent/puppet-agent-7.13.1.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 6e1d395f12a6..617c5fdd894b 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,5 +9,5 @@ DIST puppet-7.13.1.tar.gz 2874201 BLAKE2B 663cae7ed82cd9daf2efe70564509f7abc7336
 EBUILD puppet-5.5.22-r1.ebuild 3750 BLAKE2B 4cfe9e58f764927a378ccb706ea14ed3ac8e981356c2000d16b8a33b924c7d08fd8cc6f27c70cf66f859d5649c13a33d4982ea69573ba73d4b19375c8da95cdb SHA512 87fff4d2c68e882894b3a24f28db1d0b68b081530eeaaf3149314aa1968094fe3f0b37b57c5240e2e4dfe19828084b82b07e0bc3105a1dee0b52f9e28f034cb4
 EBUILD puppet-5.5.22-r2.ebuild 3760 BLAKE2B d7a45bd19ea23aada8be2ed59abcfca5cf4321519e61409774f63d41366dba1f7610e308c03394a06283bf37f17dfc258e548658d37ee20f4d5f995b8b873b2b SHA512 3c06804354b84e92cfc439adf7a0d8333887096c7d4cc17fc8d9c3fbfcaf60e4d0ed5da81bc763c0355e6337f0f038edcff201d6445c42113b09ab46562ab8ec
 EBUILD puppet-7.12.0.ebuild 3450 BLAKE2B 66410c8a2ffadc05fd84b6a0e9ded45eed7f97eaa33cce3ab7dbf1be4ed9342621936be00090fa798cabec09fa16d75a070a1029a0440fe1acc2d03004c998e7 SHA512 ac78c9c7360b96c767713999c37265cbfc53954115cd09b16c2aada061a27b8a26a2edd90d794725d779aa0f64d3a3a9229627ae69992a37b4858942110f7946
-EBUILD puppet-7.13.1.ebuild 3452 BLAKE2B 177d294d62987d30e3ef669312f3ca15b5718e2a3c8e2d1503da46c0f469ffdecb2685295b87ba07df6496eeb247c5007e7b4c8a39c9d364bfc4214627188392 SHA512 f95e15fff3d77415dc485c53ba555aa1e423c3b14684c72126707192229e470fbc39e4cef35382f6db36e99f6aa3c063e09a802a20c67fd584a08b6ac683ba59
+EBUILD puppet-7.13.1.ebuild 3450 BLAKE2B 0532c5acd52abdb5a35540f50e144b28f59f17957e3b5e940996bd880556fc526b748cc81f7be2ea57620cf905cd71702377f356a5f3169dc47070f74b4d88c7 SHA512 f4945cea3ae55ec16e17ceb79fd655bf8284e852f85670c0a2dca2cbbb3db650e1e41f8fc580f7643d2709425425d03df6c62e45ecbce14b9c33d3d1e1c0f970
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.13.1.ebuild b/app-admin/puppet/puppet-7.13.1.ebuild
index c0e45cb9c836..c3b1075ffb59 100644
--- a/app-admin/puppet/puppet-7.13.1.ebuild
+++ b/app-admin/puppet/puppet-7.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/Manifest b/app-admin/puppetdb/Manifest
index 80424b2dd21b..22ff2d370bbe 100644
--- a/app-admin/puppetdb/Manifest
+++ b/app-admin/puppetdb/Manifest
@@ -3,5 +3,5 @@ AUX puppetdb.initd-r2 1896 BLAKE2B 04f47dd0406c1f67d4f72a911b0db8b482e37673ec9a0
 DIST puppetdb-7.7.0.tar.gz 48050200 BLAKE2B 67b0152b0d3219e21fd1f0c18f235f99ad5c566c2c24c24e442e511d3eb503265497de46c5fd2d414cda8827400ee50c628d2fe5287ee1a6e1c295dbc7f8cde3 SHA512 a8f67b9c587d285ddd530afe1d467eb1acb20f7a3deed6d1b951695575a4283c3f4c946c7263fd44962adf05f4466ae5eac33cbd6ca75ef8f9785b2e7be6afd7
 DIST puppetdb-7.8.0.tar.gz 48110737 BLAKE2B e967c1dab15d5fc5a963baebbbb43d3bb3f0f46f1e318ca9547d7f5bcd0ba3b16068c1988844e2f2fd3128cb597b19d22585c70a157e3e453066f5930633ef79 SHA512 16d57e634d07eb804f524152d2faf2a729b0e42bbe0550573424669379d4634730951aff266093272e2b118399f2abb6563ee2a04104da9afbdb1163aa1d94c1
 EBUILD puppetdb-7.7.0.ebuild 2714 BLAKE2B 80e2dbe374e919f7bddce0e3a3ddd293e77fd319f61a6417994fa2a2bcd2540a63aa3b0958fae95c49c10f5c10b1e713a8319e462244f73b0f9796f267540614 SHA512 990f62b77e80d8bbe8dce3fe17afa1adee89c82d73aa2efb2f944abda66264036d4b017adfddcdb3b885b354b6caf65d4165459e4aacf67274954ca4b489eaaa
-EBUILD puppetdb-7.8.0.ebuild 2716 BLAKE2B 933aa71444ed4de13a3dd6e4f6bb252bff112ad793166bc5ce02add57fe3cab5f9c63015b861bd5fa0379839dd079d48dbebd66182b562d1c1c1deaf60247071 SHA512 339f5e3b584bbee583a8b2baeff985db00d9fc0dfbef02315d908d989d029f3a8071a091cbd1dccae793525c87e78b97a6a554621e37c976fa7284d45a085aa9
+EBUILD puppetdb-7.8.0.ebuild 2714 BLAKE2B ed35d713231248d7857d65abc06541050546f9902b045cc61f0803a5f9e0a3a674bbd5d7e93f216ee3088009f0d215f5cb5bb74282bfe8957a94562ce477d9f0 SHA512 bef15b81a0756133f84b46b817decdbda7b1c5328e9386d7777b76a09e8956cce12867eb29cd40caf2179da16305e0e51b399cf3f292dc039f2ab84625b3601a
 MISC metadata.xml 486 BLAKE2B e74960c88243252794d20dd51c071147de88663d4e610e8358013b77ffaeb13b35edb7a48575932a8a30e0916782063459fe14b57ffcb2962e16b5d73c66f9d9 SHA512 e87f0d39aa659c53cb9798929c08a853247870f9c9b7dc85c9610f7b2b9c2f10a226ffeadc738e263c6bbcde495c438fbfd7dd951c2cff18b66646da9475c7c6
diff --git a/app-admin/puppetdb/puppetdb-7.8.0.ebuild b/app-admin/puppetdb/puppetdb-7.8.0.ebuild
index a45f0b82097e..690da47d2646 100644
--- a/app-admin/puppetdb/puppetdb-7.8.0.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 8442ca89774d..7c07e2e171a9 100644
--- a/app-admin/puppetserver/Manifest
+++ b/app-admin/puppetserver/Manifest
@@ -3,5 +3,5 @@ AUX puppetserver.init-r1 2190 BLAKE2B 6e4b547af51989d678a52e0fb41e8b27a669d96aaa
 DIST puppetserver-7.4.1.tar.gz 63334102 BLAKE2B 904f3f0a84a0954aef029f42623fd49480b98ff28b3c229205ea7c41c9db1c026c5408ae74775fe9fe598f95b43289ffc0fd34c384ffdd3a2a662382ae1f577f SHA512 6212ddc4b583f9e26227b5db25e7771684aca607787f8ee80920eaf398dd65d4f901774b0e439f006a2fc6a22e9143a1fc58b9003ecd59a115da7702a88210dd
 DIST puppetserver-7.5.0.tar.gz 63397037 BLAKE2B 1804aded9ff9d06b99edfa3af72eefe0c3924c51ef49c1e837c342f4581adbfc912a2e7e80fa1fc34485edb7fa49bf0f43d76b05cd6b698ecec04c404f101c42 SHA512 5cdff7d25d4b799760fe06bbb2218edac920b72f4eef8c7b24a80658aaa777e1d2bc926422cea630b74890c91dc51e65d3aa908914ce4bb13ecf2c719158e824
 EBUILD puppetserver-7.4.1.ebuild 5329 BLAKE2B 3a0d9e4aa5f23ab91241c92e502d7d55ed821ceaee04c43bac08d27f72adffd92416993e9a88442e968a1515c8d4b163ed0f7a45fde1cf34533b07e4c6d0c345 SHA512 dd4315cc4bceeab34d439aae292dcdc6133bf584115c6b4ef091b85ef3a4c39a05bc435a81d7eff2adc492bfff1e00d3479f1fe695a32bfc0d65926fc71b7e84
-EBUILD puppetserver-7.5.0.ebuild 5330 BLAKE2B 1bb659b30e05a90e7f319c7b93560eb2c4f5c6588b0e4d21857a0cb9d5f5bb484ad339f94c3f596ddb92b921fb874a78f44243025a8bf61c3a41146fde6a2801 SHA512 f794de35cdef056503c4cb609bc2a7d673b77d169c428e647637999b16becbd94818904c79c2bb27428847e39646f991ffa0b72cc7560a6c522067682d01ffd1
+EBUILD puppetserver-7.5.0.ebuild 5329 BLAKE2B 184463a80ac6168f0cb0516a1e742c84c0c9900aaaa3132714c7d5f426242a672a7a5d9e19807c01a7074f0f4afa2a9dcf9e7020d39cfa941bcb3a94b457a717 SHA512 71297d6829d474197dcd5924a7377d6443dfdda4147c1b1e875da2ade059e3d1fe65f3577003b6c7d6a939d20165571fc1cd59869ef43130f518b495bfbc6881
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-7.5.0.ebuild b/app-admin/puppetserver/puppetserver-7.5.0.ebuild
index 40887d6a2c23..b3076e3f128b 100644
--- a/app-admin/puppetserver/puppetserver-7.5.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords as puppet
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/yadm/Manifest b/app-admin/yadm/Manifest
index 34fd55272f63..2e66c69a9e25 100644
--- a/app-admin/yadm/Manifest
+++ b/app-admin/yadm/Manifest
@@ -1,3 +1,5 @@
 DIST yadm-2.4.0.tar.gz 96877 BLAKE2B 462a5816e106c4502007ff34ab338904e14a9851ebcfc7ff79a32a8b11fbbe3e0b7e6538ed6b489ab67e2205c84b2250749e3091c77fa663886dc9792078a576 SHA512 43e16a9502f9dd9f6c6dba3bb5403bb048244a406d44cb42a96a43e62bf7342efd5f302304dbedede61423546787fc929f378d68da9031207e70239ec4e265ce
+DIST yadm-3.1.1.tar.gz 106890 BLAKE2B c85bfdaf15da8e88aea8e1b41af5396111fe95922f38c9709d09d76b6cb515d4aff99f0caaa225baf36bc408f6efe7f53e7b2febd45c78acf2b5f3c897b87290 SHA512 6be40ff6b1130be93649bb533d63ddc2dad626bb3022392863b600b31eef2529df443a9eb24915979bef2d1ea4ef04124668723ffb0ce0f86727f481a3997c74
 EBUILD yadm-2.4.0.ebuild 1566 BLAKE2B ee2b55e4039b9d3718ecc08dc23b393a8999369fab0c5bc01c279a54de2922a1c79215dea8f05d95735a6e19f98b30e4fdf476afa2c8c26e4f2d784c944efa0e SHA512 833c8a2822ad71029bfce0d36b500d0f278ad831785465193b2abf3b3ee293a9674002dbb8483449d2bae28dd3dd27e40b16ecf3624af23aa420b8373c7e3223
+EBUILD yadm-3.1.1.ebuild 2147 BLAKE2B c41819203892ca9a8e4d917a764467e726ce7b744fcce2ae88c0954e92d6db865e6b554c188cdf5954afa58098b0827db2197a810306bf8536d4c685868d4458 SHA512 9802bec047a4790a250585fb660ae7481bb0fc5e5a09f7495977d6d06572ae08b3242f6678ef082a1d8c499c066008660d4e4b59fd86dca48417178e8715afcb
 MISC metadata.xml 826 BLAKE2B 79c41680142d275a20557b3a0aca5f664542f45a34f3a09c42ab7dc15cec352462521b94f2c647b09e3801883c4a8c37d14b2d71e75fe12e16c7346cc7fb733e SHA512 d3d6100185add752cd59346eb6c6c4ee0026a6f409d63ae37ca58b9e7396b5be76794a341846d898a3c1724967e71097ff30ee331c4d0640ed0de8430ab177e9
diff --git a/app-admin/yadm/yadm-3.1.1.ebuild b/app-admin/yadm/yadm-3.1.1.ebuild
new file mode 100644
index 000000000000..b2d7cb882037
--- /dev/null
+++ b/app-admin/yadm/yadm-3.1.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit bash-completion-r1 python-any-r1 python-utils-r1
+
+DESCRIPTION="Git based tool for managing dotfiles"
+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 ~ppc64 ~x86"
+IUSE="test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-shells/bash
+	app-crypt/gnupg
+	dev-vcs/git
+"
+
+BDEPEND="
+	test? (
+		${RDEPEND}
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+		dev-tcltk/expect
+	)
+"
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_compile() {
+	emake "${PN}.md"
+}
+
+src_test() {
+	# prevent system config having influence on tests
+	local -x GIT_CONFIG_NOSYSTEM=1
+
+	# prevent git branch warning, it confuses tests
+	local -x GIT_CONFIG_GLOBAL="${HOME}/.gitconfig"
+	git config --global init.defaultBranch master || die "setting default branch name failed"
+
+	# un-hardcode path to tmp, otherwise encryption tests fail
+	sed -i "s@^cache_dir = /tmp@cache_dir = ${TMPDIR}@" pytest.ini || die
+
+	local EPYTEST_DESELECT=(
+		test/test_alt.py # requires envtpl, not packaged
+		test/test_compat_jinja.py # ditto
+		test/test_unit_template_j2.py # ditto
+		test/test_syntax.py # needs new yamllint, not packaged yet
+		test/test_upgrade.py::test_upgrade # needs old version of yadm
+		test/test_compat_alt.py # tests obsolete features, broken
+		test/test_unit_template_esh.py # requires esh, not packaged
+		test/test_encryption.py::test_symmetric_encrypt[clean-encrypt_exists-bad_phrase] # hangs in sandbox
+		test/test_encryption.py::test_symmetric_encrypt[overwrite-encrypt_exists-bad_phrase] # ditto
+	)
+
+	epytest
+}
+
+src_install() {
+	einstalldocs
+
+	dobin "${PN}"
+	doman "${PN}.1"
+
+	dobashcomp completion/bash/yadm
+
+	insinto /usr/share/zsh/site-functions
+	doins completion/zsh/_${PN}
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins completion/fish/${PN}.fish
+}