gentoo auto-resync : 04:05:2024 - 00:00:19

8 files changed, 105 insertions, 70 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 76ad6098bed4..b62f7e3d4753 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index c6fdcff17c16..26929aa5e161 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -4,10 +4,12 @@ DIST aws-cli-1.32.93.gh.tar.gz 2695489 BLAKE2B d2f81786d4db158a13ec50ed833668db2
 DIST aws-cli-1.32.94.gh.tar.gz 2696222 BLAKE2B 275464cb94d3282141209aa1ba90bd5a4a69f128f55cf222f60e8b964126d8bbc63c5313034496b18bb2db7c9ccba2ac199345e3f93e8597feded89a05f59df5 SHA512 a4fb1667d9161ffab2165502bc89a93667f83bcdae778daf42b4675b9345d0a497f5b36c40cf758613e8e4443173d4d358d39e6e30196c9f5a6b8a102d45c366
 DIST aws-cli-1.32.95.gh.tar.gz 2699193 BLAKE2B d50c00be87343f80be4342f6f1ef6ac611c6c7c37d72e369b87aff0d38ed763451a3de54a7d4013632f47cebd688b76b9103e85a20e58e01cd5ee66e7eabeb20 SHA512 0ec08479e9ef3b0eb231438c59379beb2d6a8bdca52a375bc5ba386d2bde3062093bb592bbf843d2be80658d9d88d4ae71ffa372db1261d6f6f16cd17c196ddc
 DIST aws-cli-1.32.96.gh.tar.gz 2699395 BLAKE2B 7d778ad8886b8416e3c99a639d2923fedfe4154d19e3d8c064f8261f99e586f79a10a174a731ba647c51805baf9f135ea71f6ef766de791bae18b83b80294a74 SHA512 2f02afea5a04960b94101596b55ddd8461344e2d6ac8e5023c05363f052e32ec2076727e080c1cbad8c37c90266ec57572cc41809993b6b4f5fa81c909cb75aa
+DIST aws-cli-1.32.97.gh.tar.gz 2700062 BLAKE2B f4150f20534782d000e7f936e9ebc723daebf1b41182ec4a3ec56b44a2df547b6af5e42164554742a821b29d30beb4a8b2ba0100ccb51f8074550efaf01f0818 SHA512 710e4fece1511f80da33b7d6a06534a1c2e5c986d7cb0426f4cc84a74885a9700502ed97d512c6287b4b0def76e44c0d36425a78c17fcdb8ee59df9340633d16
 EBUILD awscli-1.32.84.ebuild 3022 BLAKE2B eca1e9b920babafc0c226e1d3c0b23baa63965cffceacc71118d2e4a1302945d10294223300a94f9dec4b39e52c7bd8f44e35cbf7cf30c117f9d86fe93450326 SHA512 11de7ee4880fe2bd192c6c15081b598d4c9d2f18b28064908a855cb01283408542c8981841c531d546b6de9e2b932d2a23e2fe1a9e90030566af6b966c30fd97
 EBUILD awscli-1.32.88.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.93.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.94.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.95.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 EBUILD awscli-1.32.96.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
+EBUILD awscli-1.32.97.ebuild 3029 BLAKE2B 580c774489759d94cbe5c77316c3afbb84d597198c391cd0ed89722c239fb23a87fc34378bd669e9104fbfaaa75a924c3d73e8df2c52693ba6fc135da827643d SHA512 4a31562305f7156e91d78023ed1f56e74de8fb1555323a5cd63611254daeb7491b8e323d00e38351d9bbc2a751f257290a6bb4bd91638e28f9c45acb8742c809
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.32.97.ebuild b/app-admin/awscli/awscli-1.32.97.ebuild
new file mode 100644
index 000000000000..4a677affdbc4
--- /dev/null
+++ b/app-admin/awscli/awscli-1.32.97.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit bash-completion-r1 distutils-r1
+
+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.10.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/packaging[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_XDIST=1
+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 serial_tests=(
+		tests/functional/ecs/test_execute_command.py::TestExecuteCommand::test_execute_command_success
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_{fails,success}
+		tests/functional/ssm/test_start_session.py::TestSessionManager::test_start_session_with_new_version_plugin_success
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestDotNetLogin::test_login_dotnet_sources_listed_with_backtracking_windows
+		tests/unit/customizations/codeartifact/test_adapter_login.py::TestNuGetLogin::test_login_nuget_sources_listed_with_backtracking
+		tests/unit/customizations/ecs/test_executecommand_startsession.py::TestExecuteCommand::test_execute_command_success
+		tests/unit/customizations/test_sessionmanager.py
+		tests/unit/test_compat.py::TestIgnoreUserSignals
+		tests/unit/test_help.py
+		tests/unit/test_utils.py::TestIgnoreCtrlC::test_ctrl_c_is_ignored
+	)
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	EPYTEST_XDIST= epytest "${serial_tests[@]}"
+
+	local EPYTEST_DESELECT=( "${serial_tests[@]}" )
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit}
+}
+
+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/linode-cli/Manifest b/app-admin/linode-cli/Manifest
index 9695700a05af..2791f6fc3b1a 100644
--- a/app-admin/linode-cli/Manifest
+++ b/app-admin/linode-cli/Manifest
@@ -1,5 +1,5 @@
 DIST linode_cli-5.48.4.tar.gz 142928 BLAKE2B 28b1c90bb0709afc594b7023ef846b6d59e0376730f05d9701ebbc6744376f33536ad5a6f53b7b26a25805b258dc58378a76b0e6a4157e149f83e691d862dec8 SHA512 b07a3612afc329fc346b523412ac03932c84213d6bc23726f4c0e5edc737100bf65ec84f8131943439444fee268646789dc4d135cd61b2362311d1ab18601c3e
