7 files changed, 139 insertions, 56 deletions
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 28864d57a3eb..add1a765ec4f 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -1,2 +1,2 @@
-DIST bcrypt-3.1.18.gem 55808 BLAKE2B 03e4082f451b8410ae88c1d920625cf3249094ba2d6fc04429d5f9cd60d7e29fa1c3170e2409ba16fa8fd8c341c7471047a382ee89cb2b04dab9bbdaadc3554a SHA512 b0b44f49ac2ef7a6a75a8949943291b7d37fc80be6a4dbbbcbbf117feaa4ff09b0670c14879c358fc2dadd22866cad6e26d07cfdcbb9423d0c52a6f54ae3f8f5
 DIST bcrypt-3.1.19.gem 55296 BLAKE2B 8187a84381f9654ee271b0019dcbc0d0487b2efde384673be6838c7d019e8bebcdefd18e1d82b51e5518eeccebe673646582aaf0f9ce776db86b9d552e645330 SHA512 b34e48db1222f1c36a31afbd8a68dc87fb99431d90ec0932705999a04146886139c3654d8a9b615221dfe7048b8b0cc642a8f9819700bfa079e847d70483badf
+DIST bcrypt-ruby-3.1.20.tar.gz 51778 BLAKE2B 7278019f07aa2c0625a40a90d6a79ba99aa966ae72639427f06bc1fd4e7463d19765ceaa9700a588d168f422ad6a9ac391c683424d4bef4b30df2b667fca4bcb SHA512 a89e992a8684211fda22074269000475f7975dd41f05f9b1c2acd82e7a7e084134dc33c66053b315dc918f848330f2990545e7c806c17b69cdffbf2b382e0f4d
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 eaf9def8630d..f07d4b6d6a8d 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -2,3 +2,4 @@ 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
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 fef8a8ebc96a..19886859c6ad 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,3 +1,3 @@
 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
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