6 files changed, 80 insertions, 6 deletions
diff --git a/dev-ruby/rjb/Manifest b/dev-ruby/rjb/Manifest
index b522ee00306d..f42a171f0795 100644
--- a/dev-ruby/rjb/Manifest
+++ b/dev-ruby/rjb/Manifest
@@ -1,2 +1,3 @@
 DIST rjb-1.6.7.gem 74752 BLAKE2B 835bc45b4568599e030033d9cff4d1df2da2cffd63ad594a437eeae7974d5e6f1bea490631c79f0990697f006e0006aab923134860aaf57312b153f750bda62b SHA512 ae5980621900d2605372f1cb3783d213e19da7bf1a7b2834dbdb99895476ecf2dad0ee474140e2747bbd477a5ab6d4be94cc9bf4fd0b8f0109ded94d7621bb7e
 DIST rjb-1.6.8.gem 74752 BLAKE2B 795e80879819b7a1b1834d901b9473f5a2ee39b1b68e264ef6ce7931bf312fd0a66e898bc2d4a86f2decca87fb1f6568709a6230b8ffbf3a2202d5951f97ca3d SHA512 f5c3a17ea494c484d5a3e929de370e697c971e9e976ce8a3b38c3fe2a5c074503e5edc91eb782d4e3f0ef0fd51d3a6ba9b147dff1c69e1e895c45f0fb84f478e
+DIST rjb-1.6.9.gem 74752 BLAKE2B c8264fd0401044d9099717ae8770a30ce6bdfd12c3acfc2024b21330e3fdb07604bba69600a8808aa179c6459eb2d140e7b5822cbf58c3ea8ce47569bc92463b SHA512 c1ccae10361be881af4a129c0640ced00d00e909442b517150036cd44d5927cf24dc87bc0c30f3703f96955f114e0c0a5ff2d0f5fc555b71ade0f98e6b388426
diff --git a/dev-ruby/rjb/rjb-1.6.9.ebuild b/dev-ruby/rjb/rjb-1.6.9.ebuild
new file mode 100644
index 000000000000..49bcfd18a275
--- /dev/null
+++ b/dev-ruby/rjb/rjb-1.6.9.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
+}
diff --git a/dev-ruby/stringio/Manifest b/dev-ruby/stringio/Manifest
index 3ddd6b9b6d0b..27dba04d8ac5 100644
--- a/dev-ruby/stringio/Manifest
+++ b/dev-ruby/stringio/Manifest
@@ -1,4 +1,4 @@
-DIST stringio-3.0.5.tar.gz 43822 BLAKE2B 5b79def3cb154f4bb1f4a50b8eeb95e0841279d8500b0ad0cdae1f3029c2b53e8e3f46583ed0b5e289afe6636bb4610bc27a25e24acba5c7c1e679c5e4283f3b SHA512 d881dea34738e46fffaceb9a5e88fa3148979eff3571a6693d1d80bd01fbe236c0eb65bd8b2003abc0241bceff93d87fd3acd27b038b3a7bf6da65d492047153
 DIST stringio-3.0.6.tar.gz 44971 BLAKE2B a143fc01e7b9434db3b444f6049b002549a4149b9573ceeab4bf8955555290b1f41ef6ff012c7f58d1bc0559ca864e83aeb34f0cb75c3133ea91ac51f55008ff SHA512 118e7672fb347b111f90f4380e49ad01aac617fdf6afc9317f2242e942e68fa55ef5d71782c15156ed7b4c91d1eff75ac68d870885650ac4505d6a17b368afab
 DIST stringio-3.0.7.tar.gz 44797 BLAKE2B 2772028015b6eb5e5a45e9c86551e62e91e24a627b7280530a10b1d343f08eb19b53d4fbeaf791ed23a239e0609775e8eb4c0550dadc282f690ecc9abef7930b SHA512 fcea0a32bb70c6f1d8a3b237e8a8dbb2677b00c077f0d6ddfa72e1e382c832277ee592dd2e17abdc12003b0494665853eab18fa90bf6f34f51efa0f62f7ea1b9
 DIST stringio-3.0.8.tar.gz 45503 BLAKE2B df001e845915ca4042547338a2fed71e2938efd606b0c9ec907391a3017c8e7c6f545f6c26195caa4ca698ca24612bb2ae676320440a8a005c8efad6efa68bec SHA512 db6be9e9cee01849dd2da0540717a5c0263bfac6c367002149b67c1d001fd8f386b14a61f41445f96fe02007807e173895f2fefa8394589374d265df33f6ff3d
