gentoo auto-resync : 19:08:2023 - 09:38:07

7 files changed, 93 insertions, 11 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 01dd2a7701d4..9e424fdbbd83 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 8eac752612ab..40da1c4b4582 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,6 +5,7 @@ DIST aws-cli-1.29.26.gh.tar.gz 2503354 BLAKE2B 46997ff0759ddd267fcfc227410d25c1a
 DIST aws-cli-1.29.27.gh.tar.gz 2509252 BLAKE2B 693184fd4c1886ecba870df6c9e2cf843c3e9f2dcadba0e0de657abd751ca19044267edf7899704c8f9a9ccb0dcab0af70f4d771b9def9760cede26c70686905 SHA512 1fc8bca504262395a5eb49106198c4ddd602a083a565c0d74853c3dd67bd797ec3a48c01951243e677a84670a0f2b2c2a79a46d5237cc3e1c5f1edd8f6066bc6
 DIST aws-cli-1.29.28.gh.tar.gz 2509294 BLAKE2B c3fbeebaead71029ce882cf7a88d72146127df063d48d02ba134c3dfe5e446d8d5ba8034caaa43615cf4d28f713a45ddc489f3be4ce60cf06c364b48e23f594b SHA512 bf0f73137025110c3de2cd88ac9b03aef4ad245795ca37a0b8fdc93de900686c6eddd63f20d160f211fd0fe9b7de106a82a537162337338cd5285fac47003c08
 DIST aws-cli-1.29.29.gh.tar.gz 2509694 BLAKE2B fb303b103ac2f6f74ac557b136c23d40f3da00b26c0bc03ed07e31c04fad5c868c7ac2141072fd8a8f7ea80ccdfff5e55fb89dd25c67b91f518aed6441650761 SHA512 606a9c4c510e51ba1ad39722abd4c7666f2fc184470f7ef17b61863135cb43baf6117eb777ac1e1d143c71507ef7f2bea9a6192675d93e282eb15d13e2d8c6cc
+DIST aws-cli-1.29.30.gh.tar.gz 2509672 BLAKE2B 4c81e02da68497cbf91ca407389707e21244147ec740344394b5a8dac9e3cf95d3f48487069371bea607ea823a6c7c169c9d6ed77dc5ba92cd3545e5b9510c69 SHA512 69120b9bf222257eab809cb345a3aa0515d6f9b06b64b1233fc82bd3d26341b549e43dc301e0c70876ccac2ebc7a19f68f4f7c3872ea63add1e797e49fd156d9
 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
@@ -12,4 +13,5 @@ EBUILD awscli-1.29.26.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24
 EBUILD awscli-1.29.27.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.28.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 EBUILD awscli-1.29.29.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
+EBUILD awscli-1.29.30.ebuild 2285 BLAKE2B ab176af730bcb3713594ac424ab29325c2cb24b8136e12ac6e18cf1648c8fa81e256eab0c708077e2c5423d1592594bb842383614e9114e728703e8cc8964252 SHA512 423fc2ef82036643a93eebded5fde267beb70f6278f06faa7e4c5ea221351aefe5bdf7c6469e57c49caab603ae1aa58fb514339c65891995cef614e698e9d997
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.29.30.ebuild b/app-admin/awscli/awscli-1.29.30.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.29.30.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/r10k/Manifest b/app-admin/r10k/Manifest
index 959ef2dbd528..c651f000e113 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,5 +1,5 @@
-DIST r10k-3.15.0.gem 257536 BLAKE2B 50ddb734bef782d9b061f17338d05c8fd824d0cc1e6005c538c4ef91c584bfe9ecbfb5bc5dc033317344bad7b14825cea6a56e136efec5081778582b8c714b18 SHA512 97cbb0a3e6f23591370de339e3320d9cbff726968b3b73d2bb00ebca7637406a371d1464d3ac955b7aacc4f5cfa898b828095aebaebe24bffd7d90be462457a9
 DIST r10k-3.15.4.tar.gz 258268 BLAKE2B 6f2f69895d84e13f54f2a7e6dba086c5b4234f0644709dafa8f88366dbe37fe8f165ef2d316f4c5b60df843448d164132878d67750bc3a65a2b8f66b205d3266 SHA512 521cf69a7372a60db74c3795b608c5ab4148f628365210228d79d9146a80d7105e4c757241e891e8e37027ae0cc2f37e59773c9838bd88042b0fdab13e36cd88