-DIST linode_cli-5.49.0.tar.gz 146874 BLAKE2B a601eddff429f5457307d46b9572e8a6398c8800ad57a179f2283bfffc97e46d3e596032e0a1d0e104da3a1124a831a7b72ee2fe310a828a37b5c511f7d1c9d3 SHA512 1a9f630ee6d63bdd35c72dbaf13a264abfecda6414692bb62bd716302fc0926e19313c7e831a026e0b36cc4e9a1339d85dce66deeaced2093d49f277dbeb70ec
+DIST linode_cli-5.49.1.tar.gz 146883 BLAKE2B b4124b84f812b00c93e09e7c91c128b7ff15fbaf3a5c487613dbc4d26b1c5f00f083f521d8501e9a8649d3dc970a6349100602586dbb4acec27a7859470ba3b1 SHA512 06859939ac0c65a152acc012c87c53322a2a8cc1d4267c5dd0526b8ed0ad2b7aad7f3df42e24657d9bcca4b3fa02956ec23ea0d90ce4f5f9b61247a5b288dc72
 EBUILD linode-cli-5.48.4.ebuild 827 BLAKE2B 60bb1fc982d25f7252d11ca930b30e958736b504388c0c705cfa89a19b7fe372f68e696290a9fee87a6512d14bff62e6d14f789e5fc1a6f1299edadd4bbcf33c SHA512 3c50b132d9eb5f9fc950e97f0fc23c3a698d783e4deb60ad803169ac2502e2a6a407c88bc4ddc0dbddb2e58346d7351102986b19df2eab3c999c46a0bfe6aa20
-EBUILD linode-cli-5.49.0.ebuild 1366 BLAKE2B 040926d7881ff6801efa1795b686871581ed9524294c6cb7dfea521631a99df8888d86744ab3713714510a33d69eafba8e272c8c1cc0ea79d3dcb7705e224eff SHA512 6a865754170395580291f624c2d8256286d7f353408c45e5ead2a8b213d313ebf5c41887edc8a8cc08e455bb9450db4d45ed057d34f0a6dc4f1167b8b8860384
+EBUILD linode-cli-5.49.1.ebuild 1338 BLAKE2B 8cdcd6d7ad933ac3ee00ad19a9f900961de75404b4e9b36f8043cca9e76e6db846c1ec4a9490901edd15cba501fcf9671a808444f144962b63574c60281343cd SHA512 396a0108dfddab2e2c5ba57caec6d599d3723807cce301a2545415f0e0c625e6f0c0e846b2b243bba459695928c360c35ed04ea027ac236c450530458c6893d9
 MISC metadata.xml 483 BLAKE2B 7b3a4b824e16ba32424777359d0daf09d17cc498a06f9ce5acfd7baec80ffea26220145676f37edfe46302257fd0a2bc5071d60f955dc19cda582419b2027f5c SHA512 33c8fae2235a7a6d2653a4db3341b2d69e390ed6dfa33868dd7e6b3a384f78013ae3c42a91d8eddd25929086f7705ce0869a34e28eedadb497e286ae59570be4
