7 files changed, 74 insertions, 103 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2c849395b750..8bf2d5f5267d 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index d1409082ca85..5d9453185ee2 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -6,6 +6,7 @@ DIST aws-cli-1.25.49.gh.tar.gz 2241270 BLAKE2B 6c5e3c20855df9da322f3e6085f4f6f58
 DIST aws-cli-1.25.50.gh.tar.gz 2241527 BLAKE2B 76a594e977bedaeb89bef7b3d61cbd08a157560b3610756719a04a8195b04c5e7480b94a5a6c69494cfe9fd7388550a6b26778e2ab0e1eeeec6e6eb91bfd36e0 SHA512 d112207b0fb654693503baa09ccaf3df3cf8766408a9c4a8533005e8be3cd724d28f197466af1580758ed689ebd3ad0afd895a5c4cfc06c3da15eadda0ca495e
 DIST aws-cli-1.25.51.gh.tar.gz 2241823 BLAKE2B 86e7463a8fb63311351d60ac3dcd01a2f87a774dd63430265dbb5546661d6533fa528c81cab72e08d805518c1896779451533a0e4af02ba2565115402a1aae76 SHA512 6ea6d6532dc6e5ad8e3a392cff6034ad3084b8dbdbdcb197ae737f7912088e415da992a56915cf355a7f39206ab28ec3865c10cb618271b2d1f8a71a89a809fd
 DIST aws-cli-1.25.52.gh.tar.gz 2241932 BLAKE2B e11ce7250040886ae9a00413c8ce67c929e90b5697a83d36184750d69d947c389afc4fc97d590c64874c2c259ba4a10b97b5d20f6148aee167d9cf6b9af6ff9d SHA512 5c5e06c9e2b0529508edc829c1baa7359238a1e72712e45e269030fd58644fde2f7b94767d1e33b1ff35859a25985f2b00b7d13c96e37dc5999bc7e24cc4f5da
+DIST aws-cli-1.25.53.gh.tar.gz 2242474 BLAKE2B 000bb154882210f52f8fe5c40e56d43526b28665a9e5666d7d8b61f95302d411a8f0d0c6eeaef3bd5aff46cfa6ae1133263dc38cb6a7274b4d7058c26005c369 SHA512 82790f15c9fdd736f2bdda976aa5990849521f7af05c95ee9c2c55cf232e140d875b396714be8be1ffba382ebf8f26f8b0a03bc064699de0316ca41156b993b8
 EBUILD awscli-1.25.36.ebuild 1834 BLAKE2B 8dd7abd62571c499386dcc73967b693b028c094797cb10c43b7719b7ad2af01e683c056e9888e6ab6119204362dd2e61b6a465d3d115045130075d54c16295aa SHA512 84785cb46646fc3c97a504a712db51fc68d92739732fe696c1d5e198b99fc5665776629400cb99cb17fcebc47f6a426cc3678c827ebf28912854b8f9b5960906
 EBUILD awscli-1.25.41.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.46.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
@@ -14,4 +15,5 @@ EBUILD awscli-1.25.49.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77
 EBUILD awscli-1.25.50.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.51.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 EBUILD awscli-1.25.52.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
+EBUILD awscli-1.25.53.ebuild 1836 BLAKE2B dae7d5415e625d711cf8b71492dfe80e2ffe77da7c538f4a7b04e2777c942973ad985fdb2f65a96511ce7486c3a4e78daed6110194672b19651191f7db2f484a SHA512 8454d269cfbca202e068c39704fdf48b9e21985e6ee1e825399620585707d315c867ef26f9726c2d8b8f55054980bd5f8e88ffaa0ed8cf45a4eedb5c410325d2
 MISC metadata.xml 334 BLAKE2B 84c9f50e6c0d015aad36a7f625cddf90cf1137a8c2d445cc641cd4890d64261187c10fde59ee1a6c19b98cfdb6ff534c66ae7a7a48a00ec62d6984c9a1891750 SHA512 a845de531df2cd75abf23cdbfa613e586855b95ac4e96566ef193708d7ecf2ec7f7db72fd31b8af0ac4ccd57e51da9c6d129d426bfdc6c4feb57d7df8647f160
