8 files changed, 84 insertions, 84 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 473ca984929e..b6131a20f1b2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 0cdacc5c4d4e..a263dd43cf9f 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -11,6 +11,7 @@ DIST aws-cli-1.29.1.gh.tar.gz 2449948 BLAKE2B 5765a91501be6d789610be4d46373c909f
 DIST aws-cli-1.29.2.gh.tar.gz 2449985 BLAKE2B a5a5ce673930971c9c03f9869e3b3d49a13cfb74cb1499e1ae3a6fccad65d8f996138bbde81f633d29ffeaec51902059255e6315ac5407c4c6c19845e71454c5 SHA512 b68e81778a62abd38c70d7b9d1039e47f3ae979e62a55919d989e7ccdb6ea370a58caa3584df34a2d96d601436bd3cf5261f491031b211305b1e9d5aee1a4923
 DIST aws-cli-1.29.3.gh.tar.gz 2450427 BLAKE2B 6e240905c8fbb2916334c2de0e9fd851636acfbc050916baf971e2f5e5a1d93d398c77c6a1fe0766f701ad53683e5f41b1bb5519e5ac7b5e8f0a64d37e113c34 SHA512 3446e057abcc956e26b55de85383d0d40c041bcfda0f7e566309d80bbd22d567a474d93ab74461e91bdd7eaff1db9c77813912653c7864bcc851d12d2cea8ee2
 DIST aws-cli-1.29.4.gh.tar.gz 2451404 BLAKE2B cafdfd6431b1b6720a89e2f8f5c1fe2a356c482ba57fd8c201dc9c4ca407700b529a3d4d101c3a1b7e33bb220f22d04da1bc9ebd14be00fe7faec8a834dad60b SHA512 0fe222ffe6298e7e9216089f553e4ef6e50111fcc11b9906871220624a5ea2828c47f4ca4a8251068a749ffd042a140529d9af487db169f46740b93501f00b9d
+DIST aws-cli-1.29.5.gh.tar.gz 2451819 BLAKE2B ab468b3d2114a156163063c760e0274f7a606d45e51e7b498304ecb7a53dbd098a7d6930c80604625353512100a2c7c321842f8dd10072f451e68ab55ee4d8e2 SHA512 a5d6dacc5831198a0e32e80d86c69c6d25ed83c6d7102aae964c4ddb9f12963b227bfe7652d6a4f54875fc622203536b5c200fe143de79ff6c9c78dd6ecbc11e
 EBUILD awscli-1.27.155.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.160.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.162.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
@@ -24,4 +25,5 @@ EBUILD awscli-1.29.1.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b
 EBUILD awscli-1.29.2.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.3.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.4.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.5.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.5.ebuild b/app-admin/awscli/awscli-1.29.5.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~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() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# 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/eselect/Manifest b/app-admin/eselect/Manifest
index 3567b899840d..5075c1c1b64a 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -1,7 +1,4 @@
-AUX eselect-1.4.22-env-module.patch 598 BLAKE2B e77cb9053f28c9cceb1b2141477abeb63803cc78ad249e2df50d209732af070134ec85638d13aa271644a135c715b96396c8fdd435911973e58e071014d031d4 SHA512 5bf7c5bbb4e0aae2c80ee43cf29d723442cc200bf552466813477d210aaedce1fcedf18a90145493f96f881511165bca1b8b763b9d9a960a9c7ff8b6c063791c
-DIST eselect-1.4.22.tar.xz 183480 BLAKE2B 8f86bdddaf98bc075694bdf7283cbd366e0ef93635472b3bbac11fdd9765984cd82e493b16836bae66e4b2c42a9cb33ad0d2aacaaf8529b59e4898e11f172d26 SHA512 73a10278d604f462aefa099df398eec2b08aee33da69419351ff2faf1cf4c0f3de0f301d92015e52da63046fe7e2c1c388e11ac84b7deb3def505a59fa291dac
 DIST eselect-1.4.25.tar.xz 184300 BLAKE2B 630fe27338bee0c921a2f90e42d0a8abbb60a141a82bc2c4e7cf43d37582c24b06986ae1cbd341f8d3e69d011edc6c29675bf91ceaf1dcbc2593086f451b8f5f SHA512 98f2752d61e2c31ff6d735d5df0e7d98c3cc51d51c26b71d796948b141ccbc017002185022e6e1e48660ae0012bfc9cd383dd5ac50f644b35bb0893b9271121b
