7 files changed, 45 insertions, 90 deletions
diff --git a/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild b/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild
index cd053f54ec07..c94512f09cbf 100644
--- a/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.7.6.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/addressable/Manifest b/dev-ruby/addressable/Manifest
index 90863734101d..bafb50034329 100644
--- a/dev-ruby/addressable/Manifest
+++ b/dev-ruby/addressable/Manifest
@@ -1,5 +1,3 @@
-DIST addressable-2.8.1.gem 105984 BLAKE2B 9ba6fffe2af965be57ef7b2f86c5c86c672e0037c41996d78a3b8f31a9b5a5818e06d7e119733cff3d5469bc985186fac6fa978740f107876a975b5ac662171f SHA512 ae0b7cb5fdc0b5b8717637e9589ab9167aa3924253f4c9102134b1e5aee07c7f5e3e92e2e32ca872b4a72a3a70c8086c7073cbbddf7cbb6e1948ed97de2c9108
-DIST addressable-2.8.2.gem 106496 BLAKE2B 701f4c298686593cadc7317fe2072474fa2a4a35c53047d650fb166db969d5a0e8eca703d2ec2ed334936711d7fe5c839dfe6f04bea5d413da22a41094d58b98 SHA512 9c5f2a5cad9f1f4ea9ec9ab30106123f922737f9dafdf5efd9b74c939e933976c37c0a9775743e7277a0850fa1676ede5520db4fe6e0a9507e5b3a2b94d9d8d7
-DIST addressable-2.8.3.gem 105984 BLAKE2B 00775f119c59d3db331bfeb3bb48f26c74d938714791183a4099fc4da7c871045c12074132e6368b2a8a0c114b18e301735aa142d8ae4bc52a77f55cc3fa61a1 SHA512 dc3f0731b2ccb464473ac9005d8a68fa457b9d5f83fd60f32fa2cd741b69d0e08e89c5ea10fb4734c0bb563ef73797cfd5500b486f1daaf0e1456488ec8c2340
 DIST addressable-2.8.4.gem 105984 BLAKE2B 788d84a9fe52a05c5e8429aaea59096b604bfad22b06c48f0d8186eb4197e47171310d1d3e9ab296d08b3033443d1fdf6b9b55fdefafd51e4c88feaf5b53298d SHA512 45324e96fb4415b745eb26bd0c3e042102efbdfca879177a70288303c96a4889ff59f794ed0010ea8a95c5d6907b76b0e8c66cce0a5478832c9df465a01e3fcb
 DIST addressable-2.8.5.gem 106496 BLAKE2B 07aadf72772eb909c833079918e44231208b5d9494eac218da1ed30224eb5fabb5369b5dbb0759d328f0cc57117e26fee33ec1139f75d89b2255472df9f2f9e7 SHA512 cc35437d91dfb95f49eeba60b153b89d9f1475fd0770056c22865913629f3bf0a3545585a457bc5a42d97f2e6e81362308e9eb91fd3b2b8a571b997ba53796eb
