9 files changed, 190 insertions, 3 deletions
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index ebacb93e112a..33dad6c18c21 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,3 +1,4 @@
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
 DIST haml-6.1.1.tar.gz 669644 BLAKE2B 239b3a1fe02bcd1e2981198ba7c54c71ca2af0947102fcea6cd600cc6579294856baa290589a7d3a015e54df8bcecf8e50175cf2189e8f4f9c6f9721a558bcc9 SHA512 7d732be085b41b8f0eec418600a82b51c68301081165aa636fa342ae26b74215a202a4b15e592da980d9a7fbe24bad01399f599770420133c4b6ab7523386fa5
 DIST haml-6.1.2.tar.gz 669696 BLAKE2B 81398ca33af69a1cf79cbe6d49d82ca27489584dc8c4082c079606f1f029b99e6b4c6fb350a5b50da31349ca3cbd7b7d2913e521b401634f7442e03279753e18 SHA512 c059b96111c6e477874cf37f0463dd9150d00e2e5261e9dab8251e1f66cacfa647009bf4d7ddd60fd11582c3f41ce06515f5aa448358aa58a9df2c8289660151
+DIST haml-6.1.4.tar.gz 669960 BLAKE2B ae4194a7af653e60ec1f5a494a4f8db61a53c99790a9f859cf294961d6cf2d215ad5d2dc78f61355c65935aca0d5534604f0b2fe77dcaf9d3a6cfd775c173701 SHA512 fe866b524fd2f5e85e458897642cb39a97802fdf728182ae3ca2e828931d5526e0568e771a067161610dbb600d962808f417f9dee8b08ffe4baeb71a5566f502
diff --git a/dev-ruby/haml/haml-6.1.4.ebuild b/dev-ruby/haml/haml-6.1.4.ebuild
new file mode 100644
index 000000000000..87b992e5e5ee
--- /dev/null
+++ b/dev-ruby/haml/haml-6.1.4.ebuild
@@ -0,0 +1,59 @@
+# 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/haml/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/haml"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A ruby web page templating engine"
+HOMEPAGE="https://haml.info/"
+SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+IUSE="doc test"
+
+ruby_add_rdepend ">=dev-ruby/temple-0.8.2 dev-ruby/thor dev-ruby/tilt:*"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/minitest:5.15
+		dev-ruby/nokogiri
+		>=dev-ruby/railties-6.0
+		>=dev-ruby/activemodel-6.0
+		>=dev-ruby/actionpack-6.0
+		dev-ruby/unindent
+	)
+	doc? (
+		dev-ruby/yard
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
+	# minitest hack just to match rails/activesupport
+	sed -i \
+		-e "/require 'minitest\/autorun'/igem 'minitest', '< 5.16'" \
+		-e '/bundler/I s:^:#:' \
+		-e '/simplecov/I s:^:#:' \
+		test/test_helper.rb || die
+	# Remove tests that fails when RedCloth is available
+	rm -f test/haml/filters/markdown_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -rtest_helper -e 'Dir["test/haml/**/*_test.rb"].each { require _1 }' || die
+}
diff --git a/dev-ruby/memoist/memoist-0.16.2-r1.ebuild b/dev-ruby/memoist/memoist-0.16.2-r1.ebuild
index fe3cbf18b82c..1984e03a585d 100644
--- a/dev-ruby/memoist/memoist-0.16.2-r1.ebuild
+++ b/dev-ruby/memoist/memoist-0.16.2-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/matthewrudy/memoist"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild b/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild
index 13b062457850..445bd1a32c4b 100644
--- a/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild
+++ b/dev-ruby/mkmf-lite/mkmf-lite-0.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/djberg96/mkmf-lite"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-8.1.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-8.1.0.ebuild
index dfbabaa8b2cd..f2f2942a0247 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-8.1.0.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-8.1.0.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index b039b3e3d567..82dec5f69037 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -3,3 +3,4 @@ DIST rbs-3.0.4.tar.gz 1123563 BLAKE2B 335ba5d438b74ef36a65c1bd5d41508bb4d89a5273
 DIST rbs-3.1.3.tar.gz 1133033 BLAKE2B d9727a757bab41dc2deb4570b6fe325ec9dd6b50190fff9995d2054125ba5e05536a31b7961c068c78071c9039858b64bc73195bb40a26d12f6d7f9031e40e53 SHA512 76bce2c0a2377e2eca16877de7082c90b8df4fd7d9f89d74751e62d25f94a3418a71bcc7ea30e646ce548f675002358dc700c5d598379d8c744fa4fb0454f40c
 DIST rbs-3.2.0.tar.gz 1147974 BLAKE2B 167d8ac64173c5e7b8bc44d9fbf66c6b2a4c01c8a91bb0d45f564dc2f0ca6b9d06f0f6adafa690214671ff74f28a6396f028f07f00b830b6d6695796ca74a68f SHA512 ef593e24356f4b0236e7fc77f3f919fec03d2bcb82e05c5d511c50bfdf1cd74a193f37a9aca430fca3a869987ee3fcb423a3be94bb364f9a39365d56303dde9e
 DIST rbs-3.2.1.tar.gz 1148238 BLAKE2B 3f7a711802e283c4bfdb5a8e8bdbe5a0c33a18bee0c93a917dd38a83c983ebea8ceaa6834e1883c812f1cdb3f04119d617066259687c327f4dc35e4f5844c6b6 SHA512 9ed36b5faba77a87b0ed57b2c652c384214b830e12987244a46bb54c372932b369c9c3e87bd26c709e210b59b5b0aa7f9ae7e59c3cec1168fde9cfe15fdd645c
