5 files changed, 117 insertions, 0 deletions
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index b018abb55021..920d460bb0fe 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 93e872e47016..7ab9692ce7c9 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -10,6 +10,7 @@ DIST aws-cli-1.29.31.gh.tar.gz 2510291 BLAKE2B 9b28bd5b22cbcde62f1375920f97a53a1
 DIST aws-cli-1.29.32.gh.tar.gz 2510913 BLAKE2B bd22cc1fc38963f97a51c6c881986a48de072c9a4b5e4d59cee0b3df04f3f006660a194968d0114d803532572c7b229633802f0875fb891f7c58732894f97f92 SHA512 7951fe240f39f72fe3ddc03f350515ac441a836c6b943c6347672a228d7dfb4fbb3ab8a6a765e3346f2ff59a71620ee0cff146525057757e64ca1265f011332d
 DIST aws-cli-1.29.33.gh.tar.gz 2511146 BLAKE2B bd719f8789fd0861ecab4d2ac7def020c90d3f990e8465ce910904ea21f174fef764467374e98537f102658bc3e79b383b8cc12b595874bfa3331cae10880788 SHA512 3d0d55507c9b2cf6a0e088b0338d1a32d3f5377c24833db6001ddc6e0c92d91b5849a66038dd82238a9a98b2d20f8da78daa08ca82c475fa9f0a5190d89e0b60
 DIST aws-cli-1.29.34.gh.tar.gz 2513018 BLAKE2B 74eaa3b94f28d995f8a789421d5a0e8be3dc21359aaf70c932c610239c941361aa62ff0fb43dc4a848a225f42d8d6d88a0a17df793f600ed7db95dfe81f5b917 SHA512 115f82078770c27e1a2e5754505f1712cce7a8ebd83e87e7a3f7fbeac7f552005e7c5a0471914fa584ff4bf6f8394dc9df0779270d162abc4c1a9464d06d9c31
+DIST aws-cli-1.29.35.gh.tar.gz 2513024 BLAKE2B 7802c0eda498235938c5f409076b7706fd3e20e5f337d81366a25bacff9564326acb3edd0d8b1fd36518623a1e6d48d7ee2ee897c8669a3c1b41b8ff202fe9ba SHA512 63a4c20c494dd935dc8f52ddc1d610dfd9fb513f0d262acdb0c85265558d103962c42c757e1e4fd18a70af725186fda7b3caececef574ffa71e89f4c7164d01b
 EBUILD awscli-1.29.15.ebuild 2278 BLAKE2B a074ad11e996c7c4e5c0366e5e5d3856cb1bdd7984b8eaf9ac959108e0c5737b064be5d7a579f46669403efb0c3111e8814570f041106e920102cf2a6ddf3687 SHA512 060c06ae5d2295b74940bc86eabf279eeb7a81f7cafa4a9d89e9af8076feff5a23cc3f9bad5a631e75155af64b948abe4c0de7283883a53d4b1ee5791765176b
 EBUILD awscli-1.29.20.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.25.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
@@ -22,4 +23,5 @@ EBUILD awscli-1.29.31.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24
 EBUILD awscli-1.29.32.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.33.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.34.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.35.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.35.ebuild b/app-admin/awscli/awscli-1.29.35.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.35.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/puppet-lint/Manifest b/app-admin/puppet-lint/Manifest
index ef9441088187..d85f48987d56 100644
--- a/app-admin/puppet-lint/Manifest
+++ b/app-admin/puppet-lint/Manifest
@@ -1,7 +1,9 @@
 DIST puppet-lint-3.4.0.gem 83456 BLAKE2B fa6b274b3e6e84095fdaff6f024864dc301f0afc605198cc40b4dd8df7a9de66adfb91982195af9a0ad35301409c23e99d8d6ba5d3c43d3ee4dd57235de2b8cc SHA512 47c025ef925618cba3c1f579a3ef62bd5f9fd8ee7f8f9a68ed84daafeb7f9071e558619b24f0a249fcbe85d8c1b27e715938cc352792f9aa91de131820103e9c
 DIST puppet-lint-4.0.0.gem 80896 BLAKE2B 6e674deaec43c3b45e2c162ef3d09648bd3cdd589a3ae6ce92e21617633529705fe9999f4c6c361c3c1f041a3d25d1a03079f2f97705c01199253661bc9355dc SHA512 a23d316f60cb7d34c394bdaee0ad08070098d732210a92294a3d330cff7330aefe2be6bd9a60219d7538173c2f187c1ed427c6671a345f868286986164ea3a33
 DIST puppet-lint-4.0.1.gem 81408 BLAKE2B 2e202cf99e496336d5a8f23bf8581211b74e8ce25532edb82169b2aa484e14763087d5c6b966c1be50665ab723b72c9b21a74867b8e0c2296b06ea5e246531d6 SHA512 1709cbcae4db082dbe89b65ba6f5679684f3ed9d89955be0706228bcf0036a0bbfb58abb5ac12d8c2602ea9108386ba3e9b83627ca9c8fa0a813d19dc08f995d