+DIST stringio-3.0.9.tar.gz 34991 BLAKE2B e047831dc0c88732b9939cfb7f5df97aceeeff1bdc569d3326a5197afbed0fa64300fb844fc305a888701f164bb97239c2ca129cff05444afa496afe23f370e4 SHA512 7724ae91687408654d9686bd01aaaf7a61ef7766c11570fa62cae622c5f70ad70cda88d5386bd87147dd9e7c1edfd4e70a882d03a8e7afdacf06820e57afec49
diff --git a/dev-ruby/stringio/stringio-3.0.5.ebuild b/dev-ruby/stringio/stringio-3.0.9.ebuild
index 0a14906d1a4f..e9ef6cc8a7cf 100644
--- a/dev-ruby/stringio/stringio-3.0.5.ebuild
+++ b/dev-ruby/stringio/stringio-3.0.9.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_EXTRADOC="README.md"
 RUBY_FAKEGEM_EXTENSIONS=(ext/stringio/extconf.rb)
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ruby/stringio"
 SRC_URI="https://github.com/ruby/stringio/archive/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 ~ppc-macos ~x64-macos ~x64-solaris"
+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"
 
diff --git a/dev-ruby/time/Manifest b/dev-ruby/time/Manifest
index fe284ca55a0f..5f2a62e3f9fb 100644
--- a/dev-ruby/time/Manifest
+++ b/dev-ruby/time/Manifest
@@ -1,2 +1,2 @@
-DIST time-0.2.1.tar.gz 25363 BLAKE2B 8f9a3dae104a03cc012b156fe696890a655b8a81627e23c3cc3c811b15d1a195d5e7ca1da1b9ab8ee81895e291962be2f64bdf021a376e77a3195695a0a876c1 SHA512 695ea9907338fc13fd8b7ab98ed57d811c05e0609c99585eff80acd172d38408c705857dc25ff78b310a6945e768e5403d9c4453b357676f39d40418982c97e6
 DIST time-0.2.2.tar.gz 26129 BLAKE2B 9d7c507c06fca17c9a2734f1116524344518635562b0ba924cdf5e0b0b52cb31f6dffa7aa3c8c06e0d2f5f2c1ffdcef2a92756cd915822be6a1510f08fa91c56 SHA512 4866cd7df233222ed76cf3b35c842b6e1652b429aa15609bfe40f89683ad5df2ce7f37f41dfb0e85f610f2ebf4e431ea8046d67c3aed7aa345d928fe33ba1ae3
+DIST time-0.3.0.tar.gz 15520 BLAKE2B 05d30c8dd6da8544fe89e1f92a94d91adf198712acc236703947abef86c9ceefeedc2bc78150d3d1918b29972509c927510fea2e4bfec0a01ad12aa751e27fc2 SHA512 17483eebbddd3be40f83b35813ef5faa3b3fe695e3c13e4cc6d13579b64fd5d1637e2aca2f5e60192b4de6ae761efaa76aa6a6cbbcce7bade31f5f415f224b70
diff --git a/dev-ruby/time/time-0.2.1.ebuild b/dev-ruby/time/time-0.3.0.ebuild
index d49a30a10564..d47cd0cfadbd 100644
--- a/dev-ruby/time/time-0.2.1.ebuild
+++ b/dev-ruby/time/time-0.3.0.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_BINWRAP=""
 RUBY_FAKEGEM_EXTRADOC="README.md"
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/time/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/date"