6 files changed, 60 insertions, 136 deletions
diff --git a/dev-ruby/zstd-ruby/Manifest b/dev-ruby/zstd-ruby/Manifest
index ce6c62b257dc..ab9a76764eb8 100644
--- a/dev-ruby/zstd-ruby/Manifest
+++ b/dev-ruby/zstd-ruby/Manifest
@@ -1,5 +1,2 @@
-DIST zstd-ruby-1.5.7.0.tar.gz 1971147 BLAKE2B 9f308d1988d9e38067640169acd5431f5a92a9c8f2e58a19b3e0fc05d64ef76c207f8b065bac50fd69f14cfd0e996642bd9554a2cc6c3bc81a8af1d9ec4ff9af SHA512 fb51b9baaa5e27e8af35f7d0a94998ccf3a3d3bd2472099fa8d0e6ef3a7e97fee7a3be7e96e0e897ee5a7805127a2aefe525b130e14d24fc5561efc8cc3763cc
 DIST zstd-ruby-1.5.7.1.tar.gz 1972177 BLAKE2B b8d021ad22e4aa0bf1393bb7e3105dffd0bcac248f33a9323a72b709bd6705d8024a0547561276436180279fa181032a5eb343b0a8dedc501593da4a360de569 SHA512 e640c5ca1f51d596f927197772fc64646e20631e3291adadee410d498bf38efb0b859445e2f04df62e861f0338bac4ede92c04760bc3950b2928cc5588c90f6a
-DIST zstd-ruby-2.0.3.tar.gz 1973769 BLAKE2B 90a6f318173f2cee94868554b1d523b88265ce02d2f5d69d9013148d30cd3a83c5e7732e7b038ba44867671dc545bffd17d576c08a150828b815da921e032988 SHA512 cdfcdf1c172e744f5c99e1ac64e6e2b5d3949529dcb922608b9adb543e4d615fd2a9f89f11e7bd8524102510b3ba8ce6decc963d71f4a5e9515487402c08fee7
-DIST zstd-ruby-2.0.4.tar.gz 1973815 BLAKE2B 72f1c4273cb0f3dd16f83df51f8187e7bcf680c68ddd2b36bed4d474297e76648c7f6cf8bc7dae210513af6fd0d957ecc8c74e03338352163ebca8f5f698c39f SHA512 85e4bd83fbdcbed171adc8465906c58062890492d62f63b4bfa577e3b5d0154e19fbdf4cfd97f61938fd709d210d797259abb96e73c6f5c632a52dfa3da039d9
 DIST zstd-ruby-2.0.5.tar.gz 1973796 BLAKE2B b7d7c32bacbc23da1cf71344090ea0f7f0d08be685fff32d2f54d155de7af6a434b048034ce14ba177bcdc316808af71b88ea79c944f784a35ce62d09b9c339d SHA512 3d3639177eb2e59c572ef64786f1fbb137a14403be0de5e40bc218591f8b461e8b3d870bf53b358992a1bbfb5db3f544037804f93ab83e44eabff1d0c6f16e02
diff --git a/dev-ruby/zstd-ruby/files/zstd-ruby-1.5.7.1-ruby35.patch b/dev-ruby/zstd-ruby/files/zstd-ruby-1.5.7.1-ruby35.patch
new file mode 100644
index 000000000000..cbb5f6e7ea6e
--- /dev/null
+++ b/dev-ruby/zstd-ruby/files/zstd-ruby-1.5.7.1-ruby35.patch
@@ -0,0 +1,55 @@
+https://github.com/SpringMT/zstd-ruby/pull/118
+https://github.com/SpringMT/zstd-ruby/commit/7cc7e95bcd43b6ca42fb7961267eac216ed960a5
+
+From 5c6d656d39501d356df21c562b0a12fb0480ebf2 Mon Sep 17 00:00:00 2001
+From: Shizuo Fujita <fujita@clear-code.com>
+Date: Sat, 18 Oct 2025 13:32:15 +0900
+Subject: [PATCH] CI: Support Ruby 3.5
+
+Ractor#take was replaced at Ruby 3.5.
+https://bugs.ruby-lang.org/issues/21262
+--- a/spec/zstd-ruby-streaming-compress_spec.rb
++++ b/spec/zstd-ruby-streaming-compress_spec.rb
+@@ -115,7 +115,11 @@
+           stream << "abc" << "def"
+           res = stream.finish
+         }
+-        expect(Zstd.decompress(r.take)).to eq('abcdef')
++        # Ractor#take was replaced at Ruby 3.5.
++        # https://bugs.ruby-lang.org/issues/21262
++        result = r.respond_to?(:take) ? r.take : r.value
++
++        expect(Zstd.decompress(result)).to eq('abcdef')
+       end
+     end
+   end
+--- a/spec/zstd-ruby-streaming-decompress_spec.rb
++++ b/spec/zstd-ruby-streaming-decompress_spec.rb
+@@ -169,7 +169,11 @@
+           result << stream.decompress(cstr[10..-1])
+           result
+         }
+-        expect(r.take).to eq('foo bar buzz')
++        # Ractor#take was replaced at Ruby 3.5.
++        # https://bugs.ruby-lang.org/issues/21262
++        result = r.respond_to?(:take) ? r.take : r.value
++
++        expect(result).to eq('foo bar buzz')
+       end
+     end
+   end
+--- a/spec/zstd-ruby_spec.rb
++++ b/spec/zstd-ruby_spec.rb
+@@ -118,7 +118,11 @@ def to_str
+     describe 'Ractor' do
+       it 'should be supported' do
+         r = Ractor.new { Zstd.compress('abc') }
+-        expect(Zstd.decompress(r.take)).to eq('abc')
++        # Ractor#take was replaced at Ruby 3.5.
++        # https://bugs.ruby-lang.org/issues/21262
++        result = r.respond_to?(:take) ? r.take : r.value
++
++        expect(Zstd.decompress(result)).to eq('abc')
+       end
+     end
+   end
diff --git a/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.0.ebuild b/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.0.ebuild
deleted file mode 100644
index 5cda7646f04a..000000000000
--- a/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-# This gem includes a bundled version of app-arch/zstd. It requires
-# features that are only available with a statically linked zstd library
-# (e.g. ZSTD_SKIPPABLEHEADERSIZE) and changing the build system to build
-# against a statically linked app-arch/zstd does not seem worth it.
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTENSIONS=(ext/zstdruby/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/zstd-ruby"
-RUBY_FAKEGEM_GEMSPEC="zstd-ruby.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for zstd (Zstandard - Fast real-time compression algorithm)"
-HOMEPAGE="https://github.com/SpringMT/zstd-ruby"
-SRC_URI="https://github.com/SpringMT/zstd-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~ppc64"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC}
-
-	# Removing the -O3 optimization flag causes the test suite to hang
-	# consuming CPU.
-	# sed -e '/CFLAGS/ s/-O3//' \ -i
-	# ext/zstdruby/extconf.rb || die
-
-	sed -e '/bundler/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/pry/ s:^:#:' \
-		-i spec/zstd-ruby-stream_reader_spec.rb || die
-}
diff --git a/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.1.ebuild b/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.1.ebuild
index 5cda7646f04a..5cc5e1aae03b 100644
--- a/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.1.ebuild
+++ b/dev-ruby/zstd-ruby/zstd-ruby-1.5.7.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-USE_RUBY="ruby32 ruby33 ruby34"
+USE_RUBY="ruby32 ruby33 ruby34 ruby40"
 
 # This gem includes a bundled version of app-arch/zstd. It requires
 # features that are only available with a statically linked zstd library