+DIST puppet-lint-4.1.0.gem 82944 BLAKE2B 42bd99b1a6331c6fedf54a7b5e0100bedbb6543c1476ed82538caf371cb4e48ddaa89f4313e2bac42b1c12e5ea6c03a3dc7fb3566979c22c051152a921bf5c72 SHA512 04a8ed8b73b209db1634f3a7accb0ec18d735914b7faa2b89446e96300e586760dd0b606ebd4a5ae71b49a8f10d16f9199ee065aa12b911f8692af68e4aac321
 EBUILD puppet-lint-3.4.0.ebuild 757 BLAKE2B 6c85abe19f11a0a1ae7431be8852c1fd7bc92bfc311083ce6484dcf31c18de6377e0c732b9635fa7dfc4483e44b6948edbdcc8f6c10d3537db454b44747297f8 SHA512 5fa96119ae9086fcdbc2cac3e94f010a64f11cfffe732cb69f66dd87ff6df3f48ee0f15e9889246691efd65d0d715c20e518392f5c7fc53d8493bb4f1ce3d355
 EBUILD puppet-lint-4.0.0.ebuild 757 BLAKE2B 6c85abe19f11a0a1ae7431be8852c1fd7bc92bfc311083ce6484dcf31c18de6377e0c732b9635fa7dfc4483e44b6948edbdcc8f6c10d3537db454b44747297f8 SHA512 5fa96119ae9086fcdbc2cac3e94f010a64f11cfffe732cb69f66dd87ff6df3f48ee0f15e9889246691efd65d0d715c20e518392f5c7fc53d8493bb4f1ce3d355
 EBUILD puppet-lint-4.0.1.ebuild 758 BLAKE2B 6c022d7ec8416cf6eacb3c130e11193789c134b7627d56e2962568f39cd70a9efafa7127c21b91a602c48ae1f42cc5dcc9dc960def9ebfffc518d78e16edae57 SHA512 2e7996aabed09ebeb85c3fa3a83b7716b1f1cfdf760295171b92b322bf839da17549f83b25b7809994eb48aeb06a3501b59abfcc54e5cfcae852708ab9ee2476
+EBUILD puppet-lint-4.1.0.ebuild 751 BLAKE2B 4dce69f25f35c40feacc14e2e4de62220bf9767b8da63849e2ef501d4c12e0cbe7de8511249a086c539e4728782cbe5100974c707335e50b5e8ebca6e401c30c SHA512 ae2b5af27264e4cd165eb767b492d4af3f7d5330a94a01c92e7638407368bc5c9f24aba0f31fe383ec9b3b2e4676a73b3c47c8bb7aa0c039245efe037c62f975
 MISC metadata.xml 444 BLAKE2B 42dc45f92fcd9546eaf6dd1408ce3f2407a6d9ceb6fe343719d47d82f4e7034085ac5df7b5e215624db2558a76c6d95f0c73a4cd946c2dd91e09c6beb682c31b SHA512 91a1ce00d98421c057be1d70e74e06bbe84c78a0aeeaa574d20164772084272a910afdd1a95f65aff6b453c0cd4e1c00ca7ba146ddff09ddd3f6f2bb6ae810c1
diff --git a/app-admin/puppet-lint/puppet-lint-4.1.0.ebuild b/app-admin/puppet-lint/puppet-lint-4.1.0.ebuild
new file mode 100644
index 000000000000..dc6f57808758
--- /dev/null
+++ b/app-admin/puppet-lint/puppet-lint-4.1.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP="puppet-lint"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A linter for puppet DSL"
+HOMEPAGE="https://github.com/puppetlabs/puppet-lint"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+KEYWORDS="~amd64 ~x86"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec-its:1
+	dev-ruby/rspec-collection_matchers:1
+	dev-ruby/rspec-json_expectations )"
+
+all_ruby_prepare() {
+	# Skip acceptance tests due to unpackages puppet_litmus which in turn
+	# has a number of unpackaged dependencies.
+	rm -rf spec/acceptance || die
+	rm -f spec/spec_helper_acceptance.rb || die
+}