diff --git a/app-admin/awscli/awscli-1.25.53.ebuild b/app-admin/awscli/awscli-1.25.53.ebuild
new file mode 100644
index 000000000000..9f176fa05cc8
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.53.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/integrit/Manifest b/app-admin/integrit/Manifest
index 0f11662f465f..0f43d8960688 100644
--- a/app-admin/integrit/Manifest
+++ b/app-admin/integrit/Manifest
@@ -1,6 +1,4 @@
 AUX integrit-4.1-fix-build-system.patch 1169 BLAKE2B 36b13162ea3a583968bda35ece1b4b1cc83871d4c2352ebcbffd079a9265d84b15e72d5e93f10e2404cd26e0622c666cb8b60e1cd53f207f0149a55814e10477 SHA512 4ed15ee8383e280b2d16d353f3401a058ad03c4ad84e4d0932ceec74391e04d266c2468270d2a08d299c57ee105f504c917fcf04b4ac07639bcba42e0fde84f6
-DIST integrit-4.1.tar.gz 271626 BLAKE2B 538a34c8e5c00e1be66ba35095be4d61402372ea7fd9ba9bfff9149c9a82c43d625ffb345fe84b7561100b31f2a2a1ba319e8b9a7d2b78e44a81d1ed6ae64f3a SHA512 599ae66a193fd87971994f59422e148e1ae01a5ff0fea93a0f2555c972f5254f0213116950766e72c87a57b1bd490f04afd3e0557d25a366c41dbbacc80b6842
 DIST integrit-4.2_rc1.tar.gz 223627 BLAKE2B ff0dead8a8903dba0f43c7746672ca2d57aced352df2fef7b195fc90e9b38e77bb21affb40c424c5d23df7dcecf3192c1bff5c7c04d3fcbc5dad0dae60565f93 SHA512 2a86a37c684ca0b78bbf7901c8e72511f1169e8af7e9b4efdeadbade52e8fc7302167f6d82bd02b5af9688a05d13fc56d4f5474e3e04d1aef3dd9f72d782d739
-EBUILD integrit-4.1-r1.ebuild 1264 BLAKE2B 208f5ff74d53a189f7eabd131e3f032cff73d467e4622d317148d9a17c4b7db55335815ec6e59ba85794794bac1bff901dbd7d21b04e32ea0714fd3c7c54d5f1 SHA512 8cbb22064be0107ae5fa363185ccdecf347e7078a0d455d0af8af59b504282005816c1c52e3a01999568bb39a89e30043c48c556b6e78579c25dbc72afe8a5f4
 EBUILD integrit-4.2_rc1.ebuild 1508 BLAKE2B 0184dfc915b21b07852b5c105237b44d2f41b53c4f313e687fa939b615220a87241d440391adfe6af3f151a0c43a547ad2d898ffbae924074f49023ca91e8fc8 SHA512 2323dbd228d16300c61c43607d61fc2e64f04c79271fb6044bb2594224b72c84b9ad389b1dcc766416f254be7469085dc831d868e5fa77b69ebc64e52910c90b
 MISC metadata.xml 303 BLAKE2B fa06e292a0bc17c82d114a06632afd3c17eb1d527e1d83af4f1dd2e6e87275649bc49f48a64c6684c9c9c6595ba80e483b41682205c9336c3f322efd278904c6 SHA512 3768d8d20baa316af2c088cd97d446deae2a67dcc828f2514ce9c3f6084ef17d5adbb6726878b8aae0977a5f6d8d9cd93c4801f2a585c841770276de1841b945