-EBUILD r10k-3.15.0.ebuild 1280 BLAKE2B 07783efec4028a34c7d870c844f27375b4ce2dc92080bdce3a5d9f1839f91a0e4951eebb52d1154687115c7311382c34088ddf346b668aa6012f966436544db3 SHA512 bfbaa654b1516994e384d91cc9915ef856e2f4d21c9e10e808475cf961b3916b62a9020b1b3fd36ab51f470fd5b3403de5eb3494a958f664d461bb561e75aebc
+DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d
 EBUILD r10k-3.15.4.ebuild 1392 BLAKE2B 272088e7e8e0cfc59afba5e904dd490745664670905f2c3f9cfa81ef3347048821893f9fb9d8978f17d0dc5c364d725406e3277911f8f9a7f4fca111eeaae763 SHA512 e91232a6afbffda1dcc8e1f11a5ecf1cda219ea91c947eab47914959aa0ae40d0d175dba892133552e9800bdb26e3a6c5dd871a96f2e45f9378baaf9fe892dda
+EBUILD r10k-3.16.0.ebuild 1345 BLAKE2B 999cd1937b03cef17b186587a2f691d0944f7d2f49b65e1e543bf922e15bf5e77f2fcabf66540ec7d5cb17c24e22db60ff2c374c99c35a4eff658af7f0f1a421 SHA512 79e1e36896b236a03e2a1e3e124f54e8231db6dcf1bf8180b3dae1431816cff03373702eaada662476bec8f3da888b423e258bb3e14db331ee51655cb7f5180d
 MISC metadata.xml 583 BLAKE2B ba9d1aa2afa56933206aac7d21a4d68eba309714a20ceebdd93d3e2ec96a08af0b6ca67a0badc24065cf3422e0cf3ec8538fe4574e099715cfb0c923ad4b318c SHA512 609f9a84804a73f28fcebe1081296735b34cd54927b770fd10ef82113ffeceb2f04c3e8dd100d5c018659f11227d6807d138de318e65c8e5f6fe1dd800a2c207
diff --git a/app-admin/r10k/r10k-3.15.0.ebuild b/app-admin/r10k/r10k-3.16.0.ebuild
index c5f67b298dd7..a3baf5d7fa01 100644
--- a/app-admin/r10k/r10k-3.15.0.ebuild
+++ b/app-admin/r10k/r10k-3.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -15,6 +15,7 @@ inherit ruby-fakegem
 
 DESCRIPTION="Puppet environment and module deployment"
 HOMEPAGE="https://github.com/puppetlabs/r10k"
+SRC_URI="https://github.com/puppetlabs/r10k/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -24,13 +25,14 @@ IUSE="+git"
 ruby_add_rdepend "
 	~dev-ruby/colored2-3.1.2
 	>=dev-ruby/cri-2.15.10:0
-	>=dev-ruby/gettext-setup-0.24:0
+	|| ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 )
 	|| ( dev-ruby/fast_gettext:2 >=dev-ruby/fast_gettext-1.1:0 )
-	=dev-ruby/jwt-2.2* >=dev-ruby/jwt-2.2.3
+	>=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2
 	>=dev-ruby/ruby-gettext-3.0.2:0
 	~dev-ruby/log4r-1.1.10
+	>=dev-ruby/minitar-0.9:0
 	>=dev-ruby/multi_json-1.10:0
-	>=dev-ruby/puppet_forge-2.3
+	=dev-ruby/puppet_forge-3*
 "
 
 ruby_add_bdepend "test? (
