8 files changed, 89 insertions, 79 deletions
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index fa1d20d82531..0f608bb1d744 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1 +1,2 @@
 DIST hiera-eyaml-4.1.0.tar.gz 63484 BLAKE2B 0995bcb409cbb7fbb605475c5a61854b121e7051957592e0c3322528e37b325526931ec86f1e7f44d1d8a48e534e4fe071a80b4bb98e669470f27e8acab73671 SHA512 40bdc6d8e6929cfbd3c56282bb017763262aa22d58abc8483391632a2cd1bfa5b148ec165a946b5013276adc966d5a9e80f75d6e34cb136d7cc763b91e42f342
+DIST hiera-eyaml-4.2.0.tar.gz 63656 BLAKE2B a70adb7f8dfce774044275b603b5005a8a70324500d0b4b9c947e8ebfc5d2dd3eef426cc503fef82db60c538a92627e4214df5aa76d658701c22616e1565c8e4 SHA512 870f7967f9723fb4432a01f728edd7b83e667fc35eaed91d6ba9a3cefe1fd9deec9549aa3525c4ad1e06457c0df68d54a428dc961a9f568f2366f080cadfd5dc
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-4.2.0.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-4.2.0.ebuild
new file mode 100644
index 000000000000..8d201cccdfaf
--- /dev/null
+++ b/dev-ruby/hiera-eyaml/hiera-eyaml-4.2.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Encrypted YAML backend for hiera"
+HOMEPAGE="https://github.com/voxpupuli/hiera-eyaml"
+SRC_URI="https://github.com/voxpupuli/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend "
+	|| ( dev-ruby/highline:3 >=dev-ruby/highline-2.1:2 )
+	>=dev-ruby/optimist-3.1:3
+	!<dev-ruby/hiera-eyaml-3.4.0-r1
+"
+
+ruby_add_bdepend "test? (
+	>=dev-util/cucumber-8
+	dev-util/aruba:2
+	dev-ruby/hiera-eyaml-plaintext
+)"
+
+BDEPEND+=" test? ( || ( app-admin/puppet-agent app-admin/puppet ) dev-tcltk/expect )"
+
+all_ruby_prepare() {
+	# Fix highline dependency to be compatible with more versions.
+	sed -i -e '/highline/ s/~>/>=/' \
+		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e "s:/tmp:${T}:" \
+		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
+		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
+		features/sandbox/puppet-envvar/environments/local/modules/test/manifests/run.pp \
+		features/puppet.feature
+}
+
+each_ruby_prepare() {
+	# Run tests with the correct ruby interpreter
+	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '"${S}"'/bin/eyaml:' features/*.feature || die
+
+}
+
+each_ruby_test() {
+	CUCUMBER_PUBLISH_QUIET=true ${RUBY} -S cucumber --format progress features || die
+}
diff --git a/dev-ruby/importmap-rails/Manifest b/dev-ruby/importmap-rails/Manifest
index df78aed25c34..3fd3ba90c5d7 100644
--- a/dev-ruby/importmap-rails/Manifest
+++ b/dev-ruby/importmap-rails/Manifest
@@ -1,3 +1,4 @@
 DIST importmap-rails-1.2.3.gem 78336 BLAKE2B e652cd14e87e0f2b05ddeb04d4a1339c30325b25e59e1645e55cfdbdbac514afe7d3ce3bf5f8a825bb365065ee665f5efda436a56dedb7290201c4cf4f3dc94e SHA512 a76b0c1d138c4302d6240be4984fc56f0700b59f73b33f5bb82b12e8b9d87f62a303d78f2a61e8305de12071581587687c6fcfac67a2ed9037c0698423da7415
 DIST importmap-rails-2.0.1.gem 16384 BLAKE2B 395671195092899210115195d3a6f1ad8b24b586d04e9a4b4d569c7be43c954b5fc9fad7743eacf2dce581e1466d7485dafb8cbf110ce63dfc95a2530f6cf802 SHA512 3b2f405fe1bf7e2945f0821ab316ecf1d1282ac1d29f6fa366bfc6abdf5afe0adcb26bfee62c868568d0e6785f252ac037180368eb486f2be6ebee32fdcf2a88
 DIST importmap-rails-2.0.2.gem 16896 BLAKE2B 3fbfd4a842bf76672f33d125d40b3b7a33dac9b59d3c00c3c23a1c25e08b651829dda91120377e60ba1363150942f376517f60772256a32ea13f6fe761fdcdfd SHA512 809cf1cfd192f909b098bd903e4f6bdf11002b0b404a32e73fca7e848a15e5cb1825b1903e6a26a0d669242ae81c939a39d346a97166bb12a8fb71d60324392b