diff --git a/app-admin/linode-cli/linode-cli-5.49.0.ebuild b/app-admin/linode-cli/linode-cli-5.49.1.ebuild
index 0dde07261839..21d1ca44d811 100644
--- a/app-admin/linode-cli/linode-cli-5.49.0.ebuild
+++ b/app-admin/linode-cli/linode-cli-5.49.1.ebuild
@@ -32,8 +32,8 @@ RDEPEND="
 python_install_all() {
 	distutils-r1_python_install_all
 
-	PYTHONPATH=. ${EPYTHON} linodecli --skip-config completion bash > "${T}/${PN}".bash || die
-	PYTHONPATH=. ${EPYTHON} linodecli --skip-config completion fish > "${T}/${PN}".fish || die
+	PYTHONPATH=. ${EPYTHON} linodecli completion bash > "${T}/${PN}".bash || die
+	PYTHONPATH=. ${EPYTHON} linodecli completion fish > "${T}/${PN}".fish || die
 
 	newbashcomp "${T}/${PN}".bash ${PN}
 	newfishcomp "${T}/${PN}".fish ${PN}
diff --git a/app-admin/r10k/Manifest b/app-admin/r10k/Manifest
index 0fee96073135..125205059d09 100644
--- a/app-admin/r10k/Manifest
+++ b/app-admin/r10k/Manifest
@@ -1,9 +1,7 @@
-DIST r10k-3.16.0.tar.gz 253547 BLAKE2B 683fdd5588c7b3c3b47ae0d28d75fbfb929d5595c715531eed86b8d89f76708c91f38f9ca558040b36fac38c038211086a74fdf109b37350126bc78b25f8b751 SHA512 399a357cf8617427632516e0f439a40464ba0c8201ee7b6ce15c893ae029bfd9ae1438b76aff3b9601685d14febf8fc71dbdd2954eb3352d6ce713e769cb586d
-DIST r10k-4.0.0.tar.gz 254074 BLAKE2B 8053d435691d33cd1d8b3c55c2cb3a153cd952112a93f2eeb4b715c6c0b92e9192c65f8809b4187d5ff4f5f6b9ed8f67a644d7920bf8d8294dd0b5d8fd735836 SHA512 a6b92fabcc405fe6678da724743e43d9dc3a286e3a973a3320ac94c25dd385315baaaf495dbd1706005d31f13d4c52f1c425148d3b397448fed07fd83acb04fa
 DIST r10k-4.0.1.tar.gz 254147 BLAKE2B 83c71c39f50aaf390ef75b8d87a693ba8d131297fcb12c3e408665565e35119d3e9e2832b8172b0616145459368dd5af38bcecca666ac1020ba96a59abc83657 SHA512 74583a79637d8c60f3935cd7ea382fff189beb7d6825b10b9c6bfc0a625a62f81648795cefc878cec608d96ba2396749f7fc0a1c7bdfa9bfcf914848135a0675
 DIST r10k-4.0.2.tar.gz 254228 BLAKE2B b98a665200978a023dc2566bc4b3c141eed6c950d27dc0401c8c7e8d1096f5fa0562874bd1a0e1726dd687a046cf345c0ce5003d5a2a7f72bf397d91b07065c3 SHA512 5f4d9b5fdcd45ffe5b9c2ef95fff7b7ae3136adefcee754782815bb523d0281ec3ee50615600b2fe80ee9d98b75d80747072c425c4d15c795cd7dcb27d1f192b
-EBUILD r10k-3.16.0.ebuild 1345 BLAKE2B 999cd1937b03cef17b186587a2f691d0944f7d2f49b65e1e543bf922e15bf5e77f2fcabf66540ec7d5cb17c24e22db60ff2c374c99c35a4eff658af7f0f1a421 SHA512 79e1e36896b236a03e2a1e3e124f54e8231db6dcf1bf8180b3dae1431816cff03373702eaada662476bec8f3da888b423e258bb3e14db331ee51655cb7f5180d
-EBUILD r10k-4.0.0.ebuild 1288 BLAKE2B 4cd4c24bf05a41ac8405a4f95dad8cfeef72a0ee818acef10a52ce11384ded4b7a412edf89846ec6665c7ca01f8ecbb234927edad03537773a4d4f5f0e458586 SHA512 77ab56f6c8e1237eef8ee7d87220322933a9a5138fd513758782a6e4df76440d63d48676309bb62a8c0d2e225a583d9ac8dc447c503fd4fed08424e9be348111
+DIST r10k-4.1.0.tar.gz 254276 BLAKE2B ba154d8500beef70cb6a8761833b05e0b5a3122b6a4a04dafc7c20ccce76e6fd30dbe0ac0bae667fac7d985ddc2921f43657c0bf2cd0c6d877370b7d2e73e799 SHA512 c8c78b013fa75a29b205ae9a6ee24f1369b4ffec2d3d7d9e9b3b5482ffa77c19f360dc8fd8444388dd527cbb31fd9c2aa96201d5f60d53f0b23a55d446d43a8c
 EBUILD r10k-4.0.1.ebuild 1249 BLAKE2B 515676d031b4b8034672492798f32dce61e78af0f64b2c4a220204dbdcf419962321e4287dc9f4f4c3dea4978ef7d9ed743d6a84e2fbadcc520e9b1dbd25c3ea SHA512 699f42bf5293dcb46041c16991d37c3cf31fd3d77c1bbe9ba149d7c6284aea1e75df96b25c97f940ad67d39e10de7dd7e25a121647a76f3caf22788f7de4da84
 EBUILD r10k-4.0.2.ebuild 1195 BLAKE2B 3d119f1791d3c79e21a61efdf3cb6b37c22b44f14afafe70f5caaf26ae31c78771452e42a60fbe781add3a42e59fb5bb95bee43d18038c203a2701c9a3d7b645 SHA512 07bf77ffac469988fe4375f97b699b9895222f31740723234241ac7ca73ec1ac53f368640e498dd073b360d69342be1430bfc1a2664b8512fc246e54b8b498b2
+EBUILD r10k-4.1.0.ebuild 1307 BLAKE2B 79f754cb49c1347e6cb4c24a13803dbea46f653ff43076db15172eebf02e779e6fd02e79c7ec7ab86d05068c58c771a88158e88293dae8f1056aee5cf1f48058 SHA512 a36b42f6d6af3cd33d36d245b500b73966f33eff5f12432ebe7777d9a61235e09f4bc4d0cdad5f481b736fb0d68e16b9597c623f606d4e2461288c9c536edf14
 MISC metadata.xml 583 BLAKE2B ba9d1aa2afa56933206aac7d21a4d68eba309714a20ceebdd93d3e2ec96a08af0b6ca67a0badc24065cf3422e0cf3ec8538fe4574e099715cfb0c923ad4b318c SHA512 609f9a84804a73f28fcebe1081296735b34cd54927b770fd10ef82113ffeceb2f04c3e8dd100d5c018659f11227d6807d138de318e65c8e5f6fe1dd800a2c207
diff --git a/app-admin/r10k/r10k-3.16.0.ebuild b/app-admin/r10k/r10k-3.16.0.ebuild
deleted file mode 100644
index a3baf5d7fa01..000000000000
--- a/app-admin/r10k/r10k-3.16.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby31"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-RUBY_FAKEGEM_EXTRAINSTALL=locales
-
-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"
-KEYWORDS="~amd64"
-IUSE="+git"
-
-ruby_add_rdepend "
-	~dev-ruby/colored2-3.1.2
-	>=dev-ruby/cri-2.15.10: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.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-3*
-"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/minitar-0.9
-)"
-
-RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
-
-all_ruby_prepare() {
-	sed -e '/s.files/d' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid specs for unpackaged rugget git provider
-	rm -rf spec/unit/git_spec.rb spec/unit/git/rugged || die
-
-	# Avoid spec making assumptions on availability of relative symlinks
-	rm -f spec/integration/util/purageable_spec.rb || die
-}
diff --git a/app-admin/r10k/r10k-4.0.0.ebuild b/app-admin/r10k/r10k-4.1.0.ebuild
index fa99e710fd2f..97a2b986e36f 100644
--- a/app-admin/r10k/r10k-4.0.0.ebuild
+++ b/app-admin/r10k/r10k-4.1.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@@ -25,23 +25,21 @@ IUSE="+git"
 ruby_add_rdepend "
 	~dev-ruby/colored2-3.1.2
 	>=dev-ruby/cri-2.15.10:0
-	|| ( dev-ruby/gettext-setup:1 >=dev-ruby/gettext-setup-0.24:0 )
-	>=dev-ruby/jwt-2.2.3:2 <dev-ruby/jwt-2.8.0:2
+	dev-ruby/gettext-setup:1
+	>=dev-ruby/jwt-2.2.3: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:5
 "
 
-ruby_add_bdepend "test? (
-	>=dev-ruby/minitar-0.9
-)"
-
 RDEPEND="${RDEPEND} git? ( >=dev-vcs/git-1.6.6 )"
 
 all_ruby_prepare() {
+	# Remove unused multi_json dependency. It is not used anywhere and
+	# the code for which is was introduced originally is gone.
 	sed -e '/s.files/d' \
+		-e '/multi_json/ s:^:#:' \
 		-i ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Avoid specs for unpackaged rugget git provider