+DIST rbs-3.2.2.tar.gz 1148293 BLAKE2B a585a942d48217aa574629ace472dc57a6c876a67e8e521f3eaa00996c65f45836140b3c888e2a0e4e6d7ab9abf48337565978ec9b3950f9bbcce9f885fbb459 SHA512 758787ef7decd889ed3abcf9f06cd612299823e16b446568e729d76ba41cd66c36d626d7618ed360ff4b15b16c9d6f172fe55d9053810106f731c74f4cca3fe4
diff --git a/dev-ruby/rbs/rbs-3.2.2.ebuild b/dev-ruby/rbs/rbs-3.2.2.ebuild
new file mode 100644
index 000000000000..c66d09f9c28c
--- /dev/null
+++ b/dev-ruby/rbs/rbs-3.2.2.ebuild
@@ -0,0 +1,52 @@
+# 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_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+RUBY_FAKEGEM_EXTENSIONS=(ext/rbs_extension/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD 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="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rdoc dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# We compile the extension directly
+	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	# Avoid setup tests since they require a lot of development dependencies.
+	rm -f test/rbs/test/runtime_test_test.rb || die
+
+	# Avoid subtract tests with additonal unpackaged dependencies
+	sed -i -e '/def test_subtract/aomit "Skipped due to additional dependencies"' test/rbs/cli_test.rb || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/rbs/collection/installer_test.rb test/rbs/collection/collections_test.rb \
+		test/rbs/collection/config_test.rb test/rbs/collection/sources/git_test.rb || die
+	sed -i -e '/def test_collection_/aomit "Requires network"' test/rbs/cli_test.rb || die
+	sed -i -e '/def test_loading_from_rbs_collection/aomit "Requires network"' test/rbs/environment_loader_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index 28ab61da4b82..b522ee00306d 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1 +1,2 @@
 DIST rjb-1.6.7.gem 74752 BLAKE2B 835bc45b4568599e030033d9cff4d1df2da2cffd63ad594a437eeae7974d5e6f1bea490631c79f0990697f006e0006aab923134860aaf57312b153f750bda62b SHA512 ae5980621900d2605372f1cb3783d213e19da7bf1a7b2834dbdb99895476ecf2dad0ee474140e2747bbd477a5ab6d4be94cc9bf4fd0b8f0109ded94d7621bb7e
+DIST rjb-1.6.8.gem 74752 BLAKE2B 795e80879819b7a1b1834d901b9473f5a2ee39b1b68e264ef6ce7931bf312fd0a66e898bc2d4a86f2decca87fb1f6568709a6230b8ffbf3a2202d5951f97ca3d SHA512 f5c3a17ea494c484d5a3e929de370e697c971e9e976ce8a3b38c3fe2a5c074503e5edc91eb782d4e3f0ef0fd51d3a6ba9b147dff1c69e1e895c45f0fb84f478e
diff --git a/dev-ruby/rjb/rjb-1.6.8.ebuild b/dev-ruby/rjb/rjb-1.6.8.ebuild
new file mode 100644
index 000000000000..49bcfd18a275
--- /dev/null
+++ b/dev-ruby/rjb/rjb-1.6.8.ebuild
@@ -0,0 +1,73 @@
+# 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="readme.txt ChangeLog"
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit java-pkg-2 ruby-fakegem
+
+DESCRIPTION="Rjb is a Ruby-Java software bridge"
+HOMEPAGE="https://github.com/arton/rjb"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples hardened"
+
+DEPEND=">=virtual/jdk-1.8
+	hardened? ( sys-apps/paxctl )"
+RDEPEND=">=virtual/jre-1.8:*"
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+	java-pkg-2_pkg_setup
+}
+
+all_ruby_prepare() {
+	# The console is not available for testing.
+	sed -i -e '/test_noarg_sinvoke/,/end/ s:^:#:' test/test.rb || die
+
+	# Avoid encoding tests since not all locales may be available.
+	sed -i -e '/test_kjconv/,/^  end/ s:^:#:' test/test.rb || die
+
+	# Fix build on openjdk-11
+	sed -i -e 's#javah -classpath ../data/rjb jp.co.infoseek.hp.arton.rjb.RBridge#javac -h . -classpath ../data/rjb RBridge.java#g' ext/extconf.rb || die
+}
+
+each_ruby_prepare() {
+	#dev-lang/ruby might need the "hardened" flag to enforce the following:
+	if use hardened; then
+		paxctl -v /usr/bin/ruby 2>/dev/null | grep MPROTECT | grep disabled || ewarn '!!! rjb will only work if ruby is MPROTECT disabled\n  please disable it if required using paxctl -m /usr/bin/ruby'
+	fi
+	# force compilation of class file for our JVM
+	rm -rf data
+}
+
+each_ruby_install() {
+	each_fakegem_install
+
+	if use examples; then
+		dodoc -r samples
+	fi
+}
+
+each_ruby_test() {
+	if use hardened; then
+		paxctl -v ${RUBY} 2>/dev/null | grep MPROTECT | grep -q disabled
+		if [ $? = 0 ]; then
+			${RUBY} -C test -I../lib:.:../ext test.rb || die
+		else
+			ewarn "${RUBY} has MPROTECT enabled, rjb will not work until it is disabled, skipping tests."
+		fi
+	else
+		${RUBY} -C test -I../lib:.:../ext test.rb || die
+	fi
+}