7 files changed, 53 insertions, 47 deletions
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
index f6ff5e3ed9a0..c872700c581d 100644
--- a/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
+++ b/dev-ruby/mini_portile2/mini_portile2-2.8.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://github.com/flavorjones/mini_portile"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
index ee9dd4511ac7..a70adea1c437 100644
--- a/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.13.4.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ~ppc64 ~riscv ~s390 sparc x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/omniauth/Manifest b/dev-ruby/omniauth/Manifest
index a105ed73fd6c..a7597c449f36 100644
--- a/dev-ruby/omniauth/Manifest
+++ b/dev-ruby/omniauth/Manifest
@@ -1 +1,2 @@
 DIST omniauth-2.0.4.tar.gz 30951 BLAKE2B 6086a737e043ae37e6c7c4b1e4d597a08e6dc490c5d71f7847e9c5a8880bbbd1117470efbbe12e150bf238bf6e5413493712f1c09ae5e37f5d7b7676b6da023e SHA512 c92ce881388c9793e96354caee764cbabb28c69ca63b32f304693c4859eb8bf994e86b2cc9dbeb57993347e6f2787c43eab967c36730d5c47a3c4767d16847eb
+DIST omniauth-2.1.0.tar.gz 31135 BLAKE2B b221c084b926e3ac9e31858268940d0bd8583c667c7bcb8ce14e7fbda91c06c286191ffeff36c17d1d668ee29ca850b377312f2f2a417c47cb1dd4e8a447a641 SHA512 f1dde6f527b6aafdbed83ce6e14dae39617b738c6e80e9ece3d768ef9f63a87924ef2ef92b99ecc52bd69c0103854f16ff9c80f3d2eeb7c134fc70ab0157df63
diff --git a/dev-ruby/omniauth/omniauth-2.1.0.ebuild b/dev-ruby/omniauth/omniauth-2.1.0.ebuild
new file mode 100644
index 000000000000..16d0da9a9ceb
--- /dev/null
+++ b/dev-ruby/omniauth/omniauth-2.1.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generalized Rack framework for multiple-provider authentication"
+HOMEPAGE="https://github.com/intridea/omniauth"
+SRC_URI="https://github.com/intridea/omniauth/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/rack-2.2.3
+	dev-ruby/rack-protection
+	>=dev-ruby/hashie-3.4.6:*"
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	test? ( dev-ruby/rack-test )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/d' \
+		Rakefile ${PN}.gemspec || die "sed failed"
+	sed -i -e '/RUBY_VERSION/,/^end/ s:^:#: ; /freeze/ s:^:#:' spec/helper.rb || die "sed failed"
+	# maruku fails, resorting to default markdown implementation
+	sed -i -e '/maruku/d' .yardopts || die "sed failed"
+
+	sed -i -e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use doc ; then
+		yard || die "yard failed"
+	fi
+}
diff --git a/dev-ruby/rack-attack/Manifest b/dev-ruby/rack-attack/Manifest
index efa4bc7bc44d..7869e9c43216 100644
--- a/dev-ruby/rack-attack/Manifest
+++ b/dev-ruby/rack-attack/Manifest
@@ -1,4 +1,3 @@
-DIST rack-attack-6.3.1.gem 25088 BLAKE2B 97a6f36ad3571508f68b33090644db8fb21f6eb43f8ae16b0107dd3e0e1b8b728b6eaa43959dfa8b9781672147673b750c215c9ed01366de90175ba063d5d2b5 SHA512 e6c3fbc5a09cc3d15d06b450baf911b84dd412de7b1a9d0f67661da2106d1474ea2f7c2ec6a7cf5bbd9756642be519e618134c5c7888c41f44270afc4f8aff4a
-DIST rack-attack-6.4.0.gem 25088 BLAKE2B 97f54f8d411d279731bf85ea5c43b875bdfe8f9eb32991b5c10b65cc6fd747b6b518b47da29bfccff9a037c9295f2c09b7b0c721bd24d42eaf0bda1012fc56b1 SHA512 f7d86521b65ecc92544c0f0d0af01e1de2e95d1087c732bd2e2c6aa944835bb5618bb35ca4bc60c42061627b5e8b5b030701238f42d61cd851d6b21ddb709e36
 DIST rack-attack-6.5.0.gem 25600 BLAKE2B a2b40e3779b51f10d43da7381cf3aa6b83bf3ffcff26cde0cad47838bb7d4f3a255d2e182f3f56118afc29d8a487c574a79f2ec1d331ff51a746c5730888465a SHA512 3a50518972bbd4f9f5a2f4f5cc48958bae1d0636923e0124b34792d6f8ed10d435c9bdff64a31c79639667a996386f573c45214b931a3310d6749316db7ca37e
 DIST rack-attack-6.6.0.gem 26624 BLAKE2B 0e24985666d5af4dc693137e41b6eb6b7f97d7e85eadfdf5ccf814007315567f52a9047795a419c8f717f77cd720e3bb2161152f019f5af1aaa318ebb64b8752 SHA512 286034be8770654c7ef9f1c632932968749b406e01ce4d93ff72d28359cafe7ec22906ed973409507bcf06b42ebe685437fee84be1f6e63212dbb706835bc860
+DIST rack-attack-6.6.1.gem 26624 BLAKE2B 3182da7b9fef4506fbbcf6fe8bcf175701b6999728c3b0ef2491cad426047540bc0e9a992db6f18f4f3947d2659e6db2e692a2a015e107c44106696086ffbb2d SHA512 65973550e1639527c4b00fb2743008b7ad9438faf5b70b490585966cf02f9733b215cff1826663ad6d770bac35dbe665cf901a5c4778de8e7f02e29ae1fb2772
diff --git a/dev-ruby/rack-attack/rack-attack-6.3.1.ebuild b/dev-ruby/rack-attack/rack-attack-6.3.1.ebuild
deleted file mode 100644
index 118c935da464..000000000000
--- a/dev-ruby/rack-attack/rack-attack-6.3.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-# Skip integration tests since they require additional unpackaged
-# dependencies and running daemons.
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="A DSL for blocking & throttling abusive clients"
-HOMEPAGE="https://github.com/kickstarter/rack-attack"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE="test"
-
-ruby_add_rdepend "dev-ruby/rack:*"
-ruby_add_bdepend "test? (
-	dev-ruby/actionpack
-	dev-ruby/activesupport
-	dev-ruby/railties
-	dev-ruby/rack-test
-	dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i -e '/\(bundler\|byebug\)/ s:^:#:' Rakefile spec/spec_helper.rb || die
-	sed -i -e '3igem "actionpack"' spec/spec_helper.rb || die
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-
-	# Avoid specs requiring a live redis service
-	sed -i -e '/should delete rack attack key/askip "requires redis service"' spec/rack_attack_spec.rb || die
-}
diff --git a/dev-ruby/rack-attack/rack-attack-6.4.0.ebuild b/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
index e716cede7381..0c3241cf6d1a 100644
--- a/dev-ruby/rack-attack/rack-attack-6.4.0.ebuild
+++ b/dev-ruby/rack-attack/rack-attack-6.6.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
 
 # Skip integration tests since they require additional unpackaged
 # dependencies and running daemons.