13 files changed, 143 insertions, 73 deletions
diff --git a/dev-ruby/base64/base64-0.2.0.ebuild b/dev-ruby/base64/base64-0.2.0.ebuild
index 0a04667c63fa..8cecfd8aee84 100644
--- a/dev-ruby/base64/base64-0.2.0.ebuild
+++ b/dev-ruby/base64/base64-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/ruby/base64/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1-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 ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild b/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild
index a14138bed86c..c06e32de32c1 100644
--- a/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild
+++ b/dev-ruby/faraday-multipart/faraday-multipart-1.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/lostisland/faraday-multipart/archive/v${PV}.tar.gz -
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/multipart-post:0"
diff --git a/dev-ruby/faraday/Manifest b/dev-ruby/faraday/Manifest
index 889c9c355d17..46172119406a 100644
--- a/dev-ruby/faraday/Manifest
+++ b/dev-ruby/faraday/Manifest
@@ -7,7 +7,6 @@ DIST faraday-1.9.3.tar.gz 830654 BLAKE2B d032df2cd7018f3df3b4e6e2c06dd24f19e6a40
 DIST faraday-2.7.10.tar.gz 833034 BLAKE2B dca3ef6a48aa4d14f1717344c5ec85b1e9caf7205eb7ae1be76a7a96bdee9fbef2d112c05f96f5625262d2783fc0e5e196343f67b371e480532c5e74f77b73eb SHA512 e1d2792f49df5679c16d3690a2475c56db9ae537bf53db4bb7cc256b41455d3db36d8d672eaf3f8a63fb2b04349d45dd4d32a2c194606fd795de51b1f79ead85
 DIST faraday-2.7.11.tar.gz 1029832 BLAKE2B fd5cc5a9fa0d8c40893600a89f71d906a9de0b800c9723d64e8dad5dac1bff4ec61ba2714347b38beeadafb42a29ed6fb217344ffdb122e137607ff140b6aed7 SHA512 eafbc0c88a94f03bfe659b10a86050d07e79c6c2fc81c16af9e2aad68bc5482748a4a41a0a7828b272a9e034cb77dab06e0a9a0e136a56c72b72ed97e5bad50c
 DIST faraday-2.7.12.tar.gz 1029923 BLAKE2B 267880c4d35284c1eb2f894e9c2803662cf5a901417b5a8c6934b8cef3fe842924d945b64b6617dcd017cbfdc3c9be19271c7c295e2c39518215aba3ab8304bb SHA512 e35aaa7096a77a3dc76aa0a2c262d6e83d894564474dd5b1414488615e54096e96fefa245d65804afa71fc22ef55748c18a32213ba6eaedb431246d5f8d382a1
-DIST faraday-2.7.6.tar.gz 832525 BLAKE2B 6d53bcabbdc6ce67433e475e7ac83d08a65a3baffe81f89038af1609ba58c1efe6f7fbe4bb47768a73940cea791c864dc9f313fe3510f89ad36d9e7261b76de1 SHA512 2b0e80f685dc1b9e62955e87d226b9b63cf30fec6d5e9addada532e249bb13ef43db9933091d716df391a79493048aaabd845d3052d3ea3b6ed0e834ed2b4c8d
 DIST faraday-2.8.0.tar.gz 1030670 BLAKE2B b0dc09bb4b760e1e194276709f6d2fdc391af0422f2eeba1f07e8824bb02346dcbd05dd701cb5bfbdebd32ae77bb75914955061b43e85f5e47843b11d40e3b2b SHA512 14aa19b24996140467e74abf35129d60781eefaf97fcc3eea7f83f9dd8db17318fbc57d263e1564f94cd9cd1a03129cef210b50190491e4e094092196c72aa67
 DIST faraday-2.8.1.tar.gz 1030720 BLAKE2B c52733fa00143882d43bf7e48dc6fd79621aad9b096f01eb0cc05bb0808bffff0c01282d3823d3b105554d953dc003d86f85c7ef9505a733214a4569764b45a6 SHA512 b2af1dbfcefb92969ae45138401c8cc9a8a1b10ca2bd93dc6aad66337aefbad4cf5700949fb821b93bdba46ec5c7c61b83dcc934b5797a5516c53aab50a287cb
 DIST faraday-2.9.0.tar.gz 1030759 BLAKE2B 450ca700ccf624115aaa6c5ffc873e926884ff27a520aecd890f7156f20f829a802cece461327205930dfc53d06fd837adb1bb989e9603f369f61606640acddf SHA512 f534cd0903bc5ee83a355b09c886dfdf593b842fc85863877c9e0217ba797b027acce6d36674579053ac24e180d71afe4d879cb52cadd1da803b609f2da407c3
