7 files changed, 117 insertions, 68 deletions
diff --git a/dev-ruby/elastic-transport/Manifest b/dev-ruby/elastic-transport/Manifest
index 301a87fc964c..c18f2a6ef1df 100644
--- a/dev-ruby/elastic-transport/Manifest
+++ b/dev-ruby/elastic-transport/Manifest
@@ -1,2 +1,3 @@
 DIST elastic-transport-8.2.2.tar.gz 55336 BLAKE2B e68c5280c706cbef9b72681c8f2e1ba1847460f6d3f04a35c4faa05a000f236fbbf19a70d129e3d0a31937626d11c7fc077046d6b843d2c3e15c908ef32e9e18 SHA512 34d52bc39f51fe5011e389de6fadaa943a11d0216198976ef06768222eb34583d0ae50d250edc3253e0956eb68e58c507e7f2598535f807425fbd8224caa1154
 DIST elastic-transport-8.2.3.tar.gz 55339 BLAKE2B 648bef27a8fb55c9d617429f8c9921963b8c79c4ed4ca47652f8ab351178b472a63b7ff3b7e3736281a2c31f26433a159acae7704d745ecda118730f091bbd47 SHA512 a35538fc9dbea9262418b34bb91cb2b48b7729536e160b2c30a0ecb2c65d81b7c749015c4254e55950687d30ba6996ad618ed3d11e975eb6a7a32c284a0ea755
