8 files changed, 142 insertions, 58 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7511534e6ed8..fdee95ed01eb 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 67043e234bd5..cb911b69dfd8 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,5 +1,5 @@
-DIST bcrypt-3.1.18.gem 55808 BLAKE2B 03e4082f451b8410ae88c1d920625cf3249094ba2d6fc04429d5f9cd60d7e29fa1c3170e2409ba16fa8fd8c341c7471047a382ee89cb2b04dab9bbdaadc3554a SHA512 b0b44f49ac2ef7a6a75a8949943291b7d37fc80be6a4dbbbcbbf117feaa4ff09b0670c14879c358fc2dadd22866cad6e26d07cfdcbb9423d0c52a6f54ae3f8f5
 DIST bcrypt-3.1.19.gem 55296 BLAKE2B 8187a84381f9654ee271b0019dcbc0d0487b2efde384673be6838c7d019e8bebcdefd18e1d82b51e5518eeccebe673646582aaf0f9ce776db86b9d552e645330 SHA512 b34e48db1222f1c36a31afbd8a68dc87fb99431d90ec0932705999a04146886139c3654d8a9b615221dfe7048b8b0cc642a8f9819700bfa079e847d70483badf
-EBUILD bcrypt-ruby-3.1.18.ebuild 1467 BLAKE2B 9128c6bad5acd29b3aeda650e79b51c6d85c21abde4f161b757b83e0d5f4f8f130d0ba5966d44b4bf02a3ba6b11346e1cb41e425bb4fc283dec81eefad08a480 SHA512 fac15f2bd56bc638b3252d1595be9c2c8859d38fdd80faf266a1f73c7501ab4f60c50d4bc20ab90f836bda4cbaf61a191d6826d7bff97ef2c2ec9d70cdba4664
+DIST bcrypt-ruby-3.1.20.tar.gz 51778 BLAKE2B 7278019f07aa2c0625a40a90d6a79ba99aa966ae72639427f06bc1fd4e7463d19765ceaa9700a588d168f422ad6a9ac391c683424d4bef4b30df2b667fca4bcb SHA512 a89e992a8684211fda22074269000475f7975dd41f05f9b1c2acd82e7a7e084134dc33c66053b315dc918f848330f2990545e7c806c17b69cdffbf2b382e0f4d
 EBUILD bcrypt-ruby-3.1.19.ebuild 714 BLAKE2B 529d5357da993d91be8637ae73160cd17d096e646b221010453d939270308fa3a1ced8a60077258a40df25a022234db3d0e97a2c778b6faef65c0b56f0b0a7a4 SHA512 53ab05c9525993e77a5b41c976af7f561c3444d64e5ca81ef252e333370a7a0b724591fa97292c52a3efe24b9094c105b6151d287a91cc091b2580d28017e471
