gentoo resync : 09.07.2022

author: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2022-07-09 15:43:36 +0100
commit: 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree: 8c816148bcbd22757d892089c989ae614eae4f5a /app-admin
parent: 0f558761aa2dee1017b4751e4017205e015a9560 (diff)
64 files changed, 719 insertions, 495 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index a1e69cd7850d..ba2c087c19b0 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 efec04fb0818..715f45632fce 100644
--- a/app-admin/ansible-base/Manifest
+++ b/app-admin/ansible-base/Manifest
@@ -1,11 +1,9 @@
 DIST ansible-core-2.11.7.tar.gz 7108269 BLAKE2B c5080161bfffc34382db86f3940dbbf1c8194a4413b20ef28b3c15503aec905acfffc864041496b4f6b4b77966fee3221b80e90d4b952e38513ba9ce506ee1ae SHA512 f37c925c5302eff30d17f52a04d4a5311e38ee5c1d6db4fbdb32970afa362e0522d6ec3d07bddf40137b2f5ec5fa03a2b72e7e1ed313c28c207f65490e49af92
-DIST ansible-core-2.12.5.tar.gz 7757691 BLAKE2B 04be15e932221dfbc8435c703efe3803d4de5f1f94b3205c220f4ea105ffd703df5dff680a4812f1230b77f21ee78b9f6b1020122442aac333aa26304d4d62c0 SHA512 795001257d8b2ffdca00c13a018ebfc822c11f1d8a0eb83df30a1670c19bdc995325da1c87414b672a4fcf8bf57215ff8b7a7b85325ad561d5123c549b18dbe9
 DIST ansible-core-2.12.6.tar.gz 7761844 BLAKE2B 37fe58bd04fcd59bb8085c31d8d7b4d4298c7911acb2a5988afa7a3b9d856769f0a737179f8d4828fd94a1a6c5e029385a7514a5f1b5155fffd6b8aa7ae7427f SHA512 55138701f3733b1ea2049783d9d0246beb7cc778090785eada756c9ef540b248bc345e07a261d5542648fc22088bc25e3ab57f7b904bba615264d5556baae456
 DIST ansible-core-2.12.7.tar.gz 7756456 BLAKE2B e9c5b446fbd80524572646667875afa26a28cd6f8a0c138383ef2af7fe2e51ba5dcbb19bdbb00e7e367ba78f9667be0b03320f887367dc5cc3d18cfc33ebf89b SHA512 15b29bc52cbcd690d442e4923bad23c2b4db34b1d9af9a7e3a73fbad6b4d775795a44df80c739ad409206767f6bc9efc3d5abdab593fb2abd6ba991ca8cbee67
 DIST ansible-core-2.13.0.tar.gz 7383065 BLAKE2B 14c9c30a1d04c4235877da9a2d866bae229fa0bb28815dccc2cbc37ca7a767a6a15b2ae1824849cb2c7031b3c3bdcac433b04bf353265228ab2beec7650aa7b9 SHA512 37e17d73477ba88c62af94a6912f9b4b91ebf2ac967c2845875e293fe2ed09307e414644899714e604883973e241eed571d61b7a093a6c212446a1f5b702af6f
 DIST ansible-core-2.13.1.tar.gz 7407801 BLAKE2B 230dd2f1030c6da89d5e2be6ea7d83b78c05b4216bad6d99b51807cdd3114d13cfbc8cc3b5c3583249937f774ce5b15ba1d524f8d68c201d3042ff1350981921 SHA512 f40ec5c8fdcc1e3f2ed78f398561aca5bfd4793a5f4d9240930f7aaf96233f05c7177304c30c06115943b5b9e9944286f01545cedd378e9c3e7f93c3ebce7c78
 EBUILD ansible-base-2.11.7.ebuild 1648 BLAKE2B cfa73eefc856be5b4a7a71b37fd62b3142f09a9d2a89bb94f20d8c362bce8606e00a0efe2db3824e7e15008f346c1dddb217bacd559a410a031a76e5487b95b1 SHA512 0f71b29df5a4acf4d11eb088c567b0d00d8a1f5880e86053281165cdd36a6630339a90d5a122746e4d057b754cb19754a6d790aadc687bd8602697d91decf6f5
-EBUILD ansible-base-2.12.5.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.6.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
 EBUILD ansible-base-2.12.7.ebuild 1652 BLAKE2B 86acd8409ebeb175027e795e2008bbbc16ef67f7a18d2d523dc30325148c45f320aecb96aa0f3cc9df01095289f78089837aa540005dde997279db03b8909507 SHA512 b469bb030a5a101ee3e521caaaf69cd79859874fefd164de22af3bf926e61210fc81b4a4b74006eb3871051257f5a34351271e52945c6835ef5a3c20e6e4f7c7
 EBUILD ansible-base-2.13.0.ebuild 1649 BLAKE2B 4f0a648a9cb9f6268e694a3e853f5f5fb7070261fd2c1a822f67de100ef636e5b64928c7e1717c2cd451cce60897dc89565a67622df72b532a1bc54aab281f46 SHA512 be973064bb6de6c2063723ccfe172e48b6063528266b5f2d8cb466c4c0363f39a1188bb3851759440a3f1cbd4603f52736221c7d223a71392a6571382bc15586
diff --git a/app-admin/ansible-base/ansible-base-2.12.5.ebuild b/app-admin/ansible-base/ansible-base-2.12.5.ebuild
deleted file mode 100644
index e8c2a3cb1c45..000000000000
--- a/app-admin/ansible-base/ansible-base-2.12.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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/Manifest b/app-admin/ansible/Manifest
index d6e3c6a689c8..ac656357f081 100644
--- a/app-admin/ansible/Manifest
+++ b/app-admin/ansible/Manifest
@@ -1,10 +1,8 @@
 DIST ansible-4.6.0.tar.gz 35644507 BLAKE2B 94f544caa81ba7d20493f469483612f2ebf9eb1c4be18006b5ca6afdb3bd45428226340a0658b8f1ebecf8bd06396763ba888bb1cbd48aa6b71aaa6a56542d38 SHA512 5b7fad69628dded0b42a25e3f2fbbcc30ef876dc3f97dc1dff2c7db6443d1506fe5db62bc4d8a00ebfb7dc78ecc205a56bea3bf760f85260c835b2286f63b702
-DIST ansible-5.7.0.tar.gz 35864998 BLAKE2B 9bee56b3c1aec3af8fec68a80f97431d8c610a8646b755974cf6365d68e57a4adefb4f678ed76da1dd25802eec1abb45b596030b9ebca8337e4b9bf8c18b469b SHA512 2e2f88948e875a1ce5a6cac58ae0d918adf903848c60e125728314e935cbf29aae6db6ec87d9aad14fd5406751251a681b441f1209c789f14a1df6e68b91c3d9
 DIST ansible-5.7.1.tar.gz 35657258 BLAKE2B e13d294327ff6e6ca42a5fe95d5795c984319bace80da1d9e62b0eca861ac60cc9e6551c3bef6eddd8629670bb85b1f9ebc48fd093880248988831de2056908d SHA512 cba20da1a87e96600214b89539b5dd9ea0439edb6ccd757717c4041506b7ccb8ca046cd11840b2418bf0f6e725b21e56c8ac057f13604baba610d3716deee268
 DIST ansible-5.9.0.tar.gz 36756162 BLAKE2B 4c713f0a45536aadbd20451c5b5ac37b474cb1d1f9fbfa6031b228a549bfd65e1ae0ee76d6fcd08a0de43d7d07eaebf90d08d00764acad438bcffcdb09c5d58b SHA512 88b26b1ba59a39370ee4a27eedda441d6e6ce8ba8eb857353572c692e49b189e95ed80e5063917c52799fb15bc3608d4c1ada013a7d650909714ca8ea5dd3bbb
 DIST ansible-6.0.0.tar.gz 35015538 BLAKE2B 30736f5742c6b8a50f1cc763cec8ef7a7ca8d034a6365bb5aaedab7e768e35fa0ffdb999b53e59389da42e5ff305912e1716ce3b2847cfb44888fd22793d8abd SHA512 490bdc574ad6a444f8007138a12be5e5fcd8eb7abdd5466ff1924ac7c34e0a71be1c2495666ceefa1c88da48900fa2bca2c1e8d5775f3f559b1fa285bbcdcae9
 EBUILD ansible-4.6.0.ebuild 701 BLAKE2B 23fb332fd50a5de4e58bdf7479eb072284e8bafac36a6340da061e8a0bda644a4dfb5e4aec4be0bd182a43d20a7157f8656016965a62ab5eca17dc9f72879686 SHA512 1887aefe7d3ceb06703cce26f2442fec8de7ccdd740b5cb24cf67945ee5efdbe7adbe3cbec64dbcd2ea6b16db573f80cd4fa22896187d976a5a2fb29cb885548
-EBUILD ansible-5.7.0.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 EBUILD ansible-5.7.1.ebuild 702 BLAKE2B 7ed0f66425218b72a4b90d310ebe3c305296db12e3940efcb7f54bd8068c81671ec8bbcee375aae774dd9eab1d20e92f63e926562c5485750e5da5a3fa3957f2 SHA512 9edbbcbe86922ce40e0d7dc415153d6fba463027ca3ff15fb7cf943a15aca076c5ae8d5cc6fd5b3f6e62cf7c9d10e217626b7213f82cdabad1ed91a97baedf39
 EBUILD ansible-5.9.0.ebuild 705 BLAKE2B 3aff5e97267d1d1bfeb1c51ea3c1bf6602434de0695fb7da8c995146e626fb4c817c6a86bedd5328ac25665ed511668408af652d54c25b50e4b9f55090960ae8 SHA512 3adcec18ad42c9d3edbad2ef586ea45eb15216072eb6ad9a90ec0aeed6c5001e73f43a73b0cb74138e0eb2481485a01440ceae22ec666f4cd97d5bcd067e3ca4
 EBUILD ansible-6.0.0.ebuild 705 BLAKE2B 09a68de4d26fef9b7bae56b435b64aed0c28ba9ee5c45aa56e2a9b314124b9fb14af0b6d3c9acb6a986c07902aed68a7ea93e092f1b862e61d00cec1ce13c1fb SHA512 23566e58957aaf63da622a5cf7b92c4f289910710c0d2a326993e90011e31245665a4d26787fea38a5f298c0ec4064f4d4594e0986ea404e765b95b267ff1279
