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

3 files changed, 9 insertions, 66 deletions

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