diff --git a/app-admin/integrit/integrit-4.1-r1.ebuild b/app-admin/integrit/integrit-4.1-r1.ebuild
deleted file mode 100644
index bac0fe23c099..000000000000
--- a/app-admin/integrit/integrit-4.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="file integrity verification program"
-HOMEPAGE="http://integrit.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}"/${PN}-4.1-fix-build-system.patch )
-
-src_prepare() {
-	default
-	mv configure.{in,ac} || die
-	mv hashtbl/configure.{in,ac} || die
-
-	# tests are not executable
-	chmod +x test/test || die
-
-	eautoreconf
-}
-
-src_compile() {
-	emake
-	emake utils
-
-	emake -C doc
-	emake -C hashtbl hashtest
-}
-
-src_install() {
-	dosbin integrit
-	dolib.a libintegrit.a
-	dodoc Changes HACKING README todo.txt
-
-	# utils
-	dosbin utils/i-viewdb
-	dobin utils/i-ls
-
-	# hashtbl
-	dolib.a hashtbl/libhashtbl.a
-	doheader hashtbl/hashtbl.h
-	dobin hashtbl/hashtest
-	newdoc hashtbl/README README.hashtbl
-
-	# doc
-	doman doc/{i-ls.1,i-viewdb.1,integrit.1}
-	doinfo doc/integrit.info
-
-	# examples
-	dodoc -r examples
-}
-
-pkg_postinst() {
-	elog "It is recommended that the integrit binary is copied to a secure"
-	elog "location and re-copied at runtime or run from a secure medium."
-	elog "You should also create a configuration file (see examples)."
-}
diff --git a/app-admin/whowatch/Manifest b/app-admin/whowatch/Manifest
index f84d6723b15a..d0a4983dfcd5 100644
--- a/app-admin/whowatch/Manifest
+++ b/app-admin/whowatch/Manifest
@@ -1,5 +1,4 @@
 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 706 BLAKE2B bb21a02393fa4ceb3948cd933e41f5d8452f1ac00f81b1df9f35743e8036b97fe86504c13fd14091f432c33580fd01216f485b25ea6b9c96a5f3b9e578228971 SHA512 049dee6fc4c34493dcd872603c65bacf18da65aff19821aa8edc59b812b195e3e21d9c670a1be99a7a9c4e5d56ccff5b48d674aa6fcbe02b967c59078deb09dd
-EBUILD whowatch-1.8.6.ebuild 701 BLAKE2B 1af78b81ba38f312fc6076d79c8e3ff850f054ec6fdc95fcbd82cb0f59f22188991e848b008193bc5d35148c6e7638581da9f5c72ea264a4231453fd6602dfa2 SHA512 49a1a5bd23d4ca95bf2660d5689ec420cd19d79e3dc732f0d0d56f7a1655bf8462f072a46c49f0787fa8eec96122a97b3e5e7b219cb65502aa822ac305f08e70
 MISC metadata.xml 312 BLAKE2B 9b4eae6b1b7ed9168425f0f1a7b556658a2ad76209736a24937bdf1428a4e6383ede4efd65b44aaf501581fa353ba89707dd2ec2c2a97e384e36ed59973f24d2 SHA512 6f821797941b94408e5b3b6358791bd68b67cbf8553a7eef77934167e08b5a293144e147a1cdbae0d32cb0458cd611a6c411e391f41fc97b7d73c4f99d0f024f
diff --git a/app-admin/whowatch/whowatch-1.8.6.ebuild b/app-admin/whowatch/whowatch-1.8.6.ebuild
deleted file mode 100644
index 83d9bef99ca5..000000000000
--- a/app-admin/whowatch/whowatch-1.8.6.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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/"
-SRC_URI="https://github.com/mtsuszycki/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
-
-RDEPEND="
-	sys-libs/ncurses:0=
-"
-DEPEND="
-	${RDEPEND}
-	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 README TODO
-}