diff --git a/dev-ruby/faraday/faraday-1.10.3.ebuild b/dev-ruby/faraday/faraday-1.10.3.ebuild
index 357988df9e78..dcd189ea502f 100644
--- a/dev-ruby/faraday/faraday-1.10.3.ebuild
+++ b/dev-ruby/faraday/faraday-1.10.3.ebuild
@@ -39,6 +39,7 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/patron
 		dev-ruby/rack
 		>=dev-ruby/rack-test-0.6
 		dev-ruby/webmock
diff --git a/dev-ruby/faraday/faraday-1.9.3.ebuild b/dev-ruby/faraday/faraday-1.9.3.ebuild
index ebe4fd5201d0..a6b02c760bc9 100644
--- a/dev-ruby/faraday/faraday-1.9.3.ebuild
+++ b/dev-ruby/faraday/faraday-1.9.3.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 
 DEPEND+=" test? ( sys-process/lsof )"
 
@@ -39,6 +39,7 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 		>=dev-ruby/test-unit-2.4
 		>=dev-ruby/connection_pool-2.2.2
+		dev-ruby/patron
 		dev-ruby/rack
 		>=dev-ruby/rack-test-0.6
 		dev-ruby/webmock
diff --git a/dev-ruby/faraday/faraday-2.7.12.ebuild b/dev-ruby/faraday/faraday-2.7.12.ebuild
index a1d63144ce57..ce1849ffb01a 100644
--- a/dev-ruby/faraday/faraday-2.7.12.ebuild
+++ b/dev-ruby/faraday/faraday-2.7.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -22,7 +22,7 @@ SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+=" test? ( sys-process/lsof )"
diff --git a/dev-ruby/faraday/faraday-2.7.6.ebuild b/dev-ruby/faraday/faraday-2.7.6.ebuild
deleted file mode 100644
index 3b3e7542cba1..000000000000
--- a/dev-ruby/faraday/faraday-2.7.6.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_RUBY="ruby30 ruby31 ruby32"
-
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="spec"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="HTTP/REST API client library with pluggable components"
-HOMEPAGE="https://github.com/lostisland/faraday"
-SRC_URI="https://github.com/lostisland/faraday/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND+=" test? ( sys-process/lsof )"
-
-ruby_add_rdepend "
-	|| ( =dev-ruby/faraday-net_http-3.0* dev-ruby/faraday-net_http:2 )
-	>=dev-ruby/ruby2_keywords-0.0.4
-"
-ruby_add_bdepend "test? (
-		>=dev-ruby/test-unit-2.4
-		>=dev-ruby/connection_pool-2.2.2
-		dev-ruby/rack:2.2
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove bundler support.
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d ; 1irequire "yaml"' Rakefile || die
-	# Avoid loading all lib files since some of them require unpackaged dependencies.
-	sed -e '/[Cc]overall/ s:^:#:' \
-		-e '/lib\/\*\*/ s:^:#:' \
-		-e '/simplecov/ s:^:#:' \
-		-e '/SimpleCov/,/end/ s:^:#:' \
-		-e '/pry/ s:^:#:' \
-		-e '3igem "rack", "~> 2.2"' \
-		-i spec/spec_helper.rb || die
-
-	sed -e '/git ls-files/ s:^:#:' \
-		-e "s:_relative ': './:" \
-		-i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	MT_NO_PLUGINS=true each_fakegem_test
-}
diff --git a/dev-ruby/liquid-c/Manifest b/dev-ruby/liquid-c/Manifest
index 22964e805352..2dd6f04c407b 100644
--- a/dev-ruby/liquid-c/Manifest
+++ b/dev-ruby/liquid-c/Manifest
@@ -1 +1,2 @@
 DIST liquid-c-4.1.0.gem 48640 BLAKE2B 4fe526b48500349526ebeb2430f87fbb8ccea2f47dcfd32f16e3db803425180955c7ae81a707628ca377fd534882d71e06aece7d4119c16cc1386d4b3b222447 SHA512 72600a5b7962b91d63350adc9f3f355255ad9b9f93b6607064a896e1e3d109a9da897f442f9fc15a7a8c2c26ccb4674e491def9e7531ef9577b790ca9a3eb884
