5 files changed, 91 insertions, 5 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7cb0ec96bcd0..27caef617000 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index e275c708de65..db28daa19bac 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,6 +8,7 @@ DIST aws-cli-1.27.132.gh.tar.gz 2420336 BLAKE2B 585b35e4e07933e7fcb1b1c93924bbf2
 DIST aws-cli-1.27.133.gh.tar.gz 2421348 BLAKE2B 0511291bf018bb62616f11231327b47abd153533c8ef0cdd5414d1c6f7f96ca529e3bbc3e5bb73cdb59d010502ebd122c3e83dc63bb7b4d84a6f7b011d3a03bc SHA512 a308d805091ecc054e86bd83ca5525d5332f5f6efd2654ce1242e70c7459de75d4175689381cfcb530cb7b2b43d852fb827d54ef2845cb95206ef2379f8e3dc6
 DIST aws-cli-1.27.134.gh.tar.gz 2421575 BLAKE2B 7fee144f529720aa2bc2799bb617df5faa6262df3568c3c4021bcf5d6d2e3786420d6285b2f81fbb9ab9facac65c860a39ab09ff995ecb5c9bb7701b17c7e57f SHA512 f3aa56d46cc74050495320e7743680993e9530fd19ca0d6563b01c6379151e383c3a441f47f3fd3038837a4ecba54c2dc48f764545726d72304fb4e6a3208b96
 DIST aws-cli-1.27.135.gh.tar.gz 2421852 BLAKE2B f6c684a68e9bbc37c0e5722926713e74f9d259b758d3a0e994280eb2f2fd9ea4dc78915ce88628db4df1121f819c96c1f142b2b1cbf2c0f706b9803a97741725 SHA512 633e431fcd93c6768854eb36b694cfc32499bee58e71830890eed3f06947fb00e075bfc0fa2fe0ad77bb4bdbd6018a45ed6fb810176fc07705110f8a72defb3b
+DIST aws-cli-1.27.136.gh.tar.gz 2422696 BLAKE2B 8df6331a45752c5176abb03d1b12888a5f6b062785ca1cb0e1f6bd523326bb454b90638a01406ac40fb32c5154e2943a64ef08b6b3106f76fc574369e3570fe6 SHA512 4efa236b62aca24cb04323236e7a895f8d9fcdc659348dc066ab4b17b6818f790f54de1cb364ab949bb1efb811f9cb065a6b095e1d4ef481d745fd79d81abac9
 EBUILD awscli-1.27.123.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.27.126.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.127.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
@@ -18,4 +19,5 @@ EBUILD awscli-1.27.132.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb2
 EBUILD awscli-1.27.133.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.134.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.27.135.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.27.136.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.136.ebuild b/app-admin/awscli/awscli-1.27.136.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.136.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/passwordsafe/Manifest b/app-admin/passwordsafe/Manifest
index 5928d46a4d66..87a9ee369c98 100644
--- a/app-admin/passwordsafe/Manifest
+++ b/app-admin/passwordsafe/Manifest
@@ -3,5 +3,5 @@ AUX passwordsafe-1.15.0-gtest-no-gnu++11.patch 467 BLAKE2B d3d09e3ed71c722abf11b
 DIST passwordsafe-1.15.0.tar.gz 15354159 BLAKE2B 699f80325884cba9bc6e5ffb33bea5c0b2c01f12ed7e4ea1226c4a64c761a8f20b8272e771261ca59aeeb49bfaa4ea83edc9af6c0aa9ae853e537b0f76f28aaa SHA512 803572afc479d608899e1166ef032a2a660fce122e03f89f59f8e9da9f7439e0eb1d602f77283200626f49d7e146e82edf8edee40060ff4cf6163e81bdf5f738
 DIST passwordsafe-1.16.0.tar.gz 15369804 BLAKE2B 344e77f74e588f41ba3696f5ea05cf054fca9f285437294033284561cbb83c76dc1311033b78673db0049132b7c9f37493c3698bb3b66e8e0a91ae63f7a83cdf SHA512 839de5072d6c9ec8fb82456e4516e51408be271ac8041b6dd9cf30990ac88914a139d96b40ee09764892acd8320abb2950d7f159a5b18c3d1549e58b922aa024
 EBUILD passwordsafe-1.15.0.ebuild 1869 BLAKE2B 31576c5fc6aeafe6246e02c03c9b5d435b771f0139e54b536e6f10bffb4c4bbb0fafc55f51d0511dba84b2ffc959f3010ac0a0e61cf99d417109fef3076fdf37 SHA512 ddcb1d77847eb265a1b36b9259dc2390a6eaa5608f6a8da4e64ba3d72cfe61eee9c6df0ae530fefe2a031d62997f655c39fa54889538a13b76bf04ae1963461b
-EBUILD passwordsafe-1.16.0.ebuild 1756 BLAKE2B 307b531f6f8ef9f17f3383cbdfb8aad5e5828e030d1395514d80da2ac2175762546189f4e8c23878d32c686875ba50912a6e8ac15590c5614e4d483921f13286 SHA512 59f3ae1e868852076fd98c7d3e520e68025e0d96a79c452a02901883fb653dea246e5d557b85b6f0d42456767e8d0b1969e4114282c48e67bf4939fe93f71ea2
+EBUILD passwordsafe-1.16.0.ebuild 1843 BLAKE2B 755e048365adf9eb92cef3b501313832b41682eae40658b32626eb15794fe23d643aaccf0beac824f6aceead86a26f4f0458dcd4df27e91725db8d45f0b1c2be SHA512 149648970777ff96dbd50e521318bff6f6b79f511c2ee207a0b88886fb1eef9e465daa6f59f04679579d582e368d56a284f7640f1a7150b2f8edfe67ddbf3337
 MISC metadata.xml 714 BLAKE2B 336a69bebe009487ad72444b3805a0b332fc78aacff06566601a431d91d7799a750cf2b7aa9d61df26061a4a073c9a3fe478e80419256bdb472374eeee3c3599 SHA512 d0e6fb3b93211ca74371beecf4099bad8c9ef608d804942b961ed0ec954cebd690c3d6157caf200c07f22af3169728f2a541be334142bce060890b88cac4b246
diff --git a/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild b/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild
index d63224c667fb..fabd0ebb98f3 100644
--- a/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild
+++ b/app-admin/passwordsafe/passwordsafe-1.16.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
 
-inherit cmake desktop flag-o-matic optfeature wxwidgets xdg
+inherit cmake desktop optfeature wxwidgets xdg
 
 MY_PV="${PV/_beta/BETA}"
 DESCRIPTION="Password manager with wxGTK based frontend"
@@ -19,7 +19,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="qr test +xml yubikey"
 RESTRICT="!test? ( test )"
 
-DEPEND="
+RDEPEND="
 	net-misc/curl
 	sys-apps/util-linux
 	x11-libs/libXt
@@ -28,13 +28,17 @@ DEPEND="
 	qr? ( media-gfx/qrencode )
 	xml? ( dev-libs/xerces-c )
 	yubikey? ( sys-auth/ykpers )"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
 BDEPEND="
 	app-arch/zip
-	virtual/pkgconfig
+	dev-lang/perl
 	sys-devel/gettext
+	virtual/pkgconfig
 	test? ( dev-cpp/gtest )"
 
+PATCHES=( "${FILESDIR}"/${PN}-1.15.0-gtest-no-gnu++11.patch )
+
 src_configure() {
 	setup-wxwidgets