diff --git a/app-admin/ansible/ansible-5.7.0.ebuild b/app-admin/ansible/ansible-5.7.0.ebuild
deleted file mode 100644
index 21e85e45cd01..000000000000
--- a/app-admin/ansible/ansible-5.7.0.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="Model-driven deployment, config management, and command execution framework"
-HOMEPAGE="https://www.ansible.com/"
-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"
-RESTRICT="test"
-
-RDEPEND=">=app-admin/ansible-base-2.12.0
-	<app-admin/ansible-base-2.13"
-
-python_compile() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_compile
-}
-python_install() {
-	local -x ANSIBLE_SKIP_CONFLICT_CHECK=1
-	distutils-r1_python_install
-}
diff --git a/app-admin/awscli-bin/Manifest b/app-admin/awscli-bin/Manifest
new file mode 100644
index 000000000000..a6b98ca11397
--- /dev/null
+++ b/app-admin/awscli-bin/Manifest
@@ -0,0 +1,4 @@
+DIST awscli-exe-linux-aarch64-2.7.11.zip 46384612 BLAKE2B 1728dac769441954b86f1436708c7b84aa4d1f7affc634de9e6a7bea66a10e5143a6d1da3fd24e8e721cdaabff0bb4b363bef78e29aecc976e9cd5b961284a2b SHA512 3f3e2670614bdcf6751d556a8a150d573712b036ad904a7cbfbb85600241d04f7f257df2d1159e2fb6f5b0d02b7f65df1bfb00764218ef60782a04a7fdebdc2a
+DIST awscli-exe-linux-x86_64-2.7.11.zip 47188206 BLAKE2B 9530ad2cf832dab1d5fb38a4942d338629c24bdadebe6abd0ba3a1759688e2ea9666cd97d8643d6ba7469bc446f09bd4c63a43f36deba1afb133ef00da49ce6d SHA512 6a15745502e273ddfad1d9ac118aea1684cf62f533a0fa3ac7661c31e49984ce1d0b608c61f5ed182692686ab7fd992f9a8da6a066bc4da6fe5e3d386548ab8f
+EBUILD awscli-bin-2.7.11-r1.ebuild 2289 BLAKE2B a10366396fb39fc81382351de2b57dd95afac77cb9eddac2c11245460fb16614d8d50be696dd88ca978f13096070bc0de3909f9433784c2b3ae3ef7d1237d3a0 SHA512 19eba643095a14c9e3a4723f704b4a6d34a8fe6e60b75d6baa56030b55f7870af23cbfa8ddab7307929d611843d43ad1ebf0dbc65eeb2abcd2a198e42afff871
+MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/app-admin/awscli-bin/awscli-bin-2.7.11-r1.ebuild b/app-admin/awscli-bin/awscli-bin-2.7.11-r1.ebuild
new file mode 100644
index 000000000000..08bd8f8fab0a
--- /dev/null
+++ b/app-admin/awscli-bin/awscli-bin-2.7.11-r1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="command line interface for Amazon Web Services"
+HOMEPAGE="
+	https://aws.amazon.com/cli/
+	https://github.com/aws/aws-cli/
+	"
+SRC_URI="
+	amd64? ( https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${PV}.zip )
+	arm64? ( https://awscli.amazonaws.com/awscli-exe-linux-aarch64-${PV}.zip )
+	"
+
+LICENSE="
+	Apache-2.0 MIT LGPL-2.1+ BSD GPL-2+-with-Pyinstaller-Bootloader-exception
+	openssl PSF-2 BSD-2 GPL-3+ public-domain
+	"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm64"
+
+RDEPEND="!app-admin/awscli"
+BDEPEND="app-arch/unzip"
+
+QA_PREBUILT="*"
+RESTRICT="strip"
+S="${WORKDIR}"
+
+# This code is based on the install script in the upstream archive.
+
+set_global_vars() {
+	ROOT_INSTALL_DIR=/opt/aws-cli
+	BIN_DIR=/usr/bin
+
+	EXE_NAME="aws"
+	COMPLETER_EXE_NAME="aws_completer"
+	INSTALLER_DIR="aws"
+	INSTALLER_DIST_DIR="${INSTALLER_DIR}/dist"
+	INSTALLER_EXE="${INSTALLER_DIST_DIR}/${EXE_NAME}"
+	AWS_EXE_VERSION=${PV}
+
+	INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/${AWS_EXE_VERSION}"
+	# INSTALL_DIR="${INSTALL_DIR}"
+	INSTALL_DIST_DIR="${INSTALL_DIR}/dist"
+	INSTALL_BIN_DIR="${INSTALL_DIR}/bin"
+	INSTALL_AWS_EXE="${INSTALL_BIN_DIR}/${EXE_NAME}"
+	INSTALL_AWS_COMPLETER_EXE="${INSTALL_BIN_DIR}/${COMPLETER_EXE_NAME}"
+
+	CURRENT_INSTALL_DIR="${ROOT_INSTALL_DIR}/v2/current"
+	CURRENT_AWS_EXE="${CURRENT_INSTALL_DIR}/bin/${EXE_NAME}"
+	CURRENT_AWS_COMPLETER_EXE="${CURRENT_INSTALL_DIR}/bin/${COMPLETER_EXE_NAME}"
+
+	BIN_AWS_EXE="${BIN_DIR}/${EXE_NAME}"
+	BIN_AWS_COMPLETER_EXE="${BIN_DIR}/${COMPLETER_EXE_NAME}"
+}
+
+create_install_dir() {
+	dodir "${INSTALL_DIR}"
+	setup_install_dist
+	setup_install_bin
+	create_current_symlink
+}
+
+setup_install_dist() {
+	cp -r "${INSTALLER_DIST_DIR}" "${D}/${INSTALL_DIST_DIR}" || die
+}
+
+setup_install_bin() {
+	dodir "${INSTALL_BIN_DIR}"
+	dosym "../dist/${EXE_NAME}" "${INSTALL_AWS_EXE}"
+	dosym "../dist/${COMPLETER_EXE_NAME}" "${INSTALL_AWS_COMPLETER_EXE}"
+}
+
+create_current_symlink() {
+	dosym "${AWS_EXE_VERSION}" "${CURRENT_INSTALL_DIR}"
+}
+
+create_bin_symlinks() {
+	dodir "${BIN_DIR}"
+	dosym -r "${CURRENT_AWS_EXE}" "${BIN_AWS_EXE}"
+	dosym -r "${CURRENT_AWS_COMPLETER_EXE}" "${BIN_AWS_COMPLETER_EXE}"
+}
+
+src_install() {
+	set_global_vars
+	create_install_dir
+	create_bin_symlinks
+}
diff --git a/app-admin/awscli-bin/metadata.xml b/app-admin/awscli-bin/metadata.xml
new file mode 100644
index 000000000000..db463f3eeb66
--- /dev/null
+++ b/app-admin/awscli-bin/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 7ce40705eb8a..b381bd0587f9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -1,19 +1,19 @@
 DIST aws-cli-1.25.12.gh.tar.gz 2224456 BLAKE2B d6425983b09fc3942727108e188e184f48399388704ada03df1d65ddb9adffc9597a217b863766a862e96b59c03fdb3202e694289b54ee9298fe7e547639ecc3 SHA512 a77e0d082a8dacecadbd2fa6cc1143fa5148e075894565fe9a552e9d1a27fd068c72ae57eb5c628129bb024267111b76722cf2c40dc9f719db8d96232302b918
-DIST aws-cli-1.25.13.gh.tar.gz 2224352 BLAKE2B 0f6b94545f8504dcf6a458df28b39b3a909869033ccf04ad1ad3652e6606573002cbd3fed7f65756a140bac7d3b1ccddbc6fcc84391b194b3a987cf8534c4bdc SHA512 f494f9b31e91bb0e7446867efe4539f04ac91b12ad7f4db2f355d1a391ce7a8bd1d40f4afe04855d227414a7c2479ec6fdaf9a42f1959b28d205df48c2b4d723
-DIST aws-cli-1.25.14.gh.tar.gz 2225058 BLAKE2B 185fb35a574a73d1d43adef515dbc1e67e81bf3ba5c6511365d6633c1b3c72263b4bdd1c0449a319292fdfa2f0eaef52fd8322785f26fa7ed5da0231d5aba6b2 SHA512 e7d854cff3c68a7ad41c3f481d64b12761dffb5186cc8919ec92bd48e9f9946773382eb276722ffc9776f34a972f50773e758aaa5212c168960fff07a71196b1
-DIST aws-cli-1.25.15.gh.tar.gz 2225254 BLAKE2B afc4ef97b0c8eebaba3874ab5291cda8b971cc934379973b19e9ccc855b99a42be2a26737104e0eed151db280afb1c1a7866c9f8a376ec8e6a59d09372217cfa SHA512 b5dfb47b1b256b2c3ee2ca92e161f0e59afc955159e28d368ee947cc8a41765919828dcfcfd00f7024bb328f4ed698cf040f81747cc892c6c3914a1f7e97d875
-DIST aws-cli-1.25.16.gh.tar.gz 2225519 BLAKE2B 5800f49afe526f29b76f74078431235ab302237cbb3d6977c902d218fd65fb1eb341534020f1b8c495eb1834d3ef4c87fec7b4dee6ac8ceff4a528ec9bbf045b SHA512 4641ead6693a54d34dbd3426baaf8c389221d85aba950e21e1ba7ccbdc142633d0d4215598fe55865a90c98c4df8ea2eb78610fd0567ce49b82f32aac1941f3b
 DIST aws-cli-1.25.17.gh.tar.gz 2226115 BLAKE2B d07a9c7a8e13019fd728489d27465497ba31f53087ef09e5f816792267bcb58158fa0a7f71fc499d3e343b5b3a0da45cc3632f8c69345b8cd93ebc735f645672 SHA512 1a7f90e28d6702f9e73fe3a93e0d91e2c4ea3d93574f21a3ecde1148445fe6b5f98f217e2e61a1cbba50a07590f0ab0abd00390fb04cbb3db74dfff698224997
-DIST aws-cli-1.25.18.gh.tar.gz 2226354 BLAKE2B 5dafc484fcb592bef9e1aa18ff21897bc93c2eda049e5dff64d706fc492c5778ccb818c4368b95ee7f326ad47ee59b7b230875d1ef6e63ed7997e1e761228fd9 SHA512 40a5f0d35956d8fadc8950e0498e9254126914172a26b092ad6cb874f32e9f36a790295687da30d3e9bc41e41672d1e1424ba91051d4e32c46e44ef89601b289
-DIST aws-cli-1.25.19.gh.tar.gz 2227148 BLAKE2B a39de70c887b6e036303cdfb9fa435674cd5beb2482c1c71efbdfd675addef72772e538c11850b93be9430d12ce5a7d3293f18bec1a3bd6fd9b4d0c675b7d307 SHA512 430cbc322a26031211fbdb8a9ec4ee810d50b78a80d50b5e8fa254f22fd5131b3b5fc791db10d27d0b85ccb82b4a2a74dac4f1a1f14299262668743417532ec0
-DIST aws-cli-1.25.7.gh.tar.gz 2223153 BLAKE2B fcadda94fd721135f94b1538c4b27e41108064f6fd32f324d5436138e3d1b0ffcab53fcc545b01c461365d55c4bfa2a05d90e94c875c929a3227efae76452415 SHA512 194adacab0df87d8e4f0cdc71bb956bef6dc8b2de2e7e4416c9c079ff2b7c2bce7584ac1049428d0bcb134368b39c37c04bc5e6a8fc7540c44c64f3934ccaf21
-EBUILD awscli-1.25.12.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.13.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.14.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.15.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.16.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.17.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.18.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.19.ebuild 1813 BLAKE2B 090772347728a30e7f77a51c1e8e7bb56e5cb87aa1a74dc95330effeae079f0631ae9be24bc1698d7f87f736125e9691e56b6a75519c6bf4cd9e2a0ee1bf6f02 SHA512 26133ab5c30348efd23e1d55f4db4f703512a05e8260eaf3e49171afd3a194649d400d7a49b67b6aaf1d6ebf1fd4d8e743ca650c9a7561e13b0d827aaa13e0db
-EBUILD awscli-1.25.7.ebuild 1811 BLAKE2B c35b439798c718974574befd5d1bd327aec0c8f3747e7de256d735738975d5e90ec0eb05fc97258bbffdfbc9c337f700cda71fed90383ac0bbad0661c8ecf8d3 SHA512 2821cefd21e2d9860ae0a87fa8ef4b5f50a24649b0a319af10e890155f11af13f75be1dd18729a800153e8d0a4610baf2c8d33b91c89b889843983e0599d39cc
+DIST aws-cli-1.25.20.gh.tar.gz 2227422 BLAKE2B 7dfeb6266578fc61a4fa54f39bbaaabcc8c53fc133f1993669a3cda0398fa67a6e54f122b6a103474a0b6a31c7a259237cf4a759995eab727d8f103a8649163a SHA512 0179487b9dbc9864eeb066e9f4f30c67b17dec589c5860b476cbc7798d1b163080d7d3caeae18367afdd89d299f508bfbbb2150d4795aaa85efdeb5b61030663
+DIST aws-cli-1.25.21.gh.tar.gz 2228274 BLAKE2B 3246bcc1607fa7a43cb081192176345c189b8e19c197e22f27396d3dd72f7e55436820010f9245375ddbf4cfc24f13d2fc47864ad34a5dca1529669e91b6bff1 SHA512 26a97d632206016cfba2a8a51949ad623677a04a6582d1f7f28191c02adb39bf8f4b42e22796c3c97c29ae2dc36007803fc25f442111a67f93f3cc8880e50759
+DIST aws-cli-1.25.22.gh.tar.gz 2228459 BLAKE2B e9ca58f6be9d5836b2b4d8ce51154ecd9dca3e443a120ff6ab3475b0777ca5e50c17a3c30641c57df1df63cc065fc0316b1e847b695bdfbe49a0a5b330912a74 SHA512 328303792a75c9f44c7e37e825ffb81aa2a071d4ae18b21c31f2c9abc5e0ae8f3ec079725847cd731d4cc49b5064a0244129176789f4ce0865e6d8cae0dda1e8
+DIST aws-cli-1.25.23.gh.tar.gz 2229364 BLAKE2B 1610ceba16cc6555b333d1f2869f4c8667a7aecfb28ac21f46ebd1ca9a3f26da78d1f84816a7ec6c279273c5d17ab97e1963a73499c5a648571da0386f715b88 SHA512 8cc030c386b9a3d58ea2ff41d9a8da30f126707db1b9e8397ee676f3f9f4d0c8f74aa840307ba6664508d47e2f73d7fb3fe5090b7d117aab8d8b47b1b3a191eb
+DIST aws-cli-1.25.24.gh.tar.gz 2229473 BLAKE2B 2937ca1016052732ff382b70c5a479250a139a9c556f1cf40a2903dac35f8fbe89575b1cd3bf787c23a0cb70ebe87fd7cf3952ce9eef08347c439e30a0efd3dd SHA512 7a0c7b3ac9cc9cedefe72ce9d7004afa5cf4b5cb25826153452fd83fdef89970d286e63c1e47f699b9d8bbe2cd39f7079a2154cd3d1064ecbd6d8b6ab244c9a2
+DIST aws-cli-1.25.25.gh.tar.gz 2230412 BLAKE2B 3dc6ab33083e0ff276c2f053675af7ad56287864d6112e8ff03270807bd68d8959753a20fb8b9569dce10c20cc1c6bfd4730b95139f95b911f30992eb38caedc SHA512 fb90e9132e8911acbc984154f739b9bdba77a805b0de0419ff500634af9428e88ff6220d2fc09b301f6af510559bfbec88ec6ec4c56e81e049145f9b43da6cfd
+DIST aws-cli-1.25.26.gh.tar.gz 2230449 BLAKE2B bb792fb2e4ba25870168e4fc3301d4b92d93d831301b0a46ec7dab1ac4b1bdeda9d43f9f6cf20de153f9df3d6b66b0d9ed9754ee4c27b79aacf9d9b8d7e11c2f SHA512 56f9d02d54d20624944c8749860d3e92e7c0887b1c6f524545394ad590ad5ab63752abf25ecba400cfcb9273bdecbae110e4811804e287f15bdfde0d8638adff
+EBUILD awscli-1.25.12-r1.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
+EBUILD awscli-1.25.17-r1.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.20.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.21.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.22.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.23.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.24.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.25.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.26.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.7.ebuild b/app-admin/awscli/awscli-1.25.12-r1.ebuild
index afcfc6c6018b..f241876330bb 100644
--- a/app-admin/awscli/awscli-1.25.7.ebuild
+++ b/app-admin/awscli/awscli-1.25.12-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
diff --git a/app-admin/awscli/awscli-1.25.16.ebuild b/app-admin/awscli/awscli-1.25.16.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.16.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests 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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.15.ebuild b/app-admin/awscli/awscli-1.25.17-r1.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.15.ebuild
+++ b/app-admin/awscli/awscli-1.25.17-r1.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
diff --git a/app-admin/awscli/awscli-1.25.17.ebuild b/app-admin/awscli/awscli-1.25.17.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.17.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests 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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.18.ebuild b/app-admin/awscli/awscli-1.25.18.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.18.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests 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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.19.ebuild b/app-admin/awscli/awscli-1.25.19.ebuild
deleted file mode 100644
index 4154af977ee6..000000000000
--- a/app-admin/awscli/awscli-1.25.19.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit bash-completion-r1 distutils-r1 multiprocessing
-
-MY_P=aws-cli-${PV}
-DESCRIPTION="Universal Command Line Environment for AWS"
-HOMEPAGE="
-	https://github.com/aws/aws-cli/
-	https://pypi.org/project/awscli/
-"
-SRC_URI="
-	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-# botocore is x.(y+2).z
-BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests 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() {
-	# integration tests require AWS credentials and Internet access
-	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
-}
-
-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.25.14.ebuild b/app-admin/awscli/awscli-1.25.20.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.14.ebuild
+++ b/app-admin/awscli/awscli-1.25.20.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
diff --git a/app-admin/awscli/awscli-1.25.12.ebuild b/app-admin/awscli/awscli-1.25.21.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.12.ebuild
+++ b/app-admin/awscli/awscli-1.25.21.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
diff --git a/app-admin/awscli/awscli-1.25.13.ebuild b/app-admin/awscli/awscli-1.25.22.ebuild
index 4154af977ee6..9f176fa05cc8 100644
--- a/app-admin/awscli/awscli-1.25.13.ebuild
+++ b/app-admin/awscli/awscli-1.25.22.ebuild
@@ -33,6 +33,7 @@ RDEPEND="
 	dev-python/rsa[${PYTHON_USEDEP}]
 	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
 "
 BDEPEND="
 	test? (
diff --git a/app-admin/awscli/awscli-1.25.23.ebuild b/app-admin/awscli/awscli-1.25.23.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.23.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests 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() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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.25.24.ebuild b/app-admin/awscli/awscli-1.25.24.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.24.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests 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() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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.25.25.ebuild b/app-admin/awscli/awscli-1.25.25.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.25.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests 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() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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.25.26.ebuild b/app-admin/awscli/awscli-1.25.26.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.26.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(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.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests 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() {
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+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/bastille/Manifest b/app-admin/bastille/Manifest
index 1804c33bea72..a275858a981d 100644
--- a/app-admin/bastille/Manifest
+++ b/app-admin/bastille/Manifest
@@ -3,5 +3,5 @@ AUX bastille-3.0.9-perl.patch 1049 BLAKE2B 2a82c1883bf795b83a86d34e29fc2b3495123
 AUX bastille-3.0.9-renamewidgets.patch 2015 BLAKE2B 12003ebd9d40296e5285b45b063050787fc71c8d0f1002e07407105eaa2678ed25e2dbee66bd9c057047b323076e19e258a5efd2156c043b3d1fba5a92f8ef70 SHA512 28cf0f8a5bf11c29127f128fee80bd0a169960996b4d97b3666d7cfb2485850ca040670deaaf9d0c728e08747adefeecf02c4647cbd4c0e3673cf327c9b46f92
 DIST Bastille-3.0.9.tar.bz2 319045 BLAKE2B 480288c6e9fc5462e8e6ca84665d5769aab4252813ff478ab0519d382e1f03994da008ac2818b1d4214a09607c7316711665bce154121b3029bace6f2822df09 SHA512 a97ab2c2bb64c655d43ddcfd4000cee8666787e5b5923390e3155b258c3a2cf7d131abd474f9b0dd415eb455b664ab26a875da6636268b2a715ea87dd4dae2f0
 DIST bastille-3.0.9-gentoo-0.2.patch.bz2 14117 BLAKE2B 9c4383eae9e27cc4e110553a21424cd2811172c32609b0d3bcc72ccc3f61ba7cd76bfdbee969de5a89c22d0c1dd91b9ba92ce27ea5ac2b7260e5c0e1ce424be5 SHA512 a4ecfc064d6cf8c12b6f53c81dea841931df270293b03c39266861121f3def28fcbc4127b3bc9374028983e584736fb85361443badaadec7441cfb1570bdea8f
-EBUILD bastille-3.0.9-r2.ebuild 1713 BLAKE2B 751966d54e66ab1d86caf0bcd81eec1ad1642677d69598c8a44ca7b4151888c0975bd2f64307714c62e1b7ec27b7db6e80c89e7e235061205c9510883ac0243b SHA512 7b250fa0d0dd26662c5547d1aac700200baa139e5b439d9401b2613893b95775bdf3131ef9dc91a83748ad0ca51b550bbceaadb3975429b81976089cea154b12
+EBUILD bastille-3.0.9-r3.ebuild 1822 BLAKE2B 9ff295935e96b2f6a130cce5b0703189b3682128cc5cdc64198696fb12c551292c0a4febdaee33f748acb94a87340db6ced78dd4bbeb8390593a5942f1041324 SHA512 67f420117c904efb7d37d7fc5033b440f90a0aaf45526ffd4a8d90b78cdb2972374bcc33750335fd2ce4f3dd92f8eb5f97ac08f97073d21879b7c9bdd27cdf8b
 MISC metadata.xml 336 BLAKE2B d1ca0961119d3468c05d2a6087507eb09a3996f6fbf3414ca7b1e120af8322f09e8694551a346c8a627d5c7f7c8c462bd5136cdbdab1c11931a05d7f318e2cf4 SHA512 92294b83690656c5f7bc78ce0ede62b757763614b6c6962d89b7ee5ff044858e55e6925befca3845d7948a37119617ad8e0e3d22d781cda888b2ca994f1677a1
diff --git a/app-admin/bastille/bastille-3.0.9-r2.ebuild b/app-admin/bastille/bastille-3.0.9-r3.ebuild
index ae6415282920..365b97b97bad 100644
--- a/app-admin/bastille/bastille-3.0.9-r2.ebuild
+++ b/app-admin/bastille/bastille-3.0.9-r3.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit perl-functions
 
 PATCHVER=0.2
 MY_PN=${PN/b/B}
 MY_P=${MY_PN}-${PV}
-S=${WORKDIR}/${MY_PN}
 DESCRIPTION="Bastille-Linux is a security hardening tool"
 HOMEPAGE="http://bastille-linux.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}-linux/${MY_P}.tar.bz2
 	mirror://gentoo/${P}-gentoo-${PATCHVER}.patch.bz2"
+S="${WORKDIR}"/${MY_PN}
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -21,7 +21,7 @@ IUSE="X"
 
 RDEPEND="
 	app-admin/logrotate
-	dev-lang/perl:=
+	dev-lang/perl
 	dev-perl/Curses
 	net-firewall/iptables
 	net-firewall/psad
@@ -62,6 +62,11 @@ src_install() {
 
 	newinitd ${PN}-firewall.gentoo-init ${PN}-firewall
 
+	# See bug #455542
+	keepdir /var/lock/subsys
+	keepdir /var/lock/bastille
+	keepdir /var/lock/subsys/bastille
+
 	# Documentation
 	cd "${S}" || die
 	dodoc *.txt BUGS Change* README*
diff --git a/app-admin/bitwarden-desktop-bin/Manifest b/app-admin/bitwarden-desktop-bin/Manifest
index dc574024ffb3..b718fc748787 100644
--- a/app-admin/bitwarden-desktop-bin/Manifest
+++ b/app-admin/bitwarden-desktop-bin/Manifest
@@ -1,5 +1,5 @@
-DIST Bitwarden-1.30.0-amd64.deb 60998388 BLAKE2B 72731519bdf14153e0c7db85c200d8c67a07113f68078a22c29b2160ba49da0e3813676a2813a4fa62e8e927d375ed2c2eb43252a12435483fd998f22b720c60 SHA512 d44dea61c618bed9ddebbd7cf5cb76ea260e119486944ed9a8e252dc96b571a61216fcb0d7f570dd7eb0b6f50a5c6aac3148375145dd5cf6678993e7ff83f24b
 DIST Bitwarden-1.32.1-amd64.deb 72752286 BLAKE2B f7ea64bacb85820872c026d4f4bc6e7b70533bc64af85cea71beac4cf5da559a2178775a2eb31c805837ec5b7fc853c5c097fe3fa71bebf796ea165f62723a4b SHA512 514e9da98a4987d7a65e4b8a5f00fe9154a5e7558edc8d14360a1e7e21a24d4ad2ee82c38b029976d6671af991a82d54207cbfc73c7e246b7c18e5ddceb9394f
-EBUILD bitwarden-desktop-bin-1.30.0.ebuild 1661 BLAKE2B 9199f0a289c649f8e24d909ad4fdb820d7ebb27d41401159ed33f57a49e28bf2ccd8654f2b465a1e06a6afa5b1568282d2c779002bbfb250763981bc7540eb4d SHA512 94971cfb181947c11b58bcdcb06f48df502b974ad7b0d8bb24e34bb2c8630a8045197df642a85ccbafbd0473a61395d7cd0e77b6566c065e5166d09ff841892b
+DIST Bitwarden-2022.6.0-amd64.deb 64084380 BLAKE2B 8729385160c07be0056ee9b17f70aa53b5c5e240fbe5ecbc20d3f4b5e2af69524a4042b07d619c04c6521cd1696459346e6812796bea78f5ba7538de22ff7965 SHA512 70de5d3c626543bfe3f8e3ecde1abe427154e73456f989b6b0219db79c2f61d09a72d37034f9f37a14bd2ddd82ecbb23515551fc7eabc6bc1aa87bc8b44d4474
 EBUILD bitwarden-desktop-bin-1.32.1.ebuild 1661 BLAKE2B 9199f0a289c649f8e24d909ad4fdb820d7ebb27d41401159ed33f57a49e28bf2ccd8654f2b465a1e06a6afa5b1568282d2c779002bbfb250763981bc7540eb4d SHA512 94971cfb181947c11b58bcdcb06f48df502b974ad7b0d8bb24e34bb2c8630a8045197df642a85ccbafbd0473a61395d7cd0e77b6566c065e5166d09ff841892b
+EBUILD bitwarden-desktop-bin-2022.6.0.ebuild 1709 BLAKE2B adaab9ab789d48f4e35e6d2ba08e371072651412a5c968a049e7192b25cefd1de1201b2f9344ba3f0ac5dfe8b9ea582aeeede9bb4770ae8f9499112514a99a10 SHA512 d67fa57b7801687fca76638a629bcc9501fe56981dba1e000eeb72875d6454a7ef3b0f073056836ad8005c347ec341dac490e13e0e9357b3ffef981e47c27ead
 MISC metadata.xml 336 BLAKE2B f78a5036df5cc4dc407d59fbfb0900eceecb4532926d24e0b1c32371214742bbf7a5596c24c473bb4e85a864cac453128e52097024814aed9104753cf1061e20 SHA512 457031ca1a915ab598497cc84944a4c1379ab74df3c7cae62051258bbb0ffe64203dd71b19e698df9b0afc931d56d8bb910a9dcd40c29f8a00eb2abd759c41cd
diff --git a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.30.0.ebuild b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild
index f20778c037c9..6803b000b970 100644
--- a/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-1.30.0.ebuild
+++ b/app-admin/bitwarden-desktop-bin/bitwarden-desktop-bin-2022.6.0.ebuild
@@ -9,7 +9,7 @@ MY_PN="Bitwarden"
 
 DESCRIPTION="Bitwarden password manager desktop client"
 HOMEPAGE="https://bitwarden.com/"
-SRC_URI="https://github.com/bitwarden/desktop/releases/download/v${PV}/Bitwarden-${PV}-amd64.deb"
+SRC_URI="https://github.com/bitwarden/clients/releases/download/desktop-v${PV}/Bitwarden-${PV}-amd64.deb"
 S="${WORKDIR}"
 
 LICENSE="GPL-3"
@@ -60,6 +60,7 @@ QA_PREBUILT="
 	opt/Bitwarden/*.so*
 	opt/Bitwarden/bitwarden
 	opt/Bitwarden/chrome-sandbox
+	opt/Bitwarden/chrome_crashpad_handler
 "
 
 src_install() {
@@ -71,7 +72,7 @@ src_install() {
 	domenu usr/share/applications/bitwarden.desktop
 
 	local x
-	for x in 16 32 48 64 256 512; do
+	for x in 16 32 64 128 256 512; do
 		doicon -s ${x} usr/share/icons/hicolor/${x}*/*
 	done
 }
diff --git a/app-admin/doctl/Manifest b/app-admin/doctl/Manifest
index dc06f8cb8e91..e1f9c9859ac0 100644
--- a/app-admin/doctl/Manifest
+++ b/app-admin/doctl/Manifest
@@ -1,8 +1,8 @@
-DIST doctl-1.57.0.tar.gz 5195498 BLAKE2B 17273e9f8f63464aa2ba6c6d48dfabd78b0bdeb7156dc315d1970fb0052710c7a4b37f1d5e2a7a60211f2ab166c0926de438959d853639a8c329ec39b3ee0577 SHA512 0c868c5732a48367a93bf2b884689dbd917ba6690c82516495862546bc31d58d44aab192bd3b3543f951e9fa9b7289e99fbdf828c017af68496b84f1585a5f6b
-DIST doctl-1.68.0.tar.gz 5514572 BLAKE2B e44be00e1b7451e84d3d6dc5a19dc04fcb5dab2c8a5c1923c0c0f99058a1938f9567d63681989e869341957586cdf549842cd45ca82503007039ae989664e8ff SHA512 d81799c227c071793af74f78e54d8348782caf158b28e0a12b92adf17b6c78c787a82abbdf3aa340a960f26c929b00f38015725e6e629aad7615096270d19c10
 DIST doctl-1.76.2.tar.gz 5648377 BLAKE2B 1ec89adb5ad187ccc6b66d077dda57ca4065bc1a5981a0f2549913532f6bcc6d1f48c3cc56c100c1b6c55f698ffcf3f2c639888ccaab30948384ce800181b332 SHA512 d7efc587843cd87f3ac17b974858ea688377ca6f0cd3d4b7430c47a1e8b825cc05f4d9107d7062f5e52fe3c267ec6bbd19a8b1d773a15f1d7ab653087ce13bba
-EBUILD doctl-1.57.0.ebuild 1293 BLAKE2B 518183156896035326550d0b8e0054bb83be446cad52cafad07f2bd9a602761e263e0782c5f7eccce9d75863521fc2e99d9f8da74ddf2c490d0f5532367da230 SHA512 bd8c37680fd859bb274f1b489c5953c4190eec0405da2c239c1e523217585d73920bd636a596b1c951a9f5edc916ab2945bb3ecf2c4999d04cacefc819b71d70
-EBUILD doctl-1.68.0.ebuild 1285 BLAKE2B a863062d3cb20ff46bbc1ffd58369ddb254cce65fdca008c1dea4c4821c9f937f5962fd4aa0bf67dad5d8f432a5fd0727963d07f32de9755aff10eccb749601c SHA512 2b30bae4fe2cc84f713304754b7951c214258a935cd1d0ea75b6fca88353c3c38164c9fa7fe29cd928d2c5231aa9d6453bfad5567e918f9c78e02560f36b398b
+DIST doctl-1.77.0.tar.gz 5654010 BLAKE2B 809189c9fdfa1e81e75847e57fe5967f0d3ca476fdb7a2e72ffba1b4bb81ecdc2ce07b4b05f4f1f898104cd9e919d6bdba664d4ae0cc97adea6863379789aa08 SHA512 a53e8e3179ec467cd0617a25ab985fe36e41135a824688a947b15c0565fb2d8364c59a295573043039b79b701bb4d5a9ec5461450fa0e7c5a24f10ece53c6f71
+DIST doctl-1.78.0.tar.gz 5658172 BLAKE2B 3213219b1cfbc395c742a59a6bee1c6232f222455ac126de9ce51470a56ebaa9680de4d332cd31580a7ddb9f748b19a8abadef17ff6ea4265dffc2c42b1bb16d SHA512 193fe775885c78312eb6ba14bd34d109ee31acf41cfe68dbacbf6ab19864509b774c658aecf7a61d470598ca89829a6737ea6796eb970b3075d8f37aef747dbe
 EBUILD doctl-1.76.2.ebuild 1192 BLAKE2B 2b2e5e62493c6f2469deeb48a1c799e8ba4b9ee9b756b0ba44c1b9cd5af8162d7c8c56e65ae65e3311055ce00e5fd8094132a012d3bf3fd624c9a123f796bd1f SHA512 333c3fe715ae2b0c289401ca22f233722a7e4d3da4c1ec5e137c0ebf5c78717d44aef07067ec8ec05864dd4f6edf5d586842a58cbde7be4b4e30d62a5403107c
-EBUILD doctl-9999.ebuild 1111 BLAKE2B 9c1012c33f62651e456678867c6397e865caed095274cb6011b16d2968bd61bf194aa03580203459de0d304d66fdd98a7a00b7e8bccb6049fb9d7cf6b08ec370 SHA512 4db64ac08a870f9a4dd75756d969b9ec80f988fd5d9fba3a5817702563187494e7b69d0c327acbd53f98632e08d2e5b20ebf49df44838686dbc75d64f646bbbd
+EBUILD doctl-1.77.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+EBUILD doctl-1.78.0.ebuild 1195 BLAKE2B afb48a2d4e77a6a7e49463733a60df12f35fb6cab9e905c8f55544cf639d2a40de9ef80c24e9d5e30108e04b54e93908177907c94d2e03471b90cc08b9d8cd48 SHA512 655a4325dfb26e85f99b5e4ded5f8f1143d46d9df0757c7f12991ac6843c924ae2ca7650269dfc4c310bc87292d08497df8cf1d163a79e30af8415f8235763d3
+EBUILD doctl-9999.ebuild 1117 BLAKE2B db665b93fd6a9ff473a35f80b4d04e8474cea1c93d293f1731c87562fc65e03228569b2d0929b7fc6b1326ef4e2982d524a364276b4be537b87aee5cbcf8d3d0 SHA512 cd6a84398b1c031240b9faa0615388117215f42c740b520256a2e4b6748a59d2c7457e0389cf84fe945d483663b63ba335066cee57887783fde577e3bd196464
 MISC metadata.xml 670 BLAKE2B 5ee85d9c94a3bc5bf5a159089a11d22db8eb1923d0e713fd45ba4f76f154e17784fded0819aa2a359d2c582d96ca0db99ae80a01bb62843d136b45729b87407d SHA512 d48173ace378646dcad5eb5eb7025436432291ef03f89847e874c4cae7afebcd3c05549553543890581dccc8a7ab2808a6bab7fab6c1f315dcef7300897472d7
diff --git a/app-admin/doctl/doctl-1.68.0.ebuild b/app-admin/doctl/doctl-1.77.0.ebuild
index 30469673185f..3f5680240a83 100644
--- a/app-admin/doctl/doctl-1.68.0.ebuild
+++ b/app-admin/doctl/doctl-1.77.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit bash-completion-r1 go-module
+inherit bash-completion-r1 edo go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl"
@@ -18,17 +18,17 @@ src_compile() {
 		-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
 		-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
 		-X github.com/digitalocean/doctl.Label=release"
-	GOFLAGS="-v -x -mod=vendor" \
-		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
+	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
-	./doctl completion bash > doctl.bash || die "completion for bash failed"
-	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
-	./doctl completion fish > doctl.fish || die "completion for fish failed"
+	local completion
+	for completion in bash zsh fish ; do
+		edo ./doctl completion ${completion} > doctl.${completion} \
+			|| die "completion for ${completion} failed"
+	done
 }
 
 src_test() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go test -work ./do/... ./pkg/... . || die "test failed"
+	GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
 }
 
 src_install() {
diff --git a/app-admin/doctl/doctl-1.57.0.ebuild b/app-admin/doctl/doctl-1.78.0.ebuild
index c1ed045f556d..3f5680240a83 100644
--- a/app-admin/doctl/doctl-1.57.0.ebuild
+++ b/app-admin/doctl/doctl-1.78.0.ebuild
@@ -1,9 +1,9 @@
-# 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
 
-inherit bash-completion-r1 go-module
+inherit bash-completion-r1 edo go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl"
@@ -12,24 +12,23 @@ SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 LICENSE="Apache-2.0 MIT BSD BSD-2 ISC MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 src_compile() {
 	LDFLAGS="-X github.com/digitalocean/doctl.Major=$(ver_cut 1)
 		-X github.com/digitalocean/doctl.Minor=$(ver_cut 2)
 		-X github.com/digitalocean/doctl.Patch=$(ver_cut 3-)
 		-X github.com/digitalocean/doctl.Label=release"
-	GOFLAGS="-v -x -mod=vendor" \
-		go build -ldflags "$LDFLAGS" ./cmd/... || die "build failed"
+	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
-	./doctl completion bash > doctl.bash || die "completion for bash failed"
-	./doctl completion zsh > doctl.zsh || die "completion for sh failed"
-	./doctl completion fish > doctl.fish || die "completion for fish failed"
+	local completion
+	for completion in bash zsh fish ; do
+		edo ./doctl completion ${completion} > doctl.${completion} \
+			|| die "completion for ${completion} failed"
+	done
 }
 
 src_test() {
-	GOFLAGS="-v -x -mod=vendor" \
-		go test -work ./do/... ./pkg/... . || die "test failed"
+	GOFLAGS="-v -x -mod=vendor" ego test -work ./do/... ./pkg/... .
 }
 
 src_install() {
diff --git a/app-admin/doctl/doctl-9999.ebuild b/app-admin/doctl/doctl-9999.ebuild
index 03b7027f041b..9837f24928f9 100644
--- a/app-admin/doctl/doctl-9999.ebuild
+++ b/app-admin/doctl/doctl-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 EGIT_REPO_URI="https://github.com/digitalocean/${PN}.git"
 
-inherit edo bash-completion-r1 git-r3 go-module
+inherit bash-completion-r1 edo git-r3 go-module
 
 DESCRIPTION="A command line tool for DigitalOcean services"
 HOMEPAGE="https://github.com/digitalocean/doctl"
@@ -22,11 +22,12 @@ src_unpack() {
 src_compile() {
 	LDFLAGS="-X github.com/digitalocean/doctl.Build=$(git rev-parse --short HEAD)
 		-X github.com/digitalocean/doctl.Label=dev"
-	GOFLAGS="-v -x -mod=vendor" go build -ldflags "$LDFLAGS" ./cmd/...
+	GOFLAGS="-v -x -mod=vendor" ego build -ldflags "$LDFLAGS" ./cmd/...
 
 	local completion
 	for completion in bash zsh fish ; do
-		edo ./doctl completion ${completion} > doctl.${completion} || die "completion for ${completion} failed"
+		edo ./doctl completion ${completion} > doctl.${completion} \
+			|| die "completion for ${completion} failed"
 	done
 }
 
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
index a84b53982494..746f34e583d9 100644
--- a/app-admin/gixy/Manifest
+++ b/app-admin/gixy/Manifest
@@ -1,4 +1,4 @@
 AUX gixy-0.1.20-backports.patch 2169 BLAKE2B 1e34947b01988a676fd0bbc597613722fa98dc05011cd3dcf11fbc1315ae26fe536f34215a5f89bff414e458c75675631d78bf153ef4e9e4b5305c83a77c0129 SHA512 597f61611ac805f756c8020f823467a11260e4e09bb5c0499dd7ce4f203f89510fdbf0a5a5391856f122fefc5c32e5b3bb2e5feca155c79735b22d79a6001942
 DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-EBUILD gixy-0.1.20-r1.ebuild 724 BLAKE2B 792c202d33715ff1c95c9fa44b5a4444bcf150a2f6cffa992ce1cb75411b901d35ed02a46cc43129d82e536162efa478f07707c39393b199222c340c1150593f SHA512 db2af8b947c116ee0a26b1c20f6666cde1149fc28c7b5e8148a8c1130c2e19b7a8a7c5c373f13e5de290c3b0a5bce9cdb388015c7114ad8c7f4060f135318f63
+EBUILD gixy-0.1.20-r1.ebuild 724 BLAKE2B 9f845f1c2ea41fe9ed5689dd542ac1f9119e3e35aa9da3432569f65ce28017d24f6abbc27285d6a2874134c00bd375cd52b81ab6533adf42305651db91ae9939 SHA512 91f6199368ad510093fed8ea25a05b32a4f1e57a4271494c1c46afd4f448d4aa7ae163496e6bf190d1796925a0d6cada30b5b04377c6f53570b38953872d4bc8
 MISC metadata.xml 324 BLAKE2B f6f81a115f0e155af5bb5031ddf6e8fb5cdc293c83fd93c4fddc38b06074866b5755f76ec4836cc0736550142e2f3e6c41f105ddb32069862a984a39fa0345f3 SHA512 161132676a924c42219b89d8c994159c4e89cb44d5f7598652ad42e5b19ae799185e430adb9a266410ef1f8dd5ae9f39b8385bbc9aa9bfbf8285d399ac0d07d0
diff --git a/app-admin/gixy/gixy-0.1.20-r1.ebuild b/app-admin/gixy/gixy-0.1.20-r1.ebuild
index 806f19111532..ec3ee6ce1513 100644
--- a/app-admin/gixy/gixy-0.1.20-r1.ebuild
+++ b/app-admin/gixy/gixy-0.1.20-r1.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
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	>=dev-python/configargparse-0.11.0[${PYTHON_USEDEP}]
+	>=dev-python/ConfigArgParse-0.11.0[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
 	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
 
diff --git a/app-admin/gkrellm/Manifest b/app-admin/gkrellm/Manifest
index 2862bd2712ec..38666d7cdb1c 100644
--- a/app-admin/gkrellm/Manifest
+++ b/app-admin/gkrellm/Manifest
@@ -5,6 +5,6 @@ AUX gkrellmd.conf 250 BLAKE2B 2b0cfcd1940cd695c67db32c13bbb7f372936b1f88938a2e43
 AUX gkrellmd.initd 338 BLAKE2B 6ff2ab29e354578efc477af50af6a7e517bb7ec9267575d75fb5d5a12c9894a60996ffa37672760657eeee0680b9b7573d3d03d7d5efbe20122d330e5a55ebd8 SHA512 403431a0bfe8264ccdaf3c7e361e363a18a5e2deda8b2287919030c746c7caf80571b1a2dda407c113a9f878253078e67202017a026d83dec43bc5ca0389cc06
 AUX gkrellmd.service 173 BLAKE2B c89a772fd0273b54766f5cea36aab9156d7a1d59f5759bdd673651afebdc21e1bf6108cadbc6328287e6fc62d0edac215eeb7e6dd9d8d6a916c7ff913222c511 SHA512 8703ea4e51d243050034b65b7bc50b3d1862a6369af72b0d9e47285558763066e27dbdfadd54a4316da0402aac0d92c17cf1c42eed2b7926226191ce5d85089d
 DIST gkrellm-2.3.11.tar.bz2 783123 BLAKE2B b68c60477e4994e9508a8e5ea39fd09ab5cf0f019fc6b4567b9482b3b1fd315dd2548daed262095b42dda43ac068295d5c3c375c5cb80c91fda76ef8b9834df2 SHA512 e4147aa90e09925b9672728f287880bde26632d77d83d3f0b9458a201593a57158d9eb8cbb31e569e0d71d91a08c9bceba29814f59e542315775663ef9fd27a9
-EBUILD gkrellm-2.3.11-r1.ebuild 3208 BLAKE2B c3d4d3f16cc5ab6ff2a3a19eb1d2ff712d755bd5df64ab86f847268a91ae77c11ebaf5e6c8defe504747f3a081976cc651a8094cfa01695da6a613678fc4d5dc SHA512 5cddfb833dce63799b00eacd0e641920f0585dc8f7d19cd0110f75995e19a64c81e102a8f213b7c8aa615cb6f5740e6d046267c07be5bd1838522b0dc40044c5
-EBUILD gkrellm-9999.ebuild 3226 BLAKE2B e166906224496bac76cda607f23201a42fa71e38134b2a89c3bddf5fae9bb783d477b433d2050dcd0d4a0bf90d56678d5808c49ae2cb639afb929d3a2b6f54c7 SHA512 0c2e473570685871f00acef32335bccf28639a0035a91a9994a5c07b66755c4b9e10745d42d7a9b3f445ddc65da6a5dc91887e2bb4a412522f0c87b144eba994
-MISC metadata.xml 834 BLAKE2B f4b05943b3c857e2abff5b5a0c80a8b13e3e287d485ab32041814e2916c3dacd30877af1dc810e98185090c1ca08f2de2cd1d902b2edcbf7ecd959cea965d5c4 SHA512 bee900de1088d84fe45ce29b1a5b96831b5ca1f14db59bcb7a21145ad77760ab4c96fa9581fbe9092d6b74d20f63b2513ab837292ff804aef3e737c5ba9d7689
+EBUILD gkrellm-2.3.11-r1.ebuild 3200 BLAKE2B 5710db8a7d565d621cc170811600cc195044e1331ef3a41ffd81631b8147688bc1dca69fc7a2c6831c6b4b4a3104aa6cf638ddab3af805e3d85140b655b68642 SHA512 0360906aba0b6ed42f703b74554418f02943f0d1ff9190dcfed59057f45d53bdd8305486493c59ea09fa22932a61f4d902976e93f0be6bbe62548a5462aa781c
+EBUILD gkrellm-9999.ebuild 3218 BLAKE2B 0b298d66af4e1513c21a0c6d753090042bf227c3f83889930915782e272545ff7836350aaf3db487199a2bb9f767daac49d23a956c44f2c366499e201cb4b610 SHA512 4b4d3abe3b9b93adae1e18b1f6a69421365e332ba2cb27c09d9c7924f3c9e65e81a3d1e6fc42ec25944a6a880f8d15541db7d4b12ddaacf5e488a719d5811f80
+MISC metadata.xml 730 BLAKE2B cb17bd6be9a48e86f6571ee08a038ff939c52c1e0b37935679c3ce365da49bfcbb6f08d484c623f11d3c07af9727276454754aa342e9c6aaea216a2c54574563 SHA512 7a6b85156d81df30316bc301034f7be2ece3756e2a44efc31145b6052924921d751fedadd44353ac24af9d5ea5bd69ce7ecac6d738347e694cbb04609486e05d
diff --git a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
index 50c444a0e35b..1213ede77276 100644
--- a/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
+++ b/app-admin/gkrellm/gkrellm-2.3.11-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop multilib systemd toolchain-funcs
+inherit desktop systemd toolchain-funcs
 
 MY_P="${P/_/-}"
 
@@ -16,7 +16,7 @@ else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 fi
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="2"
 IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
 
diff --git a/app-admin/gkrellm/gkrellm-9999.ebuild b/app-admin/gkrellm/gkrellm-9999.ebuild
index 8b29bcf41db9..caea7327cbef 100644
--- a/app-admin/gkrellm/gkrellm-9999.ebuild
+++ b/app-admin/gkrellm/gkrellm-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop multilib systemd toolchain-funcs
+inherit desktop systemd toolchain-funcs
 
 MY_P="${P/_/-}"
 
@@ -16,7 +16,7 @@ else
 	SRC_URI="http://gkrellm.srcbox.net/${MY_P}.tar.bz2"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
-LICENSE="GPL-3"
+LICENSE="GPL-3+"
 SLOT="2"
 IUSE="gnutls hddtemp lm-sensors nls ntlm ssl X"
 
diff --git a/app-admin/gkrellm/metadata.xml b/app-admin/gkrellm/metadata.xml
index 4a5bb5248dee..5176167a404f 100644
--- a/app-admin/gkrellm/metadata.xml
+++ b/app-admin/gkrellm/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 	<!-- maintainer-needed -->
 	<use>
-		<flag name="hddtemp">Enable monitoring harddrive temperatures via <pkg>app-admin/hddtemp</pkg></flag>
 		<flag name="gnutls">Enable SSL support for mail checking with <pkg>net-libs/gnutls</pkg> (overrides 'ssl' USE flag)</flag>
 		<flag name="ssl">Enable SSL support for mail checking with <pkg>dev-libs/openssl</pkg></flag>
 		<flag name="lm-sensors">Enable monitoring sensors via <pkg>sys-apps/lm-sensors</pkg></flag>
diff --git a/app-admin/keepassxc/Manifest b/app-admin/keepassxc/Manifest
index cb330fba68eb..19bc71e7d3f0 100644
--- a/app-admin/keepassxc/Manifest
+++ b/app-admin/keepassxc/Manifest
@@ -2,8 +2,8 @@ DIST keepassxc-2.6.6-src.tar.xz 7640532 BLAKE2B ed55dfe992c02e78354d7aeb9f638533
 DIST keepassxc-2.7.0-src.tar.xz 8846780 BLAKE2B 74c4e9c6d06239950f1b8a64c5bce894799fdd73a562ee22d1189c60dedfff3555132c0619488e0682e94de8759e096627520b96d664f472645e4b6375d68ff9 SHA512 0fc436ae5fb8fb82765a0c2df20c9567b1baf6aceff1e08c843a151ddcc0920d4cb2d416aebd89bdd8f1b53efb0a4ad0f579955c6943ee66c20b0becbb978e12
 DIST keepassxc-2.7.1.tar.gz 11168642 BLAKE2B 4708821c596e8fc736e086a700d5526be6d9c4cfcb270e3a0a8b73395e9ca3544cbb5973494b15d66e0b98264f4e79d9fa122961407211d346275a9aa1bd5cae SHA512 c2f780ba1f464b32f741d1c6e83734ff220de56dce382f3c38d940abf255d689559c13bff6ad565c38c18cfdb1d883aca52650dba0486e3e28bb4ef872253cc9
 EBUILD keepassxc-2.6.6.ebuild 2310 BLAKE2B befacb8a5edf657b7dc182b4c1b5580a30e037342d590df9ba4450d2344c0a208ba09b59047880638cbc8c68f4bdd5653cfba873e6682949f967c40d545952fd SHA512 6f5d85aa92508284a335374c4b4c190104e4e70c4c4c228f7015e0c15efdb28931f2d97748ed30edd7fc09d65a0017cef2cb5bd28731cc3cace80dfc2b01db4f
-EBUILD keepassxc-2.6.9999.ebuild 2414 BLAKE2B d25231ddef6df71cf2574b46b8c902ba89ad046144a26d011dd3c26ba5061b5e474f80e00d0370fc04bc86e448a377c4dfd1f99535b6e29894b7d951e4a8ed53 SHA512 f3accbf2750712fb4302e7fbd792680b3d3a7094975a56e10bdc205089e8d90520cbc9b29b1cab82196abff1ccd94101d7f49f7ba49ea6ab7cef1fb74b091a33
+EBUILD keepassxc-2.6.9999.ebuild 2421 BLAKE2B 61776556c98951a5637c881e7dc7dbc6110c2fd378aac1ec275ae69896a158ae08b186091d332ccd430aed5ab797d4d94413d4dbf19d928727cf673f48f211d1 SHA512 a90c09435e52bd44d7f46821cbaf2c0ed20d23d9d03a702bc105b760983ee8f3771613b14e745becc26ee0de14cfc54eed91d56fb138140df2405b6facc5b155
 EBUILD keepassxc-2.7.0-r2.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
 EBUILD keepassxc-2.7.1-r1.ebuild 2371 BLAKE2B 9bd8707b862566c9b1c1ddda68ef69e6a17f576ab4eb0a987a177220192a6af12696079fc98a3e840a481f9ea2bd7fc8acc314dd610f518b8abc3eb2b7407878 SHA512 436e42d7de68f4424c1acae462163628d9c7ddc498aa894f86020d6aa7a690651ec858643cfb5e21576ef651db605697c5aaa9c051c9325caf29b6e0fb37fcea
 EBUILD keepassxc-9999.ebuild 2373 BLAKE2B 809a51c4a615d96f25022b0d277fc40501566734abf7cd8c73e24a9a573a73d7cb958deff3de8182c0c3b5e224afc4ed1e4d0b77f2e64059c7553fa49ab70110 SHA512 5509b00aa287d9704f82b72e4e5a8734096bbc33b7893134223fac52c6b7e4ea787ab1791bcdf86edf0f061cd8bbe1b75129b3446721dd655464677902c718c2
-MISC metadata.xml 953 BLAKE2B c9e623ba943380d785a185a42207366db5452128778a0458a0a63fc5b0d59c75b5094ce2b241784aa8e9e9c8f3e79355c596abebba79cc2afe46fce73f783008 SHA512 0e96f566ba35c9dbf741f57b2cd4a419be17e25217b994367a26c84325c10ea11405d78b4a5f1afd3ab7eb1fd7996d4a0c21e1666c75e7496ce3cee85e63a750
+MISC metadata.xml 1107 BLAKE2B 2821f7921a418f0761049591f86c2b827748276fbf671fbda0ed3c73aad3d82b0d612fcdf9434ff5dee66b261c191d041ce130a90f8e70874d504e057129bac1 SHA512 4a9995a6bedfc729b75ab4b7997cd014d565c2ba2ce1e689a950d51fe49fed7a47f657dda381c999b2a9ccaecf3bffb14914473cc5147e305a39c0f606ef4c7d
diff --git a/app-admin/keepassxc/keepassxc-2.6.9999.ebuild b/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
index e2016b26a2c8..606bf9740f31 100644
--- a/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
+++ b/app-admin/keepassxc/keepassxc-2.6.9999.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" != *9999 ]] ; then
 	else
 		#SRC_URI="https://github.com/keepassxreboot/keepassxc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 		SRC_URI="https://github.com/keepassxreboot/keepassxc/releases/download/${PV}/${P}-src.tar.xz"
-		KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+		KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 	fi
 else
 	inherit git-r3
diff --git a/app-admin/keepassxc/metadata.xml b/app-admin/keepassxc/metadata.xml
index 8debb7a00eb3..38521204bca7 100644
--- a/app-admin/keepassxc/metadata.xml
+++ b/app-admin/keepassxc/metadata.xml
@@ -1,21 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <use>
-    <flag name="autotype">Add support to autotype the passwords into other applications</flag>
-    <flag name="browser">Enables browser plugin support</flag>
-    <flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag>
-    <flag name="keeshare">Enable KeeShare sharing integration</flag>
-    <flag name="network">Enable network support</flag>
-    <flag name="yubikey">Enable database unlocking via YubiKey.</flag>
-  </use>
-  <longdescription>
-    KeePassXC provides a safe location for your passwords and similar
-    data.  It encrypts its databasee with AES either by passphrase or a key
-    file, compatible with a PDA and Windows version.
-  </longdescription>
-  <upstream>
-    <remote-id type="github">keepassxreboot/keepassxc</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>xgqt@gentoo.org</email>
+		<name>Maciej Barć</name>
+	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
+	<use>
+		<flag name="autotype">Add support to autotype the passwords into other applications</flag>
+		<flag name="browser">Enables browser plugin support</flag>
+		<flag name="ccache">Use <pkg>dev-util/ccache</pkg> to build keepassxc</flag>
+		<flag name="keeshare">Enable KeeShare sharing integration</flag>
+		<flag name="network">Enable network support</flag>
+		<flag name="yubikey">Enable database unlocking via YubiKey.</flag>
+	</use>
+	<longdescription>
+		KeePassXC provides a safe location for your passwords and similar
+		data. It encrypts its databasee with AES either by passphrase or a key
+		file, compatible with a PDA and Windows version.
+	</longdescription>
+	<upstream>
+		<remote-id type="github">keepassxreboot/keepassxc</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-admin/mcelog/Manifest b/app-admin/mcelog/Manifest
index 463145679f1d..b79ab4d5bf31 100644
--- a/app-admin/mcelog/Manifest
+++ b/app-admin/mcelog/Manifest
@@ -3,6 +3,10 @@ AUX mcelog-129-debugflags.patch 416 BLAKE2B 97aa6da3146380b40013966bb109de412158
 AUX mcelog.init-r1 349 BLAKE2B 17f8a28dc1174fa62d50cb0d6dcae7bf4755ea99ff380d42a5beb16ab6ca07f1dbfcf7783ecb3b8f85f714357c39b0a333630c69e0bef5af32ba602686117cfd SHA512 a43f0efe7eb5007e9422ca2eba43b666d5110696c8b049b74990849e200b89b99e3d22707803e21e4452b0e75bbacdec0526ed933b234301ebbbb19d700df0d4
 DIST mcelog-181.tar.gz 314690 BLAKE2B 4e182c84ae15abf3673e0210940830c66377b275e05c0bf88ff2199ef1b87bf1e9bcff12ebd9c07e5af00d763369c96aae37c274174563fb3ae0db7bbd7306de SHA512 70f0a923bfc0a941b2a70501dd89b8634be52f51c98ab482b212e337684620165f71420205bd779039fe7704e230eb35e47c77802109242dc401803613393bb9
 DIST mcelog-182.tar.gz 314857 BLAKE2B fc0716a468ce3eb4fd08806913c7e5e7481f0181f1217bf6e7bc6d675651dd04adac3cd0927428a6f88b15ddd919fbb1c26a4cfd977c3d902906fc09170bb1b3 SHA512 546fd30d16b00efb79e0df49c4c2d7cff08280762f04c4f67c3ceed500dcd19ba63a6eeb55f6ee444f9bbae04431745eb8aa3ded609c10e6be69cf5dd7722443
+DIST mcelog-183.tar.gz 314338 BLAKE2B f1a9999e938fc6fdb22407b08f54b07bfe45d5dd3660c5b9b6d757a6a0becb811130aa0240fbc7aa0ede0334095c80e2d28dce3b1b3940068c918bcf960d4ae7 SHA512 fc9a3fe5eeaedc7957af99fcb91ca16e4a6ea2467fa36e8ffc2152a717f3bd018aa68c67aaaa6e5c12b740d740555013f0d198cb1a3d050817b0e5f7bf3e18cf
+DIST mcelog-184.tar.gz 314339 BLAKE2B 2eaceb5acd8bca9afb458541ad49bb8cd11e9bc55962a8506cfc3b5beb8d469a7ef0bd0ba44e5b845d17c18b05d897838372dd32e9dda181ea24c00eaba80c70 SHA512 b5ec84632a4c103e3e198956e219a32f4687251b3c6fa1fbc14a55bb26c4371fc993b423e715d4fb691b9d6e6c686dc6602c351ad45a8f09363166b16832e3ad
 EBUILD mcelog-181.ebuild 1129 BLAKE2B c145537c454aa41c2bfababeda876d349e6c0cc82a52c7c03e09c323562d801f329956c4f7241744aad82c0cea2c653c37b35eee04af104bd35acf66d11246e9 SHA512 2ebe74e82511c423be28db3054d5c348f8d712dfabe165cc624377da94b39cb9d8460f48cfb5b8b7acc7a3f135b689e0666b615f057e0b82a9bf76eceb31e35b
 EBUILD mcelog-182.ebuild 1131 BLAKE2B 9d7782cfbf380776b639dec709d38868ace6573ab1c45e3993aecc9fa131023c69db19d491c32652e63245fa426e608335897d7dc6cf5a282570bfbae7f8d5d7 SHA512 7001060bdee5995f6d9b0b7f3f762351f809800d01868f286255b0a89138aa71c913c1d58193db993c63e8c804fe1cb085ba82f42a41537df1e7bd86dba6e270
+EBUILD mcelog-183.ebuild 1131 BLAKE2B 9d7782cfbf380776b639dec709d38868ace6573ab1c45e3993aecc9fa131023c69db19d491c32652e63245fa426e608335897d7dc6cf5a282570bfbae7f8d5d7 SHA512 7001060bdee5995f6d9b0b7f3f762351f809800d01868f286255b0a89138aa71c913c1d58193db993c63e8c804fe1cb085ba82f42a41537df1e7bd86dba6e270
+EBUILD mcelog-184.ebuild 1131 BLAKE2B 9d7782cfbf380776b639dec709d38868ace6573ab1c45e3993aecc9fa131023c69db19d491c32652e63245fa426e608335897d7dc6cf5a282570bfbae7f8d5d7 SHA512 7001060bdee5995f6d9b0b7f3f762351f809800d01868f286255b0a89138aa71c913c1d58193db993c63e8c804fe1cb085ba82f42a41537df1e7bd86dba6e270
 MISC metadata.xml 538 BLAKE2B 02cb85b3717b287e5e6a02db8c5485d52d1a5f7c9f927fad728ea8c313a93ebdb1aac5ac070cb852f18aae2cfebf5096ddb2c298948bc60180e4093c532aa899 SHA512 865e9e806a9fcf1d21ae7cd15c0e65196b3ccf7f866dc69237594908f020e224eca35d2d49fe70bef1e4d38b084ec8558e849148e470d3e22959f85177545bdc
diff --git a/app-admin/mcelog/mcelog-183.ebuild b/app-admin/mcelog/mcelog-183.ebuild
new file mode 100644
index 000000000000..b95ec9cf6b31
--- /dev/null
+++ b/app-admin/mcelog/mcelog-183.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+	python_fix_shebang genconfig.py
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit ${PN}.service
+
+	dodoc *.pdf
+}
diff --git a/app-admin/mcelog/mcelog-184.ebuild b/app-admin/mcelog/mcelog-184.ebuild
new file mode 100644
index 000000000000..b95ec9cf6b31
--- /dev/null
+++ b/app-admin/mcelog/mcelog-184.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..10} )
+
+inherit linux-info python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A tool to log and decode Machine Check Exceptions"
+HOMEPAGE="http://mcelog.org/"
+SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="selinux"
+
+RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
+DEPEND="${PYTHON_DEPS}"
+
+# TODO: add mce-inject to the tree to support test phase
+RESTRICT="test"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		local CONFIG_CHECK="~X86_MCE"
+		kernel_is -ge 4 12 && CONFIG_CHECK+=" ~X86_MCELOG_LEGACY"
+		check_extra_config
+	fi
+}
+
+src_prepare() {
+	eapply "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
+		"${FILESDIR}"/${PN}-129-debugflags.patch
+	eapply_user
+	tc-export CC
+	python_fix_shebang genconfig.py
+}
+
+src_install() {
+	default
+
+	insinto /etc/logrotate.d/
+	newins ${PN}.logrotate ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
+	systemd_dounit ${PN}.service
+
+	dodoc *.pdf
+}
diff --git a/app-admin/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 9b53f0e2cce9..e285495f6915 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -1,8 +1,9 @@
 AUX passwordsafe-1.06_beta-system-gtest.patch 2962 BLAKE2B 1ef77391d355364e55da568c2686c1988916da9eadc312c37d01016df3449535b88b503dfd3aeac2bf3c8e613141552bb1d97f5f5a733becc33f3c565a610940 SHA512 2fc6745b84ad810a550c2b221aca4cd10f87d4bc77282cb31b3d3070b61a3958c126ce0d3da4eaf550d80be470ca4c5aefaeb863caaf2f9fb285bf844f5705bb
+AUX passwordsafe-1.15.0-gcc12-time.patch 306 BLAKE2B 03c0d2cefc7cab1b1342df38bd49e6b4fcce6d4c656c0cfabc678a4dd037c95d45e4e5ddeebb4bf8b2031e4c3b2c3c8738eb4e4b8fcb567f472ccd5c861136fa SHA512 2f209a5ae3691b37144b5c32eb467dd50abfe1b8f440bf63b6e3c3f070f788a160a56dd1e28f631df695c58981bd5596534b3d931ce7096555cd0cd12a3bfdb7
 DIST passwordsafe-1.13.0.tar.gz 15022877 BLAKE2B 353976c22365fc98c034eac339f067061ee659043ab8507bbec174483414619b8442ba4fd7671e888127b83e9865d21587529c7821bd706a55da951c300425d4 SHA512 eb8ae46e9f3e8287b2ad781ed6d6e13026096a35fadc1fd1da1116e5e6b65e16e76090d8e7d1c64be387229ccd1053dcc820acbe7ee97914e46c311ee8ff03b8
 DIST passwordsafe-1.14.0.tar.gz 15303935 BLAKE2B 977386e5c469772753173bd46f608e9fb77e462706fbe6bf80a18cf8e5f3b89cc7300f92298b2b45885dafbef323a0ba59d67ddcea20c229f4f9520a54800653 SHA512 958ab87ac6a9066a0359890facd509c1085646eddcefc33f89b934a9375df51bcbc78213298d165d354c64618c8fb753c2588e386e886fa4c1c478e0a27d3d27
 DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738
 EBUILD passwordsafe-1.13.0.ebuild 1887 BLAKE2B dcfb7d0f84ae7817dd33233cd06df44f255c2590e617fc7d951042ee11c672622fd7f4ebcff80a9391e6f5e29aa1ad7c59d5488491a89a5246dfb2982722a1e3 SHA512 a6e31b0aa014f55fb6a269eeafb0b3bc9e449e8666cd30b4cd844a6f560c93ca631ce5c9c77307bbe6f20f5dd6b8d5111b03d9696d42b8e24b30ba74c700086d
 EBUILD passwordsafe-1.14.0-r1.ebuild 1891 BLAKE2B d4f7f558759d0cbfa932e1ee8c363bfebce03ad8acec940974ae186bc7a9cd001634ba2908a4f182c644809f168033ab6d8bddfd489a840c20e18c6df229746c SHA512 bb0111fc9125d7428bd06f640e36ef165b91518658f5c5a5c3aea20d366881c2f86a47ab55c3902213d34f1f1c82ee75d3a9b05d71157989496cf23dbc35687b
-EBUILD passwordsafe-1.15.0.ebuild 1892 BLAKE2B 57f8c4e8a5940cd60222e3461c470a53d8a0e18e9d80b3c2af7b235b2dd0e0d90f1b6ad712689667d5517131f16ac7ce1e73385089fa11300c322eb7a2e3a397 SHA512 33297d330f3222aa298b753a65593a699ce886df2c83453235420147391587703579b81ecd14fb1aa0253471f9e67adcb83de9e1a4271bc5033339ac55160f01
+EBUILD passwordsafe-1.15.0.ebuild 1950 BLAKE2B ce0565cc05d05490902ae1b7fc6f6047bc23b37efe5d30e8ee66558597eea8531cf6b0224926cbf208e30997ec078d39e3cf88c42f23fc9afee2a885c8a2468d SHA512 8a5bf004d783e0716d00633ecd3c3f0a5aae146cddc62a6d995e18d550bf0ee8319408262f7957adc9792c3c37176f0b711f25faec2232c1d2d542b5ac7dd72e
 MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246
diff --git a/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch
new file mode 100644
index 000000000000..c960c9ca2688
--- /dev/null
+++ b/app-admin/passwordsafe/files/passwordsafe-1.15.0-gcc12-time.patch
@@ -0,0 +1,14 @@
+https://github.com/pwsafe/pwsafe/pull/865
+https://bugs.gentoo.org/854144
+--- a/src/os/unix/pws_time.h
++++ b/src/os/unix/pws_time.h
+@@ -10,9 +10,7 @@
+ 
+ #include "../typedefs.h"
+ #include <stdint.h>
+-#ifdef __FreeBSD__
+ #include <time.h>
+-#endif
+ 
+ #ifndef __TIME64_T_TYPE
+ #define __TIME64_T_TYPE uint64_t
diff --git a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
index 209366001f8a..da104b993d4c 100644
--- a/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.15.0.ebuild
@@ -37,6 +37,10 @@ BDEPEND="
 
 S="${WORKDIR}/pwsafe-${MY_PV}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.15.0-gcc12-time.patch
+)
+
 pkg_pretend() {
 	einfo "Checking for -std=c++11 support in compiler"
 	test-flags-CXX -std=c++11 > /dev/null || die
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index a6a5183f9a76..74d9acca1872 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -4,5 +4,5 @@ DIST puppet-agent_7.16.0-1focal_arm64.deb 19543124 BLAKE2B 2a946462ddf1344f05f21
 DIST puppet-agent_7.17.0-1focal_amd64.deb 20397624 BLAKE2B 8304f937e6eb3f1a3c2a72ba34fce029ecec99decaf1a78b08b556c1ebe3073fa159e70e43baf468e833ede2e9a659f6384f52969e16932ac24a2a997da14eee SHA512 f493298af50e6eed61c7ffb0cf4234b1eb69594caedd24826bc9bcb5d85e736101bfa98b14dcfdceab5ee98e8bc228f25743fdcce440398ff9e0019c6861bde2
 DIST puppet-agent_7.17.0-1focal_arm64.deb 19595304 BLAKE2B 719473363cb24dcd58a864c9ce4d24cb8d8f328d6179ec666d3f3ba1dbf8df53746b9dba37a820c782b6b7b56639c068da1a7db4813e44c5520dfc74ff026008 SHA512 5d74f2fca8fe214c70931b099582d5861ae95a3f11be69e33ee4a10b5135cde43d57b117fa3492983b13e023f9138584d72df6ea788015e058124e4578ae1e39
 EBUILD puppet-agent-7.16.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
-EBUILD puppet-agent-7.17.0.ebuild 2594 BLAKE2B 50cf4300e0420105383d9ce375f643b6122562bb5cf6841db7b8009107bc752827be49288a30c9ccce030b854c3dcbedde3d86bf64e9af37cef7cf5b2e521faa SHA512 9c4e4599785c65a32bdf31a7257862c953bd3c7ee1b7db2279bd1bceb9082ec20dd3f020a3592f5bd211e27b55fa8a5ed7b116c67d11c73151015f326a66bb81
+EBUILD puppet-agent-7.17.0.ebuild 2593 BLAKE2B 1e94777916beb4e793dfbcdbc5c83c875c72ff39bcc4cfee6d8799dd9445cdc46d45a58266739406399f6c4551a5e55fe46f13dd7d4e8cdabb97ed105d16835d SHA512 84230e1234ca4314eba502a376595534d5af4b135c8563308a24c874e6305b72a176652f328b37d061daf5633f83fab0a0bfd941f76a3071c6a0c20d8338cbe6
 MISC metadata.xml 1032 BLAKE2B 35156eb59a786ad7dab4ac5c281796af6a8f3dcad2b7ebc2c6af926aee6fcbffaef39f0f7119f1aefed42a1e8148f323ee4d3d5f77dfb4d3671317af6fd078cc SHA512 b624438f825e288802e516637dd38f775a63b4a4aabaa53c5adfd1f71f694018dbf3d47f1622a90d5da25a00aac696f9203c085190e574a586f3a3e4fe14f9d1
diff --git a/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
index 3ef55d1516d2..0776db0b3b8b 100644
--- a/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.17.0.ebuild
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index b2d440b9189b..1b25ac14e563 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -9,5 +9,5 @@ DIST puppet-7.17.0.tar.gz 2812615 BLAKE2B 80b5115b8825a87427a688ca7a9337334180fc
 EBUILD puppet-5.5.22-r1.ebuild 3750 BLAKE2B 4cfe9e58f764927a378ccb706ea14ed3ac8e981356c2000d16b8a33b924c7d08fd8cc6f27c70cf66f859d5649c13a33d4982ea69573ba73d4b19375c8da95cdb SHA512 87fff4d2c68e882894b3a24f28db1d0b68b081530eeaaf3149314aa1968094fe3f0b37b57c5240e2e4dfe19828084b82b07e0bc3105a1dee0b52f9e28f034cb4
 EBUILD puppet-5.5.22-r2.ebuild 3758 BLAKE2B e9e5ed85c6606cc4ed8e29c1c3f4601be291ed9da1074404cbc0870bb7ad0485a440778d50c8c1753d5bb80627bae35d107c1a2f697b63d1bfb35f86a8474b5a SHA512 b4c19d02f28f6337a0e468374b6547f388208ebab6ca4bce65b6f957b6f28329f65360d2554887b10e2727fac8b206d80fb56938fde4bd416c9b532f8fd7dc04
 EBUILD puppet-7.16.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
-EBUILD puppet-7.17.0.ebuild 3459 BLAKE2B 3afedefaf365433acf67a6696c7d6919aecf8850d84733f2f25679ddbff2611f484d192cf558c7b01ed36a323006fc8932f9c491bdb79776e2219ac031fb0b5a SHA512 09059194222f23c8d7183409cc2534d272615e2154bdd25c4bf83c85ef80f48188e0ca420cdfbbc1e91aae0cdc1b7483daa21d1f5714ff6c52a11fd425170c07
+EBUILD puppet-7.17.0.ebuild 3457 BLAKE2B 67bf80033dbe3bec0117118b158f4d177695dee5d6956322e156efea99cc2ba75eb830912f019e495e903706a36b623e62492b62b1f66463946a048a223104bc SHA512 0e870b484df92c17ff5af92f883ad8d8da911e0cc48e4dc9ead0505e1dd9c2e3681b683f6f4b92176dcc83a76b5b03939dd326f182d3eb72590c62adc9116b2c
 MISC metadata.xml 1570 BLAKE2B 5ea0d1f9d7e83fc99130bc7375de7638fd509d18ea5728d14d370338089c33c788156f20b976e6b909502e94e356428e4a1ce95e10bf307d81bd2fbbb1166941 SHA512 4ec568674227749e9644c4eb09d39c25f2458a7eb89f7d36d2be035845e8ffefc6bffbdbc09be9950bb424f2c940ff9bf43ea60e22cd4816bf12d3593e41e7b1
diff --git a/app-admin/puppet/puppet-7.17.0.ebuild b/app-admin/puppet/puppet-7.17.0.ebuild
index 98baf706218d..b0c6d6d3ffe3 100644
--- a/app-admin/puppet/puppet-7.17.0.ebuild
+++ b/app-admin/puppet/puppet-7.17.0.ebuild
@@ -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 ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest
index 59f160d8a1a5..f948f2619b62 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.7.0.tar.gz 64646018 BLAKE2B 7ce0dfc469705093107f3761c25119a488fffd0bf95112108b86fd0bbaf923d090712c0612d0efb8226059645b15386593fcc5b5c13b0881a9ffd36b714a7d50 SHA512 f56a94cfb75f2e95aef4947b2e755cda1ba4b3a1f646f14525c2ed2434c49da7d71b5dc2766bae727dcc307e06e2c56df80682b2376d8379b7c291a319a37ed1
 DIST puppetserver-7.8.0.tar.gz 64651673 BLAKE2B 7bd53e3a15128eb4405b47edc066e702a3ea702a22258d039a4be5a7fecb509c724dcf21d893e9d76a99e9c94ca8a514d48bcd7085bcf429dd318defdf9fbd8d SHA512 82503c79e3d24ae2700537c8acdd410ddd3b400993d51f392f30664f6d259c224ba782c8ebeaf21e49c4acfb503b2f1a8ac880359a67c8d008797abcaa3210ab
 EBUILD puppetserver-7.7.0.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
-EBUILD puppetserver-7.8.0.ebuild 5356 BLAKE2B d16d614eafd7c9770b1c1b01afa58f7aa51bc5de6055144736a1bce4931f2752861c6e1ab0b0f17a477406b9384e3b492fc4a86d4bdf45ddbba50eda36496c55 SHA512 01ea3ed8ea76519754a51921c9c58aec187192915b3fd92be92df0db6fce8caf78bbeca6af12715581495f85d65c147e6bccdc9b90e3292aad18621e4ce0d4e3
+EBUILD puppetserver-7.8.0.ebuild 5355 BLAKE2B a056b0cc747b7c04099df4d0a99d33081a60285bdda79286dc9bf6866bd7ca935f6ba74694031974e90fd6450e3078edffa17165f40c9f91fcf7305dac56e70b SHA512 22198f51ab66063f4962a519e2b4be072176baee327f3d7bd4e46931829eb2793b97609a095f814240eba3ed6f23297f10540b0c654a245d2b9f905a89ec4b09
 MISC metadata.xml 341 BLAKE2B 6e19f31ed866283c5827f9ca2550ca99c12d8b9506fbc13447d8bdad3ceaae844d3b103fe6cced8f829a75b7b1c317ef43bd2d1e885e9b509f70b8646a9e5bf6 SHA512 72945305ef496758676dba53925ebbd5cd0d01935fe82708559f941d831bf6b2ce34444d5b85a16b116f577596b2647183fe7b7c6ef92080a8e332fc0226d7ac
diff --git a/app-admin/puppetserver/puppetserver-7.8.0.ebuild b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
index 6877b38e3a99..7323a3ecf896 100644
--- a/app-admin/puppetserver/puppetserver-7.8.0.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-admin/ryzen_monitor/Manifest b/app-admin/ryzen_monitor/Manifest
index 25d96379400e..836013e5f44a 100644
--- a/app-admin/ryzen_monitor/Manifest
+++ b/app-admin/ryzen_monitor/Manifest
@@ -1,4 +1,6 @@
 AUX fix-Makefile.patch 480 BLAKE2B c0228dc813a780c0a92ce3f931b90ce786debc5c6d6f514470e59e5a79090ee0bd36a565165c10c2c71b15aacb0723fd3f7eae58589434233f9222c4af5e9ff1 SHA512 67214dfeee57031eb069aafe284c537fdf980e3c5ee3c50ed12c8cb0f04413a4bb75bf73b769f1b8237ced1ca7eb1fcdf2f1d2b3672077c8e896ed3219978406
 DIST ryzen_monitor-1.0.4.tar.gz 33716 BLAKE2B f755cc946b26ea5566c1bd304f84e3a3aee80383d151ec8e702919837d04287d4b3b4000b4f9587003cb20b2be45d4af727eb941c0080772b5f94104d68f8b78 SHA512 93cb55b64db75596da88d8f1f3c5eab38cce52d7ae9bb8b7895d62d39ec0b4c0157bad3ed688c32cc0aecf09eb211614b81159a31c704a0f028751ded46723c5
-EBUILD ryzen_monitor-1.0.4-r1.ebuild 625 BLAKE2B 4fff5724f494867a7a2e143169b5507f93d80d2ff4d33b97520e61ba11b18990c15bf95a9aae9f9a181ead446fa3fc77d58ed8347f8ff193d5bfb6e8f704f823 SHA512 3b7ec2ea6fb6f109dcf8c2f4fcf85761c64fd3e64c20c022f0f9ceb5cc98a2d69a0809debf2167f2841cf79e7c9c09ed630c349f8a8df693e1fae776970920d4
+DIST ryzen_monitor-1.0.5.tar.gz 37372 BLAKE2B 021b417a60a284020e7f9e96348f5e0745aede68e01c1b560e2205c4738fd504d4565bbc5b9c6824ea697a8c0a1d981722f9e6e178a8cfa9213b2e703c5f6b72 SHA512 8e1f02f59f40a3e4fe84c805a1053939a20d21e5c40223bb6b7c41716eff361b86e87fc67fd90078d3ffa9d78d2016284af5362aad2212b9cf35979427906ca8
+EBUILD ryzen_monitor-1.0.4-r1.ebuild 623 BLAKE2B 908b07b7b838ff46f57ecbd329a1c1b350d22a92427fb6110e35930a6a0cb142fb542d622a887aee44b9b57fabeaeece09a0185e667ff9501deaf43ca047cc35 SHA512 b32fd4ba7cb4897a501e78a34bf7c008f7d01387a955c9f0f22358c28797f4336c154ac515d3ddf80c4e00e8c3533f10a3b98460d8eb44a76857a3eb90b4d313
+EBUILD ryzen_monitor-1.0.5.ebuild 578 BLAKE2B 698db5eacc57f7e40980680c4e2cee2c350e34a1bd01a2ba98b6cc29353addf2f84aaccf2687a60a78f032f4904961c9739b4a576b24c661c99ffa2891c82d36 SHA512 a95755dce5b14da89b30865f45fff7d365b7949c8953ca1f77df4a5f8da59fd3f9d0275736e20dbb0e9aa1b2d50266302444f3452e6678bbe7784aa54e186bfe
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
index 3e0570fd4532..479eb87145be 100644
--- a/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.4-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit toolchain-funcs
 
 SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
 HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
diff --git a/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
new file mode 100644
index 000000000000..87fb7869e0ff
--- /dev/null
+++ b/app-admin/ryzen_monitor/ryzen_monitor-1.0.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+SRC_URI="https://github.com/hattedsquirrel/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="Monitor power information of Ryzen processors via the PM table of the SMU"
+HOMEPAGE="https://github.com/hattedsquirrel/ryzen_monitor"
+
+SLOT="0"
+LICENSE="AGPL-3"
+IUSE=""
+
+DEPEND=""
+RDEPEND="app-admin/ryzen_smu"
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
+}
+
+src_install() {
+	dobin src/ryzen_monitor
+}
diff --git a/app-admin/ryzen_smu/Manifest b/app-admin/ryzen_smu/Manifest
index 0a1d85b50a65..50212d134fa9 100644
--- a/app-admin/ryzen_smu/Manifest
+++ b/app-admin/ryzen_smu/Manifest
@@ -4,5 +4,5 @@ DIST ryzen_smu-0.1.2_p20210627.tar.xz 151900 BLAKE2B c3845755753256aeee4e68d106e
 DIST ryzen_smu-0.1.2_p20211205.tar.xz 386260 BLAKE2B eea0466f6abd93a18c670fbbf603be7efb60807865151543341b6a0a9f248eff8a99d8ecda864bebab6e5e2471ff7239681a83ae9b3dded3b1350a7f363ee62c SHA512 93f7eaac4811ac6e3d46abeb012b1ff4e334fc9247a3747ca67489a35ea04dce20806ae2e57f46e930e5238d1d2a966e8d0b83f8bf090a735d0c2d078f3256f3
 EBUILD ryzen_smu-0.1.2.ebuild 734 BLAKE2B 12d6de1f710039e5db92698e3bd2af0d2b658d9e84719f2961578d4710f171dc850e9b83a377134a42f4a2109a00fe08510c043698da2c724caadf5b984965bd SHA512 80ae58556632ab6095a9a48699abbc54e0bdca84a1c8b57052ae47336d2e35a82d22c5e0667ed9c01ab14dc0878a794c47787bc01c0a9d9d8eb70ed0790602bc
 EBUILD ryzen_smu-0.1.2_p20210627.ebuild 727 BLAKE2B d2230e9a14222da60f4ba256d968a677ec8266649344fd9ef377cf3607ec03a8f52da414e97328f26e4ff526d0a417cbe516608e07981c79f18b75f99f402daf SHA512 7077291d2dd35fe457286e01f94bf6909cf0644d31020bf56f0266201a0d5b9a96001094d5027ad5ec3fbe5fc28a5070b3f4b617d254beded70930f486c362bb
-EBUILD ryzen_smu-0.1.2_p20211205.ebuild 727 BLAKE2B 5ec3c85d9bf7c0e50109b45a281a3ab90061aeb1fbe12682edc3e55871f18eae41c0244bed4bb66618e6c9456b352700972d73bb41a6f9253f7e67b78741422f SHA512 7af2bb31b49b6c31cc294d0f502c908ab090b4ed1719137b66995b349630cbd657b4be3ac33b64ba299b4d727c1a2d17c08c96c1eac5abf351cacdf547e56bad
+EBUILD ryzen_smu-0.1.2_p20211205.ebuild 725 BLAKE2B 0aaaa80179b45a0187e91baa96b70af042764de193128354f823d8b8f8e14a498790f0e685a1fd392e91fb50d42437753902d0120f7997152791d2ecd0fdf919 SHA512 a5ef2de43ffc369bfff54575cc1d5f9643cd03a5c1d1d240662ca270239469e76f80885866df4ef796ee4e75dd8388abf6572b3c497b897ed698e81dd55cbc8d
 MISC metadata.xml 253 BLAKE2B ac07d0a4457abddec76b322a6e7f175661559091067a6f3d92658d4e6c2f1f90a57f5d0c139de0a91a19a5a797fed39fc66fd90ca25bfd0c66497ee8e4088810 SHA512 40abc637528fae614d2eb151b5834c323cb151d5c9ebbee415d70efb4603df0fa7483e0d689ea1658a424ac1e54fb944d8eca37a4bd80bbc15222ed9259096df
diff --git a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
index 90210e25cb73..aa763072c39c 100644
--- a/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
+++ b/app-admin/ryzen_smu/ryzen_smu-0.1.2_p20211205.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit linux-mod linux-info toolchain-funcs
 
 SRC_URI="https://dev.gentoo.org/~slashbeast/distfiles/${PN}/${P}.tar.xz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DESCRIPTION="Kernel driver for AMD Ryzen's System Management Unit"
 HOMEPAGE="https://github.com/leogx9r/ryzen_smu"
diff --git a/app-admin/superadduser/Manifest b/app-admin/superadduser/Manifest
index 1a35300d475b..57be1b7ab4ce 100644
--- a/app-admin/superadduser/Manifest
+++ b/app-admin/superadduser/Manifest
@@ -1,4 +1,4 @@
 AUX 1.15/superadduser 15878 BLAKE2B c55c30e217e5df3f6802f80dba9350fc114004fce3e228f1da95954947839f8a2ef164914e3a320f201f2c9fa3c8f4747eada8c58edc7cedac068ae15ea9bdf8 SHA512 0187b3d85f6f8ff956c3612ad937c9645d8d6423382def5ae00a9528bad1c9d06a1c0ef01e12da010de2c2eac527eac26282d1ff5c71492671c14ebd5923827b
 AUX superadduser.8 517 BLAKE2B 25817073bfd4effb62fb18a8a7721cffe9dd376d88734a3dea337ba9c6cfc3ad4663c56e44bf44ce70ddf23113d3691e6ffdaf6bd5a6eb67add357fc47d46d06 SHA512 f07bc575a8ee89b2fcc27714eac4ad5c7129dedc2fa927d5490735109594f81dbe0fd7057f5c1317f3aa1905a1ac5a51e589d5eb9484b528b0174380e6c3297f
-EBUILD superadduser-1.15.ebuild 470 BLAKE2B 76624cf8e2f725342295cbb24398d7b4b4831ad2630bc6375bb6ac29270f88ab78dca1921fe2f259872369c25593334033b53c455a33947a7bb75f916e8ec4d0 SHA512 84866b0cba87fe5b6b6421058d13344ef69dc36872e88b50a189505adb56bd0d5503481beb6296cdc66897a0eb0bff7cac4078cbe23edcd768066b923e1cf1da
+EBUILD superadduser-1.15.ebuild 477 BLAKE2B b3964f9cc1c265c24b271e7fb547421c6afc3945d9cbc1de2f36afb0284fd13b7499f1fb17ec9ea753eb5eb5eeb6be4d8b832c7a0854cf2d1964ba172bd8394a SHA512 9e4029330d3f5e31bffcd4e91cf59b8d194814b610562841949f572b766ed7f88ff6be14d39f11186b521d9ce4f78a04840bb65d157056cebf181db2cd0a8586
 MISC metadata.xml 258 BLAKE2B b3ebb9691cf2c860b26172c2fc7ead843959a83806b7c06f4eec2ea349a6d2f39afe2f4b08c09bc7f65d18bece520b8b6306c8c7c2075d653f04b09af43db8fd SHA512 02ab38ca1547c68e87cbcad1dd4bb121e90d1fcca941cbfd29583ea803ed50617aa6a29df11915af5e95d63fc817df2250c7b8189157d705ef86e477d6a1685e
diff --git a/app-admin/superadduser/superadduser-1.15.ebuild b/app-admin/superadduser/superadduser-1.15.ebuild
index 07938399b9bd..443e989808f3 100644
--- a/app-admin/superadduser/superadduser-1.15.ebuild
+++ b/app-admin/superadduser/superadduser-1.15.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
@@ -9,7 +9,7 @@ S="${WORKDIR}"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="sys-apps/shadow"
 
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index cd33b1db3924..6d8ef9baa4e7 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -3,4 +3,4 @@ DIST sysstat-12.5.4.tar.gz 1474379 BLAKE2B 73bd4ebc44cc57cd3dba4fecbcd45026929bd
 DIST sysstat-12.5.5.tar.gz 1481620 BLAKE2B baf4d57eb369d75787e3fce48b29909f90ad5e981996930538ff0a60e668853457440bcea8323cfa10d86f7069b0f4e24e27d62aa09572bd1c9535c2bd730451 SHA512 66ccbf0fbaf783fac3cf2b52daf53a8d5bc6d182a66fa0b2965717cf5afc5e54590f08711948f18806b9b95c9f06a45376a1d18b5081d63a5214bc55f81f5696
 EBUILD sysstat-12.5.4.ebuild 1881 BLAKE2B 1f285b96455f80ebfd841afec6ef75d483e26e1e91ef3987bd39bccf01cb26d4b28492c7aa368a7666dca3b80e7584f94c0749115a91b89e423a661c9568a1bb SHA512 5350bb48dd51622d5e6acb9b72b50531f34e046380af4547e4f232087a41a72aaeafdafad0a63a12c818363931293d2161db0fd085a672d66db760f6d9816367
 EBUILD sysstat-12.5.5.ebuild 1888 BLAKE2B 6ed7a47394309e13538fb0253b3adf0b4990d0257eb40df0cc565f295a8e9a6c3eb21c2260c99875fb2797385d58127bb29b3c8ef286ed5f73951a6d927aa699 SHA512 27d6fc1e19ebda59a8b580c567efa9f9552acc6ca93a29182cae934a34fb15d49bd29979389831a822ae04674da0e10c512eb35982516963b9c81e0a3ee45c85
-MISC metadata.xml 363 BLAKE2B 4d85c322b826830448a87368a86b2a7eab78ecb5019ed386955cda5b8d9ecaf878d5d36d74304f9ad3de62188678c1a60d26176e53f5e5ee737f577d6e29b3c9 SHA512 63bdc13c49d9c7d07e3e8fc719eb0d8fa5b962349bd4c1372f81a989479fea10fef781e715b2c7caf6a57933f9efdcdbefd6e7810af70dbcc0f4ce58855b44ce
+MISC metadata.xml 469 BLAKE2B 53490577d19dc7183909c56b546aa1bdd4052fab6f7133b31e3d805e3b30c59f83624900a35f85dd6500ba727f3822189ed3f404df4ba144749ca9f3b362dd25 SHA512 3f46f10260fe8e5912cc941286f423e0e554dc94e5f3ad086ff900d84b1e3e0112c4a3a07c2c976b6e3c008c73fa85993f7df736413f96e8fa8d7990ed9d60b6
diff --git a/app-admin/sysstat/metadata.xml b/app-admin/sysstat/metadata.xml
index 5430d7358fad..2ca06a59ea2a 100644
--- a/app-admin/sysstat/metadata.xml
+++ b/app-admin/sysstat/metadata.xml
@@ -5,6 +5,10 @@
 		<email>gyakovlev@gentoo.org</email>
 		<name>Georgy Yakovlev</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
+	</maintainer>
 	<use>
 		<flag name="dcron">Adjust cronjobs to work properly under <pkg>sys-process/dcron</pkg></flag>
 	</use>
diff --git a/app-admin/terraform/Manifest b/app-admin/terraform/Manifest
index 5988768c0cce..c444999667b5 100644
--- a/app-admin/terraform/Manifest
+++ b/app-admin/terraform/Manifest
@@ -2,6 +2,9 @@ DIST terraform-1.2.2-deps.tar.xz 264293344 BLAKE2B 939e0385d04a535af85ccd45d8078
 DIST terraform-1.2.2.tar.gz 5179827 BLAKE2B 28a5d4e9c7c4f2001a76acafa039d808996eb41b20af21f013f6ecb1368f11a9891b2b17abedc41fa9a881081e3e89a42958c6a6868df19070d9fd8ed3abc1f2 SHA512 0bd56c2c281848a1f3e983e76a6ee13b7a483b02c35dcdf09084a2bee0aa39e9cc9380be35cb1b13cf895430c42117884c6bd2e27d487953d1fc73caac070f9f
 DIST terraform-1.2.3-deps.tar.xz 264283836 BLAKE2B 5b8305463b5978c903499d0a813acc3217d5cbd0298e6d0eb62d30a25b7a6dd29f6d7a3991f16ab23b5f5b99a073bb79fe8600b9af782efcbb1d274ce0f3d205 SHA512 2bb63e46e5e9a8f52620661cd186c82aefb74d92dffbc71c8b7e38e3861ca958a6d7ab1656d22e1f011ddacb32b4624bb4aee74e00fb051dae8fdf0e31dd9d6f
 DIST terraform-1.2.3.tar.gz 5181975 BLAKE2B 120db2c139726b3c1a5c76dcf048de6508f0a99b1f7a8abc2bc7fdb596a72453b4543806090062d804d68157dcb42255119e9e13c462668077baeca83016d287 SHA512 f2aa7436ac82fad365fbae22428984c6a62cb9a7ffa339af035c06f5002fae1b3b440265fdb97e0f4a4aeaebf3838f5a05cd3c40bca1a50273f0560ad4482fda
+DIST terraform-1.2.4-deps.tar.xz 264291608 BLAKE2B 4c0dd8d76bbf2b062f80225ff65342bccdf1f9efb03f0a309a42cdb64f139dbf31fb9ab6cf1754c0dde36c57123ffb7d5bb078d195ab879d29f29b2338761402 SHA512 e4440e541096a4311f713f8338d0653dd35fb7169cf39b1f06d8b1a7ad59d9b55d8115ae56edee9ce3da744d85180e606a9428b4907d1d6badcf8c77f72df36d
+DIST terraform-1.2.4.tar.gz 5183520 BLAKE2B 51b9353dfe40e988c8c621f9e09ec9d3e8facfa7b682832671b3f0f12f52d0836dd6ff1851bebfe6ca590248cd029c508dc35b437b637a51ace4c36ad5807730 SHA512 43dfc4745dbcb3f29577fac610771258c5a9551bf33019d1f6bd3059a808cd365f432842c565522c530b03abf18aeada53fc390604eaeafce4464afd9edcb463
 EBUILD terraform-1.2.2.ebuild 739 BLAKE2B 6f14802c7247aac051dbc1ef2ea537756859c66ccbf7ebddcf1e1b6a5547b6c307a16bc2cd21014f83214e9ff3a129065ef2add6942eb49a05f89ec8798c7a9c SHA512 8dbfc53405fa7e64bdf7bde56322379f4f51832cad598f7fe6ebe4dfd5456c862e1ff2c93eb53e028ac449d62e345f1b3704df4f092bdaf43744835b3d546d73
 EBUILD terraform-1.2.3.ebuild 740 BLAKE2B 56720bd8ea6fe9467cb11c1481a4721607c0af25c552c82b71bbc62a2ea7c8274866be462323c397d7b8fc8463c15e72e30f3460d2e3b8d32339d0bff21f8e39 SHA512 0d860bf1c7920f4da435b5bf5f9adbb5d4323e1010db07a950d8326a7e3d7bec55f0d3f54a755df3d51de292311043712004ec85850fe32bdd18e6d355f0daec
+EBUILD terraform-1.2.4.ebuild 876 BLAKE2B 4ca5e552a7a1db32a27cbd0c1974267a31d9ac9d90fe9b628299e90c74545281bba2d3907e0ece1aa1f92ba89a2b8a4e734ed145d6145c86391a71d8039129d9 SHA512 526c149d6263190695637d8a5030789096024ebec4f67b3d07980832c56b9042a50b458b8a1c52a2c5e56b41dc035b9525bdcea91177f09f663aee019b62cb90
 MISC metadata.xml 1184 BLAKE2B 778da6678848ae048f8bf3d2e2ef2845269b82a14cc7d15044315c21d5e652774954028a81961eb04e32202cef5d67ab98f5c5ce423826477dd0cf049622de94 SHA512 09d06b2229442269fe078171e40d5bd0bd287e15999a0030be391d7ccabc906bb32af1a0e48addc50fc1230264018e3b06d656afc254b16621a6d851aba21b3a
diff --git a/app-admin/terraform/terraform-1.2.4.ebuild b/app-admin/terraform/terraform-1.2.4.ebuild
new file mode 100644
index 000000000000..411e61a46d05
--- /dev/null
+++ b/app-admin/terraform/terraform-1.2.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module
+
+DESCRIPTION="A tool for building, changing, and combining infrastructure safely"
+HOMEPAGE="https://www.terraform.io/"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD BSD-2 MPL-2.0 MIT ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+
+BDEPEND="dev-go/gox"
+
+RESTRICT="test"
+
+DOCS=( {README,CHANGELOG}.md )
+
+src_compile() {
+	export CGO_ENABLED=0
+	gox \
+		-os=$(go env GOOS) \
+		-arch=$(go env GOARCH) \
+		-output bin/terraform \
+		-verbose \
+		. || die
+}
+
+src_install() {
+	dobin bin/*
+	einstalldocs
+}
+
+pkg_postinst() {
+	elog "If you would like to install shell completions please run:"
+	elog "    terraform -install-autocomplete"
+}
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
index 9e1e017f59e2..7a65068bc3cd 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -1,5 +1,5 @@
 AUX whowatch-1.8.4-tinfo.patch 627 BLAKE2B 2b7a5623188bda62a038a07ad6796e66821f8e34d53d82605f0ea462171a2145578dc97fa2b374933fac0d710f68c69f90efab52a341510b0e461b67e53e21aa SHA512 7d256fc59184839a1ce6168689763c0b2a1e32c841438979c00ab8c2c2fc0e87e5e8f6002e1433326b94ebf9b917348b2f19b126562e01ab387bfbed79184c7a
 DIST whowatch-1.8.6.tar.gz 141801 BLAKE2B d52ae8304d25c570873c65cc3b91d8fe227bf71f1802cc8055332f4614b9ca9f6c17dea10b07bbd20f834623f9e10456b19c6393996f6c66819e7e921ffb6240 SHA512 49aa45b0a88a41c98fb7b548f0f098004c8bcca9ec078e977fcec8bc109c9beab25989003bfff4b3dc38a9d62d69378f64441753a1cca62729d2013d2ed73cb0
+EBUILD whowatch-1.8.6-r1.ebuild 709 BLAKE2B 8e02931eae0ee20aee8044df5798eaa2636efb2aeecc845408e0de7ae8ea67be9a8d1505ec88c06830b3a0f32ea92e3257f438f1b807542034d173b631b85105 SHA512 b65be7b50b8189e994e3def8bf43a255de1ef28566fde55dd5659d6de0022a5020e7c4f4ab0a955f1e6d31b4a1ff02f4979d3b8aa3df27a9a3e374207d81ac4e
 EBUILD whowatch-1.8.6.ebuild 701 BLAKE2B 1af78b81ba38f312fc6076d79c8e3ff850f054ec6fdc95fcbd82cb0f59f22188991e848b008193bc5d35148c6e7638581da9f5c72ea264a4231453fd6602dfa2 SHA512 49a1a5bd23d4ca95bf2660d5689ec420cd19d79e3dc732f0d0d56f7a1655bf8462f072a46c49f0787fa8eec96122a97b3e5e7b219cb65502aa822ac305f08e70
-EBUILD whowatch-99999.ebuild 706 BLAKE2B 7c6480a13f7c487834c052629eeee1c65ad8c7b49282de552950311c755e97ed8449425b5a14c208701bfc0ee347d0b20d714d688e5abe77aaf2fc793b6c6a64 SHA512 af518f0ded883887df7deabe14e46e1ff810bcdffcc80f6ce0cc4a5769ca2766f5ee92815e8c1d30c2faf62246bc0c0920e5a07ba2257ac4aca98b26fbeee605
 MISC metadata.xml 312 BLAKE2B 9b4eae6b1b7ed9168425f0f1a7b556658a2ad76209736a24937bdf1428a4e6383ede4efd65b44aaf501581fa353ba89707dd2ec2c2a97e384e36ed59973f24d2 SHA512 6f821797941b94408e5b3b6358791bd68b67cbf8553a7eef77934167e08b5a293144e147a1cdbae0d32cb0458cd611a6c411e391f41fc97b7d73c4f99d0f024f
diff --git a/app-admin/whowatch/whowatch-99999.ebuild b/app-admin/whowatch/whowatch-1.8.6-r1.ebuild
index 73c452f9523b..5d2251fb9743 100644
--- a/app-admin/whowatch/whowatch-99999.ebuild
+++ b/app-admin/whowatch/whowatch-1.8.6-r1.ebuild
@@ -1,36 +1,34 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-inherit autotools desktop git-r3
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Displays information about users currently logged on in real time"
 HOMEPAGE="http://wizard.ae.krakow.pl/~mike/ https://github.com/mtsuszycki/whowatch/"
-EGIT_REPO_URI="https://github.com/mtsuszycki/${PN}"
+SRC_URI="https://github.com/mtsuszycki/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+
+RDEPEND="sys-libs/ncurses:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.8.4-tinfo.patch
 )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 src_install() {
 	dobin src/${PN}
 	doman ${PN}.1
-	dodoc AUTHORS ChangeLog.old NEWS PLUGINS.readme README.md TODO
-	domenu ${PN}.desktop
+	dodoc AUTHORS ChangeLog README TODO
 }
author	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2022-07-09 15:43:36 +0100
commit	2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch)
tree	8c816148bcbd22757d892089c989ae614eae4f5a /app-admin
parent	0f558761aa2dee1017b4751e4017205e015a9560 (diff)