@@ -27,6 +27,10 @@ LICENSE="BSD"
 SLOT="$(ver_cut 1)"
 KEYWORDS="amd64 ~ppc64"
 
+PATCHES=(
+	"${FILESDIR}"/zstd-ruby-1.5.7.1-ruby35.patch
+)
+
 all_ruby_prepare() {
 	sed -e 's/git ls-files -z/find * -print0/' \
 		-i ${RUBY_FAKEGEM_GEMSPEC}
diff --git a/dev-ruby/zstd-ruby/zstd-ruby-2.0.3.ebuild b/dev-ruby/zstd-ruby/zstd-ruby-2.0.3.ebuild
deleted file mode 100644
index 32c2bef51c18..000000000000
--- a/dev-ruby/zstd-ruby/zstd-ruby-2.0.3.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-# This gem includes a bundled version of app-arch/zstd. It requires
-# features that are only available with a statically linked zstd library
-# (e.g. ZSTD_SKIPPABLEHEADERSIZE) and changing the build system to build
-# against a statically linked app-arch/zstd does not seem worth it.
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTENSIONS=(ext/zstdruby/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/zstd-ruby"
-RUBY_FAKEGEM_GEMSPEC="zstd-ruby.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for zstd (Zstandard - Fast real-time compression algorithm)"
-HOMEPAGE="https://github.com/SpringMT/zstd-ruby"
-SRC_URI="https://github.com/SpringMT/zstd-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC}
-
-	# Removing the -O3 optimization flag causes the test suite to hang
-	# consuming CPU.
-	# sed -e '/CFLAGS/ s/-O3//' \ -i
-	# ext/zstdruby/extconf.rb || die
-
-	sed -e '/bundler/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/pry/ s:^:#:' \
-		-i spec/zstd-ruby-stream_reader_spec.rb || die
-}
diff --git a/dev-ruby/zstd-ruby/zstd-ruby-2.0.4.ebuild b/dev-ruby/zstd-ruby/zstd-ruby-2.0.4.ebuild
deleted file mode 100644
index 32c2bef51c18..000000000000
--- a/dev-ruby/zstd-ruby/zstd-ruby-2.0.4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby32 ruby33 ruby34"
-
-# This gem includes a bundled version of app-arch/zstd. It requires
-# features that are only available with a statically linked zstd library
-# (e.g. ZSTD_SKIPPABLEHEADERSIZE) and changing the build system to build
-# against a statically linked app-arch/zstd does not seem worth it.
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTENSIONS=(ext/zstdruby/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/zstd-ruby"
-RUBY_FAKEGEM_GEMSPEC="zstd-ruby.gemspec"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby binding for zstd (Zstandard - Fast real-time compression algorithm)"
-HOMEPAGE="https://github.com/SpringMT/zstd-ruby"
-SRC_URI="https://github.com/SpringMT/zstd-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~ppc64"
-
-all_ruby_prepare() {
-	sed -e 's/git ls-files -z/find * -print0/' \
-		-i ${RUBY_FAKEGEM_GEMSPEC}
-
-	# Removing the -O3 optimization flag causes the test suite to hang
-	# consuming CPU.
-	# sed -e '/CFLAGS/ s/-O3//' \ -i
-	# ext/zstdruby/extconf.rb || die
-
-	sed -e '/bundler/ s:^:#:' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/pry/ s:^:#:' \
-		-i spec/zstd-ruby-stream_reader_spec.rb || die
-}