+EBUILD bcrypt-ruby-3.1.20.ebuild 808 BLAKE2B 2122a8c5388cfb58ebe7b9894b46a97fae51eda3208d739c86c0bdca332b600b12b059ae4b18de27db8ed9f2a654eee5fe66cfc46d0d7ac0f9338258c2095cd8 SHA512 1b5e45f8f23fa4d69a7a471037ff39901618bfff0fbd4505f8494109138fc69d157db5dc7ac5efd3bfb76c11e311a73737daf2615e617a94d389df0cad516b83
 MISC metadata.xml 350 BLAKE2B 3e6b2ecf22fbadc960e6a57344a326c5b022a269201da97938eb3e1c13340fc4391eb26b70037f85be8de7b70fe031a435fd2e32056fb91575ad82574e16ddf0 SHA512 696b597375b8021d284c95229d0d38976a656fd4a55345049c5ae0375249701d2c641400c11b556a01c369e1fd64833205969185c08e4c14fa252cd59e720145
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
deleted file mode 100644
index 668443a9c818..000000000000
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.18.ebuild
+++ /dev/null
@@ -1,50 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_NAME="bcrypt"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to keep your users' passwords secure"
-HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e 's/git ls-files/find */' bcrypt.gemspec || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# bcrypt was called bcrypt-ruby before, so add a spec file that
-	# simply loads bcrypt to make sure that old projects load correctly
-	# we don't even need to create a file to load this: the `require
-	# bcrypt` was already part of bcrypt-ruby requirements.
-	cat <<-EOF > "${T}/bcrypt-ruby.gemspec" || die
-	Gem::Specification.new do |s|
-		s.name = "bcrypt-ruby"
-		s.version = "${RUBY_FAKEGEM_VERSION}"
-		s.summary = "Fake gem to load bcrypt"
-		s.homepage = "${HOMEPAGE}"
-		s.specification_version = 3
-		s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
-	end
-	EOF
-
-	RUBY_FAKEGEM_NAME=bcrypt-ruby RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" ruby_fakegem_install_gemspec
-}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
new file mode 100644
index 000000000000..182da4d9050d
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.20.ebuild
@@ -0,0 +1,30 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_NAME="bcrypt"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to keep your users' passwords secure"
+HOMEPAGE="https://github.com/bcrypt-ruby/bcrypt-ruby"
+SRC_URI="https://github.com/bcrypt-ruby/bcrypt-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e 's/git ls-files/find */' bcrypt.gemspec || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 07221018c96a..c3652f3797eb 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -2,8 +2,10 @@ DIST nokogiri-1.14.2-git.tgz 10446957 BLAKE2B 0c72c520642bfa3e69a38f5dba8783a4f7
 DIST nokogiri-1.14.4-git.tgz 10767764 BLAKE2B b0983b5537ea6ffc86431740e2277bb58ab45a237e47af9a8ef3e98f73872ee81dbd13ae6a9508845dc3d3ba84dc101763e674400e4e5ce98b31defcbbea678d SHA512 09e8bdb660dd2e4340d0bdc701909f066234e70754ad799e21f1462d06f76500ceaf3da074cf792fa690f4717f1126e041a6f3247fd32f5a806404447bdb68be
 DIST nokogiri-1.15.3-git.tgz 10767496 BLAKE2B d9d2abd3f57fd3f9e3e49e38de7559d5d9bad278166b4108d2edf4f90884256c01bf574cec8a15b6f30420c9f4d501707b710e3af0f32dc5cbcc01b4433c6662 SHA512 9084e97c81bca52c19cf2cd47dcf0d3377705ceda559399aa1cbf1e112845b2a796e34576f08a073377fb523a7a298254bda91563929535734700c31c473cb49
 DIST nokogiri-1.15.4-git.tgz 10767816 BLAKE2B fe35809f62279ded261c655cc589fdb3447514f6525b62d591da58f91cc9dced34f5ac3e8bde180944ce23a67f56b2f93c90ac9cf69699e331dceee1ea259408 SHA512 f255a51053c55151c6df8937a979833571e2cbc8a25d032674d71d1303267ed4d3a1226d0995e54d9a152f237b31e7fe85e70fb976578902234eb5a2f4f3ce2b
+DIST nokogiri-1.15.5-git.tgz 10768080 BLAKE2B 25d24799c69a4271ea5283b264061c05f6907635ed55de196f76684d2db3c6c226e7f09f02f30de049b282c17cdea69154dec9a06813cb4f63adaac4876e160c SHA512 1df3f6bf4508a7c84fa22ce774cb878ca47154e69730f1cedb403fad270df42c580526ac03b47e73bf2267ad50d2999ed1341079b10043b450f51ea6b0565da7
 EBUILD nokogiri-1.14.2-r1.ebuild 2753 BLAKE2B a0ed06258e80b17ed4666fa05c7f1af9bb6f3cc39860e143a31c11dd5c96332688146d3b7bd7111b30ce7fa7f2c7c7c218e15523847512eff85bbd35f08b760d SHA512 11d8f831c1e0044cf8cde68b1573d39fa6217b1673be9e5e10771c6bcd4df8db75f995e7312b5443833064a03a105dcf813ccda80ad499f97e7e652c9f308eb9
 EBUILD nokogiri-1.14.4.ebuild 2818 BLAKE2B 3b89b5e9c31e1e57f8cf11239bf046e92f71323e55b4a861ca2ed60a301bfb04c0a8d0d9d22fd7ec77ff63ef1f420aac6d1d2aef88b423be07ec1cd9ac6edec5 SHA512 52e53a7ef41f268f1384813761d9c7954ffc6551b7288c70917568a8223c4fc5fa9648fe097bcd520f7e5728c136cb5e8fd9488ba6cfe4ae1d11262517259a3f
 EBUILD nokogiri-1.15.3.ebuild 2702 BLAKE2B 8934088d9edfb342b53b74f5fcabf397cf9cdb050c5c8d5ebac1686a15070ae4c1d22d3320de67ac0d055d18384f177353ffa05683e0ba17663c1cba2ae2f9e7 SHA512 3add6c7af7cc8bee29064e8fed1cea2237b401381f6451f5b5938728df1f60046ea4e342cad334630a5e00ccc54fe39a31d8c59a8f10051a56c3219c83e62f9a
 EBUILD nokogiri-1.15.4.ebuild 2725 BLAKE2B fae2cf3841a75e8971fb765db24eb3ab2948df06405561a2365b7a5b37be950331fe5960d393892ed00ffb37c73045ec16949363ab3e5c331c0317906d49b706 SHA512 97f0a0fc75c85dc646cace0560ac02645f4f8fe19309645de2aec3c17f0d0363526ee1a927c688d4d74bf2f81e2db3560e740a162a1b0186b93e84f824edd974