-EBUILD eselect-1.4.22-r1.ebuild 1547 BLAKE2B 52dfda6bba7622a5ef0567fa0377330a7896239da07eb6f564ef83a99ce78281c9c20656b0bf9fde11b4fb63e23d23ba4fc7c3020f7c983c60f17c278319d39d SHA512 b7f3a2c4ec5b0abbb89497d1f7c9759358dc20008af564896d5442f2733b4b8f2a810e97c7551f47da6dd0cca5f67f682a8c7208540aaf2cc3883d5fa3e6d071
 EBUILD eselect-1.4.25.ebuild 1634 BLAKE2B df9dcdabdacb583059591bd117ef048078eacf497e50e2a2051bba732e8de912abff8b6ea77d83d7ef7fede103ec2c7cbf605543ec4de8be7f355820b1aa409c SHA512 91ad34b8dc9fbc41ed9137ab1d38ccb5973f34d9c6e7b4f9a4a893ed24d8955a50e70c394223867e9e1a339c5c30307e3fc98f572263b183b089c7fb70dd78e7
 EBUILD eselect-9999.ebuild 1394 BLAKE2B fb62991371b697680959344974f4d7d4cdedba39337b12d004588d118632be5cd26c2026024fd6a2cc1e448f196c3367b82ba3fe347617149602c4730f8083d1 SHA512 78c75a30e9a8bfb370620b25cd200be9c6a8724858548cd1ab76926194f9d96a25c7441463d1dcb7a2aa3a6c947b1a656d6a0b455eb95e9ad9a1535f8cb349ce
 MISC metadata.xml 347 BLAKE2B 58c9ec8100f46cbb91dfcc6fc6f223e4d45553f401fe7312e36c0260c433a5842b07f894cef7dfd6c518ee5b664d86e3a4d434892ad3ea9c78c26c6f621e3063 SHA512 1963bcefd43ff52163c81a03bac522ca792688ff5317691ac30ec4375c6da4ebbf07f96da7bc1ecaa9554cee18c9f51f8b867e7e15bb652bdc7eee542f4a8d2b