+DIST elastic-transport-8.2.4.tar.gz 55964 BLAKE2B 8f995985e543dcf4a472a8b034116eede1a4ca7fd71e710cef57c4437243e9607ecf80cd8d345a09b1583df98f5539f0e9702940cdeca13845c6f3a4b6f3dbee SHA512 79ec2b0dadd4c63e502e426264ceabf8fc76c7c28c78ec3e03b91f9e09c5a347c8151c2a99a7cb775fb5558ee42e24b8c9b8cceaa112df0fc3d2b02daebb12e6
diff --git a/dev-ruby/elastic-transport/elastic-transport-8.2.4.ebuild b/dev-ruby/elastic-transport/elastic-transport-8.2.4.ebuild
new file mode 100644
index 000000000000..c9d6146ca24d
--- /dev/null
+++ b/dev-ruby/elastic-transport/elastic-transport-8.2.4.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Transport classes and utilities shared among Ruby Elastic client libraries"
+HOMEPAGE="https://github.com/elastic/elastic-transport-ruby"
+SRC_URI="https://github.com/elastic/elastic-transport-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="elastic-transport-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	|| ( dev-ruby/faraday:2 dev-ruby/faraday:1 )
+	dev-ruby/multi_json
+"
+ruby_add_bdepend "
+	doc? ( dev-ruby/yard )
+	test? (
+		dev-ruby/ansi
+		dev-ruby/hashie
+		|| ( ( dev-ruby/faraday:2 dev-ruby/faraday-net_http_persistent ) dev-ruby/faraday:1 )
+		dev-ruby/mocha:1.0
+		dev-ruby/pry
+		dev-ruby/rspec:3
+		dev-ruby/shoulda-context
+		dev-ruby/curb
+	)
+"
+
+all_ruby_prepare() {
+	# fix to work without git
+	sed -i -e 's/git ls-files/find * -type f/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# remove useless dependencies from Rakefile
+	sed -e '/bundler/d' \
+		-e '/require.*cane/,/end/d' \
+		-i Rakefile || die
+
+	# Tweak test setup to only run unit tests since we don't have a live cluster
+	sed -e "s/RUBY_VERSION > '1.9'/false/" \
+		-e '/module Elasticsearch/,$ s:^:#:' \
+		-e '/reporters/ s:^:#: ; /Reporters::SpecReporter/,/^end/ s:^:#: ; /Reporters.use/ s:^:#:' \
+		-i test/test_helper.rb || die
+
+	sed -e '/pry/ s:^:#:' \
+		-e '/config.formatter/ s:^:#:' \
+		-i spec/spec_helper.rb || die
+
+	# Avoid specs that require a running elasticsearch instance
+	sed -e '/#perform_request/ s/describe/xdescribe/' \
+		-e '/when the client connects/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/retries on 404 status the specified number of max_retries/ s/it/xit/' \
+		-i spec/elastic/transport/base_spec.rb || die
+
+	# Avoid specs that require unpackaged gems
+	sed -e '/when using the HTTPClient adapter/ s/context/xcontext/' \
+		-e '/require.*httpclient/ s:^:#:' \
+		-e '/when the adapter is \(patron\|typhoeus\)/ s/context/xcontext/' \
+		-e '/require.*\(patron\|typhoeus\)/ s:^:#:' \
+		-e '/when the adapter \(can be detected\|is specified as a string key\)/ s/context/xcontext/' \
+		-e '/when the Faraday adapter is \(configured\|set in the block\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/client_spec.rb || die
+	sed -e '/using \(httpclient\|patron\|typhoeus\)/ s/context/xcontext/' \
+		-i spec/elastic/transport/meta_header_spec.rb || die
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 98aaefac3fb3..ce48e96d35bf 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,3 +1,2 @@
 DIST ffi-git-1.15.5.tgz 168139 BLAKE2B 2ddd5bd7bfb7bcd39b6d740cbb1e0f4cd419ce6cb4ec12926f91f254b3f3142bc6166728a81a6f23dccfbf7aec911c63237c20fb0e2c70d30d48f4648e352585 SHA512 3668bafae936bf5010f014fbcf63258b023bcc318882775e7d2fcfc11334722ec2b6e8a8b9c910d406889fb173dd503c5c13f5af8e4f6927921f12f688461707
-DIST ffi-git-1.16.0.tgz 183318 BLAKE2B 41e9fc25e0e1ed7b295af2d19e02c8fabfa8f4382392549233ac386b9ace9ee87625b5b9b54ef99508d8ff2df6f286a6a4de0cc387d22173e625f68f4617736e SHA512 4677a65b9cfc09a1ad239327b29c89ecc7a668d981be9ad231c59fe3e0b82f18a2cea26fbf4253e0e3d1bd69b4fae4a027aad374af3b03c19a4395925355352f
-DIST ffi-git-1.16.1.tgz 183333 BLAKE2B 4c7c79d3dd26713eb2efbdb62ff8057a1e0cd9df95082ea60ef3fc896251a6c62a62665704f04cf1041382fd1604897e1d16cef620776e74f2a840206b7438a4 SHA512 144d9985bacd1a68e35bd1a8c600096c1488c00fce9731abd58241fc12319c7bd1f23805d7a66f3f20335b8b28db1c3769fb41b9b15bf6744ffe573e6e979dc8
+DIST ffi-git-1.16.2.tgz 183435 BLAKE2B e2c9dad9c18f1a675905a000c8cec4ecfd0213df52476df21a035ca96faf257260896721364fcadc2e3bfec364dc7d036fc7402ebcc1c1a10af15f8ce9e2df7c SHA512 8329b67fbb6b1c9a8df1eacc2f8b1c2e2b2d80902914af76060fb9f3dad493ca4cfa0624596c080d641f38324bef165f2a6f7fafefe3e0e0653951f8189ed579
diff --git a/dev-ruby/ffi/ffi-1.16.1.ebuild b/dev-ruby/ffi/ffi-1.16.1.ebuild
deleted file mode 100644
index dd92a3fe02db..000000000000
--- a/dev-ruby/ffi/ffi-1.16.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
-
-inherit ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://github.com/ffi/ffi/wiki"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-# Needs recent libffi for HPPA fixes (and probably Apple arm64 too)
-RDEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
-DEPEND+=" >=dev-libs/libffi-3.4.4-r1:="
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	sed -e '/require/c\require "./lib/ffi/version"' \
-		-e 's/git ls-files -z/find * -print0/' \
-		-e '/^  lfs/,/^  end/ s:^:#:' \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_compile() {
-	each_fakegem_compile
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.16.0.ebuild b/dev-ruby/ffi/ffi-1.16.2.ebuild
index dd92a3fe02db..dd92a3fe02db 100644
--- a/dev-ruby/ffi/ffi-1.16.0.ebuild
+++ b/dev-ruby/ffi/ffi-1.16.2.ebuild
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 74043660ad3a..a8035ed770a9 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,3 +1,4 @@
 DIST zeitwerk-2.6.11.tar.gz 127029 BLAKE2B 7d810c1b6087522757e60ed0d70fe73dc8633474769992a9b9864a4437a44b482e804f8a7d10c1bc54395054539e80e98be926f31025a7abde5016df87636622 SHA512 6fb2fcf158497f7c11b8edc815a4ac4318d9794c9c76af9a6bed969cee3192f552624c9dfcde8147aafbdf6a754e6715523721d91eb219174f9b768ef4688431
+DIST zeitwerk-2.6.12.tar.gz 127162 BLAKE2B 863e9ff44c14843378e49b34c1ce7694d8d5026f823df5abf69c810f01e3affe9a96de5b615b2d04ab5d71f61e24d42df5b72ef4a415f238428efb4914ac695d SHA512 9d153ed6833a799b0cc2fcbeacab9daca4ef94c2b3871ec5a5cc79cb413f845d53901a875d7b4f2d2b13bd18e2aa9f0858642b76ef3550a1b58f90a9f5d54e9e
 DIST zeitwerk-2.6.7.tar.gz 122658 BLAKE2B 7435f8fb117be8186d56262c0aa8832132105d065cfdd470ed293e9530aa282edd824593f28199b908476a47f90507158beb216b803d39fdaa956d32ffa072ea SHA512 666f527771bc10d34b05a8f27996a9a7adf89466c54fd30a174a1e2e6df2500a2a658e08505964644d25ebd11ed13bf3f741724bfc9fd2a189c3e7b3ce24ffc0
 DIST zeitwerk-2.6.8.tar.gz 124209 BLAKE2B 7274b0e9cd55d48fa619d1e9da44074268186c119584fdc3ba18656db33884ec2e24a76ace863d18b0ec51601cde5a3cb9ed35889dcfd3f619960ddfcb1465c6 SHA512 b0609f7d38572d95bdf1a065a9051a7c39b15a7910e354981c991862692e2535477b4abd0a3c623a5d37e53622d95566ecf0d0243ca96fef59f0135693731a71
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.6.12.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.6.12.ebuild
new file mode 100644
index 000000000000..ceb5b959ebb4
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.6.12.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="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 ~riscv ~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
+}