+EBUILD nokogiri-1.15.5.ebuild 2718 BLAKE2B a5d2ce24c50bf189b35dc761e4e809f5fe2b010d25f55a589917cdbe10055e8a62195c373cb9cc1686530c9c922d657d37a26b974c436abe1bf9fd1f2f378156 SHA512 d97312834c8a5d5a59117a7a4c4e278e2e4a844cc3c52ac911696c5a357c5c0e02d4c0e2636c4b5c6b3d8c3934f54da3ccb9bb54fc3e81a854d339007341fbb6
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.15.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.15.5.ebuild
new file mode 100644
index 000000000000..6789ff1df6c2
--- /dev/null
+++ b/dev-ruby/nokogiri/nokogiri-1.15.5.ebuild
@@ -0,0 +1,95 @@
+# 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 ROADMAP.md SECURITY.md"
+
+RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
+
+inherit ruby-fakegem multilib
+
+DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
+HOMEPAGE="https://nokogiri.org/"
+LICENSE="MIT"
+SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos"
+SLOT="0"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	>=dev-libs/libxml2-2.11.6
+	>=dev-libs/libxslt-1.1.39
+	sys-libs/zlib
+	virtual/libiconv"
+DEPEND="${DEPEND}
+	>=dev-libs/libxml2-2.11.6
+	>=dev-libs/libxslt-1.1.39
+	>=sys-libs/zlib-1.2.13
+	virtual/libiconv"
+
+ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
+
+ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.8
+	>=dev-ruby/rexical-1.0.7
+	dev-ruby/rdoc
+	test? ( dev-ruby/minitest dev-ruby/rubyzip )"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/tasks\/cross_compile/s:^:#:' \
+		-e '/:test.*prerequisites/s:^:#:' \
+		-e '/license/ s:^:#:' \
+		Rakefile || die
+	# Remove the cross compilation options since they interfere with
+	# native building.
+	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
+	sed -i -e '/cross_config_options/d' Rakefile || die
+
+	sed -e '/simplecov/,/^end/ s:^:#:' \
+		-e '/reporters/I s:^:#:' \
+		-i test/helper.rb || die
+
+	# There is no need for mini_portile2 to be a runtime dependency on Gentoo
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_configure() {
+	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
+		${RUBY} -Cext/${PN} extconf.rb \
+		--with-zlib-include="${EPREFIX}"/usr/include \
+		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
+		--with-iconv-include="${EPREFIX}"/usr/include \
+		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
+		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
+		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
+		--with-xslt-dir="${EPREFIX}"/usr \
+		--with-iconvlib=iconv \
+		|| die "extconf.rb failed"
+}
+
+each_ruby_compile() {
+	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
+	fi
+
+	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
+		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
+	fi
+
+	emake -Cext/${PN} \
+		V=1 \
+		CFLAGS="${CFLAGS} -fPIC" \
+		archflag="${LDFLAGS}" || die "make extension failed"
+	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
+}
+
+each_ruby_test() {
+	MT_NO_PLUGINS=1 ${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
+}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 1d58fcf6a2b2..cb68d798598b 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,7 +1,7 @@
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
-DIST public_suffix-5.0.1.gem 114688 BLAKE2B 7d1f2bf8b05c4de548b281f01a50eba8911ca9d56f42301139e0e3242eb9960db7b6fe312f4b65996b9b796fcc84748c53968771417b45773a453dc99b2fa33b SHA512 9498d53af79ffa7ccf5f94eb4e54c2281ff3e025d963c9024aeac06efa919dcf766a51f901ab6168125737b6f53831f8835d5777739fc45ddb66c99c2e573746
 DIST public_suffix-5.0.3.gem 113152 BLAKE2B e14a5c343f4db466a31c3a84c95f810d82b5bf64d6be9e0690d9639aaae8feec91ffb1e867dcb3664027426c436396a090a7051189308414b76c4f962c899930 SHA512 7d8c1c0ff951458060dfee4247cfdb04a3f875f97e8451e2955b05335c9ea8480612be1455280ee86c9b2a1c62d0dac663d67b68825d8ce3a99ef63c5841017d
+DIST public_suffix-5.0.4.tar.gz 111469 BLAKE2B 6719dc40206f5dc2bb8152576ca82d1321b1789fd8b085d20d1246d4f5f44f64116f9a62cbd55053a066c6b99fbe200951f13862d0a4136a62c235147f65fd4a SHA512 d42bd895387739d87579249ff4799fb5a49c49a2e4cbf4f22dd0b42a252b264d813549bf86d6c327d85e7d38fbdd97681d777adf2ff8398025dafd9eac655654
 EBUILD public_suffix-4.0.7.ebuild 803 BLAKE2B da33efc517c42c1f52550b57d58976e440e7a5df68a04b1468ab44296be933c7f5344511377f64223618ea38bc9c93fadae41f6ddbda97414a7d71896da77d47 SHA512 b3d3c4cc9f9231ea53ea9d79430e84dcafe53bac9bd74866c8107e94a7c5f317da9e760b7527d7e9dc2a3516f21f326d71504d6be7b2c74cd4c867fc9e3c0f49
-EBUILD public_suffix-5.0.1.ebuild 812 BLAKE2B 6ca0e963618e44ad1b0bfcfbed73fcded707c4609b78a2adeecfcee64d666e2b9641d5548442429cb9a2627854885d65c72a2d3f25072e2f7a24f21134bf287d SHA512 93947cb09f8e433f438a67b70d8c2818e4c3b1ea3843c79a6b309a07d4ca83be62f7d17ae9b06ec6b2a366bb70bacd1f0544cfb1f4ff337640ce716a39944a05
 EBUILD public_suffix-5.0.3.ebuild 803 BLAKE2B da33efc517c42c1f52550b57d58976e440e7a5df68a04b1468ab44296be933c7f5344511377f64223618ea38bc9c93fadae41f6ddbda97414a7d71896da77d47 SHA512 b3d3c4cc9f9231ea53ea9d79430e84dcafe53bac9bd74866c8107e94a7c5f317da9e760b7527d7e9dc2a3516f21f326d71504d6be7b2c74cd4c867fc9e3c0f49
+EBUILD public_suffix-5.0.4.ebuild 1116 BLAKE2B 2ecae7c1059c3b80025dc9fff81b1668ec68c104d179ad1b52b6cc0a0518d0750b832b12f97f5f4379b8a2a94561ea92a1ae1b29422a9efae15864127d57f271 SHA512 6db937a1380d58e7f1c398af9be582eb696cb457c690243f1f95d52b067fd7165f38f32ebc00f2a2572b5fe88eb77c4f765a2729b073b001f4ca778e4dfadf2c
 MISC metadata.xml 341 BLAKE2B b3cca7169b9fbc96674afb8199385f169236045a393efea2c899cb2ef6ba3f2887225b7f543fe4bfc7a48d67405cf88a58c2d076cd3ab8ad24a36997e836e8fe SHA512 d70ea0d3d7bcede6344839ab591ca4bb86da938f57fa8ffa1e2fc8498b0867fd9a5859a7b96b372453f577620c26250df8c20b9687aea96234a01d249251ad27
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.4.ebuild
index 6d070b774378..3ff2680de133 100644
--- a/dev-ruby/public_suffix/public_suffix-5.0.1.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-5.0.4.ebuild
@@ -3,25 +3,32 @@
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRAINSTALL="data"
-
+RUBY_FAKEGEM_GEMSPEC="public_suffix.gemspec"
 RUBY_FAKEGEM_BINWRAP=""
 
 inherit ruby-fakegem
 
 DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
 HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+SRC_URI="https://github.com/weppos/publicsuffix-ruby/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="publicsuffix-ruby-${PV}"
 
-KEYWORDS="amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
+ruby_add_bdepend "test? ( dev-ruby/mocha:2 )"
 
 all_ruby_prepare() {
+	sed -e 's:_relative ": "./:' \
+		-e 's/__dir__/"."/' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	sed -i -e '/rubocop/I s:^:#:' \
 		-e '/yard/,/CLOBBER.include/ s:^:#:' \
 		-e '/bundler/ s:^:#:' Rakefile || die