@@ -41,8 +43,6 @@ RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
 
 all_ruby_prepare() {
 	sed -e '/s.files/d' \
-		-e '/fast_gettext/ s/1.1.0/1.1/' \
-		-e "/gettext/ s/'< 3.3.0'//" \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Avoid specs for unpackaged rugget git provider
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index a8b1fcee82a5..96891eb19a2e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -6,7 +6,7 @@ DIST sudo-1.9.14p2.tar.gz.sig 566 BLAKE2B f72469340cfbb5005540a7080410dcf7269496
 DIST sudo-1.9.14p3.tar.gz 5232320 BLAKE2B 702d0c5489658dfd35c5a57977431343d29e6c2d7bb44bb7a8fd9f7fc7b7094b3f3fe2348d1ab6b9aa037e2b5fd1019f127f45e99190bdfff077e94747dc17e1 SHA512 d4af836e3316c35d8b81a2c869ca199e8f2d5cb26dbd98b8ad031f29be62b154452afdf5a506ddabad21b80e5988a49f1f7c8f1ec44718ffcbd7e89ccbdef612
 DIST sudo-1.9.14p3.tar.gz.sig 566 BLAKE2B 61ea3ca0e6032ddabbfd7e5b56881f0e800b49eed0404738c1a28687160917a8ddde91378b915cb81c9576732629d398790eac31d300e536e117fa9bbf5b1f4a SHA512 e1723f589eb3b758bd7e7e0da158d21e9315976320f8d39159a97e801c9745768b42b7b16c697cdbb3917a3f3def0125acf868dc343b062834f9f0818d741608
 EBUILD sudo-1.9.13_p3-r1.ebuild 7466 BLAKE2B 6c880d950c1bc21c99e8e186b4602fc91b5511aa1bca7dcc1e21eeb93f39d8c802b7b5c1ddabc49ce9f42db9de05791c434574fb9bcca0a09868ca9135ef8db7 SHA512 4828c4aa791be701398466f7bf186321e6d1eca2eefa85142669ea6271563b566db334d2c77ad82746c0b36932b632e80a51bef861a222d55f6d0fd88c50b53e
-EBUILD sudo-1.9.14_p2.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
+EBUILD sudo-1.9.14_p2.ebuild 7400 BLAKE2B dba757f1749e0eb25fcacf4c82eceadbdbc035ffd20d2af6631b96899bd563c562e1be72d8e8c650d7d043d2fcac5c66b4af658dc6d420092f1d1ee0a4fa22ea SHA512 620685cdbe7699dddc29f449b7aab04aa8f5c396ced3de0ecb0b37ab3deccb19bee4b584678b56e17524d8bdfd4620a739c65363b8c62078acf7bfe805c4d1a3
 EBUILD sudo-1.9.14_p3.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 EBUILD sudo-9999.ebuild 7404 BLAKE2B 4ad89b1684fb5c57a7a32125a86f0d4c89a0545b511dfbd390336e8d55c679959bdd5c25b7a7922e609d6f1f13bdb1162abc53f082fcd523b19a84cdab9b53cb SHA512 c1e16ed74a5d085f3731f92a51460654083367e010b31368dc23d7f1a18895b4d3c3107407df7348ea60d7d4b444bb8a9d78e1e431e5d933cf1b89816ceadf6c
 MISC metadata.xml 1107 BLAKE2B a18b1d280445ea98ba686021abf08ab47a5ac590795018c125008f2a8e44f7ea45e256e32a737781030960cb984bc16d8fd23175fd1e88b294e5036c86085367 SHA512 8cacbd9a1a23fc7734c5ad8b95c769b8506ec35490b5e3f69439bf71bd51d1eaf04fe699a82cbb3ac56182195fff570d75e3b20c33d86774480a2939122752a6
diff --git a/app-admin/sudo/sudo-1.9.14_p2.ebuild b/app-admin/sudo/sudo-1.9.14_p2.ebuild
index 7c07fd34b3b7..c3c73cd4bdfe 100644
--- a/app-admin/sudo/sudo-1.9.14_p2.ebuild
+++ b/app-admin/sudo/sudo-1.9.14_p2.ebuild
@@ -33,7 +33,7 @@ else
 	"
 
 	if [[ ${PV} != *_beta* && ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
 	fi
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-sudo )"