+DIST liquid-c-4.2.0.gem 51200 BLAKE2B 16c01f099263dc415cf185114c0ae8a4953fd2a599897a3ca69e2c220643e3599e908d426bf2ffc1cea8dbfe42d640e8da60282a0b39e0df5611467afab783b1 SHA512 4d349903e507eee30be7d04d2529628fc81a2091b5ac1f15094e2769d93b337769009f38e373378fac07ef32e8bc6f53a721984411ef6f6596363b77d96789d3
diff --git a/dev-ruby/liquid-c/liquid-c-4.2.0.ebuild b/dev-ruby/liquid-c/liquid-c-4.2.0.ebuild
new file mode 100644
index 000000000000..7e785cccf7ee
--- /dev/null
+++ b/dev-ruby/liquid-c/liquid-c-4.2.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_TASK_TEST="test:unit"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+MY_PN=${PN/-/_}
+RUBY_FAKEGEM_EXTENSIONS=(ext/${MY_PN}/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Liquid performance extension in C"
+HOMEPAGE="https://github.com/Shopify/liquid-c"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm64"
+
+ruby_add_rdepend ">=dev-ruby/liquid-5.0.1:*"
+
+all_ruby_prepare() {
+	sed -i -e "s/-Werror//" ext/${MY_PN}/extconf.rb || die
+
+	sed -i \
+		-e "/[Bb]undler/d" \
+		-e "/memcheck/Id" \
+		-e '/extensiontask/ s:^:#:' \
+		Rakefile || die
+	sed -i -e 's/unit: :compile/:unit/' rakelib/unit_test.rake || die
+	rm -r rakelib/compile.rake || die
+
+	sed -i -e 's/MiniTest/Minitest/' test/unit/*_test.rb || die
+
+	# ruby_memcheck is a gem just for running w/ valgrind.
+	# We don't run tests in ebuilds with Valgrind because it's
+	# non-portable and sometimes flaky under sandbox.
+	rm rakelib/integration_test.rake || die
+	sed -i -e '/memcheck/Id' rakelib/unit_test.rake || die
+}
+
+each_ruby_test() {
+	# Backup the original extension and hide it away
+	# The tests won't build if they detect an already-built ext
+	mkdir -p "${T}"/${RUBY}.orig || die
+	mv ext "${T}"/${RUBY}.orig/ext || die
+	cp -r "${WORKDIR}"/all/${P}/ext ext || die
+
+	nonfatal each_fakegem_test --trace || failed_tests=1
+
+	# Always restore the original extension we built, even if
+	# tests failed, as FEATURES=test-fail-continue may be enabled.
+	rm -rf ext || die
+	mv "${T}"/${RUBY}.orig/ext ext || die
+
+	if [[ ${failed_tests} == 1 ]] ; then
+		die "Tests failed with ${RUBY}!"
+	fi
+}
diff --git a/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild b/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild
index dae86a8de8df..9e9543d01da9 100644
--- a/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild
+++ b/dev-ruby/multipart-parser/multipart-parser-0.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/danabr/multipart-parser"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
 PATCHES=( "${FILESDIR}"/${P}-fix-tests.patch )
diff --git a/dev-ruby/pg/Manifest b/dev-ruby/pg/Manifest
index 687862452f06..a45eaa318e9a 100644
--- a/dev-ruby/pg/Manifest
+++ b/dev-ruby/pg/Manifest
@@ -1,3 +1,4 @@
 DIST pg-1.4.6.tar.gz 282608 BLAKE2B 73616b6ba0373ae81394188fd96d7ca37144b76e5e89d0267e076ea39b9e33d19851d3881e70d9d5934ea26671c07635a22e7e530dd0094a243de8e9d9793fb5 SHA512 5cde5441f9864f89e7f44fd72d8becc60c223ba90793812c4756764f9807610d393ecca5ba05187e8aefb0d3530d67a7525b4e2c638160161410b369937e912a
 DIST pg-1.5.3.tar.gz 296167 BLAKE2B d1f3d0cfecd2cf006dae3373e378b7784d07d08710595b62c5b2f3e887b8e10f0fc06fb0fbb1cccb995a04c51ced781362ecfe7bc95a311c0609ffc62ed54a7e SHA512 d15f5ddcf83cf70df23cb1e127442ff94850aa47fa78f8fdf34aa88ae43039dca6395413e714b60bee9f825d1016e98fcf446b704bd9bebfc71c0a5a9109a73a
+DIST pg-1.5.4-x86.patch 2744 BLAKE2B c60a007ac1133117f458f2bfcfeea7a009a21a865a93ff542e3e4237643f22344b042376c70d15c8c14baa3d5345aee032b61261d3e15e8300d960e548cf4ba0 SHA512 a82ef374c0774dd36e636a23c548fcda41533aadf63e8e6e80668c855037b5d75b4d90cb3cbd688b7bfa376f0505edc99586853132b8ebb9449476319545a347
 DIST pg-1.5.4.tar.gz 298368 BLAKE2B 1028fac00371f9f769ee6c484a518149dc7c89e78ee8c05754a4412c4fec062f958de75bfbfb3f8c570e9598e439156e1d53ba00a8bc6e1be93d00412d153281 SHA512 87d950d2240e4d9d540f19ce89b945cb2b4a6d96e79dc7aa67a2dae014f1b20b307d2c195bfe3afe5c86894b94d379980fa2b7c4cf0e6a68a15c58b8d6d469f8
diff --git a/dev-ruby/pg/pg-1.5.4-r2.ebuild b/dev-ruby/pg/pg-1.5.4-r2.ebuild
new file mode 100644
index 000000000000..ec48789bc2e8
--- /dev/null
+++ b/dev-ruby/pg/pg-1.5.4-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby31 ruby32 ruby33"
+
+RUBY_FAKEGEM_GEMSPEC="pg.gemspec"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="Contributors.rdoc README.md History.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby extension library providing an API to PostgreSQL"
+HOMEPAGE="https://github.com/ged/ruby-pg"
+SRC_URI="https://github.com/ged/ruby-pg/archive/v${PV}.tar.gz -> ${P}.tar.gz
+		 https://github.com/ged/ruby-pg/commit/fb3fba9eac65291b20f22eb956f02490d62de3ec.patch -> ${P}-x86.patch"
+RUBY_S="ruby-${P}"
+
+LICENSE="|| ( BSD-2 Ruby-BSD )"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE=""
+
+RDEPEND+=" dev-db/postgresql:*"
+DEPEND+=" dev-db/postgresql
+	test? ( >=dev-db/postgresql-9.4[server(+),threads(+)] )"
+
+PATCHES=( "${DISTDIR}/${P}-x86.patch" )
+
+all_ruby_prepare() {
+	# hack the Rakefile to make it sure that it doesn't load
+	# rake-compiler (so that we don't have to depend on it and it
+	# actually works when building with USE=doc).
+	sed -i \
+		-e '/Rakefile.cross/s:^:#:' \
+		-e '/ExtensionTask/,/^end$/ s:^:#:' \
+		Rakefile || die
+
+	sed -e 's/git ls-files -z/find * -print0/' \
+		-e "s:_relative ': './:" \
+		-e 's/__dir__/"."/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid tests that assume IPv4
+	sed -i -e '/expect.*hostaddr/ s:^:#:' spec/pg/connection_spec.rb || die
+
+	# Fails with network-sandbox
+	sed -i -e '/connects using without host but envirinment variables/askip "gentoo"' spec/pg/scheduler_spec.rb || die
+
+	# Avoid test that only works with bundled pg
+	sed -i -e '/tells about the libpq library path/askip "gentoo"' spec/pg_spec.rb || die
+}
+
+each_ruby_test() {
+	if [[ "${EUID}" -ne "0" ]]; then
+		# Make the rspec call explicit, this way we don't have to depend
+		# on rake-compiler (nor rubygems) _and_ we don't have to rebuild
+		# the whole extension from scratch.
+		RSPEC_VERSION=3 ruby-ng_rspec
+	else
+		ewarn "The userpriv feature must be enabled to run tests."
+		eerror "Testsuite will not be run."
+	fi
+}
diff --git a/dev-ruby/stringex/stringex-2.8.6.ebuild b/dev-ruby/stringex/stringex-2.8.6.ebuild
index ede1d1ce1b55..876f28a2bbd1 100644
--- a/dev-ruby/stringex/stringex-2.8.6.ebuild
+++ b/dev-ruby/stringex/stringex-2.8.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby30 ruby31 ruby32"
+USE_RUBY="ruby31 ruby32 ruby33"
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
 inherit ruby-fakegem