13 files changed, 21 insertions, 67 deletions
diff --git a/dev-ruby/activesupport/activesupport-5.2.8.ebuild b/dev-ruby/activesupport/activesupport-5.2.8.ebuild
index a3e5ad214065..b1f727bcc049 100644
--- a/dev-ruby/activesupport/activesupport-5.2.8.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.8.ebuild
@@ -23,7 +23,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-6.0.5.ebuild b/dev-ruby/activesupport/activesupport-6.0.5.ebuild
index 8a635120c3c3..7d506409e031 100644
--- a/dev-ruby/activesupport/activesupport-6.0.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.17.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.16-r1.ebuild
index 8adc7e6003fe..d25a4aed22ca 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.17.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.16-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test features"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.16.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.17-r1.ebuild
index fb9781c3c2ae..d25a4aed22ca 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.16.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.17-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 2021 Liguros Authors
+# Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test features"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
deleted file mode 100644
index 420d4b66e12f..000000000000
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="fast_xs text escaping library ruby bindings"
-HOMEPAGE="https://github.com/brianmario/fast_xs"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-RUBY_PATCHES=( "${P}+ruby-1.9.patch" )
-
-each_ruby_configure() {
-	${RUBY} -Cext/fast_xs extconf.rb || die "extconf.rb failed"
-	${RUBY} -Cext/fast_xs_extra extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/fast_xs CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/fast_xs/fast_xs$(get_modname) lib/ || die
-	emake -Cext/fast_xs_extra CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/fast_xs_extra/fast_xs_extra$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	# the Rakefile tries to run all the tests in a single process, but
-	# this breaks the monkey-patchers, we're forced to run them one by
-	# one.
-	for tu in test/test_*.rb; do
-		${RUBY} -Ilib $tu || die "test $tu failed"
-	done
-}
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r4.ebuild
index 6bf1b4f1d438..a64b9a54e4e2 100644
--- a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2021 Liguros Authors
+# Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
index 26c67f6e0ac9..0e6336f88634 100644
--- a/dev-ruby/hpricot/hpricot-0.8.6-r5.ebuild
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
@@ -43,7 +43,7 @@ all_ruby_prepare() {
 
 each_ruby_prepare() {
 	pushd .. &>/dev/null
-	epatch "${FILESDIR}"/${P}-fast_xs.patch
+	eapply "${FILESDIR}"/${P}-fast_xs.patch
 	popd .. &>/dev/null
 }
 
diff --git a/dev-ruby/mustache/mustache-1.0.5.ebuild b/dev-ruby/mustache/mustache-1.0.5-r1.ebuild
index fdc88f5f28b0..e498f7d57fa0 100644
--- a/dev-ruby/mustache/mustache-1.0.5.ebuild
+++ b/dev-ruby/mustache/mustache-1.0.5-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/mustache/mustache-1.1.1.ebuild b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
index f68315eac62c..50160ce7baf3 100644
--- a/dev-ruby/mustache/mustache-1.1.1.ebuild
+++ b/dev-ruby/mustache/mustache-1.1.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
 
-USE_RUBY="ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST=""
 
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.1.9-r1.ebuild
index 497220ae0b14..41aaf292d707 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.2.0.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.1.9-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/rake-compiler/rake-compiler-1.1.9.ebuild b/dev-ruby/rake-compiler/rake-compiler-1.2.0-r1.ebuild
index 497220ae0b14..41aaf292d707 100644
--- a/dev-ruby/rake-compiler/rake-compiler-1.1.9.ebuild
+++ b/dev-ruby/rake-compiler/rake-compiler-1.2.0-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=7
-USE_RUBY="ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.1-r1.ebuild
index c68ca9541b62..2692a5f58a01 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.1.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2021 Liguros Authors
+# Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test:unit"
 
diff --git a/dev-ruby/rdiscount/rdiscount-2.2.0.2.ebuild b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r1.ebuild
index 847c764c554b..ce7741bd1f41 100644
--- a/dev-ruby/rdiscount/rdiscount-2.2.0.2.ebuild
+++ b/dev-ruby/rdiscount/rdiscount-2.2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2021 Liguros Authors
+# Copyright 2021-2022 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_TASK_TEST="test:unit"