diff --git a/app-admin/eselect/eselect-1.4.22-r1.ebuild b/app-admin/eselect/eselect-1.4.22-r1.ebuild
deleted file mode 100644
index 6b4aa0da4bcc..000000000000
--- a/app-admin/eselect/eselect-1.4.22-r1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1
-
-DESCRIPTION="Gentoo's multi-purpose configuration and management tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Eselect"
-SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
-
-LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-4.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc emacs vim-syntax"
-
-DEPEND="sys-apps/sed
-	|| (
-		sys-apps/coreutils
-		app-misc/realpath
-	)"
-RDEPEND="${DEPEND}
-	sys-apps/file
-	sys-libs/ncurses:0"
-BDEPEND="doc? ( dev-python/docutils )"
-PDEPEND="emacs? ( app-emacs/eselect-mode )
-	vim-syntax? ( app-vim/eselect-syntax )"
-
-PATCHES=( "${FILESDIR}/${P}-env-module.patch" )
-
-src_compile() {
-	emake
-	use doc && emake html
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp misc/${PN}.bashcomp ${PN}
-	dodoc AUTHORS ChangeLog NEWS README TODO doc/*.txt
-	if use doc; then
-		docinto html
-		dodoc *.html doc/*.html doc/*.css
-	fi
-
-	# needed by news module
-	keepdir /var/lib/gentoo/news
-	if ! use prefix; then
-		fowners root:portage /var/lib/gentoo/news
-		fperms g+w /var/lib/gentoo/news
-	fi
-}
-
-pkg_postinst() {
-	# fowners in src_install doesn't work for the portage group:
-	# merging changes the group back to root
-	if ! use prefix; then
-		chgrp portage "${EROOT}/var/lib/gentoo/news" \
-			&& chmod g+w "${EROOT}/var/lib/gentoo/news"
-	fi
-}
diff --git a/app-admin/eselect/files/eselect-1.4.22-env-module.patch b/app-admin/eselect/files/eselect-1.4.22-env-module.patch
deleted file mode 100644
index 54eb20692d14..000000000000
--- a/app-admin/eselect/files/eselect-1.4.22-env-module.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-env.eselect: More robust file type detection
-https://bugs.gentoo.org/908401
-
---- a/modules/env.eselect
-+++ b/modules/env.eselect
-@@ -46,9 +46,10 @@ is_envfile() {
- 	[[ -n ${envfile##*~} ]] || return 1
- 	[[ ${envfile##*.} != bak ]] || return 1
- 
--	mime=$(POSIXLY_CORRECT=1 file -i "${envfile}" \
--		| cut -d ' ' -f 2 | sed -e 's/;$//')
--	if ! has ${mime} ${MIME_WHITELIST}; then
-+	mime=$(POSIXLY_CORRECT=1 file -bi -e soft "${envfile}") \
-+		|| die "'file' command failed"
-+	mime=${mime%%;*}
-+	if ! has "${mime}" ${MIME_WHITELIST}; then
- 		echo "Skipping non-text file ${envfile}."
- 		return 1
- 	fi
diff --git a/app-admin/pwgen/Manifest b/app-admin/pwgen/Manifest
index aef35d28e355..18b35e01a176 100644
--- a/app-admin/pwgen/Manifest
+++ b/app-admin/pwgen/Manifest
@@ -2,5 +2,5 @@ AUX pwgen-2.08-c2x.patch 1537 BLAKE2B 9fc3313890f9900dc987f4dd71db5c05087ec37e20
 AUX pwgen.rc 389 BLAKE2B d8a3af8df9be2a78e18aaddd7d17269ecb0c61a4c77252a77bb2d492edfe5b8c31279de616c4b0bf92ef6ec4763235b18931edc333121c543cae3e839927bedc SHA512 5d2bdf0dfbaf8fc31cd8217495fccccfefb383779c8a03faedcfaa830851b3bbdccb63fdf8d1bf8aa8a96759ea90a31da6b7a4e0cf5368e62ed10b8db8b0382d
 DIST pwgen-2.08.tar.gz 54884 BLAKE2B 43bb6176d9408558b362bd84839c190c4bcf5d8f71b46fcbbe0b00c390d957683fd9403ff697e96cef2e4de27776c841e12032d3589965629e8e2d29bf202583 SHA512 4a930dc7d4c58a4434209db30c54629d76fce57d0fd5767cd7894168bb1a5b85eaae6734a982b0f4e0640540c366ce27ad84860ff2c406dea3f5902b5bb54255
 EBUILD pwgen-2.08-r1.ebuild 576 BLAKE2B b9ba76c15bdf1292aa65ba902117a68f74ced0d5d9e23685b38c4f303d266d1bd69ee1b38d21f08bbb900e70bad113482b8510681de089b04352fbfa6bfca875 SHA512 754f241bad74d03b5172c739130fde664267885bc3a10c4b4fe69efbc94e0a6a2352c59f094efe01271bd63b66e96f402a05b2e3a8c47e27848830b65c912dce
-EBUILD pwgen-2.08-r2.ebuild 636 BLAKE2B 36a952faf646a864f004ba0ef24707b005056a5263eeb2c4fead753310c9e88e10e4e40a996df3c7da3f28f490c220b09dae4b8bbc2be02eb86ff63fc7e7af9b SHA512 559a86badf54c74e9fe36097c6f670f72fac9d17d93010f74ab9676be433b23126981455ea01fbd3cce7e8449144744c79e201121f1bd2dcf3f3aaa7d9440c81
+EBUILD pwgen-2.08-r2.ebuild 635 BLAKE2B 7c06ea4dfc6b71c099c4c4843fa5560c98502e08f9930ca20da5062f1754c23701ea3fb1de45d58182b46b075e96b1ab32b8709d5c8e8cfa58646228b82599b6 SHA512 838a9c2b191c7044474a6b94fcf376d1e883fba53912de74c69122360a82ccb7fa1224ae2e37691342c8613796888bc9d42e99dde00514de94b9786aecaa62fc
 MISC metadata.xml 801 BLAKE2B dd9ac9712fcbfc2a681587ca84aa40ac7e2c96474dd6b89ba4f16b40be44c7ea441bf44dd4008397aa99ad08ae2ab07a535ce5375940b6f3991dc6e8e9f5f75a SHA512 15ab62126db1bb0211d39963ff8102e31cfb8791a496c660d6a63666c0c440ab1d6f04ad490e0455aa39f9c69bb69035e0c33c02107b9940e45a0a788b2f9ce9
diff --git a/app-admin/pwgen/pwgen-2.08-r2.ebuild b/app-admin/pwgen/pwgen-2.08-r2.ebuild
index 75a5977e135b..aa9ee53d0682 100644
--- a/app-admin/pwgen/pwgen-2.08-r2.ebuild
+++ b/app-admin/pwgen/pwgen-2.08-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/pwgen/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="livecd"
 
 PATCHES=(