+DIST importmap-rails-2.0.3.gem 16896 BLAKE2B 5602b91c1554993dd1692184e1188fdd84f3f6ea403664ad6f843b8e55486b37809c7b41035e5f4ee1a5e063a5be7e10240df3462dc26250d679e19b79d0c593 SHA512 24ffd7fcd001c44e391fb626b76a697008c3b0dbc4727e8ebb4d310a95bb8df5f409657e2d7b2783cbd607d33cd0de9cdcf1db9900df04af9f99d2b2dac4a043
diff --git a/dev-ruby/importmap-rails/importmap-rails-2.0.3.ebuild b/dev-ruby/importmap-rails/importmap-rails-2.0.3.ebuild
new file mode 100644
index 000000000000..18d71b0be7ef
--- /dev/null
+++ b/dev-ruby/importmap-rails/importmap-rails-2.0.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_EXTRAINSTALL="app"
+# Depends on appraisals, unpackaged dependencies, and unpackaged rails
+# bits.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use ESM with importmap to manage JavaScript in Rails"
+HOMEPAGE="https://github.com/rails/importmap-rails"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/actionpack-6.0.0:*
+	>=dev-ruby/activesupport-6.0.0:*
+	>=dev-ruby/railties-6.0.0:*
+"
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index d78fc838253b..54e7f7675d43 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,6 +1,4 @@
 DIST zeitwerk-2.6.15.tar.gz 129919 BLAKE2B 2a49464a99c97ac1f927d462d87d531e61667e029d4735eb6ac6e8a4c30ab8f542affa4125a0aa768bdedd3c7b5cb75c57a5e1b1cbb0da8f5c5d898f482b240c SHA512 c83bfe793fa4853df461160376fe41359f96bca41d943f77714d69368004373dce007c8aa2f3bb1f796f4036e6a0bc51c670b6b85c137dd0c01919314f56d6ca
-DIST zeitwerk-2.6.16.tar.gz 130657 BLAKE2B a51226a252d13b12f7ec91d0edfaeb814c8de574ab923b98f78058ed1e9c11758abebfbc1896c7cf792b0094dafa49a066de5ba3cd8faa480a83fd68da29f30c SHA512 420b053d3ab09443e67e1b386b61d9fbbd1362740fbe155d817f998d8197fec7fa9e5206eecb47a81a9ebeebd65830023b0f86fa05f19db22761c9d931ff83fd
-DIST zeitwerk-2.6.17.tar.gz 130738 BLAKE2B cdd81b295108102f83364e1f1c30b58ae56227fd3bcce9c5580ed678009654ce406f02435df254dd20074a9425f7c85ebca4b86f0b6cc9ee673fb9cd3912bad8 SHA512 7bb4e40023e2e7a9283dffd0fb3a0d1792cf2efbc03f8a8a4c2536d4041101f4c1aea12ada76ae0f3c919a81d08b4f1f5bd49390d25f4695b3d17d8a7b2d217b
 DIST zeitwerk-2.6.18.tar.gz 130995 BLAKE2B 05dc3f5deb1c7e3d9967a473a9672b943605ae66e93e2b2201f4d51dac6fc168c5966785f9b911b76afe5523c0d48f203e10d157e7250ec8a3a1d6e59683de56 SHA512 4d2f8338d2ed2a91178345fb1d4b7b1a9f5317d6b1ca538bf6824cbb76951d20f3e44df5e5ad9274900787662f3efce657f15f617e1639f06b3430344d927281
-DIST zeitwerk-2.6.8.tar.gz 124209 BLAKE2B 7274b0e9cd55d48fa619d1e9da44074268186c119584fdc3ba18656db33884ec2e24a76ace863d18b0ec51601cde5a3cb9ed35889dcfd3f619960ddfcb1465c6 SHA512 b0609f7d38572d95bdf1a065a9051a7c39b15a7910e354981c991862692e2535477b4abd0a3c623a5d37e53622d95566ecf0d0243ca96fef59f0135693731a71
 DIST zeitwerk-2.7.0.tar.gz 129163 BLAKE2B 3c90a6d20f645f662f17bcfad39fe2cf5377c0308b9f5bcc02ae5ce3d7a24e99ae156002fb10aab79c0779efeb32d9966cd2bd3c0da51505f71c1912a570ec8c SHA512 a3699493a1a07b973a9c5e2fc2d894643d3b36a678cb63a0a9a60a069f2e108e8929ffbcc2f4285c13a189ac4732bc17245c0ace3078b12a744edf3036f6bd11
+DIST zeitwerk-2.7.1.tar.gz 129956 BLAKE2B 31a74191348b198e593eb35517dcc6c77980ef07047bf2a73ce8be6efc4cb0b07d005068fb9a178ec3d0d63e385c335f656fb5f39f2d344a8dbdf97f9f2e3015 SHA512 b55cee3b944888b01779adebfb979496185d4e80231ec55d9195dd786468bba10b552925bd04d152d338f88adde47f01e879ba0e9bf02654a8221d1f59f71856
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.17.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.17.ebuild
deleted file mode 100644
index eb0be93eb354..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="test"
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
-	# It's more of a quality check for the tests themselves rather than a test
-	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.8.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.8.ebuild
deleted file mode 100644
index 3b19cabfa28f..000000000000
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Efficient and thread-safe code loader for Ruby"
-HOMEPAGE="https://github.com/fxn/zeitwerk"
-SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"
-
-all_ruby_prepare() {
-	rm -f Gemfile.lock || die
-	# Dropping proveit should be fine based on https://github.com/fxn/zeitwerk/pull/253
-	# It's more of a quality check for the tests themselves rather than a test
-	sed -i -e '/\(focus\|reporters\|Reporters\|prove_\?it\)/ s:^:#:' Gemfile test/test_helper.rb || die
-
-	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	${RUBY} -S bundle exec rake test || die
-}
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.16.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.7.1.ebuild
index eb0be93eb354..7901e88e5a88 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.6.16.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby31 ruby32 ruby33"
+USE_RUBY="ruby32 ruby33"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/warning )"