+DIST addressable-2.8.6.gem 107008 BLAKE2B 0f831f5b2ca1f6fd8c36a5518a9b0bf5819a74f29be2f3897428ec941e40089b3bd627a5359637c7c59cd81fdec57b85c2f3a9a24501d1a425a20940e9f61c50 SHA512 a7cb784cd5564cabec99eb7582ac17969b166e38057c23f3df74707d0078d00d001c2523432ce4e52720528ee808f314f2d6c9139562de27b599363b919cca65
diff --git a/dev-ruby/addressable/addressable-2.8.2.ebuild b/dev-ruby/addressable/addressable-2.8.2.ebuild
deleted file mode 100644
index 9b55aeb560fd..000000000000
--- a/dev-ruby/addressable/addressable-2.8.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/addressable/addressable-2.8.3.ebuild b/dev-ruby/addressable/addressable-2.8.3.ebuild
deleted file mode 100644
index 9b55aeb560fd..000000000000
--- a/dev-ruby/addressable/addressable-2.8.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement for the URI implementation that is part of Ruby's standard library"
-HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/addressable"
-
-LICENSE="Apache-2.0"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec-its )"
-
-all_ruby_prepare() {
-	# Remove spec-related tasks so that we don't need to require rspec
-	# just to build the documentation, bug 383611.
-	sed -i -e '/spectask/d' Rakefile || die
-	rm -f tasks/rspec.rake || die
-	sed -i -e '/bundler/ s:^:#:' \
-		-e '/^begin/,/^end/ s:^:#:' \
-		spec/spec_helper.rb || die
-
-	# Remove specs requiring network connectivity
-	rm -f spec/addressable/net_http_compat_spec.rb || die
-
-	# Remove spec that tests against an unreleased github fork
-	rm -f spec/addressable/rack_mount_compat_spec.rb || die
-}
diff --git a/dev-ruby/addressable/addressable-2.8.1.ebuild b/dev-ruby/addressable/addressable-2.8.6.ebuild
index fb9479eda1c2..9a3bc5143290 100644
--- a/dev-ruby/addressable/addressable-2.8.1.ebuild
+++ b/dev-ruby/addressable/addressable-2.8.6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -18,7 +18,7 @@ HOMEPAGE="https://rubygems.org/gems/addressable https://github.com/sporkmonger/a
 LICENSE="Apache-2.0"
 
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="doc test"
 
 ruby_add_rdepend "|| ( dev-ruby/public_suffix:5 dev-ruby/public_suffix:4 )"
diff --git a/dev-ruby/psych/Manifest b/dev-ruby/psych/Manifest
index 03942483825e..78d2320df7eb 100644
--- a/dev-ruby/psych/Manifest
+++ b/dev-ruby/psych/Manifest
@@ -1,2 +1,3 @@
 DIST psych-4.0.6.gem 93696 BLAKE2B f5bea8262b401c0c291514dbd5ddc4aff389aeadb0b6483901b70a9562d267460260ddc5991e1540e51fb371a79d3a4a831bfdb8cb0b5dd9bd53cac939287545 SHA512 31f0ff5cd48e80ae81977f9519aa7952685b2da4a88b202aeb7214a364932cb1ca256f0934bed158d44a7d4d6e8cbb34928d33e731d0a8ba1a9885733ed32cd1
 DIST psych-5.1.0.gem 39936 BLAKE2B f4d1b2b3699e36cf5f5101ad038ac3fd2e44b434df3e91516b850511684daeeb1eda32901ffbff870f533b8bda859b09bbd63e5ebe8a5ca3ce271ce869ef3a16 SHA512 94dd2a7b98d9d452fb24ba14d42d91969aa0d93f5737728e41a5032d76bad45d0e0b365f53447664cece448559d2e47ab35d95b4989016d9f0daf03b76d8a5cc
+DIST psych-5.1.1.tar.gz 84699 BLAKE2B 5b45ddf8964c6bbbc7cac641d80c2967805125dfe338a2383a4f2c413b75b74d6ff5f2c0885ec1ad75c8f406afeaa5ba4fbf12e2bbc6abffb0d41cd88cc570a3 SHA512 a417459b038c1b9c66a93e7666c62c556ea0d2728405fb3ddde309ccd87a92992b82cca1f6be592395cfac75f6ac24e8ee52b8aa0c0cf28233e1cab0bf8a3a2f
diff --git a/dev-ruby/psych/psych-5.1.1.ebuild b/dev-ruby/psych/psych-5.1.1.ebuild
new file mode 100644
index 000000000000..43ecf2660829
--- /dev/null
+++ b/dev-ruby/psych/psych-5.1.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_EXTENSIONS=(ext/psych/extconf.rb)
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_GEMSPEC="psych.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A YAML parser and emitter"
+HOMEPAGE="https://github.com/ruby/psych"
+SRC_URI="https://github.com/ruby/psych/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+RDEPEND+=" >=dev-libs/libyaml-0.2.5"
+BDEPEND+=" >=dev-libs/libyaml-0.2.5"
+
+ruby_add_rdepend "dev-ruby/stringio"
+
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit
+	dev-ruby/test-unit-ruby-core
+)"
+
+all_ruby_prepare() {
+	sed -e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC}
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:.:test -e 'require "lib/helper"; Dir["test/**/test_*.rb"].each{|f| require f}' || die
+}