gentoo resync : 08.10.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
committer: V3n3RiX <venerix@koprulu.sector> 2021-10-08 23:06:07 +0100
commit: e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree: 4c5f7db60483518201fef36f8cc0712789a08db2 /dev-ruby
parent: 391b5b359a346aff490103da7dddc85047f83830 (diff)
115 files changed, 551 insertions, 1564 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 48c11233fe34..e79e1d231b27 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 9c79742a6edf..1117d56427df 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,7 +1,7 @@
 DIST rails-5.2.6.tgz 8841270 BLAKE2B 8e813f376446ef249aa3b48934d3cb5ae125c09c54353cc93557c3bee4f23e47ae7ceffab75d5cbfb691daed85149d9054337b468a0010bc5c7ebb879502396b SHA512 465e017591a9962a2e0dec2eac9669d5f507d0904e9eec50fbc8848d804ba5f1eb3220fd5acc949845f048f59cfc5e43f099707650edf301d6595e70e33888c7
 DIST rails-6.0.4.1.tgz 18595307 BLAKE2B 9a950a45cd04c5fe0cbe57fd014a6997074dcbe8f95fcbb2f5d3b6372867ef8bb0931b909ca8eba623787419f5f45504cdcd477729ba3b3a052f5003229121cd SHA512 322cfa6d0ed62f0660ce2f43003b2a745297f3b82dca486d7e4a9821441ad4ec92c202556515645d141fba31c998e17aa00bbe3d8c2106718e6839f94e88c975
 DIST rails-6.1.4.1.tgz 11003728 BLAKE2B 8baa45968536ebe34f3bc4e4f25246bff68997a88c1019d1f7b7ba73785bc11901d7222ac04866b900c7dc35f9291ede78c0949abd979e797d07f3759179c05a SHA512 411d3fe21c7500e884edb86cc6728c4d3b7125d2e6ea913191437716f2be0d522252c55c25cb4c5221cc112b3ca5eeba690b0b0e59572fcc54ea42ba05ec4520
-EBUILD activesupport-5.2.6.ebuild 2543 BLAKE2B e3c4f0707894c506272988e3300356e465ee8b215b8fa07e2433b8495e109bdbaf4727a165389db27dfeeec0748b5a47d76833f7c213a79847af210f11a591ea SHA512 e441d84273ca22516cedd638d2ffa20dcc7c8a03ba2134a4922a233bf810fad1a698120191e9f8e3a625ef48efd731165aaf2f27712dcc0009ba4b62c0134c56
-EBUILD activesupport-6.0.4.1.ebuild 2578 BLAKE2B c70698d330c9f8b33306e56f62d8260b311d4c3eafcc0ad949eeb39772539af73396a3739b337d8ec8a3c465b97005e8b4335e501743ef24249861e41239c0df SHA512 d9a5812de86632af5163f25930b6fe3635bc5ce702f43af0daed99d3d35244068f9db2c5a70665d9ceab79024377cec137cbd3331a5ab12ff870aa24b9cd345e
+EBUILD activesupport-5.2.6.ebuild 2542 BLAKE2B e35b58d232635db20c433dcf8237da6f990462f6c974f2d7a43a3b83bab0a60369d41e4827f54a03014411959952e27d41b333d7b3e1c9fcd0bc7e2d83a1035c SHA512 a242ec95b4068ed86bd5085c982a2c017f4e8cda427b5fd9b9af715db5d7ac57192f6ef117f8b2d850bea3a2bb8c2befea2dbd5a65916090f8fbeb1e9804802c
+EBUILD activesupport-6.0.4.1.ebuild 2577 BLAKE2B c911f5ec8f7d00f4f40f67c5fe2dc84804d8b260d771e0511ffe325c9452d3a53497458b6cea8d02706f52080512c59e76dfb3620a331634b824f04b796ff81c SHA512 cb3ca951abce0c852ce23e324494d684f6b30146062c8a9a87ce67e2e5856b233d32514dafadd01a3087a6c21527ef32d64f3b259c584ca70555e0fa0c0c0fd0
 EBUILD activesupport-6.1.4.1.ebuild 2666 BLAKE2B 13b8f0caef01917d3e59f785113557cd529357af0c6a3b967a2965f7902f096f3f54fa9be85f8fecc002f4b9ce802db7a7b1d2ebc5f9381f94fc447882bb06c2 SHA512 4588eb794577ddf831c2875c3acd27deb10972276ed8bc84fabcb57e1ce9b4617ec592cf02e199227c338396d44b565c4264b002bb15b281174b91ed184ef01e
 MISC metadata.xml 338 BLAKE2B f32f1ecbd729e4e6162f22cdb9bfe1fbb1284c8b7f021d8207a1a54d2543b0e9866e775d550360dd01ef4f4eb92e96064a8416476c7047853034ea05479eb6e7 SHA512 24fd0d8ea6e3cd5514e5049b7e064b7e3e667ea14978cc7cf620e9c1b020bdc7caf7dbec97ccbf92c2f4c657fff3e9151d6f2af103b3d9c3cc5181cb3a81a295
diff --git a/dev-ruby/activesupport/activesupport-5.2.6.ebuild b/dev-ruby/activesupport/activesupport-5.2.6.ebuild
index 81b2ebd9b8aa..02dd47811dcb 100644
--- a/dev-ruby/activesupport/activesupport-5.2.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.6.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.4.1.ebuild b/dev-ruby/activesupport/activesupport-6.0.4.1.ebuild
index 86312cd1cab5..aa8ba7a98a98 100644
--- a/dev-ruby/activesupport/activesupport-6.0.4.1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.0.4.1.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/Manifest b/dev-ruby/asciidoctor/Manifest
index 6da35fb6d704..3903724c5ac3 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,7 +1,5 @@
-DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
 DIST asciidoctor-2.0.15.tar.gz 1633310 BLAKE2B 58029acdf3832459dde5df2835749bb781ccbaa547fa4a09dc10a69fbef36ed690fac7cd0e2b3da1a5de847be678d0ad410c17c6768e466fffc7ad30b5d9d4bf SHA512 4cd0ce922d5db5bc5b31ebc75707c2e9e2a94a2a28eeb68ed25f55c46c416c950d28b880c4b1ab52bbcdda9ee4ee7b1c297049754d214983b68eedf2d96492d8
 DIST asciidoctor-2.0.16.tar.gz 1651396 BLAKE2B 6da2971c38e48497b482ca1bc22916a10c3505d7bd4fa802ffd4939a0c0986d650a30b5870fea7979046c4b61c6e97aec08d9ba345ce350de6721d545c2923b5 SHA512 95003640632cc99f1edd2447156135267ad78f24983418817f19256fab6e313b8faab9f676317e7cc610728abb8b047f2d2f481f4700009a2d6bdd3b9efcc463
-EBUILD asciidoctor-2.0.10.ebuild 980 BLAKE2B 56233da21d65a106c8263c61cb52818e87295130a70b9701ba9b0a112d45f15b900d130d8f1bd4c24eb8188f77027bde8746c2188ea74ecac0bf48fc1b3f596c SHA512 5b51f04648b599bd65777c3910e0eaca39ce805c6aaa5fad7295e709b7c1d5479c9f1fbb1f72d3aa89c63f4b361670df335836eb5113acff0d9d09cd2464e057
-EBUILD asciidoctor-2.0.15.ebuild 955 BLAKE2B 7430d8510ad1fff250fa57c98df1898522fdb4e4288cb0ddbbb7e43d0ebef3aed289f186e1b474913a9a7f4808bbfa885a08ab83a3edea8a25a640190c292de0 SHA512 b32f04ea18132837fa334209c0b8286cd14d63a241607b44a0aeddf98ef03ad74d9a68d17e06d076c7e41d3befdcbd13b2b6ca055339b83809b86d0c4bddcf31
+EBUILD asciidoctor-2.0.15.ebuild 949 BLAKE2B ac2794c4d86135f0223390bdc83f2306cb6e71fef6fb68595e866a841c10c89d46f1165e057c6de0bafaa6d70c5eff00caf01f3f4a7da49ed2040fc3ae3ec65b SHA512 9b3cfc83bd88c76beec152ac0ce5fcfca12d37df915b0015da220b4f2c73dbd16aa447abbc9d0b37f5e53742db2aff9d59e77a7ab54a9282b508125e76d69d76
 EBUILD asciidoctor-2.0.16.ebuild 1085 BLAKE2B 7fc86dee5f2cec007c6fa3b4a10626362d60d0dc07f6aabc83fef3911eb48f079c0f3a7d1dbb7e845543575f7a77ea5a6d0216d63a4d0fe6637a9a11e12eb5fb SHA512 f9c22d157e224c4aadf801b2758a7a510676d3f69a43f14a7c337f318347468e54551adca62d457f49e641a9f29a0da02e5e7d462de35acf0e47e247c8309d54
 MISC metadata.xml 350 BLAKE2B c70c7bdd08d3c12de9192349bb765e3f0a03e5124128b77d4e4cbd266ddc84d72aa4502751bbaaef2562c4d8b78a4ecc28bdf656ecb56c74168999c92dd294b1 SHA512 beaf7f42c6804df34ce8d1ec28e08bdb5dff9ed9ed023247a464e7531ab8fcc41563133cc2bdb6385d5527a78f5e4a6f11063b72c567a015b8517ea09cf5ca17
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
deleted file mode 100644
index e1f715e6bbe4..000000000000
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-util/cucumber
-	dev-ruby/rspec-expectations:*
-	dev-ruby/asciimath
-	dev-ruby/coderay
-	dev-ruby/concurrent-ruby
-	dev-ruby/erubis
-	dev-ruby/haml
-	dev-ruby/nokogiri
-	dev-ruby/rouge
-	dev-ruby/slim
-	dev-ruby/tilt )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/asciidoctor.1
-}
diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
index b19e986d2fc8..76217435521e 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.15.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 ruby_add_bdepend "test? (
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index ebb2e61de7c2..6af707408a23 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,5 +1,3 @@
-DIST bundler-audit-0.7.0.1.gem 162816 BLAKE2B 2e068531d8edf542ce7bd1d362ac36290c90e87d12a5e861ce269575e7a10f9e8399c256be5f0f9dba145f1c3bdd6e0dfdb78826d4c45f79ae8a280631450564 SHA512 49d0262a03db03eeab95730550c9554453849bb58fcb1d883c85ca021a181b44e7983f21f83d0b14f857d57ea08bfa13b470cd93bcb3695cac31f366a78d8c1a
 DIST bundler-audit-0.8.0.gem 44032 BLAKE2B 1d6de8bbca13e1e3b881ccbb4029d000c89f7b7c8f342877baa2a0ea3cf9bf87db93e22c9e622d64a4522afeb6258151293b0196b6ae8a5bbe192785e72956c6 SHA512 6a61fd191f31c153df71320e88ea84e6d93ad4d6ccacfc3f356c9486bf8adb8487aa7c5b3357cfbac0f36b8bb4b65c09845cedc0c8d86814910ea60aac7e92d5
-EBUILD bundler-audit-0.7.0.1.ebuild 1256 BLAKE2B a2674e230dcc68c8e20a7650afbb44850465156c6d06a28c06252055f6fd35151f0e35f74daa9431bf313cb4879ae216074f7547151cea599c00bb938af5d6d1 SHA512 ae4c92ef869da0a6dded698bb598c9a5cc04925a5c9a9a732b2d5d05cbbe156a3000d7cb9a735989e4c442925174725b125e1bd12e244a3625cd19ae2cb825a7
 EBUILD bundler-audit-0.8.0.ebuild 1215 BLAKE2B a3f9027d3a676c5b9a90a0ca94facb83ca9de09316b4e768637fc2b7c30e0d941d2d8370721dc8843cf00fd790a3a1ac9222f45b8c5d8ad7e7264c8c7f530221 SHA512 879a8685169f7aca3ed1ab1d6d72039732f5f2ae2762b661e3d4a1aeb49ab749df108fbb6013e958d022b3ad0ca3e1405d8fa831eb46f80ea49076d22621e26f
 MISC metadata.xml 338 BLAKE2B ace789d7488589dc1b89c611be2203930260f5062fb29b72c06feef97f3bce137450c2c3196653fcb5dc6d0e52ff0ab21e8d0989324d5a79be181fd1d8e6ad82 SHA512 0b42bf0312a05f3b85da7d9e02d47432ade81bf81047c760679df050d23e6b41f5a4424372d2298a054e62f3cb4f1712712411b99c351b16112d607ff1803740
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
deleted file mode 100644
index 71a834176e6f..000000000000
--- a/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides patch-level verification for Bundled apps"
-HOMEPAGE="https://github.com/rubysec/bundler-audit"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-#tests are trying to download AND have some odd failures
-#rspec ./spec/database_spec.rb:113 # Bundler::Audit::Database#size should eq 323
-#rspec ./spec/database_spec.rb:117 # Bundler::Audit::Database#advisories should return a list of all advisories.
-RESTRICT=test
-
-ruby_add_rdepend "
-	>=dev-ruby/thor-0.18:0
-	dev-ruby/bundler:2
-"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid specs that require network access via 'bundle install'
-	rm spec/{integration,scanner}_spec.rb || die
-
-	# Avoid specs that only work when the source is a git repository
-	sed -i -e '/describe "path"/,/^  end/ s:^:#:' \
-		-e '/describe "update!"/,/^  end/ s:^:#:' \
-		spec/database_spec.rb || die
-}
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index cc37dfae2edf..4eb635cd14e8 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -3,5 +3,5 @@ DIST bunny-2.17.0.gem 207872 BLAKE2B 4942c132ed2c979f878671492be9d6a0e3995286435
 DIST bunny-2.19.0.tar.gz 208864 BLAKE2B 81d17b98e7fd944aa0ffedc02015c7696f0553888d2c11ccb05cda977b09ca7f79746a1b1a651ca0fbd17fcbf2b56fa297919ea3d03ee77491481ebdaa27baba SHA512 39e9b785853275d469c5af0977ea8a5d0e2e13c5ca0f51dfe39552da728345b9852c637e81ad468f92f089d10fdc701abd8105d0eb336b55a071d3329018b111
 EBUILD bunny-2.16.1.ebuild 570 BLAKE2B 7abb8ad5c2ca5b476399526a60fcaaa77c7d91bd61756634175758ac1a5dcbbc33a88fe7e09ef438b66ffe2623b43c0455d15bfdc9bc2f03c2d270affaa470a1 SHA512 b3d271442ef7be907185d24db47ebe9b4bd575931710d31d1b54a2406f310d1101d6e01fcee82d191449c0591c06648fa2c342416eb3bf53b45ee125d0fb21c7
 EBUILD bunny-2.17.0.ebuild 570 BLAKE2B 7abb8ad5c2ca5b476399526a60fcaaa77c7d91bd61756634175758ac1a5dcbbc33a88fe7e09ef438b66ffe2623b43c0455d15bfdc9bc2f03c2d270affaa470a1 SHA512 b3d271442ef7be907185d24db47ebe9b4bd575931710d31d1b54a2406f310d1101d6e01fcee82d191449c0591c06648fa2c342416eb3bf53b45ee125d0fb21c7
-EBUILD bunny-2.19.0.ebuild 813 BLAKE2B b06816a7822481bb7a43a38b9bbe0c1933141d84c519a2096ea03b60350edc541b24f39904b528488215f71970c8c1b65648d092a4ef99418d3203fce3c80d99 SHA512 7417ec15c8febbefa98ac4146a7f6467ed056e8ff0b493c47d1cde9bceee809b8f298fe473989b3a48e975b6630f703bd01398ed1fd318a01d361aef3c524863
+EBUILD bunny-2.19.0.ebuild 818 BLAKE2B 3177c01e9f6d81b6028fd951a87767b694ce6b51ccc53a6495e3436793e5472c61dab5f76d750ac2f1ba4b774d83e7487ebfa78902cf69dcf8dead1c48af4303 SHA512 356b3bd8ca030d8fa6f8a37dfcef8da1f640587ab54f3b422c418210b1f9402d355087ea1f37a621ce6b2d050aca9a2a3e02b07c08f572d1040a7f31ef789196
 MISC metadata.xml 340 BLAKE2B c28068e983d8197e5df95ae32b7ec166093a0f5ed60f02cf8364e036316146128e36fbdce0a904534d6b9e6503270c62abe434b144c6217dc0a97b61f5acabf9 SHA512 b5d9cbda2124b4adde8f27fbcfd7f617b02ed528822734f62c1399a3141c127ba51d862a70bb72bb760fda1142db5517a60d91845baea99b658ecdde0987825a
diff --git a/dev-ruby/bunny/bunny-2.19.0.ebuild b/dev-ruby/bunny/bunny-2.19.0.ebuild
index cb5b6370f0b9..fb2f1ea4fe3c 100644
--- a/dev-ruby/bunny/bunny-2.19.0.ebuild
+++ b/dev-ruby/bunny/bunny-2.19.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/ruby-amqp/bunny/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/childlabor/Manifest b/dev-ruby/childlabor/Manifest
index a094ddb8058b..c4fe2fcd0fb8 100644
--- a/dev-ruby/childlabor/Manifest
+++ b/dev-ruby/childlabor/Manifest
@@ -1,3 +1,3 @@
 DIST childlabor-0.0.3.tar.gz 3120 BLAKE2B 555310e2b6b70292b580451b3627973a2cfc33ae0a8ceb5507fcc92ee70f388802644b1586c18736b34339418a9aaa6450f07e5353f3925a7238f02d397a640a SHA512 d18f3f90204b12e3b4a21be1439fcf44a4eb9f905402633966e6ab2a3cc9412a28c502a8c78487834a82e1de24f0f905691f33f443de930f670c70b17288fb6e
-EBUILD childlabor-0.0.3-r1.ebuild 995 BLAKE2B 9a9278ccaa0cb1fc502b995dda593ad215c59346241372991da501622cb91efe11bc255897f3954880ea5224a1cba83f7b301e58689e57c6ac90e35752bb0bfe SHA512 73ac4d4e51e39e9359cb2013e42d0282689c98f1207f503d5014d1c6da9e20dfeddf3589bd7ddd6ebf41869b230d76278b9cfa1a5e9fce2b1d27b55b319cefbf
+EBUILD childlabor-0.0.3-r1.ebuild 994 BLAKE2B 482d03dccce006b96cb4b8ed8c92f8fe2b0271d4f8d1e25ce022437fa586636faa3c2ff7cc6b864c6506894ec6af5229554f913e762ed386f2fc83b4369ecccf SHA512 78bf7fec8f91cde98f54b5c9a3b5160c19474177ddc285d111e5bb4e6c4318b9ad6daa21686963acae0bafc69b4d025c705cd409da5dba8a1ebe668529e800fb
 MISC metadata.xml 348 BLAKE2B c762375aacc3e71a19cca6bc56921bc95af9118d414b9c4ea107ca14d0d03a48139aac70b3bffa97ef8a79bc304c77d19ec886cc6afceaf507978045df5580ed SHA512 7fc536d6c210376169edeb9141883a08a163193c2551f7a6f55d9b896ca455fd4933cc8bb2c311ad6eaf448a56acb161f6dec9d8f6f426d23620ad3d38f0e392
diff --git a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
index d4af922e7cd6..f1c57a296957 100644
--- a/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
+++ b/dev-ruby/childlabor/childlabor-0.0.3-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/carllerche/childlabor/archive/${COMMIT_ID}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="test"
 
 RUBY_S="${PN}-${COMMIT_ID}"
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 8b90fcaee832..f6c751e55011 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,3 +1,3 @@
 DIST dalli-2.7.11.tar.gz 52341 BLAKE2B 5b3a2bc57f4b0e3a9ac0d24ffa3bba89ea38665ac08ef3d7760fa6ce74db21d323a18e74a4f3009165364332731d7c6890df36c68409afbe21d3ac096275f028 SHA512 8f299a19d95293370564b6337bbdfeb32d928e0a95bf5f5df962ea20b039f4765da1797513ca96cabf93309484575481a02fb1e0c6d227f74c81fc72f95be22a
-EBUILD dalli-2.7.11.ebuild 1581 BLAKE2B ed47d70cab3b75c4b2d1955c2f62211d057d384144f45b56dd0441ae812a697e35e5f74c9ccc041244563f1b9d8062a2c9ed25f68694c186c5626d671532aaae SHA512 89775593fe15194d61c035de42260f7783375b0fe9ff63a6c6a65a2acae9e3b106818c5a497ea19846f6ae381d997fff893a73a37e5748bfa368559838fe6293
+EBUILD dalli-2.7.11.ebuild 1580 BLAKE2B 39f0f7be69f4e765a7b1d071254b50ddcfe40a2da74eaabbec89ec4b326ff8021423fb9b9689480105e73ffc4e9dd4f1d099bd61b1cb1675233607149c80cc21 SHA512 e18919458eb72a224bd69849eb991af5e973d799873af42d97404eb8b864eee3336fb63f71d6d2cd08456d310e26cc9ff5d9037ff4d292237b54a3e11571ad98
 MISC metadata.xml 347 BLAKE2B f1e7c89c18e4fb1a02714796274401469ee66687a98d56445ed894024667a9bb277d0d1c1f6cc4ddfd90c3d3b3cd2f826bad7dda8fc5f3d6111b8326865228bd SHA512 7645efc96c6c7d275946260d28055c704f3fb45674e864b60a4a60e7265c8c61e82105373a243ecad18101c850ec47ea3c9a5a2a0538b4f9c99232ba1fa36c6e
diff --git a/dev-ruby/dalli/dalli-2.7.11.ebuild b/dev-ruby/dalli/dalli-2.7.11.ebuild
index 81d772c6367d..a918291870bd 100644
--- a/dev-ruby/dalli/dalli-2.7.11.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.11.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.5.4 )"
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index dc0d7086e0c8..a37012d704c6 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,5 +1,7 @@
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 DIST facter-3.14.19.tar.gz 409345 BLAKE2B f977bb36ec8042ac950babd19ed398b8bd4fece854304a8a7a5f6b7608c3ad6ba4999b9038e401d599883da5bad63304b502fef164d1988d68a8477f1ff302a1 SHA512 65efc0237edc8198165e8229ca5d64e165a36e58718a863e14df9de9b64d4c9fb911d084e23daa982473f0703077b2cb0a5de8c544161591a894d537312c30f0
+DIST facter-3.14.20.tar.gz 410552 BLAKE2B 8ff8422e9066ab6fabe00e22dedb4c2970e126eb06e307df52ab2b4f989f18a8f6b405fff405702720b6d25503b663791f5d0ec94b07d32759387bebbdc302e6 SHA512 14073dbd628e0c211fc95b5dab2a65bd549429a933c9f745cfa62c6bec7a810f444626c165117efc05ad67b3aef2dae5398112911059826f1b5d2bee9b27eedd
 EBUILD facter-3.14.19.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
+EBUILD facter-3.14.20.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
 MISC metadata.xml 540 BLAKE2B 584d6db1a27bfa9383048929df3d6da07040cf507acc2aa58de7a4e9ba665079cac60b48b398bbb0510914acc03be1fd3468e5678e690f8d6fd03060e659dd4a SHA512 c1311ca348655bf9566889ec9edcd012a2d003f0b1122749caa9066cea2005d3fed7b7a0d1bca75281396e8e43cb6a2f611550572523dc011113424d642c2a2f
diff --git a/dev-ruby/facter/facter-3.14.20.ebuild b/dev-ruby/facter/facter-3.14.20.ebuild
new file mode 100644
index 000000000000..249ddd7569a6
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.20.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake_src_compile
+}
+
+src_test() {
+	cmake_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 7cc7d4a4e5f1..a413a31af271 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -1,11 +1,10 @@
-DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f3aa699279a07cac0ecdee533f54ee1ab36f7ee2a5cc43d0ebb386b8b3285102d98ffd18fa297e2e1b882283 SHA512 86a6a95aa5d4f005eb457fbe26b38e7b8618899db3de3459f3a01128aa7c488a47e50d13aef05ae83519178c80f2f7ed0a0280147d7e30aace13bbab82871f30
+AUX ffi-1.14.2-32bit-long-double.patch 701 BLAKE2B d8a3f2a00f8b93f42953bf5317cf6ae45ed662c81b993f83b728125d6fae15c6f75d11e0f76b0f46912b1c52c849764d3393a09c3ac1e35f3557e97bd3662364 SHA512 9cfe4e1c80e08c672eee30fe3b170d667e72cc2e047f4edd1e9573bfe6d4dca315a84baa54855756631f90c04fee59a417f286df95662f6abcfd3728c1b1a4d7
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
 DIST ffi-git-1.15.3.tgz 167804 BLAKE2B a0d040cd87a0606ebf618bb1e5bf5189e03fa30d2a3681c8dcf2b075b8cba40fbc5d130d78bae0f31d1c20319299f106653576cdb89f355090df5de0c10d916b SHA512 25cf025aa51c5389c99f47043443d33859ce91e50d057dbd49b376b81b2d81c0d158785e9d7d8efba53b9ff450e49d43b475ad2c870822635d8350592f3bb3ce
 DIST ffi-git-1.15.4.tgz 167917 BLAKE2B 0694bc5baed1a902a444d75ca534f38c61e56db17e542311f78edad07cc40566aaced5849766b2cce2fdbb531a7ae5ccc3d2506d5871f15c382bbdb3a8302af3 SHA512 3278dd217669b5467e3e0b92b5879fea745c955be52de4096ee490efbfac4ad887018c07ecb5dcd8b0fefd8a02144740c2aba74a1e545d798e73f64f69c7cd79
-EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
-EBUILD ffi-1.14.2.ebuild 1570 BLAKE2B 6d3ca83aa059fdb6d0ff44fa4f1c42da59ed88d7d25881930419600697618676dd63f6596f08a5f1df163ab466081c6ee13d4f9632631aa1e83253e286352ca3 SHA512 27b77a053e0f45cdb7bc523a5fb2a8c2e68743e0ea962b06e9196dfd780f2ccf88cd0de3e2b374a34afb99fdc845e0eb9d4d219b486ed0b2249de949a7bac25e
-EBUILD ffi-1.15.1.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
-EBUILD ffi-1.15.3.ebuild 1672 BLAKE2B a3850132e42565dcf3924a963b93b82f85b6e5f3823804b46ea5515472dbd570cbca4c32c7ee7b876308803af1574f23ed3cfbd3bb4c7338e2bb39eaeb23bcab SHA512 9c2e6a4a257f6835ebd73028437b0dc0bc70549d1fff73404d0d3de65ecb2169478cb9df47c44f08f168e7109aa10a84fe474ff443c42dba5f972002a3f254c3
-EBUILD ffi-1.15.4.ebuild 1665 BLAKE2B aae4bfe7dff7f3c27c246f274b221401bb5e647bf9b46f8f24e6707cfa0bbf0d799527c3e93869976e15e43bbdb3ca6b877a8deb87f2341d0a8fc7b7618432b5 SHA512 cd4ed5ae4f05867a4e806e466312198323360edf40cdd7d5b2f39455d7e1cf54a7b728774d57fe077fc6e8786742012c3fb7e0fd10cbf073b8e871bc08614b8e
+EBUILD ffi-1.14.2-r1.ebuild 1635 BLAKE2B ef999eedbb4c80ef9d64e04c21f7b8abdf390bf1189fd4c24683934930323fd71cefd70d734c76e8b908473d5167463a3da73b1bfbb2d15ddbbca6f4214b30c5 SHA512 fb9af61383048819156d2a2919c487a41bc30e67a4bf6602cd6e9c9383e63ae001f8c26c3b4562bf011234c4d16b187d418ff667ac17126ac9f265dcafdfb84e
+EBUILD ffi-1.15.1-r1.ebuild 1731 BLAKE2B 45b4105438974b881c87a8b3816511bf36a3628ddbe2c51de674035e79060fe93f8ff10dd1eb94eeb6489775e67f4b43d3f76e3cee7169e33e1dd7c340a422ad SHA512 c917cd89095105b05dc036f6a1331f596ad7fafc4dd38dc1d050925bfbda8c1e9bdfd3103e7efd86d8f4819a47f74f85227207a5e206f0de39acd73521682ea3
+EBUILD ffi-1.15.3-r1.ebuild 1738 BLAKE2B 23a9aab4109842cfbd7594da2da91b08de3f1bb77dd44d0832cc00dee1accdc7e752da1627a3a325bb8ea6d7d0db6a0b4a56cbc9de9e3f8e91e09b40a6631db6 SHA512 6377fadfa25732fe421b52be1230c25940527acb79f91e00cd202d20a609ea35a85de299c0a10bb314ff037e9d42dc194f4ff574da7039f3cb70d035e986ef79
+EBUILD ffi-1.15.4-r1.ebuild 1731 BLAKE2B 8ef7962bf3415957c6c685d4d0c4e91853ac9086c677dddffab0165489f70af803f1d25c71ebaf5c91ce979035dc904a121636e4fae72fca7c0d3be759a0963a SHA512 d8250be6b4b7df40e28443dceee3654686a8866e52687dfda7b6779fc96c9dce8aa6285a8bbd536d841568df44eb42713702b1cecf257254803337a424768911
 MISC metadata.xml 334 BLAKE2B 02ad2c909797d4aaf2a23497611777a790000683866cfbd9d12c4b19cca6de902e219584c4edc85c46b4b0dc51c63e770506a077a4c1052b46f8df19a9588c15 SHA512 e72dc6ce177ad3881f5465f10cd44ca6740b7603ab4e55cfa9e6088be3c6615abeefaee4b717e76fab2850c64d66eee626115544e10709f64c4187f1987bcfe3
diff --git a/dev-ruby/ffi/ffi-1.11.3.ebuild b/dev-ruby/ffi/ffi-1.11.3.ebuild
deleted file mode 100644
index 1961e20d6fcf..000000000000
--- a/dev-ruby/ffi/ffi-1.11.3.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem toolchain-funcs
-
-DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
-HOMEPAGE="https://wiki.github.com/ffi/ffi"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-IUSE=""
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
-
-ruby_add_bdepend "dev-ruby/rake"
-
-all_ruby_prepare() {
-	sed -i -e '/tasks/ s:^:#:' \
-		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
-
-	# Fix Makefile for tests
-	sed -i -e '/CCACHE :=/ s:^:#:' \
-		-e 's/-O2//' \
-		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
-
-	# Remove bundled version of libffi.
-	rm -rf ext/ffi_c/libffi || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/ffi_c extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/ffi_c V=1
-	cp ext/ffi_c/ffi_c$(get_modname) lib/ || die
-
-	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
-}
-
-each_ruby_test() {
-	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc samples/*
-}
diff --git a/dev-ruby/ffi/ffi-1.14.2.ebuild b/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
index 38868b674422..10c95ec49b55 100644
--- a/dev-ruby/ffi/ffi-1.14.2.ebuild
+++ b/dev-ruby/ffi/ffi-1.14.2-r1.ebuild
@@ -24,13 +24,17 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${PN}-git-${PV}.
 IUSE=""
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/ffi-1.15.1.ebuild b/dev-ruby/ffi/ffi-1.15.1-r1.ebuild
index 244b9737ea49..76ba9f8c1a8d 100644
--- a/dev-ruby/ffi/ffi-1.15.1.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.1-r1.ebuild
@@ -26,11 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/ffi-1.15.3.ebuild b/dev-ruby/ffi/ffi-1.15.3-r1.ebuild
index 92b209d828be..67d86c924a08 100644
--- a/dev-ruby/ffi/ffi-1.15.3.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.3-r1.ebuild
@@ -26,11 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/ffi-1.15.4.ebuild b/dev-ruby/ffi/ffi-1.15.4-r1.ebuild
index d79112dff229..dc92b96f4e08 100644
--- a/dev-ruby/ffi/ffi-1.15.4.ebuild
+++ b/dev-ruby/ffi/ffi-1.15.4-r1.ebuild
@@ -26,11 +26,15 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
-RDEPEND+=" dev-libs/libffi:0="
-DEPEND+=" dev-libs/libffi"
+RDEPEND+=" dev-libs/libffi:="
+DEPEND+=" dev-libs/libffi:="
 
 ruby_add_bdepend "dev-ruby/rake"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.2-32bit-long-double.patch
+)
+
 all_ruby_prepare() {
 	sed -i -e '/tasks/ s:^:#:' \
 		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch b/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch
new file mode 100644
index 000000000000..7373a8c28cda
--- /dev/null
+++ b/dev-ruby/ffi/files/ffi-1.14.2-32bit-long-double.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/815130
+https://github.com/ffi/ffi/commit/315d66e7b0768856d589e15bf597f4816d5cd524
+
+From 0ef7a9d7d22c9a7779def3f8c7f0166d996a2401 Mon Sep 17 00:00:00 2001
+From: xtkoba <69125751+xtkoba@users.noreply.github.com>
+Date: Wed, 29 Sep 2021 19:24:44 +0900
+Subject: [PATCH] Keep `LONGDOUBLE_ADJ >= sizeof(long double)`
+
+--- a/ext/ffi_c/Call.c
++++ b/ext/ffi_c/Call.c
+@@ -71,7 +71,7 @@
+ #define FLOAT32_ADJ (4)
+ #define FLOAT64_ADJ (8)
+ #define ADDRESS_ADJ (sizeof(void *))
+-#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment)
++#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment > sizeof(long double) ? ffi_type_longdouble.alignment : sizeof(long double))
+ 
+ #endif /* USE_RAW */
+ 
diff --git a/dev-ruby/haml/Manifest b/dev-ruby/haml/Manifest
index 527dad2fc0e9..89f0c5ddb5a5 100644
--- a/dev-ruby/haml/Manifest
+++ b/dev-ruby/haml/Manifest
@@ -1,8 +1,5 @@
 DIST haml-5.1.2.tar.gz 126059 BLAKE2B 5d805f29c28d0f6355f7b79e5724ec1639a808cfae75c26633edddcc82d964a48dbc1654b780fb706529ca22abcaba953a1af6f483386c336035c079a719e585 SHA512 405976de297bfdbd6f010442d940205c404f057a54cd7162feb400b1831af3e4e60fd05a637a2f480204428512ca7dd66c02aca22b0006d6d515c06968eb08a3
-DIST haml-5.2.1.tar.gz 129795 BLAKE2B f561d8969fd4b49f1bbbf943c612a5cd3205a1b3a1ef544b4939dec5746d6e04b438f8bf69a320b95455fb15ab5a8d6c4c7ffef0aeec3d0698d46e6ef0d37e34 SHA512 b7a034604346b6e62f7cf13cce5582d53d81644bd4fc3b178b4c1e175fbea2160a562a6a2b539d810288ccfbca2d12099694a314d9df4286aac33ed1e0e22fa5
 DIST haml-5.2.2.tar.gz 129833 BLAKE2B d68c24c7a3c817d6d364b2ec92b84b4f56f4fffa48b99d17b2df27da35f50b1fb1f69b184a7b21d899c476e0d4c8ad2b940a7cb2995ec24ecdafab8ef61fe393 SHA512 1aec59fab20d8139a5dfedde2007fa8137a377a345e4d30229f9d1140d56cdf970c8ae70e2647e6a408d7fa543a16050f66a8a636efa6a6b1f91ee1ffcc136c1
-EBUILD haml-5.1.2-r1.ebuild 1680 BLAKE2B cb73b65a6f73e3e555a34b4f59800ef7338eb3ef0ac3e40b9b64b6252781b1f715b4bf9ceb2a12fdec6bdbcd5830b2f5efd3b72cc388d8333e1dab180d24e809 SHA512 06ca53ab7ed464657aed8c5b4c09d7357ac47e58f9f38c922d4addf257e3d7e16506244fab6328112f93e8004f675bdee49ea02abe97d894b937e251095e1f19
 EBUILD haml-5.1.2.ebuild 1659 BLAKE2B e9a2581d41907f0b6a587829ce8243e57c9f4582ad09f4e90eeaf02bcddf2704c9f96a0a384a14cefb9b4a1d93979df7a398cf7e69d1bd7e7b9bb42ed9b34aae SHA512 dba0fa00d2eb9b29acdcb2e707132b9a8f23a25e254cce611e04dad239eb8f8f885801cf52212880105f176fa96a0ac7e31337d3c59f2cf38a528855db241d38
-EBUILD haml-5.2.1.ebuild 1674 BLAKE2B b282fa4a7f509f560e41770f3fabc73c0203ee48f82a10ad6673565dc10ad2fb71d750f260e2a98b41fbe00d290059ecbd500fc8628e2bbe443b985223f14ed7 SHA512 24eb0d0616e6de073391615c1ea15261230c7f60da21cd2e8087ca1c90215a0fed91259063d1da09129a3a31020f174f09bb56b4271730327960dae629df1a87
-EBUILD haml-5.2.2.ebuild 1675 BLAKE2B a33ecf2b28be5ef1e5073d11de6cb336edf9ff8b86432cd2b01bc17b1d8ab783316efbfe4c138339ac6a3ac946f47058b188c9bb1e55e089cc2b7f170ee482bb SHA512 10872d599561b70f2ccefea97a8415eb4b51caa7704cf27e9e224345016cb9bbc3af62aecec1b026647f819eeb38c946072da216f9d1ae2fac963c4f8d526400
+EBUILD haml-5.2.2.ebuild 1669 BLAKE2B f9bab14614d5fa67e8e9cdc29aa7507fbb81e6e5de8ba5ac1b42771cc9ae8a2832fb8f19901c4bf868dcea8378a2ac074798ec7c79a764bb03cf536c0f10e6cd SHA512 6ac9525b3e78f94bea80ee7a2f5cad2067f0cbde043133df53f3d55f58bd8e9a055454dc4539c7ab4b53fd3b22480e834bbfd4ee89ae32ac8e33a655ce302be7
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/haml/haml-5.1.2-r1.ebuild b/dev-ruby/haml/haml-5.1.2-r1.ebuild
deleted file mode 100644
index b90ecb0360da..000000000000
--- a/dev-ruby/haml/haml-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/railties:6.0
-		dev-ruby/activemodel:6.0
-		dev-ruby/actionpack:6.0
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	sed -i -e '/bundler/I s:^:#:' \
-		-e 's/gem "minitest"/gem "minitest", "~>5.0"/'\
-		-e '1igem "actionpack", "~>6.0.0"'\
-		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
-		-e '1igem "railties", "~>6.0.0"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
-		test/filters_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-5.2.1.ebuild b/dev-ruby/haml/haml-5.2.1.ebuild
deleted file mode 100644
index 9c7af1f851bc..000000000000
--- a/dev-ruby/haml/haml-5.2.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true RUBYLIB=lib test"
-RUBY_FAKEGEM_TASK_DOC="-Ilib doc"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md REFERENCE.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A ruby web page templating engine"
-HOMEPAGE="https://haml.info/"
-SRC_URI="https://github.com/haml/haml/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-IUSE="doc test"
-
-RDEPEND="${RDEPEND} !!<dev-ruby/haml-4.0.7-r2"
-
-ruby_add_rdepend ">=dev-ruby/temple-0.8.0 dev-ruby/tilt:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/minitest:5
-		dev-ruby/nokogiri
-		dev-ruby/railties:6.0
-		dev-ruby/activemodel:6.0
-		dev-ruby/actionpack:6.0
-	)
-	doc? (
-		dev-ruby/yard
-		>=dev-ruby/maruku-0.7.2-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '/bundler/ s:^:#: ; /Bundler/,/end/ s:^:#:' Rakefile || die
-	sed -i -e '/bundler/I s:^:#:' \
-		-e '/simplecov/I s:^:#:' \
-		-e '1igem "actionpack", "~>6.0.0"'\
-		-e '1igem "activesupport", "~>6.0.0"; gem "activemodel", "~>6.0.0"'\
-		-e '1igem "railties", "~>6.0.0"'\
-		test/test_helper.rb || die
-	# Remove test that fails when RedCloth is available
-	sed -i -e "/should raise error when a Tilt filters dependencies are unavailable for extension/,/^  end/ s/^/#/"\
-		test/filters_test.rb || die
-}
diff --git a/dev-ruby/haml/haml-5.2.2.ebuild b/dev-ruby/haml/haml-5.2.2.ebuild
index 30d93b2b370b..5a429930f3d2 100644
--- a/dev-ruby/haml/haml-5.2.2.ebuild
+++ b/dev-ruby/haml/haml-5.2.2.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/haml/haml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="doc test"
 
diff --git a/dev-ruby/hashdiff/Manifest b/dev-ruby/hashdiff/Manifest
index 6fc6940884f7..1d62376a75e0 100644
--- a/dev-ruby/hashdiff/Manifest
+++ b/dev-ruby/hashdiff/Manifest
@@ -1,3 +1,3 @@
 DIST hashdiff-1.0.1.gem 20480 BLAKE2B 9f9723bd4e3547422b185df07d314699d0381ce6526be31c821f2d213f0721f077560567c830256a3bb2873b37a2616213113257e993fc364cd72a416b77cf10 SHA512 fa6e7ad88373038341473de25b7df5e146744efb8b5613fb4da41630498e68de585e2a8d66ba86d577ded574464948234f51e662a9caa6e695c3d6a2c3b85059
-EBUILD hashdiff-1.0.1.ebuild 640 BLAKE2B bd33961c3fd7ddd8f8f08d4407038d9a8c49d3bd60350325ec0ddb1a1cad54b9fe1beb1a5a378255e283cb33ea8bac1917cc9d34ca0cc770b98c33fcfd1c7dc5 SHA512 1c8176513b6aba6f7fd5657298760899e5c87ca9e5c9f7f867908911d174cafde1c8959c05357aa64bc7619541272dab0dda0d60785d433bb751936634cfff28
+EBUILD hashdiff-1.0.1.ebuild 639 BLAKE2B ec5c4328034b4cf1030ff990e329d05a12af3210a43f1f80a0be7c9f428b0a9657cef775559a2a2f3742fff7047b79920e37638a55ba10edc26b0d772c65f8c2 SHA512 955bb8c923710ae608282f3a9f28b4226d8db71807728c4fa6e4264a57eae2b4bb2469f8ac6637ea39be1b9c14546c82077bb3467d4b63e4a095a12df81b756e
 MISC metadata.xml 346 BLAKE2B 0ac82bc25e38d72b83c632f6324a83a715ed5d04092b535fe7dc5dc450a979d762d482908e763283c5fdc4b6c130a5168cc653610719b4c9789680d7841952bb SHA512 b58cf79baef304504df661970bf3bd8d4f00332332bd429f0b747792256ee9947c13012b0b50cf21d694556ece2b2ee9f6019f6af67baca84f1726045c118c77
diff --git a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
index 2b06f625e76b..34c24f509f35 100644
--- a/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
+++ b/dev-ruby/hashdiff/hashdiff-1.0.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/liufengyun/hashdiff"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 8b086f9ea99c..78737c007151 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -2,6 +2,6 @@ DIST hashie-2.1.2.gem 34816 BLAKE2B 7406fece6c731f62ab8b73095b6c61d4d79cc3811ba2
 DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
 DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
 EBUILD hashie-2.1.2-r1.ebuild 736 BLAKE2B d54f1f1d5cf059d17af6bbd20c229cb8cf28cc2cd2a62a4ee6e42200f76c16393e0b1f2927fec47c485a5e144211dd8ed9ee790c73dee30fa93ab865b79bb084 SHA512 650393587f133232d8bc304fd1783d19c8eb6f9baab5e5efb3b3619b957f69dab9b46c90d8c7622519a2b3ba3e06c4496c2074079dedad14a768a36789acc1fb
-EBUILD hashie-3.6.0.ebuild 1268 BLAKE2B 04e697da97b799f233c554d8ad87975c615117016a1b2a9c04a0fc0863cce12e7c4c2de50699c94ca722c354ebc400f70d5fad5591ce56b2ae3b842a5c6d2fc0 SHA512 b9e49a49083f9f38fda4dd89739fb26c0abf5a99bd8e17b077a970b5827bda62c071e4341bc19ed76d2f8dd9c57ea9c94727f98da09f95706829e679c85215c7
-EBUILD hashie-4.1.0-r1.ebuild 1423 BLAKE2B dc4f910fd0a74a62606a3be071b96ab0b24c9bf960f69c33b61be779f47dd5c8fc3b9d73758ebe6f670f280029e07b91a5cc54cfd7f242650bd5dcc1eb7a76b3 SHA512 1cbf44f2fe3560c74bcf83ea74432fc3a8d2175662ce008acaf66a810eb79ee3c9b6812c705d0c7e775357b52b5fc911fabe54003227a0417d1045205750f14c
+EBUILD hashie-3.6.0.ebuild 1266 BLAKE2B 5003bc6dff9dee766277c1399fffcc0b7beef0cf006fe2dcac444fdb0c21548f3287c37f92756ca9fb46a570ee9ea6747756088e3d4a8ea39c59c87ea3a7dcb2 SHA512 fa6d6a28b708aeb94c791a3925bb8f52d80f0fd8b31192a1a6a83bd2cddbbe4391f5126ecec9ca17517fa96cd213c132feb7c4bb554a1130b69fc0bbfe360253
+EBUILD hashie-4.1.0-r1.ebuild 1421 BLAKE2B 0bfd27fc464961d35ea4be3bd9359d02db368313f5f8db101c4dcf0d4facbf635107e9a5169dd093c6ce87a4c0558042ab85f9274b842361394a37bb8da9cede SHA512 1a5bedaaebc502d1cabedbff3f2f8f83900f0b726bd78ee4c173ca2a73d3173060fc3ab5c259e87f45e5ee92d971c54742f2f9cfd74ea6182b8f316a7450200f
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/hashie/hashie-3.6.0.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
index 3225a15fd058..1d6ac814ed5c 100644
--- a/dev-ruby/hashie/hashie-3.6.0.ebuild
+++ b/dev-ruby/hashie/hashie-3.6.0.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
index 2cd22ebcc43c..ecfb8d5798d0 100644
--- a/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
+++ b/dev-ruby/hashie/hashie-4.1.0-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/intridea/hashie/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/activesupport )"
diff --git a/dev-ruby/httparty/Manifest b/dev-ruby/httparty/Manifest
index b57919db62a1..751b821cf386 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,5 +1,7 @@
 DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
 DIST httparty-0.19.0.tar.gz 101070 BLAKE2B 921858ad7d2daf080f041b08b28b69c29b01bdbf4b399616d46fdd43570a1ec4799c61a9edbd04bcc6c6d60e59fd2a3d6a25a40808f7f294f316d644fb3c4998 SHA512 dcdb66b1940e709c58cd1dbc925a3be44db2d01e0a30992b924aa90554405f1608c3c32e8658b2754e20c822a465202e4ee382e37078e871acbbc37465971011
+DIST httparty-0.20.0.tar.gz 101975 BLAKE2B f15eb837a4bbc98de501e6dcca5a17bb0906e8ea6671c55a85d665659ab60bcee5e84d9dafad6b2450e22cedfaf5a86e10e077e52b1120ff9ae2613a1176a651 SHA512 f5770d5a64be2e80aa70334dad899fb723b08088a673a788ca1402285b77ae6b3cef21e3ed263d9618a32879711c9183f2dc82ff7b50bcf6439a8e6bb7a2eb4e
 EBUILD httparty-0.18.1.ebuild 1843 BLAKE2B aa21a61e27231d4b4326463aa0b996947e0d711b40a83b9de78b6920f60a0c4bf397e2f54b7ecf87f0ffbb2e9a021e4ee15eaff259bcd421aa2372870e156d0a SHA512 732404c9aa489e7cc6da4991141ce927ca8ca2f227eeaa1e0343d79051670e235a0309d1fdd15b4d290d68feb995e6576c4ff53ebca126f724ad37dfacace0a0
 EBUILD httparty-0.19.0.ebuild 1837 BLAKE2B 48db30ae160ae233f06f24531d3ab23e9ec9da40827367c85e8ddfcc5704e4f78da001d5edf7c71b0c6921b921d19c004120b7259d991a4d2a6eae06598c5ebe SHA512 cab1e493f603b0d9a113cfb398acd366cc36ba8322e5c9aeda1cb1dd104b0cadd26a86d3ba59d9d610ec9007e594532f46ea1f931faffe764b78c0b0bb73b532
+EBUILD httparty-0.20.0.ebuild 1837 BLAKE2B 48db30ae160ae233f06f24531d3ab23e9ec9da40827367c85e8ddfcc5704e4f78da001d5edf7c71b0c6921b921d19c004120b7259d991a4d2a6eae06598c5ebe SHA512 cab1e493f603b0d9a113cfb398acd366cc36ba8322e5c9aeda1cb1dd104b0cadd26a86d3ba59d9d610ec9007e594532f46ea1f931faffe764b78c0b0bb73b532
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/httparty/httparty-0.20.0.ebuild b/dev-ruby/httparty/httparty-0.20.0.ebuild
new file mode 100644
index 000000000000..6db437819a69
--- /dev/null
+++ b/dev-ruby/httparty/httparty-0.20.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="httparty.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Makes http fun! Also, makes consuming restful web services dead easy"
+HOMEPAGE="https://jnunemaker.github.com/httparty"
+SRC_URI="https://github.com/jnunemaker/httparty/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend 'dev-ruby/mime-types:3 >=dev-ruby/multi_xml-0.5.2'
+
+ruby_add_bdepend 'test? ( dev-ruby/webmock )'
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files \?-\?-\?/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Remove bundler
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Avoid test dependency on cucumber. We can't run the features since
+	# they depend on mongrel which is no longer packaged.
+	sed -i -e '/cucumber/I s:^:#:' Rakefile || die
+
+	# Avoid test dependency on simplecov
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/pry/ s:^:#:' \
+		-e '1i require "cgi"; require "delegate"' spec/spec_helper.rb || die
+
+	# Avoid test that works standalone but fails in the suite
+	#sed -i -e '/calls block given to perform with each redirect/,/^        end/ s:^:#:' spec/httparty/request_spec.rb
+
+	# Avoid test that is not fully compatible with newer multi_xml
+	sed -i -e '/should be able parse response type xml automatically/askip "multi_xml"' spec/httparty_spec.rb || die
+
+	# Avoid test that fails due to unicode normalization differences
+	sed -i -e '/handles international domains/askip "unicode differences"' spec/httparty_spec.rb || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc examples/*
+}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 0d076a9d8c2b..01c7f4a34f15 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -1,7 +1,5 @@
 DIST i18n-1.8.10.tar.gz 67943 BLAKE2B 58e8041f8cf652627a305e3d987ff2450913d3dc919ea7aae641cb484524d17312ebd3e0ee68cde1c01091e42713ea229ccb41ed3998c6bbf772d32f855ca107 SHA512 e8b10bf380241d1e6b19250cd63e727366215b4ad7e63479a02cb81a5b46a48e06db827d9df9969c2052895646ee30c237fd17c3352a2bbfed97615bb9b6cfca
-DIST i18n-1.8.5.tar.gz 67840 BLAKE2B 977bfd086c83f86a47413a5d332f09ee521fc269f4e333721ee8bf71334cff001975fe3a31fc84e600b34d0037050e00afd5f59db5a51b566d8648fec50de016 SHA512 0fd51cdc059c17b1581d187f39149bec1de4bcb06e6c9867f084fce26a8d6a6570b0058689cc30ff7ae14ea562b64ecdaf10ab3d4d2fbe246717583ca20100be
 DIST i18n-1.8.9.tar.gz 67899 BLAKE2B 56113d0879cb644a49ef79aea892e4452b65df0769a9532af44083852ed85c5afc8ac68cd6ae4f42d4b68a5aa548f7d92cf69371685c65e4cb5e3b3a0e29445a SHA512 0dfe43bcb341c63b10ace733246c2005f1261bbed23f8f38298b0712aab5047a3ddd61aa8f42c9e0cf3dee6564b67c04595234a6dfcf95db30d9a0d044483505
 EBUILD i18n-1.8.10.ebuild 1580 BLAKE2B d282f7c3fe160de710586e1bf454807e4c9c5c80b25ced3c31d41b863164e917a753b2a7cbcf02621126d749f9832e92fab00323792af7bd46b1c2b199999e2f SHA512 1f90a5e3587a6da2b16679f14608d1b39d62403bd2fd1bf819e6ba07fd6e47214b17805ae557f77884a9fec67a3a4c0e01a3f0e68330e05d9768be69a53cdfb3
-EBUILD i18n-1.8.5.ebuild 1554 BLAKE2B 01ea2c6fd2cec8c6e34a81e377138445eeff6fd3c658dea1f48f1fdc101fe5dc0c0064496753da5a918af47fb626eb8006f1d1120261303a65ce38ddbc34d00c SHA512 d0ca2c9fef218f5a97e065b66789fac5d8da8a8b4fb6e30e68b0c7dd30971e8dab3c03d6170b2af1756591ca1eaa3e454c79c9c1493f37d2066e43d7ff21f467
-EBUILD i18n-1.8.9.ebuild 1572 BLAKE2B 0495e43acd4b892882f955aa9f7393cdf5763d7deca7566ad7ea770372df8425ca8211f6c00aea2e29bcd3b58ca16c71b42e8c8c17ec6673e69085fe1f87df30 SHA512 a4bb852026ec4366eae9185c9db9a94589488e644d41c16e9e36493e755b5d8ef537ee84750584e6a3ef329f4b633b12f5fdd3aaad54968af3139bfae9a5decd
+EBUILD i18n-1.8.9.ebuild 1571 BLAKE2B a12efebaa78afc758b65b6bd82dd0a3a9909ae9f7f11bee834f5a22bb4691ce69f671b597a9abbfc439e785a89d966be38b6f4c901d3f98c5f89af8085f5b161 SHA512 a4ae786b0b6b2bda3585285f4209044a2a8584b9ee55279fb36cb5f108988f172c81de57bb066ddf8d497e7ef489b51cf6166cc190b427bd5a7856cd3a5da4f7
 MISC metadata.xml 341 BLAKE2B 88504d4f80239252fd3d4d82c5636bd4656f1063e337fbdf37baf23bd109abe7aa74090b07f90e27d9350c8eee2c342b4d1bdd38feb438ce2236c9c9b094d606 SHA512 86b7231bcadd93247b82ef706ad9ba12f77306d7c6f08065ed3f95bc46c2662a8e1535364fa25419612359d11cd84d26da818e2d9be5e931fa6203b6e63f2f73
diff --git a/dev-ruby/i18n/i18n-1.8.5.ebuild b/dev-ruby/i18n/i18n-1.8.5.ebuild
deleted file mode 100644
index 384f922459ba..000000000000
--- a/dev-ruby/i18n/i18n-1.8.5.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-5.1
-	dev-ruby/bundler
-	>=dev-ruby/mocha-1.7.0
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-
-	# Remove optional unpackaged oj gem
-	sed -i -e '/oj/ s:^:#:' gemfiles/* || die
-
-	# Update old test dependencies
-	sed -i -e '/rake/ s/~>/>=/' -e 's/1.7.0/1.7/' gemfiles/* || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			versions="6.0"
-			;;
-		*ruby26)
-			versions="5.2 6.0"
-			;;
-		*ruby25)
-			versions="5.2 6.0"
-			;;
-		*ruby24)
-			versions="5.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-1.8.9.ebuild b/dev-ruby/i18n/i18n-1.8.9.ebuild
index 3e97a23cc862..31067be5e225 100644
--- a/dev-ruby/i18n/i18n-1.8.9.ebuild
+++ b/dev-ruby/i18n/i18n-1.8.9.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index e91153a28b4e..450ab16ebecf 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -3,7 +3,7 @@ DIST listen-3.5.1.tar.gz 56236 BLAKE2B e74186532d5aa9fa7488d0734867d7ec7218036b1
 DIST listen-3.6.0.tar.gz 56134 BLAKE2B 6826426c5e46fa10145148d545ebdda278af080c4ddda8b055189a9aec91c26302c991ba69199d2616ae171ac85cb0ec6cef657980e6b984bc09513adabf3d16 SHA512 32b93ee98333657f8dfcaa8e5c9aa291d5413ddfadac3c3ff34edd2a2273e119922dee71825d6b06a6e86951deb96a676a8b9cdd98431fd21c55557a154702ee
 DIST listen-3.7.0.tar.gz 56192 BLAKE2B eb7d154dc0e608d43b6751db630f0b99e89fbfefd61e718aa99cc6a03c47e1a4aaaa55d42f1ae75351f4397c60902dcc78d8c9e8250899f075c351a7fd781069 SHA512 86942d60cc57a0a960ba813c3b90ca33c47513bb609c1861c792ce2b9b37371998859c0d6e1cd979d4a3427319d3a75454dfffa068ca1dec22d38497add1335c
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
-EBUILD listen-3.5.1.ebuild 1208 BLAKE2B efc9f7ccc344a4272fa0879b6de1652b88041fc2bea9f8b174dfe3bc3daa11fcf773792bb9c55df41f997cc516c4574efce310a592e8519fd0092e5b84c594f9 SHA512 1788a9eaef1d08d9a5c2f09e3e0285daf0f603feeefd6c04db54992d55a2a52e82cfb5d73e7a11380512b295be187ec70d1615a79b0a22884feeed599ab30e19
+EBUILD listen-3.5.1.ebuild 1207 BLAKE2B e223fe981c15ee7d82dfd8c478e56b76537548047b18b48c87acb9cba25d427c38d7e3abc2405fe2c83c738bcdd401f2533d0877e2e33dd557c50fea98f46ed4 SHA512 a9016edbb630fba96ef1b3011c39666feea2783cee7d0078bcfc6a973ed04c689ca5b6a886b7fc89185788a041267ab62e33073115d35590bb34003903679cfd
 EBUILD listen-3.6.0.ebuild 1202 BLAKE2B a1645e77dc86ed485abeada0b52e2876ec7b14ba8bbce9c6bdddfca2c22d65a9ed980f7fafe30fa4312da5c3f56de45e8a760eb5933b48d055dec96378308bf7 SHA512 c0ca51bfac9dcd1270a0f3ae2b6d722bec329675270821717d8283b353c2712ea614e1f988361426ea1b70f95c798a85bd00a716be1f3fcac2a1b3cb348fa4ac
 EBUILD listen-3.7.0.ebuild 1209 BLAKE2B 407281814bbcbd60f7688efe14c57fedc7d2d2b4cd11d03a5e06b7f4e818a81577382b883ec542e5a96f6dd713f4d37a772ed97aa3c6455e9ab03ebaef1a1da9 SHA512 e11ed90de9322059fba79c85c7f10de56a1d957de07bd1310aaac129178c65099701f5e09ad7aed25ca18d58e9ff6e1a9ad8abc7ea539e9b14841e981276e42a
 MISC metadata.xml 339 BLAKE2B 13641c725d126e51be4bc7ce83c26afd940fd2562cdca16b523a6d447fdb876b48bd8f948dc50edc30d0573d93fc6d12c1598bc201ddc8aa33d2279b33260fa9 SHA512 269d7d6f3d427c9a4497d1f4ce13ed601d0db8f807f2378510a0fc0dc0b0bdc065059b09b8cfa8beaaefef510925d0ac47750bb790b85c13b95c0923afcde9d6
diff --git a/dev-ruby/listen/listen-3.5.1.ebuild b/dev-ruby/listen/listen-3.5.1.ebuild
index 02939cccff71..36ff3d28e8e4 100644
--- a/dev-ruby/listen/listen-3.5.1.ebuild
+++ b/dev-ruby/listen/listen-3.5.1.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/locale/Manifest b/dev-ruby/locale/Manifest
index ff03b97b7ed9..5c84d924c4f5 100644
--- a/dev-ruby/locale/Manifest
+++ b/dev-ruby/locale/Manifest
@@ -1,3 +1,3 @@
 DIST locale-2.1.3-git.tgz 99648 BLAKE2B e395a442f674c73ed03d0d4d55d875c796add076132964ce2abb457d5d6e2ed8643395f283728735bbbf1ffee8b03549e882e5c66f6a589106a0a36f5b9e4ff1 SHA512 77877f15914dbee5ca83155f8cb84815296b4e2e4205218c9926e0265b40940cbdbe68fb048870ce4f53a6caeeb593813a2e16e8c130a19e44a28cb67c82fe25
-EBUILD locale-2.1.3.ebuild 1084 BLAKE2B 4efd40fdba78937fd40e5e4743dfda5caf1b5c20d814faf7426469e56dd92aa7cf0a37e206560b9ec4e6ff6931f72f87ef070ec0e3275b77fd2c6537c5b4996b SHA512 b4a56b1dd3ddc4dd883ce5619321bff63d12432a7d66285cd76bd23c6fbc682018e42e4c85d9215d87ee2ffd5603c702fb2eccbe36b82f45b01ec96b93e3cdad
+EBUILD locale-2.1.3.ebuild 1084 BLAKE2B 79866e45609ce52edb104983d98671c9e61ed1c4d145c43ebc0ea1e053399ed254dd732c4ae9b68759c7cae58a08d10aec52cd371f2d2aaa651ecd3a6512f178 SHA512 0356a1de31fef21bab8a989fa8b077fc840f22212cdf72b41319a26e2950a9fd1e576a07e45bbb12d58ffd4feda51417f781e40796fcf72b1b26567b6f00b867
 MISC metadata.xml 346 BLAKE2B 89e78531ff1bb1d6cde18895763c825dbf9c889311169c629cf77dce14038444349573971f1688ca5f0f27ea2f59d1002cc90bd7b94ea48050041fdb57a55cf9 SHA512 39fd977a553a1c6b24782c5bdda67eab5613a40b20bff1765cda83718e2c5a9a52b39be7a616a6250069d52fbbf97527b453b08fd9bf6b3abc013dc3851d832e
diff --git a/dev-ruby/locale/locale-2.1.3.ebuild b/dev-ruby/locale/locale-2.1.3.ebuild
index ac76ddca104b..20f9c0d6d299 100644
--- a/dev-ruby/locale/locale-2.1.3.ebuild
+++ b/dev-ruby/locale/locale-2.1.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_DOCDIR="doc/reference"
diff --git a/dev-ruby/mail/Manifest b/dev-ruby/mail/Manifest
index 18321830fd3c..1408be665bba 100644
--- a/dev-ruby/mail/Manifest
+++ b/dev-ruby/mail/Manifest
@@ -1,3 +1,4 @@
 DIST mail-2.7.1-git.tar.gz 625251 BLAKE2B c1efbb259042155e983c1971fe9821eb0dd850089bd04cb0c74513f6f17dabf8ecc3155d9e5846ae657383f522872323f8fba37d51fba4318ac682d18a6d4c50 SHA512 17c601c86715135331f750048339a11a67a17f34486dbafa3ba7e9af9970d60927a2fa95c72a398418548df1fdf5addb2ed3afe9da7dff1f0bd949438726be1b
+EBUILD mail-2.7.1-r1.ebuild 887 BLAKE2B c47066ebe7d14e24e7e40d69972bd67b9c9d951ee49af3b2b0356f7a03ddaab41ece2ec7b0a176fdd5d018c45704b5f2d7b7cef7d28822a16783cd6216f32152 SHA512 27fe1a940ad8caf59f58431191cb89019e3fa7921c531d29656b27a4106579fceb0f0eb0cb00da87508b7a178c31fdd7d337aab3e69d5593c295797123452215
 EBUILD mail-2.7.1.ebuild 904 BLAKE2B 379b56b701fa0a0cb2aa9f690eafe914245e3cde8b29607425b5c352401514f0b1b4f55cd5a669d6c95a0c188e0ba2ad85b86310728b152c91568dca22cf4917 SHA512 cf3e5f7dfd4a3382def661c6819980a33abcfdad8e21cabdb9a68e955e28d97d7bec898b68fc77ac9a2c46ccc10aa1156ff5f41f0ca0f78c5eccc6fcb6e21e5b
 MISC metadata.xml 337 BLAKE2B edda3267d35eae7a763cb191424ad231a356da5d17ce213061d0111e9addab8d34ae9bb52e47c0ea05d58258d04befa284aa3930d316429ca4b82c2d676bb61b SHA512 06ff50f20204499fef8bf6eb3af793ec7b471c2d1a29fd30b821086f934344a6251c0304cc52c9b720af5a7b7214831a68813c33f36fe4f679deb8667d3cb7f8
diff --git a/dev-ruby/mail/mail-2.7.1-r1.ebuild b/dev-ruby/mail/mail-2.7.1-r1.ebuild
new file mode 100644
index 000000000000..300d06e0d751
--- /dev/null
+++ b/dev-ruby/mail/mail-2.7.1-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc README.md"
+
+RUBY_FAKEGEM_GEMSPEC="mail.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="mikel"
+
+DESCRIPTION="An email handling library"
+HOMEPAGE="https://github.com/mikel/mail"
+SRC_URI="https://github.com/${GITHUB_USER}/mail/archive/${PV}.tar.gz -> ${P}-git.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/mini_mime-0.1.1"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undle/d' -e '6d' Rakefile || die "Unable to remove Bundler code."
+}
diff --git a/dev-ruby/mini_portile2/Manifest b/dev-ruby/mini_portile2/Manifest
new file mode 100644
index 000000000000..b3e463224c6c
--- /dev/null
+++ b/dev-ruby/mini_portile2/Manifest
@@ -0,0 +1,3 @@
+DIST mini_portile2-2.6.1.gem 27136 BLAKE2B 762b538c2d57cffe8a8ef570469b7796442f51a7a813a2e4f1dae5bd9a3ca62220c6dad1fc9d9157cbb8e93f940afce4b1e5b2b4d4f9edf01d54ce48d99dd6ca SHA512 d1cda6b7bb6b10187360717fc8ae6812d8f6625f6d302d4f76b7a829213f7938c7f0b68cdad7d7433186513542acfadd30100f4c641693e19ff82c5d6dc78859
+EBUILD mini_portile2-2.6.1.ebuild 549 BLAKE2B a783fbb799269991fd79db64aeac52af7345b7deced459d8c2cb6f431ac0e28b0f31a6d9b88a2f3ebbda2b7243f8cfc324b8581c660c86501520d30a003033c3 SHA512 1506256b34811b614d2b3572e456b8f3b12499d8a76c2f5b57f52a7d7e055d21d509c7688bcd591c0f8f11eb6f0edda98bb92343ff94c36f1a68c0d13a877726
+MISC metadata.xml 351 BLAKE2B 1089816679cc238435b30f4a2365c7d1fe7a15837602f266924604629bf4300462b1ded28a537b9337c9fe13e4b397fcb1e97672bcf901eb65162090a514751d SHA512 80f58025f07a49376e4fab08a8396ccbc5e09ea76eea09263c3388666b14cea9dae84bfadff887aca2468c8651666d5e907911782968b76b7c1f3289036586e0
diff --git a/dev-ruby/mini_portile2/metadata.xml b/dev-ruby/mini_portile2/metadata.xml
new file mode 100644
index 000000000000..7eb5329f4083
--- /dev/null
+++ b/dev-ruby/mini_portile2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="project">
+    <email>ruby@gentoo.org</email>
+    <name>Gentoo Ruby Project</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="github">flavorjones/mini_portile</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild b/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
new file mode 100644
index 000000000000..1ab9cfaa4ead
--- /dev/null
+++ b/dev-ruby/mini_portile2/mini_portile2-2.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Simplistic port-like solution for developers"
+HOMEPAGE="https://github.com/flavorjones/mini_portile"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~riscv"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/minitar
+	dev-ruby/minitest-hooks
+	dev-ruby/webrick
+)"
+
+each_ruby_test() {
+	${RUBY} -w -W2 -I. -Ilib -e 'Dir["test/test_*.rb"].map{|f| require f}' || die
+}
diff --git a/dev-ruby/minitar/Manifest b/dev-ruby/minitar/Manifest
index ee8392f23778..b7a531d39938 100644
--- a/dev-ruby/minitar/Manifest
+++ b/dev-ruby/minitar/Manifest
@@ -1,3 +1,3 @@
 DIST minitar-0.9.tar.gz 33873 BLAKE2B 6d285c181510c96f173d850a9411da8a214459da14895e2d186ce712387d390c8ac95e27e4e768005540fdfb7463f32206085a72faf4de6b24c31cb732234260 SHA512 e3aaf0e664a985704cf9dccb72250ea2a7ebb2db9b6120590fb8d5525fe2717e0a90b3020f461ae0c4dfb19dc8728b4eeb6ba2e24ab75d12fbd7f5d98b269c79
-EBUILD minitar-0.9.ebuild 865 BLAKE2B 33ed8e795b4c02d7237397baa8b3e77a5e139a72644718f7b47ea9af098607d6ae83bb7f84a062439f7031ee82380009fed6a09bf87cc4b3b74202415dc7d157 SHA512 06f5d2bee0341df4f875fe65d0008797564ce9cb3073bd57743d1e15c17ab8af8c4012d197aadeec131d8a3ac724e54812e9d31efbf59402fa071061f4415e09
+EBUILD minitar-0.9.ebuild 877 BLAKE2B 37a7e45651bdc27524c9340748dc7d5e0a09d6a8a24d503ba76f674ed223ee4e0c15e0dda0a82e678425bd82d26be9c2bd736f20b5c647e1ec4be9fc0f2fde0c SHA512 601d6a3e8606d29dec8997d29d18ba05e67cac76c87fb7e8863261a8ec8bf94e0ccbd569ab21532b28f3ec04afe10c44c76543ed6c59f3aed2c4ee99a479c189
 MISC metadata.xml 345 BLAKE2B a46be73631fb9e5d1a47518c20dd0fbf2eb23c106f53c8f2b4bb3dfb2478246c2e764310c02ac1176e602ac0bf73a4daca80c10703a59f1ac861124df41905ca SHA512 8107541ada060cd98c15f57dfb1106cda2f0c5bfc6b4907b90abd7e5e5d8cbd93b2398b057a56af221cc4adb52d063ebb70b7e41c623d5936c720008a24d5b33
diff --git a/dev-ruby/minitar/minitar-0.9.ebuild b/dev-ruby/minitar/minitar-0.9.ebuild
index 00e16ce05168..caeb476fbc53 100644
--- a/dev-ruby/minitar/minitar-0.9.ebuild
+++ b/dev-ruby/minitar/minitar-0.9.ebuild
@@ -20,7 +20,7 @@ RUBY_S="minitar-${PV}"
 
 LICENSE="|| ( BSD-2 Ruby )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 )"
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 789a408c6968..f3ec7018a09e 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,9 +1,5 @@
 DIST mocha-0.14.0.gem 82944 BLAKE2B 50a066e2f5007df08a7f76785fd4c2b12327b4969c11324a0574c707bea3219d51edb9ab40635378c16b46ad826ec7eff42434a27cd61113a6f40251fa2e6930 SHA512 918e45f2ee761c7dc399c7958e4d406f9e186c90f479fd01a421aa542944b47e9b2c5e938f4fc5292a7da345726447b2d47dc5f417e114201f8a4d9893c4d461
-DIST mocha-1.12.0.tar.gz 244820 BLAKE2B efc4b40509cef44d976b1556e4977258f1b37a314e37f492943fcac955c681d17008a1db30f963d7a6adcb788b1832439e0585899c99ed8f2ece69c887952e91 SHA512 969a6cd48d925845004dffa12f8a9dad155d3bf24b974957e9921a2e13dc67985f01080017ef9e82dacfd4bf87533774f3f5d15226923bdf50f8b90e95e1730f
 DIST mocha-1.13.0.tar.gz 246249 BLAKE2B 028b40646b96084f26df9813a8c8c4d5adc9f4649e11971069af086716d84f90f1acc6abc8fac8297c3a516afa51049c4bcd7ff0f6fd3917d0665fa6f9afe754 SHA512 84cbe344b0bae434e9931a83b587dcefc14e8699893022a56e30a59bff574b52e3879a123b8f2f70e77301701b167d5992489e2173191ffd3450f09db3e7383b
-DIST mocha-1.8.0.gem 223744 BLAKE2B 625f38d6ec53cbf549cbace873172b8511f2e6a2ccb5d7fd4133c3d9a67a8e5d55626fead7a70de363c8564b687530d3e0515ed7fc167a65091d9e17d89dde47 SHA512 b0abd6234f34dfd92d44019001e97914dff80ece5fbe2b53ccc91192f99f06a79f9c96cdb136b2a389a1a1b7038076fce688d8d8ee8645538d3c58f73e345fe4
 EBUILD mocha-0.14.0-r1.ebuild 861 BLAKE2B b454f39405e42281948435ef50529cbc53e7535adc04148a45a1f3cf4753244d6313b8fafdb7a82e5735ee8e96592bb430fb771cf1ec611fd677c7d6d3fa5435 SHA512 bacbebe46b81eefd058bc78e36f03bf3c8958ca955555c8865bfd5d01330992ff183d39787b20d3f0a348bf1dfc8e87c83984e60e69caaf92c3ef08349290027
-EBUILD mocha-1.12.0.ebuild 992 BLAKE2B ec903e2f555fe7c721fd177929bef26c9875e33c902926125f0bc1f1d9acdc7aeffa926fe7a58d8c93ff5bbbace076182c2242de12c2cf6c8172d5e114432819 SHA512 3a64925befd828a2adbdd139d819eddef43e97e6d4399bb3c033101ff704eab67fbbacee76674cfb325cc1290bdd0a804f9a817df7d3ba50010c1256485700ab
-EBUILD mocha-1.13.0.ebuild 994 BLAKE2B fd8557fe6b5cd4b99973821e1f526de8769666443c359f92a7a8d2d9c141f8319f37e517bc04a9275778156665b694dc63876e6b2ad2165d1322e6aaa0bc0694 SHA512 acda667736ea67960ed47a101b281aa06ff4c52c8d126003409f09cfd2004b3fc8211767765eedf50cbd16ae80b2ac8c476abcefb2d0bb191b451d3efcccd897
-EBUILD mocha-1.8.0.ebuild 862 BLAKE2B 5de8d30303f52c1d13add741dad6d80b279cebab848d9371c2f60cdedd766ea5ae49fa50508bc6395b32990113c134617b2faa44040ac990611391d54b58c678 SHA512 b94cc3498d028871591e6b84c0b3d037c058c0eeb6cbea04a1d70a8d157215fa9bc62194bf2d11fa1e5d2a57e2e848b32fd0ba0b6e737895b4f46cc9388fd124
+EBUILD mocha-1.13.0.ebuild 992 BLAKE2B 8d4d6df147963eaaf4b8dbab2d3054b0cb62487e31d1aa0cec22c3f7c23d531beb5e69eaababb6f30373dabf8d5652c2297a36c05f02fd2c66c0942a8e1e87b3 SHA512 25bb6ce3295eee8e4413673ab88b92f1477fb851224dcbffb61b1c879b3edf47c3c1b1ab2c6bc97995fbf9d8da516e71bd49b359b1b89e538660baa833482e63
 MISC metadata.xml 252 BLAKE2B 77e9556ac1d210367a95f4c47816618b685c707cf01d1543d988338e14794fb9ccfb9976ebd11f389db618616d91ee024d8e46dc3a1a356ba7a017a7796b44d1 SHA512 0a970a16d73747993198dd301a3127cef7e65a9f46816b40ca149669ba617826c1d81bac1e5ecf93d16079922964923d37301cd8160f22c823c1ec3b79ee56f1
diff --git a/dev-ruby/mocha/mocha-1.12.0.ebuild b/dev-ruby/mocha/mocha-1.12.0.ebuild
deleted file mode 100644
index d7603ff12ea8..000000000000
--- a/dev-ruby/mocha/mocha-1.12.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
-
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="mocha.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="https://mocha.jamesmead.org/"
-SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/mocha/mocha-1.13.0.ebuild b/dev-ruby/mocha/mocha-1.13.0.ebuild
index e4e579a7e5d8..cf08b665dfa4 100644
--- a/dev-ruby/mocha/mocha-1.13.0.ebuild
+++ b/dev-ruby/mocha/mocha-1.13.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/freerange/mocha/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/mocha/mocha-1.8.0.ebuild b/dev-ruby/mocha/mocha-1.8.0.ebuild
deleted file mode 100644
index 8fb051072333..000000000000
--- a/dev-ruby/mocha/mocha-1.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test:units test:acceptance"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Mocking and stubbing using a syntax like that of JMock and SchMock"
-HOMEPAGE="https://mocha.jamesmead.org/"
-
-LICENSE="MIT"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 sparc x86"
-IUSE=""
-
-ruby_add_bdepend "
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 dev-ruby/introspection )"
-
-ruby_add_rdepend "=dev-ruby/metaclass-0.0*"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	export MOCHA_NO_DOCS=true
-	each_fakegem_test
-}
diff --git a/dev-ruby/multi_xml/Manifest b/dev-ruby/multi_xml/Manifest
index 06df605b2359..0c9b7adbd3ea 100644
--- a/dev-ruby/multi_xml/Manifest
+++ b/dev-ruby/multi_xml/Manifest
@@ -1,4 +1,5 @@
 AUX multi_xml-0.6.0-ox24.patch 866 BLAKE2B 366aa40e831d76b4dfd6516d0b80599c70e0b0c2cd804c2f8f96b82a1582c933e931153f81f27bba8176bbe3ee8f6c4517468b58bd8bc7b380fe6c6257cb953b SHA512 f054a4bba4990f1ff8d6236ed2a99b97182b96c343b749e18c90c63faef10ea25d8f40ca0dd92e58aac8924d0cee15915b3ae2ebe5a6e6c024ea6d4b38b5e05a
 DIST multi_xml-0.6.0.tar.gz 16571 BLAKE2B 1492eab7782823915167ebdb529b6d4699b31f3b66c48eee5acf7857dc25caae62b63a0da10a0bd862ade22865432bc6c4290a3f6ff8e99a889fcf09b56f6b7f SHA512 67e280d838ba07373a6ad5cbe4658b32655102906d8e0ed5429d21220475c21e07ea2ec0d2729df4d30a1bf7d0a5e6ff2d4482342098873135cb12e18c53194a
 EBUILD multi_xml-0.6.0-r1.ebuild 966 BLAKE2B c5e47a049141247dbe3e93a922487cc011424d23a0e4b287d0d353740788a1b4589ce23b488a6568959f20b9a3da9c8e67547ac62990d348fd95f11c12188dd4 SHA512 8f04748d8d74ba669677a4b0ee30b037a9e13f70bf8569bfc988065c9ae6a7669bd19ef550bb28ea07086b224d5b088ab13799e9bd5da2855fb2d573e05d51ef
+EBUILD multi_xml-0.6.0-r2.ebuild 960 BLAKE2B e69020eccaf304bfd2196b0a111fde77b51c6399a7d100ae11c8112e4aaac70702889dc603f28c1bc0f30a1e13e7f7e35ecac3dd1f3650aeaf8130089c45950e SHA512 aaeac84a88b978d0fe52bed7aee735d8d05b410e0e6e071d09adbf4972faad3e1963e23e0167f5e10112e3fd6e45fc1721d300b9e2375d7b9d2f50c7c0429ece
 MISC metadata.xml 333 BLAKE2B f1a72c5112ba70c8f41be64b8b8e2678d64a6270cd05fe5735062204ce9deab09e7ae29a386b259c9c628ae22293d08b55ac721012afde24e4a1b3ca6f9913c8 SHA512 15ee9589bcd9f2c41c5f36aa030b6dc9fa8a17192c47d18047f32e09445af981d7a7d89ee26c4f70a37a1d53ab9c0edf86587d6622d2becb19349e8d1d03e5a3
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..4fe8cc4c3005
--- /dev/null
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0-r2.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC="yard"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A generic swappable back-end for XML parsing"
+HOMEPAGE="https://www.rubydoc.info/gems/multi_xml"
+SRC_URI="https://github.com/sferik/multi_xml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
+ruby_add_bdepend "test? ( dev-ruby/ox )"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}/${P}-ox24.patch"
+
+	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '/yardstick/,/end/ s:^:#:' \
+		-e '/rubocop/I s:^:#:' \
+		-i Rakefile || die
+}
+
+each_ruby_test() {
+	CI=true each_fakegem_test
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index 0d306d5b2668..90bf3c35c588 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
-DIST nokogiri-1.11.4-git.tgz 5867481 BLAKE2B d9b0df4d6301a510824f8f31bd51e0f3beaf3cf7d3685a703782ae5fab0667b6276c0ccea20032252efc6c2dd6515577fcb21942f5d27a65815bc48f8af91137 SHA512 ca4bf385b06416f5a5b7f8fd742739181cccf93b42590c7d2d4f666846fd3a25d45c16717ae50bacd85e25644efe8584e195df7174450b8a59f2c6ef47624354
-DIST nokogiri-1.11.6-git.tgz 5869434 BLAKE2B 222b6b9e871c124a14ac5d9ac3901d9edfa057daaba7e1179853746af50d661bd70568b326603663f890b4b0d80fbb68f8cc22637ca340fa49699f475cce1bec SHA512 a9d2977ba5a12cb252ee615cffbbf043227e78d746ecba4bfcd82fa825f5ef9fdb74feae27115b16cd65da6dd189e4ac88f1d605e776dfbc52aaf2e0e3044381
 DIST nokogiri-1.11.7-git.tgz 5871407 BLAKE2B c0449b5cb8210d22be31f1f9a43c0c13c7ab21feae2d731bf30475fc21c69a3928395109936b9ff242a89da424a5192c8a8cb0ede9d05d6d9ac16c1d6e5a7f63 SHA512 f355185f490e0ce73fdfb496f49e36b39c89835ebef2cbe3aecbfc5aceb5a9757dc07738a709059c3e22b5808fac11e7b340b7ebbb3b2c1b5ea3df8aff0db131
-EBUILD nokogiri-1.11.4.ebuild 3140 BLAKE2B b53910356936e9e450ecc28220343ca68491ea93eceb070c4adb09d67e9017f0d9b20319ed2d2ba2494dc8cc40df220d49450001cb8f60b881f88564464871e4 SHA512 3fe0a0805e12b52556483f1e0a0daa6ac84a0faddad121d2fa0b3f62976f289fe5fb50881ce493d712f2f39408acce5c9b174f515da64fde3ae33c0b4dcc1899
-EBUILD nokogiri-1.11.6.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
-EBUILD nokogiri-1.11.7.ebuild 3154 BLAKE2B 92307c6fb1c305dc9271ebe5833a0f1afae1ad6b2a506ee0665cf98f182282eb755e601a84496b823a0f1393e584cdb1c9400912c8eb5b055cb6b950ced4db46 SHA512 c61d7a401a39f6d471f5882f6ced4b3c18625b33dacfc451d2a416f0fe4b3c7b9b73fee8754b87591e42a4d19de810cc3b12c9f986c40e7f14774684c9937a6d
+DIST nokogiri-1.12.5-git.tgz 6158880 BLAKE2B 994fd89c5163d92110de40e2dc654698b11d5a18524cc4b7b668ec1475e7167014e1c7604932686e6ad888f352b04ac26a7fbe526d814b20e686c5d9da95c5df SHA512 36d233df250213c4614c34d045c4fbea099e81e991a6da49067c165bc95f36b281c58cc79deb3b6a8aaccc50743a79efa27969e067cc2b546bef7615b139d79b
+EBUILD nokogiri-1.11.7.ebuild 3147 BLAKE2B 020c0670608a63e9126d98e30a423aad9937e698fe3b3d55ccbade79d7cce323253a528db4eee0b3bcd86ec746e8be38b71e0316548f948e60f3d9b8ec0b7efc SHA512 017ce68216111061f5056dae14eff11c27a3665bf20e8f104f388a694fe1971d6548650d31d354fb99b0e6b8a5d45d20657e2b2d4bb88241aba059cdf8d50f4c
+EBUILD nokogiri-1.12.5.ebuild 2642 BLAKE2B fe4203accab0093d0c8bb01473ad48400737b7cba1c3f476fc4a6b226f62877fce54d9b0d7435c822c20ee9eaa08391f73057e7ba100134b6b235df802400852 SHA512 6a34e891eb6c74ba396473d5f20fa8753c088bb70d2eef5a959b3b5dfc160f6be403d1165d969a07554546f0cf1a05686da057af0affd371654d503cdd322570
 MISC metadata.xml 349 BLAKE2B 824094b81182da6ed2c43f55f8697dbf614662e1e032ed62bcf8ec4ef8fb6e6a1bf346f90863a8cb7d6cfaf2696f0be70fd3027d6d01e583bba0c1334252447d SHA512 9ab17ab504279d8d1ea584f7a6f411fe778b89564016dc0d596ec7f714cf9ad80ed5e30c179ec6aa190bafe8a8b72bfdc5a964d213a8024783da246bbb817629
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
deleted file mode 100644
index 0a05340414ac..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-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://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 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.12:=
-	>=dev-libs/libxslt-1.1.34
-	sys-libs/zlib
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.12
-	>=dev-libs/libxslt-1.1.34
-	sys-libs/zlib
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.7
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-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
-
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Account for fix making it upstream into our libxml2 system version
-	sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || 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() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
index e1c14225b0f0..4dac40ee475b 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.7.ebuild
@@ -20,7 +20,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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
index 863fd634fec6..35fbe47af261 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.12.5.ebuild
@@ -1,14 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md SECURITY.md"
 
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
 RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
 
 RUBY_FAKEGEM_EXTENSIONS=(ext/nokogiri/extconf.rb)
@@ -20,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 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~arm ~riscv"
 SLOT="0"
 IUSE=""
 
@@ -38,6 +36,7 @@ DEPEND="${DEPEND}
 ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
 
 ruby_add_bdepend "
+	dev-ruby/mini_portile2:2.6
 	>=dev-ruby/pkg-config-1.1.7
 	>=dev-ruby/rexical-1.0.7
 	dev-ruby/rdoc
@@ -58,10 +57,8 @@ all_ruby_prepare() {
 		-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
-
-	# Account for fix making it upstream into our libxml2 system version
-	sed -i -e '116 s/using_packaged/using_system/ ; 131 s/if/if false and /' test/html/test_comments.rb || die
 }
 
 each_ruby_configure() {
@@ -97,11 +94,3 @@ each_ruby_compile() {
 each_ruby_test() {
 	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
 }
-
-each_ruby_install() {
-	each_fakegem_install
-
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-}
diff --git a/dev-ruby/nokogumbo/Manifest b/dev-ruby/nokogumbo/Manifest
index 19720667cd6e..689a2687d1e4 100644
--- a/dev-ruby/nokogumbo/Manifest
+++ b/dev-ruby/nokogumbo/Manifest
@@ -1,9 +1,3 @@
-DIST nokogumbo-2.0.2.tar.gz 295558 BLAKE2B ce52794eb3359ad34234d8f5faad4aff7c197326f6449a09a2264cb1a3d920886377f805e055980224644223d31a6621300c583a04f48ce8a8abe275b2614470 SHA512 fd115e072d2763ff63c46dc6f6117bb841b2c2ac28df0180d44a581a2a46f0b7b90ec17ae1b629e3e7c2f8a2cade53031cc118c8a946bbfb7e9e8600efefd67c
-DIST nokogumbo-2.0.3.tar.gz 297394 BLAKE2B f1afcf516c5c47b15c8404e8c218af1f2ca0bce022fefacb39842527be7be38cbaf9d2fe0572afd8d9c1893a82428b903ccb8d4506043f766305d4d43aaf066b SHA512 b44af7394f0b2c7159b34ead2aa15e39cd08348c1e3d7c4d9a2830c0920ae1a0d22ff9ac32db8fa1bd69c8ce55bc4a32069572944b53ef0d743f8a40560bcb47
-DIST nokogumbo-2.0.4.tar.gz 297809 BLAKE2B f55a08417fe46b9cb4e89ea032deab7f4ec8d4c4d377ca87fadfacf12f86fbea6c61de087e88d5de4ab29656276b014b1619ea7d83dae86aac671306ac0b989b SHA512 188ae188bd33969b7282230e18808e52363075723cef21d268af7ad1cfb2a0a93a8cc595297f467a32f475a47249f316836ea40c587f337f35ea57bd60d0699d
 DIST nokogumbo-2.0.5.tar.gz 298201 BLAKE2B ab342fa271983a13ccf7ca1fa6bbb2d250eb5027beb812c77d76bd03c971a95ff60440bc8c37ea5a482d21730cde5224c2419e89098824b1157b372974d09107 SHA512 3dd4dd83742b8c4b14e741b2b9195d227e5e3f14eb5b34992960cf021658476072a2c7f07fc21868d1347f4ba3c95e267e2cf7193b8d53c5451658e560128d16
-EBUILD nokogumbo-2.0.2.ebuild 1302 BLAKE2B 3b8e4fcb5c8c657153231f37ad723fa02dac6e87b5db2976ed69316a47967592672f16f3e1f33fb552723da73a10b934baa18a713c6e5cadc984e108009ccbe3 SHA512 2f71da7dafb5edc1fd94b70b55e5b369dcac4742ae0bc0783c6b56608d5abc099016fd83c159fc1ad16e46056f73f712eab577ebbf9c0a956945bbf8d6ffe08c
-EBUILD nokogumbo-2.0.3.ebuild 1295 BLAKE2B b28e4b608924a083a6284043307f225f3fb4e9eb539fa58b12e1b20970e45e07abd9d310aea4620ebd2b85c5afab4c025ff6c5b3bd7c5fe947b491ed28f4cf1c SHA512 b6d408d4ba17fa5cc5d0bd9e3371bb1b7eebbb6647bad35df234435cd5e72150eed4db99820feb484deb0e095a0112f072a2e68cc28534be6cc4e914dac4cd13
-EBUILD nokogumbo-2.0.4.ebuild 1295 BLAKE2B b28e4b608924a083a6284043307f225f3fb4e9eb539fa58b12e1b20970e45e07abd9d310aea4620ebd2b85c5afab4c025ff6c5b3bd7c5fe947b491ed28f4cf1c SHA512 b6d408d4ba17fa5cc5d0bd9e3371bb1b7eebbb6647bad35df234435cd5e72150eed4db99820feb484deb0e095a0112f072a2e68cc28534be6cc4e914dac4cd13
-EBUILD nokogumbo-2.0.5.ebuild 1307 BLAKE2B e08f59f7f2f385e6e4d73f53b9b7048bf17c47fcf70eac5898bbfc1b64e2a8f32a243ae9cab135c3a7876425a970ca2aabe1cdf12dddfcae395fe6809410bf05 SHA512 ec7719e1a0f4d4ff82e16e6e10c37574bcab4f741f9c3b6104966792a5f003ec67733e394b1f06abe8c5fd4417c6b10b96adb08acf0ca21c2794d5aa6307a8f7
+EBUILD nokogumbo-2.0.5-r1.ebuild 1268 BLAKE2B 84b57da4d0027372fb082cff490842fd7401fd78836e314caaf5ba3f485a78ac42e107545f9803d549da4050708d45feb939bdc1a19119c17357bc8e344b95b4 SHA512 dc343e6917ec480c305148ab2cc136f785d4296727bc803e2aa2380bd38d141f9b0b1d8b5333b16093e9cc07d52b8eada6985b904ad3dea660149558988737c0
 MISC metadata.xml 342 BLAKE2B 2d883646af6c04fcd5745ca6948c3204c6431c1f535fcb090ace694df3ba71a98ed01a6035e6ad1f7ae22aed3f494ec13f4ef179d1a1c1136bacbd116390e3e3 SHA512 3df8ce88efb8967920d8b10354a7570bc47e6a2f2061b17b2106a772dbc754e555980d631953f74acbd64f70138b4eb178e5f9243183413c610996960e8cfc35
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
deleted file mode 100644
index 7e3261abe766..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Contains a bundled and patched version of dev-libs/gumbo.
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
-
-all_ruby_prepare() {
-	# Define rakehome in scope
-	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
-
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/nokogumbo extconf.rb || die
-	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumbo/Makefile || die
-}
-
-each_ruby_compile() {
-	emake -Cext/nokogumbo V=1
-	cp ext/nokogumbo/nokogumbo.so lib/nokogumbo/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
deleted file mode 100644
index 993d79849023..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Contains a bundled and patched version of dev-libs/gumbo.
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
-
-all_ruby_prepare() {
-	# Define rakehome in scope
-	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
-
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/nokogumbo extconf.rb || die
-	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumbo/Makefile || die
-}
-
-each_ruby_compile() {
-	emake -Cext/nokogumbo V=1
-	cp ext/nokogumbo/nokogumbo.so lib/nokogumbo/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
deleted file mode 100644
index 993d79849023..000000000000
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.4.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Nokogiri interface to the Gumbo HTML5 parser"
-HOMEPAGE="https://github.com/rubys/nokogumbo"
-SRC_URI="https://github.com/rubys/nokogumbo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Contains a bundled and patched version of dev-libs/gumbo.
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
-
-all_ruby_prepare() {
-	# Define rakehome in scope
-	sed -i -e "1irakehome=File.expand_path('../../')" ext/nokogumbo/extconf.rb || die
-
-	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/nokogumbo extconf.rb || die
-	sed -i -e 's:-Wl,--no-undefined::' ext/nokogumbo/Makefile || die
-}
-
-each_ruby_compile() {
-	emake -Cext/nokogumbo V=1
-	cp ext/nokogumbo/nokogumbo.so lib/nokogumbo/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/nokogumbo/nokogumbo-2.0.5.ebuild b/dev-ruby/nokogumbo/nokogumbo-2.0.5-r1.ebuild
index 5ddd1b3250cd..975d0694bf54 100644
--- a/dev-ruby/nokogumbo/nokogumbo-2.0.5.ebuild
+++ b/dev-ruby/nokogumbo/nokogumbo-2.0.5-r1.ebuild
@@ -1,13 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
 RUBY_FAKEGEM_GEMSPEC="nokogumbo.gemspec"
@@ -28,7 +27,7 @@ IUSE=""
 
 # Contains a bundled and patched version of dev-libs/gumbo.
 
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.8.4"
+ruby_add_rdepend "=dev-ruby/nokogiri-1.11*"
 
 all_ruby_prepare() {
 	# Define rakehome in scope
diff --git a/dev-ruby/rb-inotify/Manifest b/dev-ruby/rb-inotify/Manifest
index 95dd69f87d83..4671b49ae7f2 100644
--- a/dev-ruby/rb-inotify/Manifest
+++ b/dev-ruby/rb-inotify/Manifest
@@ -1,5 +1,3 @@
-DIST rb-inotify-0.10.0.gem 15872 BLAKE2B 52647ff17994287810efa9c04bc9553b101c42cdd27cf42d530565127dfce104a589ad729d7019409079731577d327221ec3423fa7a5f746aefa3d817b93d898 SHA512 16aa7fb21e5ed713335e583299cfc72676e3ef66de3d349f74a14885b88020b79e031839b193dc140036a0b6539a45ef3a0c3c6027a7211508d388137d22a13b
 DIST rb-inotify-0.10.1.gem 15872 BLAKE2B 1ddf4fe8de7cdd348e007ac29ab7b41667092439f9b70eeae49d7e917351c73512e43a7ccf6679af1c9225b19efadb6a1581f63e1958d2a31d61f2bce5a13664 SHA512 7831a6228f2d6363e634b8d6b4a12206f19b96098e5dfba1d27b1e994a7284a5cb58cd0299d861a6ff275fc8248c0e68faaaf786d6222ad68f3e6b43ccea29ec
-EBUILD rb-inotify-0.10.0.ebuild 1022 BLAKE2B 33d6137fe2260e512f2011e3a8e9a66c8cba92d0256ae897fe08601fa89681fe5f399d9c9f0d95a4f2b04e183d5860a309bc81172d8afe21bda4a5c1a06bf60a SHA512 54a8293a827b9c1ab73d26f4296839d8fa1a79c647ef807ab21e56daccc27baa5dad13b0a68fe3d6c42912ec6431ccbdc8bc1bd6e843d4023084a1f43761c283
-EBUILD rb-inotify-0.10.1.ebuild 999 BLAKE2B 9997965b4647b78909d401a0b27ad7dfb9fb294abacf59f547fc80a159228d1951770123fbe2358cfdd4d4f11bdeb2827749e99ea75fe185c76faea00f08ce0c SHA512 0f101cdfcaebe733679e8f1d45ac09262289ca59f417aa0ec75445d107a476807884f02f6a3c7aa3fcd5375a2f8bec33cc0cc932f6b56f277997b90b056ec0f5
+EBUILD rb-inotify-0.10.1.ebuild 998 BLAKE2B e4d98d21c5c0eac6b79ef708df6a6e820f31457a564d93bbcb26c816487742491f7c6597b3ed85141bffb94f9c976c2167121029557462c6736b0fa6c4b4ba19 SHA512 709143d0cb5886b78c51c813b7e8fe4f885ab58875edf3ae5c6c17c564b432b8a939fb9314684d798cc0fcfd613c1f5d3f5b0c7106afe5f1c560b1120b75256b
 MISC metadata.xml 342 BLAKE2B 6f4587e7af70218aed1523368746721fd9fc5431a52adf87f2ecd31fcd3027564744087e40b0e3ae5282e2b7391b2e0bbf95121b691730796a2470c276d0fffe SHA512 c9ed5a3b063886bba917410aaf1bf45b5da718c29299197369e29e4c5a567df3ef5791f934dd265b9904a557a4a9761d8df5ac5f817eedae74e7577ccf88b5ee
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
deleted file mode 100644
index 6c2c605ed656..000000000000
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A thorough inotify wrapper for Ruby using FFI"
-HOMEPAGE="https://github.com/nex3/rb-inotify"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/ffi"
-
-ruby_add_bdepend "test? ( dev-ruby/concurrent-ruby )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency on jeweler.
-	sed -i -e '/:build/ s:^:#:' -e '/module Jeweler/,/^end/ s:^:#:' -e '/class Jeweler/,/^end/ s:^:#:' Rakefile || die
-
-	# Remove mandatory markup processor from yard options, bug 436112.
-	sed -i -e '/maruku/d' .yardopts || die
-
-	sed -i -e '/bundler/ s:^:#:' -e '1irequire "pathname"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
index 3fbe2a1e8e9a..4562d5b272af 100644
--- a/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
+++ b/dev-ruby/rb-inotify/rb-inotify-0.10.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/nex3/rb-inotify"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/ffi"
diff --git a/dev-ruby/rbtree/Manifest b/dev-ruby/rbtree/Manifest
index e42f493f8d53..1e6a3ab9dcee 100644
--- a/dev-ruby/rbtree/Manifest
+++ b/dev-ruby/rbtree/Manifest
@@ -1,3 +1,3 @@
 DIST rbtree-0.4.4.gem 30208 BLAKE2B 3b79407f0652728440e429a862aac7fb2927456749d94d36aa20c4871ad78bf5cd3ce09e765ca238a1ff135fffd9c9217fcc9a36a206956006da66315285e776 SHA512 4cfdb6c0b98ea33baa82da4099d5ba25f1cb64825c183f9f881ed49e7ab7abcd8672d50ecf28b63b9f05b0e0452c12a7696bed4f130395d59c2e059cd61d8ba7
-EBUILD rbtree-0.4.4.ebuild 435 BLAKE2B aef95a8a68b8f352064e109ac37a17af2be3eb07b7bd4ae9a30025561ba6a51a56c35f119a030cfc67ab99f7d6088fda29b3300a4231f25dfaa65c12f7a9d2dd SHA512 6b45e4bb690265005c477b983b922859202c1c9ae02ffe76a0442e7cce49c08c67d6fabd97976b8eed11fbf23ca9f7a3ca39ad767b7ba939ee01bda2b0e53078
+EBUILD rbtree-0.4.4.ebuild 440 BLAKE2B 0ae4daccc5d1284e22aa89c3bb113cb6e612269ffd41604e2103ebe00833cd8fd61552b36cdb59de0526576f5fe34fdff67fa7a005a40a0de25346f4b0bfe247 SHA512 cf6422e86c8bf69e9c49d5288eba37a6963e5fa4d2e8449ed2b81c068ae7023820fbb1e3ae1d93ba465e8cc3ade16e5d46ea23ed4c7fd39f5558b23a2ddfdbbb
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/rbtree/rbtree-0.4.4.ebuild b/dev-ruby/rbtree/rbtree-0.4.4.ebuild
index 546d735bd800..c5eea618f196 100644
--- a/dev-ruby/rbtree/rbtree-0.4.4.ebuild
+++ b/dev-ruby/rbtree/rbtree-0.4.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://rubygems.org/gems/rbtree"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 each_ruby_test() {
diff --git a/dev-ruby/rmagick/Manifest b/dev-ruby/rmagick/Manifest
index 880760d76fa7..b0a72289f6c2 100644
--- a/dev-ruby/rmagick/Manifest
+++ b/dev-ruby/rmagick/Manifest
@@ -1,7 +1,5 @@
 DIST rmagick-3.2.0.gem 1950208 BLAKE2B 5d4255fec8fcfb8ec2f6f361fd54a3371935dbae323918b2fe1aea47645f160024a8dd16582acf5c930639a50f702b2062e475d231c3bb0acc0bd83ac9ea00ed SHA512 f6f15b013699da5c61e83ecf4ca16d64e7e2f447dc721c7db55cad6b880f9805eb8bdcbf70aef3e30a82f38bbab8ca093d8c6d2ce761cde4f47209e3f99a9f16
-DIST rmagick-4.1.2.tar.gz 1978867 BLAKE2B f89aadb3d0dc5274376c2fef335cbcef3bdfec3fa9aa2f9e0d1982c9d2b5568689a427c3b2f7536c0585316c0f53ca7111c3da30f8136df4c878782668830847 SHA512 671ce8ef0d2387d6f0091a7a7a79a5ee9a5c5cd9340f5d29b4a35227c2293eae5e0e5c9ef16a83dc24ed0cb59cc7258427f8880484f7bb49dfaccb00d280e2b4
 DIST rmagick-4.2.2.tar.gz 1984143 BLAKE2B 8b8119a0002c48f3a289f72d4bbea6ac86cbecb287b34ddc14ca126fd2d951a34aefa39d68603dc4c9de674d346e47ef9e3b2c8ed96a5bc081373a4184a3ec40 SHA512 0a6a30a631786ea310d2c8add297abd527588be755d021143d6c64fbb597006aefef859c374604f8d26b0f8b1f6cd8a5f1cdd6489772ee713c71681f3980c7fd
 EBUILD rmagick-3.2.0.ebuild 1571 BLAKE2B 64042d8dca87fbb45cbbda5027238f514e3b318e8411bbc5533d69c1f363a29929059a3ece5feaae36addc9e2da64ea18329315a6b9dd2ccf3fc2c4d1b8818dd SHA512 bae5e087c94971cb2e5c5b1e60e72fbbfde68e134166d1ecd8b2f75deb61d2adcba6a43bc345f8395cc699c798e68ebc5b6d9402fc18ba9a4ba768de7551a5e7
-EBUILD rmagick-4.1.2.ebuild 1815 BLAKE2B 28b551d3619913b9a89e3b3185f19959d82ad4f1536befbded1c96afed760aed4c52b9095fcfad8d7a2c2e73dc54246211358fcff459d9096996c8b04cdb65bb SHA512 8d3eb2320c6f37bc65dfdbbf2b19498132e85024544728ed0a9915db12a950bf21505bed98d6f75488e13dcfd0bcb9e42563bf0fe7e5bfff5b431f08f35b06d8
-EBUILD rmagick-4.2.2.ebuild 1847 BLAKE2B 1313919f4b9104cb2ba305be3a4e590d7cc0996840fb9d1a5a2b8122379d83f1e0fb892093983c678dd9862340d65ba3af8d1b01f8f96bd482e063e3610bb25a SHA512 95e4e82fbd9dff8819b768124817aa73ed428112bf50b0e7b3d21a3195f2f9f1651a91ef01c29ef03826096b139246ec23817c3f0521cdd17aadf1f92015ad51
+EBUILD rmagick-4.2.2.ebuild 2350 BLAKE2B 2fabcd5effb838935edaa22c252a54ea267c26e68b7fad78967346d55e80e79a89d428312d4b7b7d0a203021031d9f237dc8079652b19528bbbfd54fc94b5dbb SHA512 f428cb34408b52bec1439c1d90028e9a33b19d9836d511fac9ef2bc9b4282de50626680afe99dafee75a1d6ab7c0c2ea227baef89721483327e21b3e16d1baef
 MISC metadata.xml 342 BLAKE2B cb38f3f9a158134520f82cef13b3322af5ebbe3b638bf695077e17406d754643ced9878aa304424057f0fd63da296efb787b40f5249d02e0d5993e2815256c00 SHA512 014d14485664346a449dff7c9a0c01bd1f6c549a6842da456bcb10c4f0b38111ccb025a8507f222e756cd4d136de6a217689e0ac807cf7fd0e3f806a6069fd28
diff --git a/dev-ruby/rmagick/rmagick-4.1.2.ebuild b/dev-ruby/rmagick/rmagick-4.1.2.ebuild
deleted file mode 100644
index 0efd8df2af44..000000000000
--- a/dev-ruby/rmagick/rmagick-4.1.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rmagick.gemspec"
-
-MY_PV=RMagick_${PV//\./-}
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="An interface between Ruby and the ImageMagick(TM) image processing library"
-HOMEPAGE="https://github.com/rmagick/rmagick"
-SRC_URI="https://github.com/rmagick/rmagick/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-RUBY_S="rmagick-${MY_PV}"
-
-LICENSE="Artistic"
-SLOT="4"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" test? ( >=media-gfx/imagemagick-6.9.0:=[jpeg,webp] )"
-
-all_ruby_prepare() {
-	# Avoid unused dependency on rake-compiler. This also avoids an
-	# extra compile during tests.
-	sed -i -e '/extensiontask/ s:^:#:' \
-		-e '/ExtensionTask/,/end/ s:^:#:' \
-		-e '/compile/ s:^:#:' Rakefile || die
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e 's/git ls-files/find/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Squelch harmless warning about imagemagick installation.
-	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
-
-	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/RMagick extconf.rb || die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	emake -Cext/RMagick V=1
-	cp ext/RMagick/RMagick2$(get_modname) lib/ || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	docinto examples
-	dodoc examples/*
-
-	if use doc ; then
-		docinto .
-		dodoc -r doc
-	fi
-}
diff --git a/dev-ruby/rmagick/rmagick-4.2.2.ebuild b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
index 3cb79596f21d..5b061481d8a1 100644
--- a/dev-ruby/rmagick/rmagick-4.2.2.ebuild
+++ b/dev-ruby/rmagick/rmagick-4.2.2.ebuild
@@ -25,11 +25,11 @@ RUBY_S="rmagick-${MY_PV}"
 
 LICENSE="Artistic"
 SLOT="4"
-KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND+=" >=media-gfx/imagemagick-6.9.0:="
-DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,webp] )"
+DEPEND+=" test? ( >=media-gfx/imagemagick-7.1.0:=[jpeg,lqr,lcms,postscript,tiff,webp] )"
 
 all_ruby_prepare() {
 	# Avoid unused dependency on rake-compiler. This also avoids an
@@ -44,7 +44,7 @@ all_ruby_prepare() {
 	sed -i -e '/prefix/ s:ImageMagick:ImageMagick-6:' ext/RMagick/extconf.rb || die
 
 	# Reading PDFs is not allowed by the default Gentoo security policy for imagemagick
-	sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
+	#sed -i -e '/can read PDF file/askip "Not allowed by Gentoo security policy"' spec/rmagick/image/read_spec.rb || die
 
 	# Update version number hardcoded in tests
 	sed -i -e 's/"7.0"/"7.1"/' spec/rmagick/image/channel_mean_spec.rb || die
@@ -53,6 +53,22 @@ all_ruby_prepare() {
 	mkdir tmp
 }
 
+each_ruby_test() {
+	# Borrowed from media-gfx/gscan2pdf
+	# Needed to avoid test failures on e.g. ppc, bug #815856
+	# (Unclear why it doesn't manifest on amd64 here at least)
+	local confdir="${HOME}/.config/ImageMagick"
+	mkdir -p "${confdir}" || die
+	cat > "${confdir}/policy.xml" <<-EOT || die
+		<policymap>
+			<policy domain="coder" rights="read|write" pattern="PDF" />
+			<policy domain="coder" rights="read" pattern="PS" />
+		</policymap>
+	EOT
+
+	RSPEC_VERSION="3" ruby-ng_rspec
+}
+
 all_ruby_install() {
 	all_fakegem_install
 
diff --git a/dev-ruby/rouge/Manifest b/dev-ruby/rouge/Manifest
index e2d1ba545990..cc1641bd5a65 100644
--- a/dev-ruby/rouge/Manifest
+++ b/dev-ruby/rouge/Manifest
@@ -1,13 +1,5 @@
-DIST rouge-3.19.0.tar.gz 919603 BLAKE2B 53cffee53d8c6bd8e27dc0278f9ef8e9bff2a01d568d2342847ce0afe71ec72a8394f6e9184f575e38abad7893c61a4553ca73c8072bdcdb91f347ffe63a65e5 SHA512 4a59e5bebfb0c58be82bcc23e7a9906d9ff5cba8a636b47b94be00194ab0ab6cfae4d584586ee037e160245630abada889aa85332398289a214b7a493a8e825d
-DIST rouge-3.23.0.tar.gz 947011 BLAKE2B 2b9f35859d54aa616e2b30c468466f1e6e9b8300004e306e9fcf5e1ca3c7814c2966e4286ed2bcbe4236a6926c10c00491d671acd7c2c5a52f37b35155530427 SHA512 5babaeec803cc9e3346a82d8599ca305b2dca6bf1e3104741b2cfc2ce25561f03e1f5b96f006af782a50245c35de2944ce51e339c6bbdf076a95779c8a3a32fb
-DIST rouge-3.24.0.tar.gz 954216 BLAKE2B 6813c0ee4bb6af664b684cf12662e1d0bec916f18aaea1f1d3a081a18fe7dd534298d6432e42c0798b437bddcd305a40fafa8eced4142215d094b8e1c94b5b17 SHA512 5823e5907f1b3303b928e88dbad2d95e91846be32e242b8a291ad90108aaae1ac6b8d397a47d3fc4c047a26e260e9b8d45866d0627e0a98f955ff46556ca1908
-DIST rouge-3.25.0.tar.gz 955146 BLAKE2B a0e2fb513f3ab251d13c0777bb4620c4b447436a5906c7a0600b3b3652de952ca14a014f59408776cf2dda8f42b835748f1513ce637bee0cb6298392acc0ec3f SHA512 3e50d2655a7a58374a798b6718753cdf73b6edd434d954f11746278073478281dd9df246e6d9524f5c23deaf5b43c9bbe8c750160e356c8ee6ffa9b795c2b2f4
 DIST rouge-3.26.0.tar.gz 971871 BLAKE2B 9739c229788d615f4875caf5d38c91ca30b4fe5703c577b2e7aa5d54bd625f33e998ee887d375d357e72c9f05ac9a284b88ce7902c6fae422e8196098a993259 SHA512 bd6006b11924b3705dc142922878dc87af25ceed8a153ad9691ad2595144ae1f3f909574799002601928e985a6650fe4c8d93e05a1e8e26bdb10e9b2f9a28765
 DIST rouge-3.26.1.tar.gz 972469 BLAKE2B 48f7741d69ce6470235ba4f469b8a37b6bac409a68ba44bce3d60f3ffc4d3cd7a1e3fc4358e4f7a4f27b27653e4525767749da5d7949a1208810f2634be2f331 SHA512 4b5d5a840dab75579e2fb10b4d86fde647ccf183b2fe496463a6ab14dfc9022fa44be9ac75e5f792bf3f2102477a40aafb5fe4694e59bfe9786d3a2d70ddb9f6
-EBUILD rouge-3.19.0.ebuild 970 BLAKE2B a5a5fca185c436833cfc31d8ba1d7acf897c274a961a54d350a188cf82a03234cd15ffdcb889c74fe213cab2f68a93a3f6384a4f2e2929aa6158f348c8c5b8fe SHA512 d9fc5b0e2d57578347450e7ba6d88a445f0d84f8ee2a8b975daab510c1398df5314c225f33d216a970699f70b2633b5cb49eb562793619ab73beae2cb8b7d5c7
-EBUILD rouge-3.23.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
-EBUILD rouge-3.24.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
-EBUILD rouge-3.25.0.ebuild 968 BLAKE2B f714fac60256678764f27c1bab8ad4f86ddac1384a93ff7c0da2248edae46282b2c79ab168dff6855205f24933088249e5b71926da467cc1f388edeeee87e3c7 SHA512 fc547adf5c97e162b7a0920320f0c0e3197d381e0348466836d1a12c6415151f1207afecf0451abcca43a800ae80f15c78b4683f95106c3ea6db57b52b195244
-EBUILD rouge-3.26.0.ebuild 979 BLAKE2B a83dab94dd22ed6f1f991fd20e9022b790490bb8a5c720ee6eef747974ee2d39afa4ec38922bb1926c47ffc0d17c933c44d2179051ca651bf7cda8c68b42278d SHA512 a1b2af781446d71c9103fe268ac6c79ee5686451fd358612eae7927b24d0e2796e32e1e9e0c0a506b5c84f7ebf36fc65560ee8b692a12fd801f5613c7fa78135
+EBUILD rouge-3.26.0.ebuild 977 BLAKE2B 7be79ad729709869c28fedbec40505327b663d4c5ce730c6b3e1a8414e0abe1a881182c8e5fc2086ddac05674f12843e0b1f4a5aa645501964bb2d48f6a3b379 SHA512 306244a572165afa6e545f93cc66df565c0eca65747750786d4172a9af8403d50be20d5c77ce278da2b2c308b61466fbec97c4dcaf5a9b401db3d11544a621d1
 EBUILD rouge-3.26.1.ebuild 975 BLAKE2B 56547b3fed0d897b0e96750b4b81bf52de7196efc6772e2017c2458c8e6205121e0cf743c80c43f942bb6aef9f7d7c93aced26cf3fefd05bc34855701d66448e SHA512 1607bda0366f599674c3a1a91c3cfd288e60d2e600018badbab7b97d10dd49430d8ed4713dad12e0422091bec3bccb853ed441d3646ad4b3511e10cec2a90b1b
 MISC metadata.xml 338 BLAKE2B b9a7ec25ef86f08524a092129330c037144a7316ef87b5afe7dd0f03788f7fa847eff2de644387def96ae8a360237605b8e782a01607c9783a7826486b2d5959 SHA512 8ad90512c84bd0a6bc94d2bd0a5b62424eb29fdadd65a1b31eed834d12b90a4a6f552b6906eed494cf0e531a07aa02e8a4db897968185f1095fd37811d613de1
diff --git a/dev-ruby/rouge/rouge-3.19.0.ebuild b/dev-ruby/rouge/rouge-3.19.0.ebuild
deleted file mode 100644
index b4b7be4966d6..000000000000
--- a/dev-ruby/rouge/rouge-3.19.0.ebuild
+++ /dev/null
@@ -1,36 +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"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.23.0.ebuild b/dev-ruby/rouge/rouge-3.23.0.ebuild
deleted file mode 100644
index 7e43cc39b023..000000000000
--- a/dev-ruby/rouge/rouge-3.23.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.24.0.ebuild b/dev-ruby/rouge/rouge-3.24.0.ebuild
deleted file mode 100644
index 7e43cc39b023..000000000000
--- a/dev-ruby/rouge/rouge-3.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.25.0.ebuild b/dev-ruby/rouge/rouge-3.25.0.ebuild
deleted file mode 100644
index 7e43cc39b023..000000000000
--- a/dev-ruby/rouge/rouge-3.25.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-RUBY_FAKEGEM_RECIPE_DOC="yard"
-
-RUBY_FAKEGEM_GEMSPEC="rouge.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Yet-another-markdown-parser using a strict syntax definition in pure Ruby"
-HOMEPAGE="https://github.com/jneen/rouge"
-SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
-	test? ( dev-ruby/minitest-power_assert )
-	dev-ruby/yard
-"
-
-ruby_add_rdepend "dev-ruby/redcarpet"
-
-all_ruby_prepare() {
-	rm -f tasks/{check/style,update/changelog}.rake || die
-
-	sed -i -e '/bundler/I s:^:#: ; 5irequire "minitest-power_assert"' spec/spec_helper.rb || die
-	sed -i -e '/\(changelog\|bundler\|rubocop\)/ s:^:#: ; 1irequire "pathname"' Rakefile || die
-}
diff --git a/dev-ruby/rouge/rouge-3.26.0.ebuild b/dev-ruby/rouge/rouge-3.26.0.ebuild
index ee58ed8f28be..1eac0b015dd2 100644
--- a/dev-ruby/rouge/rouge-3.26.0.ebuild
+++ b/dev-ruby/rouge/rouge-3.26.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/jneen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~x86"
 IUSE=""
 
 ruby_add_bdepend "doc? ( dev-ruby/redcarpet )
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 2e4d57b49d98..d9208dd6d33e 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,5 +1,7 @@
 DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
 DIST gettext-3.3.7.gem 292352 BLAKE2B 76232148ec89720553e7f260c7222b8c5f9eccf0dd0b0b3afa776d9fe6dc6205b21f7853fd1a1edb6e28208ebbd56e327d160af179a4b7c7aaab12965243b806 SHA512 6e7906d68b3e834e1a9d69cea26a61ffed07abd035c9a8ffc3456bc2fdcb9495700c2aaa4d099cf75f88dc6916899510208012e02d1d4f15de3d5148251b4233
+DIST gettext-3.4.1.gem 231936 BLAKE2B c225a3b0239f01fade9406d4e7704905971369bb37cfc29a5aa3c1bdd60e3b71057b2f7f736cfc3dde60709efcd935a609917384a324178badd760f8e40dfa01 SHA512 c4c88aa9b1d81772dce533bcb6a24c2bcde81f15e2f3947e491c7e391099f23c1ac27b6a25fa012f9f7b01c16711446adaf0c014f46d55acc73bc4a7a3317af9
 EBUILD ruby-gettext-3.3.5.ebuild 1729 BLAKE2B dcfb65933b92155a73e83c55ffa7bb6cfc0ce05d2ec5b4dbca0fbab50abe4499f44ef8d10d6c4bf22ea39808eb02fed3d43027cf3083a17cf471ef183341733a SHA512 5418d2b91c2ac538a8ea3d4fb089a25f8c354fe193bb46b98aba79e91e034eefcf8e911347153ea55710534292c24591b1df4337c7c2f44984b2d0b5c4c421f3
 EBUILD ruby-gettext-3.3.7.ebuild 1736 BLAKE2B 30f9ab98b4b1e5e061b7599c848b85509b224562d53f5cc9060dcabdb1a66769f9706c96ef9d181bea6b414ed12ec5ba99a33277adbe5b6b9f7a296b4445ed66 SHA512 7aa10787e7d8a2ee5109c0e0cf4a571c461280488fcefe9ecca34449f7c8e3dac2e3cefe1c22f1278f1f5cae1b0308f563d8e10133abf38a4f2281e3cb12c130
+EBUILD ruby-gettext-3.4.1.ebuild 1500 BLAKE2B bb54b27cc473d966ffb864d2a0d23276153c241096cb1fd901527f419135458b119ac0dd9e131066e90f55cdea9651fafb4ecc4c12a661c09bbfd057a6f5e11f SHA512 0cc215afb2b5934955ef7cbe0a74a73d7db17f4ee69085ea89b8123ffdc23feb26f27e3cc62c329d0714de918a909f9a27e53237e53a31fc4cc979161a3df6a5
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.4.1.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.4.1.ebuild
new file mode 100644
index 000000000000..6a95dca662f5
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index b6002e99d422..9b8e51fcdc12 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,7 +1,9 @@
 DIST sanitize-5.2.1.tar.gz 1352785 BLAKE2B 2742085ac296869b8be36cf803f999475032c147d94aa0fba77fb83b8305470baf144f4c68fc5711871779f327c9bf1ba8b3b817f3777a04fb0b9c726318ee1d SHA512 3384d01db244f9f7feeb67bf2fae5773a85f512411bd761db6a71ab3fb690fac33c0caae848e5a4df6f202be7dd7cc52f8bac4c82bef447d20dbc70a586ed82f
 DIST sanitize-5.2.2.tar.gz 1352903 BLAKE2B 8ebe57b6de733556015e38ddca0a2ed69e4bb8a22d5f3e812f7e346f4822df15e0554b4a74d195fd812c45397ecc03543ce7024e9052b4d0045d56fc3c02f64d SHA512 9a2e7d265799fdb7e02256bd9050ede7ae73c6088064bc79fec6c94f3d35871ff427c2b59f0e3ed122e091ae36b996413080f7fdcefe85f740c1825a70abedcf
 DIST sanitize-5.2.3.tar.gz 1353257 BLAKE2B 8b74376e2c184e6219d089f5404cce0f0ec2acb2002d49eead0045b5771331960b6c1c47ff876aad155d822d04b282c2be6881b25d9864f68e617c2be45e6ac2 SHA512 0cb30811251fbb60a7f37307010ccdc8917ca4a5bc8c9c702767e3c00d9e68fb79d5f0fe2afed3ce74646d9195eff8060e11e0fae1ee1e9c3f5c9e05af14f111
+DIST sanitize-6.0.0.tar.gz 1353309 BLAKE2B 3056b79ee9611797cb8058f37a694f029e7609b4df8d968ccbece4ffe562c30aa55d9fafdbb9abc1ded86aa0c605fbd48546b8fbedef06272f0184c16f7e9dad SHA512 8a3ce765b6bc0ef8418af785e1fea5ae3b2a32eda82cfc21f9ea36df164c293250fd277ad8ac065757db18ea104b826fcebcbd46d5ad2ab059807e377765476d
 EBUILD sanitize-5.2.1.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 EBUILD sanitize-5.2.2.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 EBUILD sanitize-5.2.3.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
+EBUILD sanitize-6.0.0.ebuild 750 BLAKE2B 37b2f6f9d5717a5ffb8a0468c044d4a2eb6f066ba9f76eea7fcdfc1bccc258965c3c25fb38709cb60b10ab8800df9bcd2e89f73acab8a54f7152109417560b9c SHA512 d366274ace665820f87e333ad0b7e2347138f77535f3750610d13d3113bfea9bdd2d6bc861e22e18a8e8829d969e0aac782d8896435c2dd354333947d8868c62
 MISC metadata.xml 342 BLAKE2B 56d8c8d3467a7284a795dbe938e591403576e6e3d4fe675471e2b24b6c2f8520bec8cdea8d7e3182fe6fe8187a6dfb2889befbf5272f76b8f87acc4942a36e9d SHA512 e4257fbb18383d391d7962b3869db25b6875721cad7100dd42f7e10ac72254720c67e1028c13e4fe7517fda833677c1a542e12ff81ba0632b878b851a974c00c
diff --git a/dev-ruby/sanitize/sanitize-6.0.0.ebuild b/dev-ruby/sanitize/sanitize-6.0.0.ebuild
new file mode 100644
index 000000000000..f30bc4795e7c
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-6.0.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~riscv"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.12.0
+"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/sassc/Manifest b/dev-ruby/sassc/Manifest
index 65cb57b26ae4..1ac96da3bb52 100644
--- a/dev-ruby/sassc/Manifest
+++ b/dev-ruby/sassc/Manifest
@@ -1,6 +1,3 @@
-DIST sassc-2.2.1.gem 302080 BLAKE2B 626601d2b22f91f354a4ddf7a68e4463b0a56b0a79e5d2ca122a083101146dac32699e348fd4573ef4ba76a430470ecd39427a8542caec931a8e16b26a23bb70 SHA512 728ad274363fd79aedee74fb6d4dbfc60f31b334e1a8054943ccf9cfa534fa3465abb00a2bd3020e198d287327058890411bb1983da6dc5dc3c4413b1936e2eb
 DIST sassc-2.4.0.gem 304640 BLAKE2B a4cd96859855cfd26e78a35becba30af8b7ee52d8ba67f7dcbc6354786f26e60a312be4e773f515f6edda6623142249a4a470f418d9fae3db734f8ae11498dc8 SHA512 835ba03d0fc5a791b2d620367f63202973f778bd8ebaa87c27f6a1de75b5895270205e8746fbb242d2739c9830a27d72453a75c1b536090840de581c52caade6
-EBUILD sassc-2.2.1-r1.ebuild 1048 BLAKE2B 8c48e20062edfbefd711bd25e824d18c23b57015b3a45e813d149a3d65f7267c0834fd0d68a66c557983e4d2a1dd77c8cd1986bc1af35f271f4f3f5d3324d3f9 SHA512 12909cacf82d0ce4bb059024a17464143fe37f902bae472f3aed317dc720eb79c12cf948199c24922ad5e2e42d65e84e93b1db68eaaf3212b62b9c67bf7eee51
-EBUILD sassc-2.2.1.ebuild 1032 BLAKE2B ff9fc9b4fd8704d6ce318fde53989aa914bec96cdd10f3d9898e89dc02f7e26640df8150f0ae18c09db7fa97f541452eeef39ab4900602f4442eb44c47668ce0 SHA512 89ad98172e679447138d251dd34fcd1e5a1ca4bc21d438f82929052a0b23ca6f8bf0ce36ec13aa2a98f5665e8669b0ea51044d0c145ffd7eac2cc76356cc06e2
 EBUILD sassc-2.4.0.ebuild 1048 BLAKE2B 8c48e20062edfbefd711bd25e824d18c23b57015b3a45e813d149a3d65f7267c0834fd0d68a66c557983e4d2a1dd77c8cd1986bc1af35f271f4f3f5d3324d3f9 SHA512 12909cacf82d0ce4bb059024a17464143fe37f902bae472f3aed317dc720eb79c12cf948199c24922ad5e2e42d65e84e93b1db68eaaf3212b62b9c67bf7eee51
 MISC metadata.xml 342 BLAKE2B e142db9aa3fbeca45133f091bff39a3452a51917779f21f78928295cd69bed7e12fb68de1e1d432d5765fe1560b5841a6c12be62487375b206170052c8aacd2e SHA512 39e8f3ff146ac9ee2b06246a6277b9abf3b5466dde0820ffe309f0303923310610dced252f33ed5ac342bea64f8bc3941d71d5d57b7c36bd8d302f415b32e10d
diff --git a/dev-ruby/sassc/sassc-2.2.1-r1.ebuild b/dev-ruby/sassc/sassc-2.2.1-r1.ebuild
deleted file mode 100644
index 3040ccc0c12f..000000000000
--- a/dev-ruby/sassc/sassc-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Use libsass with Ruby"
-HOMEPAGE="https://github.com/sass/sassc-ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="2"
-IUSE=""
-
-RDEPEND+=">=dev-libs/libsass-3.6.1"
-
-ruby_add_rdepend "
-	>=dev-ruby/ffi-1.9.6
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/test_construct
-	dev-ruby/minitest-around
-)"
-
-all_ruby_prepare() {
-	# Use unbundled libsass
-	rm -rf ext || die
-
-	sed -i -e '/ffi_lib/ s:__dir__:"'${ESYSROOT}'/usr/'$(get_libdir)'":' \
-		lib/sassc/native.rb || die
-
-	# Avoid version-specific test so newer libsass versions can be used.
-	sed -i -e '/test_it_reports_the_libsass_version/,/end/ s:^:#:' test/native_test.rb || die
-
-	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/sassc/sassc-2.2.1.ebuild b/dev-ruby/sassc/sassc-2.2.1.ebuild
deleted file mode 100644
index bce02501c5c5..000000000000
--- a/dev-ruby/sassc/sassc-2.2.1.ebuild
+++ /dev/null
@@ -1,48 +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"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Use libsass with Ruby"
-HOMEPAGE="https://github.com/sass/sassc-ruby"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm64"
-SLOT="2"
-IUSE=""
-
-RDEPEND+=">=dev-libs/libsass-3.6.1"
-
-ruby_add_rdepend "
-	>=dev-ruby/ffi-1.9.6
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/test_construct
-	dev-ruby/minitest-around
-)"
-
-all_ruby_prepare() {
-	# Use unbundled libsass
-	rm -rf ext || die
-
-	sed -i -e '/ffi_lib/ s:__dir__:"/usr/lib64":' \
-		lib/sassc/native.rb || die
-
-	# Avoid version-specific test so newer libsass versions can be used.
-	sed -i -e '/test_it_reports_the_libsass_version/,/end/ s:^:#:' test/native_test.rb || die
-
-	sed -i -e '/pry/ s:^:#:' test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/slim/Manifest b/dev-ruby/slim/Manifest
index 594082b2246c..adb500b3eb67 100644
--- a/dev-ruby/slim/Manifest
+++ b/dev-ruby/slim/Manifest
@@ -1,6 +1,6 @@
 DIST slim-3.0.9.gem 99840 BLAKE2B e449585fe5642c1980b4d8fb0c93979d8c16020c331f1bc2993c6f7b5bb3e55c1b85595711bf3acdc369c6a3fbfdc6873a8208c59aedaa49dead1cd9166347d4 SHA512 220dbcde230aab05e294022924346fbb02a1bf813a7c97910c2f60d7b3a7dd498d04f6f4f2883b895d2a3e6e9f526331914e3ab4560e748de2bd991358cca90d
 DIST slim-4.1.0.gem 103424 BLAKE2B 87de8411d6284569ac56366d4e2f3ee351c6908001cbda2926312f25c1c39520662371e826493d1346722bb507348bd8c117f3b0447b433bdb406435b80a70e2 SHA512 a929edcd1b194bc6abddf5757e0e942835f6c5e1555aa7bf021b0e850d74c9777637a2a0eafbdf2de7f0f0574eb03866c562826c656adcc0517cc4bfcb5ca897
-EBUILD slim-3.0.9-r1.ebuild 1628 BLAKE2B 1fc3c75042d2c270ba06e37c9e41a2f9454b82614289547133985156aaaaabd798ede3c60a635c02bced648ad8a020595e0870fff63225ac85935f6a70a593d2 SHA512 159783c00c5b0f916083850e36f645907adfd97007e284c81fc333dbbd09a06b8f0c11fb95041ba62cce99b65e90e551ad1706555e03778a48eb0361f642375c
-EBUILD slim-3.0.9.ebuild 1604 BLAKE2B b8caa913c512b408d04c99741cc4dadf95af6bf80abfee204997d8d9bba75c7ff65d8227430e80eb3967c1e70eaca1133f984f28be36f46144d91aad06ce9829 SHA512 4545b952f41cd47d43ea6cc3421d7599be2c351bf80c30ceeb92efe2e0255c03aabd210d122d90a0e982a2532ad95e3d17b038e8268551f701bebb7b21db00c9
-EBUILD slim-4.1.0.ebuild 1673 BLAKE2B fea31c503b4e7fb9c7dfec09803c84406fb243c33e77fe0eb74f5090bb24f421fee0b520f52dd7cd3c97890bacf40060ba8a258769535a9c9595ad7c7967d565 SHA512 3fab903654672c62e8c49b1b5a60781dbabbfee636d65abe185d210af02fd20c55d3e28035a45c57690efe6592155faa5530b4a77dd39d2ea054fe5f95f7e4bb
+EBUILD slim-3.0.9-r1.ebuild 1622 BLAKE2B a21f9c749739126147c9c8594e3212f061dec057aff4256a2adedd701cc5f31ac7b5cc3ef65bc6b4730e57842c3cb4dcd7f1d6f6d7fed77dc10c208dcc214520 SHA512 2ea75bcd6076502b53ee4804ba5dca49b88585f712030bcf58e37f74ca1dbf93c5aa3fd318fb6d5a30128707bf2abc70e9156e8a143cf25d7a724abb1e6d3635
+EBUILD slim-4.1.0-r1.ebuild 1756 BLAKE2B 810a241d007f01f4c5c841ce1ce38f7c835c9ac0b007a8ff613ae2b15e7599cd8b8b79ac52d8e387fb7249370b312e3be6aa63030288ec2f99baac46dd00ec70 SHA512 cc53128575e0f8e649aac1761706daeb2a777bebca4b03ac4a18eb01b36a3ad4ea432c7cb208fa7c4c6d3c39e0a186e257f7f827f9a56111046107eaee3c8c05
+EBUILD slim-4.1.0.ebuild 1653 BLAKE2B c706e322135b0a78d2bc2fcbeb0fbaadf8c44bf4635850043b3281c560f7075ef1e8692cac6ca7df3a28f88bc176b068d1ee9e745fe88a50f89ae7f8dab62bc4 SHA512 2be3514f16ee6fd78dc2a28f2b88c737011acc7a8abaf9281cd36e2ceb3eaabdb579bf0d230cd67a88401bc2486b22037d7a31b77b5564dd1e4cee1eeb369624
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/slim/slim-3.0.9-r1.ebuild b/dev-ruby/slim/slim-3.0.9-r1.ebuild
index 28b1bf6d333f..8c301dc90bf4 100644
--- a/dev-ruby/slim/slim-3.0.9-r1.ebuild
+++ b/dev-ruby/slim/slim-3.0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-ruby/slim/slim-3.0.9.ebuild b/dev-ruby/slim/slim-4.1.0-r1.ebuild
index fc9e8312c7df..d1f1920d1e35 100644
--- a/dev-ruby/slim/slim-3.0.9.ebuild
+++ b/dev-ruby/slim/slim-4.1.0-r1.ebuild
@@ -1,12 +1,13 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGES README.md"
 
 RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_RECIPE_DOC="rake"
 RUBY_FAKEGEM_TASK_DOC="yard"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -17,16 +18,17 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
-SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+SLOT="$(ver_cut 1)"
 IUSE="doc"
 
-ruby_add_rdepend ">=dev-ruby/tilt-1.3.3:* <dev-ruby/tilt-2.1:*
-	>=dev-ruby/temple-0.7.6:0.7"
+ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
+	>=dev-ruby/temple-0.7.6:0.7
+	!!<dev-ruby/slim-3.0.9-r1"
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
 
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
+ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sassc )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
@@ -34,6 +36,9 @@ all_ruby_prepare() {
 	# This sinatra code expects tests to be installed but we strip those.
 	sed -i -e "s/require 'sinatra'/require 'bogussinatra'/" Rakefile || die
 
+	# Add missing include, bug 816573
+	sed -i -e "1irequire 'ostruct'" test/core/test_code_evaluation.rb || die
+
 	# Avoid tests for things we don't have. The builder test does not pass with tilt 2.x
 	sed -i -e '/test_wip_render_with_asciidoc/,/^  end/ s:^:#:' \
 		-e '/test_render_with_wiki/,/^  end/ s:^:#:' \
diff --git a/dev-ruby/slim/slim-4.1.0.ebuild b/dev-ruby/slim/slim-4.1.0.ebuild
index 956b9c862858..a618317cb6de 100644
--- a/dev-ruby/slim/slim-4.1.0.ebuild
+++ b/dev-ruby/slim/slim-4.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ DESCRIPTION="A template language aiming to reduce the syntax to the essential pa
 HOMEPAGE="http://slim-lang.com/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 SLOT="$(ver_cut 1)"
 IUSE="doc"
 
@@ -28,7 +28,7 @@ ruby_add_rdepend ">=dev-ruby/tilt-2.0.6:* =dev-ruby/tilt-2.0*:*
 
 ruby_add_bdepend "doc? ( dev-ruby/yard dev-ruby/redcarpet )"
 
-ruby_add_bdepend "test? ( dev-ruby/redcarpet dev-ruby/sass )"
+ruby_add_bdepend "test? ( dev-ruby/redcarpet )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/I s:^:#:' Rakefile || die
diff --git a/dev-ruby/sorted_set/Manifest b/dev-ruby/sorted_set/Manifest
index 1a22f2159b14..cfe0333079d4 100644
--- a/dev-ruby/sorted_set/Manifest
+++ b/dev-ruby/sorted_set/Manifest
@@ -1,3 +1,3 @@
 DIST sorted_set-1.0.3.tar.gz 4863 BLAKE2B 43dc21205db8cdef8be016d041607cecc7c23a847b2622518f212fe65d00b4bd63bc77c356f3e96ee84c6a1a702641f8248bb3d3201d7252652fd2fac7900d88 SHA512 67236fdac7d024203dd8d7432ec575008a14ad1e54367f6afb168711158ef5abac24629417751b0e11f641607d0a83689ec79e0c42b44025a6a7671cdcf3a70a
-EBUILD sorted_set-1.0.3.ebuild 654 BLAKE2B 21b89547a145004a3ad4613a0f4c31dce5a7b111553b88c1242f018d000a54e9d88b887a54a892599b78fd3e93f1e05f5b6c9c5666266c9fecfb023ebd168897 SHA512 3189eb7e5a49de64c8d4f1598d36bd4271926b0fa0ab974849d8743ca95d7660f2612c58106cc14edacd718bd20276e318839289ca8d8ea62fe1a00de9e226ab
+EBUILD sorted_set-1.0.3.ebuild 659 BLAKE2B 24f0383d788e1c2376cddb869e2d2cf07bf4092671b10341a37ed150d6be63f119b12c6c3e06ccdfbd81b3fb9fec5d0b1adcdc79ab44340d50e9a3def44e0eca SHA512 128dc08334e802a28245e48ffb81ffa70c0c996e0c2ab16e0b0124d6a4dc9da9f95755b099a254a1a65f11504dab47cc4c170e0bed1adfbfb62c2cddfdc1bef5
 MISC metadata.xml 258 BLAKE2B 3c49249352f2cb11df010da6ecd8312a27047557ca5f2686837ad66933be9ea2627c40f91daedf8dcd9099c6cdc0dc2d2ba32aaf9d888c41fb60ee098e1c0c1e SHA512 ce517e35f3c0a2a9807ee68b0a8c84ca28db8dfabb41758cac71f9da22847fe20d259295f0681e38a52a24618450a0ca097939dc1022e3987bb0088762e48326
diff --git a/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild b/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
index 7f412c4a4bae..9653d09dade6 100644
--- a/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
+++ b/dev-ruby/sorted_set/sorted_set-1.0.3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/knu/sorted_set/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/sync/Manifest b/dev-ruby/sync/Manifest
index 9dda15c5c759..729603baa041 100644
--- a/dev-ruby/sync/Manifest
+++ b/dev-ruby/sync/Manifest
@@ -1,3 +1,3 @@
 DIST sync-0.5.0.tar.gz 4957 BLAKE2B 9b4b1710d2468068387d782109199dd45c783b6d7bb0357851f800df2ac4961a72143cfc2b42f522524cf7148694545ae8eab47ee6629062d8ea1505d9095ba0 SHA512 5f887d9169e0be834c7fa17ae42b71078f25ce3d83e695490cd136adc1799d6b92e4aed41ce3f3d57b3ad193a1ac4de940b37212c2864bbf6331ba3582128166
-EBUILD sync-0.5.0.ebuild 660 BLAKE2B 901bd6b68bb5d0beb49acd78a84407436e258c61516e7f7c7c2557fd49c70d01be785a2e93f94723b2c6c4142af34605e5d202657f31fde4ba29d391877ac217 SHA512 a951e54de506ba5d48247f4430c8ba4b5cd291cd5ff64243751f48c1ebceaa90689010b05fc7cae1eed66d150c041f24da2094617a6cf9980273eafd6b1c89af
+EBUILD sync-0.5.0.ebuild 659 BLAKE2B dcdb3cce98bacfd51c7d2a4bd5a86750f4a635092fce16de6da165e236779fb048219fa225e0368fd4921d72f1204b3b14355e6f8e8259a94386d27154d72f03 SHA512 7b19554cee5d2a8366249209dd4d179b21c1f1a5d7d021c8b40db43588acf9c810cdf910ad37770822ff0e9ef50e466e6e26f1f8414a32088b33e7cac9a3d24b
 MISC metadata.xml 336 BLAKE2B c6c56576f607edf4075d6bb9eca47ca898d5037dd830464c57df25c8cfa50e236afc6a318570145b9f48fea13c55255943674b1a418a016762a94ea3e348deca SHA512 98a7781b1e6f5372a564f69eed27881076a5b73609a4b87fccefc251990f3a60ca6526c99e7e9fa3acc01f285dca2beba4e268f0571201081ae55f8e85971124
diff --git a/dev-ruby/sync/sync-0.5.0.ebuild b/dev-ruby/sync/sync-0.5.0.ebuild
index 2b1f245135e6..8bd4bff82435 100644
--- a/dev-ruby/sync/sync-0.5.0.ebuild
+++ b/dev-ruby/sync/sync-0.5.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ruby/sync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/test_declarative/Manifest b/dev-ruby/test_declarative/Manifest
index d949c6c7d7d1..92b34ce1d390 100644
--- a/dev-ruby/test_declarative/Manifest
+++ b/dev-ruby/test_declarative/Manifest
@@ -1,3 +1,3 @@
 DIST test_declarative-0.0.6.tgz 3586 BLAKE2B de8e4b011de9ce0773e2c76887d6cf7d888c2f799a07e6dda024b301594edc37ccf2c386c366c0a13d81a1f0697fe7be92932db7d66e5ed482d529fac4b9ce78 SHA512 f147fef7f3ac912c7b1cb2826cfc7cb5abf4cba92ea4f7accc2b1ba3a4f0775bff5ae06e80370144b7b1e7d03e2f3129e268c5d7056ee2aca9d77047a1b5a1c3
-EBUILD test_declarative-0.0.6.ebuild 1017 BLAKE2B cc4e143b1d70efb76859a08fb40ca740839602cb39b3ba65ad9d006a2d82c03a518aad4f4c1fb5e63196bcc918d774fb467a09ea47f5ff4903083de9127e4207 SHA512 67bcf8e423c1991c2e91f94736f883960461f8cf808cef1ed9a70fb64940d05bdb1633e4a99b5656d98500510348689fe0876f125ca745d62dfc822e20fab578
+EBUILD test_declarative-0.0.6.ebuild 1016 BLAKE2B ca4647e178c383acecf9cdbed06414c737ddab8a9ada93453708c6f247e18e2d6757c801e156ce9c34b024c04fe3e53143cfd51bc31f698224c88a3c8e09b214 SHA512 dc7039c13f230293b523ca7eb0c43dc558bafb3433e799efaeba11af44f53bfcf9dfd05131dea4b02af7647f3a05d6fd87c9339f882fe87676ddb1492a5c2d8b
 MISC metadata.xml 353 BLAKE2B 504efd99cbd9cd70b9241711a5ecb7ac96f10bef5a88e25288dd6293e1c42b2d215ea3042feff270a4c9b9d36c724a6f6450d180dc69a724781d034e5d91e27f SHA512 c6a704277f2ee955f9cfc5898a89285951ee0a9546760bd949bd29e06b4a8037788365b9a95e2530da65907e03fab5d52dbd0d73768ee75cfcf1b00eddea5d85
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
index fee88b0e83d8..5dcd6d1e34e3 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6.ebuild
@@ -19,7 +19,7 @@ RUBY_S="svenfuchs-test_declarative-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler >=dev-ruby/minitest-5.10:5 )"
diff --git a/dev-ruby/text/Manifest b/dev-ruby/text/Manifest
index 374f0bd4dc37..720389b7a86d 100644
--- a/dev-ruby/text/Manifest
+++ b/dev-ruby/text/Manifest
@@ -1,3 +1,4 @@
 DIST text-1.3.1.gem 138752 BLAKE2B 19c837d83f72787ef1a70eca74d9b2d2e8336d60eb2dc07578f07fa446919984946b1c2431efcb4a3b29770f77f9eb0ea9a40c8d74dd07972786066b67aa3e2e SHA512 0380fc77e2f0d427afd9015ed904947311139e52adf3d49b748d0e6ee32c579073ec979f0cdbc117b53e3d841f25ce9f271637dd7edb5f6e124e369cca788eb8
+EBUILD text-1.3.1-r1.ebuild 398 BLAKE2B 120f51b01014545f379aa2c8ff6f03936b1c6459676ef05b9a497fb5a380ac08373f89f1a0360d5363ecf08e45334003e5bc3cf3ba26080abbeb3c9ff04672f9 SHA512 30bf6a40d9bc4ed2b894207a2dadc80d7cb57983897ef81a67a874b74b740c53df18b464856c85c1f48a632516053fb6be059a2f635d9f352bad99d092a48713
 EBUILD text-1.3.1.ebuild 429 BLAKE2B ef761d3251ee38830ba233990bbf8069611b2fa66d7dcd80ff427cfe849409a8543d258214e14bcd42283c42da97ee27587040068d67184ddc06d47776f3ad01 SHA512 2b892246fa9962e2145a490a83343dc61593e73d9564c62fb62c4ca119b78cfed1d1aeff9ca45e21cad9f57f61561c71189c4b40d028216b3701728c5e29e57b
 MISC metadata.xml 344 BLAKE2B 6a1b407c9fbef40e4a1b79982bbf7de3b2459c6b1726d7be04500a3d1d2926fd6a697830c66c47e3d2a63f432f8d3b0b76775bf5dde17a4ad803c99390cd3b20 SHA512 0a076cc71bd6ca52aa2d418469f5d6cb6b3c3ccffc7061a9418d9face99188e33e37d07c59edaf1d211c5b3e90b06fd6352509a44d437a6f0c2f61200a68473f
diff --git a/dev-ruby/text/text-1.3.1-r1.ebuild b/dev-ruby/text/text-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..bdb24da28420
--- /dev/null
+++ b/dev-ruby/text/text-1.3.1-r1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A collection of text algorithms"
+HOMEPAGE="https://github.com/threedaymonk/text"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index d3458b60925d..a1c86e8340fa 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -1,8 +1,5 @@
 DIST thor-git-0.20.3.tgz 94786 BLAKE2B a27ef27d9d375c1f5ab1b065f6ee5b635dab3b43cac7915ae24771e7a9e24189b8c3df8936bf6ad333f0660e4e36ff73372746afc227972f1745dc993b90c85f SHA512 368cedd9584fcdecf8f5feb9b727aa283b37747e8200f8629aaa762f8e3a59dafe6ee1e7c60ef2b43b2a16b319842b10d0f3face12ba8dded4b6211640db7f44
-DIST thor-git-1.0.1.tgz 96670 BLAKE2B db7e10a31e7de14441f26e3b5f1574200a3e7f86475ee68e6a18800c6894a5a949c156d54c2be44c1a4a79136a6d93f2416ac616aa77b296997f6b518c101799 SHA512 cd0c6e3833976b27f9d23d69f261d4457ab99bb52eb5e7121b92c53aedd6bd953616215ba01b8b931c86e9cd22b944415810230d0e868c95dc9ef712f05f99d3
 DIST thor-git-1.1.0.tgz 98252 BLAKE2B 1537cfe6e7cc0d92cc8bde56f0e2acf06b6ee4cb366a5686bb62de43dd15709a4aeaf1b30c3dfa71a6d6c7570e702deeebab6da324204388ac427337514be3f0 SHA512 d1872a834478c5a2054dde6f55e93f6765fd628536f99f888bd7495436c88658537d48c44ef1e5ad6d1388edfa294ea2a3f3cbde32c19b7d2253b78bc62bf9d0
 EBUILD thor-0.20.3-r1.ebuild 1436 BLAKE2B bd76a7a658afdff2e6a60ceb5be8ab977eb1b67f4825e86d216c0d39c726445c72b00491c338c8a4604f8bb933e11d60228abc2d4f2a4328cd9d5df879676663 SHA512 bfdd0f4c287a8376afb4bc661ca56c7773a7d3edaa0ff443bfdab53913944813bb2f25ee60b96eda9cb9256675bd80e2ceccd436040a4f1c1b35bd9e12b84944
-EBUILD thor-0.20.3.ebuild 1440 BLAKE2B 905f7bd1cd95ff41fd11e1df498063595634b75a368610521b7965470d1039654d39023f8301e5f3a9d196a48473f9898532227f584d311c95948a19781046e0 SHA512 515bc470d08ba459e00c8ec1f605090fed982132b29dccef1834159145542381d08e3101e625cee46bb864e26be3151a1586f5a41d26eac635b55e8f961802a9
-EBUILD thor-1.0.1.ebuild 1585 BLAKE2B a230df8fc7a52de052611cd2f8816e4b4eb008867dc827ce0f89435daeba85a4903fb6900ce395682df834b28f0dd8112be8adf4e2cacdbb69d4925a4f193b79 SHA512 dfba72978896b7983cec71fc386d39788c363b58df008170aad15e52fdff7c2832a47ad3d382f6a178ef0c6d473e8734787b4d9fe6b596a961889a7a5f97b407
-EBUILD thor-1.1.0.ebuild 1724 BLAKE2B 2e5295338d7cad7fb4baa01aa1e9df3ee89084a64256adc8466488e97f94c3762219e2392778d5f204e1cd49b7261e6f15057e23a05bae322f9ac430d450e63d SHA512 4064290bca4a444fbe64a45cec9946f7ded74fc5eb13d271ca85af9b9b93c757c7600c03f54914bce8decb752bbd16f19a32778272c79c26e6e119e8e1b0370e
+EBUILD thor-1.1.0.ebuild 1723 BLAKE2B 459c1c524d3d43ff934ff3780e8bb03c2b5c32892cab1d7e25bae4cfd90db7a70589c6b50bbe0eb088dd52a7934b07160c048af7a54ceeb0c2d25cc046fbcec5 SHA512 db6fa89e2b968639cc67a5aba134a43f41179e26d7daa9eca26934904e3ef2d8a9ad724a59c70c3b91e9578565b25c62e1ef4220557802991b8e4f342d5b7e85
 MISC metadata.xml 681 BLAKE2B 18af48da65edba93d19a6a8541a5a79b63485d15108736b8b2c964a57006dd8e0bcc094261045a2598ab5537c3162cffc012e35dbff7c631e45f8de1657b5cd4 SHA512 ccc14bf0262a52707216bedfa51c46d5de83b04308d6768dd73e9d63a0e807ae5f069b9730b5e88311ddf51185aaec12144ffd8540044baf2b18d1208dee380a
diff --git a/dev-ruby/thor/thor-0.20.3.ebuild b/dev-ruby/thor/thor-0.20.3.ebuild
deleted file mode 100644
index 0d051f71a3c1..000000000000
--- a/dev-ruby/thor/thor-0.20.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="doc"
-
-USE_RUBY="ruby23 ruby24 ruby25" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^  end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-1.0.1.ebuild b/dev-ruby/thor/thor-1.0.1.ebuild
deleted file mode 100644
index ef4f6652543c..000000000000
--- a/dev-ruby/thor/thor-1.0.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_BINWRAP="thor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A scripting framework that replaces rake and sake"
-HOMEPAGE="http://whatisthor.com/"
-
-SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE="doc"
-
-USE_RUBY="ruby25 ruby26" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock
-	)"
-
-RDEPEND+=" !<dev-ruby/thor-0.20.3-r1:0"
-
-all_ruby_prepare() {
-	# Remove rspec default options (as we might not have the last
-	# rspec).
-	rm .rspec || die
-
-	# Remove Bundler
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Thorfile || die
-
-	# Remove mandatory coverage collection using simplecov which is not
-	# packaged.
-	sed -i -e '/require .simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-
-	# Avoid a spec that requires UTF-8 support, so LANG=C still works,
-	# bug 430402
-	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
-
-	# Avoid currently broken readline specs (already fixed upstream)
-	rm -f spec/line_editor/readline_spec.rb spec/line_editor_spec.rb || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby27)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/thor/thor-1.1.0.ebuild b/dev-ruby/thor/thor-1.1.0.ebuild
index 0052255e5c79..bc66fcb688e2 100644
--- a/dev-ruby/thor/thor-1.1.0.ebuild
+++ b/dev-ruby/thor/thor-1.1.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux"
 IUSE="doc"
 
 USE_RUBY="ruby25 ruby26 ruby27" ruby_add_bdepend "
diff --git a/dev-ruby/tilt/Manifest b/dev-ruby/tilt/Manifest
index 183d16b8bf2c..6cc766f4abf0 100644
--- a/dev-ruby/tilt/Manifest
+++ b/dev-ruby/tilt/Manifest
@@ -1,5 +1,3 @@
 DIST tilt-2.0.10.tar.gz 51446 BLAKE2B de5c12dcf22994f182ae163a82c3060f1d0d8b4bc2a4495f28c9befc954b4949b9d2ae6aed42e3a9c35fb68825844881d9f15b2b68d949236e5396083ff199a3 SHA512 4a36c55347e307ea0c842aad3da72cebe98bcf8a0421040cfce7a43540d1746e736ce92b7ce7492a5cfc184372842c3ac7a006f3650b4c9420d5825ec005b4ef
-DIST tilt-2.0.9.gem 55296 BLAKE2B dd181295d2317ef591e9b89a0a4cf29680a05403c89c33680f563459ebbfc675bfaef14c864f8c8834103fc2ea069b33dc928f2b804d911eec21b09427f7c619 SHA512 522b2b40ca1eefc7df66cb421c66734699a2ffb1e7d1797181c2718f7ca018d3376c1a2b3617b5d3549115af69108db4c3c4632e2682329d5baf24bfdae92b42
-EBUILD tilt-2.0.10.ebuild 1609 BLAKE2B 3eae899644087c87df9ae2733de3f5632a50294635e7195229637da1104446cf314bbf17403390a6633a3965b2ef13f9a0ef43246baccb36a98b2bd963e22a30 SHA512 1f9e061466e0044642a63c84b47ecd53217e240799d6cda948a3dadf774dbc664633396fc22234c88cab6ec6a458df643a3163118f7506272f62a9e70e2df421
-EBUILD tilt-2.0.9.ebuild 1371 BLAKE2B c6379824518eb5a02a475f72de978c7b93f5f90647bc57a09fc30728cf024315c4e8dfa1db75d35819afe260980569b6b4c081cd61c451b845f384628f9f61ae SHA512 96b2076d651ea2f24d41fdb7ea73bda07718c03a62197d46f73a5cd897edd8bcdba28f473ac78e8e52b4784823d8c3b078f5236a905bd02de9068593f6157463
+EBUILD tilt-2.0.10.ebuild 1603 BLAKE2B c046401f51f7a87aeff75991d0ddbbb6c402a1cc8dee8d867ac44922ddb72791e673d296353e5eeb5f52860230d10c2eceab6e056d29f85f7df7e78c3b355a31 SHA512 9c4f2a2c43b29c76e9ed970f44be4b6b8c5b4c96ab5b34e17dfcedad416d4487efa9a6ebab332bde09b1aea5870e4bf3ac1752505838ceb506d1a464b0f16531
 MISC metadata.xml 340 BLAKE2B 5414049365511f348e3da85bf3f207b791dc4269331e6a650f90398b6afe2502e2e62624ec9597a2d55dca4a7e4a99e209837c44bac7a901ec42139518f41647 SHA512 4be8002eca7cc4c0204311dd7dd187caeee3f40db9b00d108fb18e97009f8cec10d298a958bf83d24177297cebd78789cdd546a0c5e9c7288aa697dee1facf71
diff --git a/dev-ruby/tilt/tilt-2.0.10.ebuild b/dev-ruby/tilt/tilt-2.0.10.ebuild
index a5db38a86ced..46a445fe60b6 100644
--- a/dev-ruby/tilt/tilt-2.0.10.ebuild
+++ b/dev-ruby/tilt/tilt-2.0.10.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/rtomayko/tilt/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Block on some of the potential test dependencies. These dependencies
diff --git a/dev-ruby/tilt/tilt-2.0.9.ebuild b/dev-ruby/tilt/tilt-2.0.9.ebuild
deleted file mode 100644
index 76abbec81e89..000000000000
--- a/dev-ruby/tilt/tilt-2.0.9.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md docs/TEMPLATES.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Thin interface over template engines to make their usage as generic as possible"
-HOMEPAGE="https://github.com/rtomayko/tilt"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-# Block on some of the potential test dependencies. These dependencies
-# are optional for the test suite, and we don't want to depend on all of
-# them to faciliate keywording and stabling.
-ruby_add_bdepend "test? (
-	dev-ruby/coffee-script
-	dev-ruby/erubis
-	dev-ruby/nokogiri
-	!!<dev-ruby/maruku-0.7.2 )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -e '/bundler/I s:^:#:' -i Rakefile test/test_helper.rb || die
-
-	# Avoid tests with minor syntax differences since this happens all
-	# the time when details in the dependencies change.
-	sed -e '/test_smarty_pants_true/,/^    end/ s:^:#:' \
-		-e '/test_smart_quotes_true/,/^  end/ s:^:#:' -i test/tilt_markdown_test.rb || die
-	sed -e '/smartypants when :smart is set/,/^    end/ s:^:#:' -i test/tilt_rdiscounttemplate_test.rb || die
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 50bc2ae95ff1..be48afa773e9 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,9 +1,3 @@
-DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f46950ff339834b55cb1eaa36e1cdd47a9795d783671a8ef393f6059578ed684240de377ec8824c2468f5014 SHA512 c6c7694ddadf0cf46176a1fabda8ffc2d6b098ca6ed4d568f30c66100a2f55c25ce83c09e8ba379ee6c49dd68d6f1572f17f70f9666628c1fe5225fcc9d7b788
-DIST tins-1.26.0.gem 306688 BLAKE2B 0e3dc0a2493d95d4d32fd0f37c462cf37ad736b186ae5ee421570a9be7b8155b9d7b10d66ec748b22df99eefc31ccd8d1d7c22f8552d1e62a82f94991ee85149 SHA512 adb5e29420d13a0c147262bb4eaf5289c793795ea929a0e4e9e611658bf97e76edfdb008cff657719f497b0b146a23c497c8adb128014fba390389483e533cfd
-DIST tins-1.28.0.gem 306688 BLAKE2B ddb7706ac0a24d913d6bd9256b819218e4d31c0c614f0c9b59758b60b5f7d3670c9bec89c55317a00bb6b4c6d381b236c86cf049489f899e1186d21fe04c2912 SHA512 5b24d1f68226755b1e35e6af5d7c234d0126be5f2638ff50aea61877dca2f640bf5cfca73d39268bbe5624cdc420d256e128dfe0faf59129228826fab36defa9
 DIST tins-1.29.1.gem 307200 BLAKE2B b7e95094662df021d81ea7b580cee5c4ce8f9fa6a09ecf63afa2c84f42ffab62f96f37ae734392021506da373ccabbf68c2dbf55f5ff09224168e24031b1fa99 SHA512 043a49d0755bb158cfd60554b530cd315cfe869520ab02ee819addc0fea39f441960a6c416753c0e69dc0dbf122523842f940ff89dcb43e64f5825a2c0c5a53e
-EBUILD tins-1.20.2.ebuild 625 BLAKE2B eed2203644e3a0212d6cd17e69b854ee6cd226bb90da0c094e0f5b19a91447a24b7bdad65e3ab4127ccd2692ba0c949406e0c5b1be7f069b82b6fc8cd157d302 SHA512 21f2ad099da1d276ca7df14d4941b39fbfd0e65e4130cea31cd8492b8d20401e1353deecbb29977ac25f15950b558384216bc9a02fe0dca46bf35ee10faa589e
-EBUILD tins-1.26.0.ebuild 842 BLAKE2B d52c83625b5dd10d7bfe866c252f1ec68254c170a50760f389008239171336e7ac8f5bf525067bba025d40765ac99fdf71726f691b78c88b81b3175d2af262d5 SHA512 db5fa43ec2f62233406e94b821b948d168e5d1ecea5253358adefab192f972577a231a923bdcfc8ddf7ca245b45e1733dcda7adc9f2436d01f555dbe14d4593e
-EBUILD tins-1.28.0.ebuild 848 BLAKE2B 6997f7521890f4432b7230965ff8825423c62bcd7d1a173da6df0ebd8797e20f0070983d4b1c8e1928530d5b504b3ebdf7587e126800a98d53efef2904d35062 SHA512 8a8a644845eb3a59848375642d871a6066d9e15788597c426e696ad57094321f1404ba38858f7283d4686a36070cde3925db5efb99e000bca1a828288d8db799
-EBUILD tins-1.29.1.ebuild 844 BLAKE2B 7e742704eae4c736012a014cbe75fd05bdde12921e59921a6896873133e6058afff2561cce0c52f8f29b29dc7f6a187ae50922a1176deb16ae0315a2654cd0c2 SHA512 3630668284dfcba23da48e5f6d375162f90fbf0bad95cf5b2b84ecebb511c1beed248a2f8eecb85cc389c72829d55926326c38b7d426035f1387bcd57de3d716
+EBUILD tins-1.29.1.ebuild 843 BLAKE2B 2abacbf3cf8e1afc0dff0b5f9f6602225d6f82f2421e36a9545545f3968fadc3e335cb99d1c553c8f22154d8afd8adba7c0500a43adac17186698c787f213681 SHA512 aca5c80a5e4155d2e7c54ac0d28ffaa9d29fc03449208a251c1221980a23c8e0d6719da1c993d70405c78426eccfe68216f5303e7db9ceae33215031431567cd
 MISC metadata.xml 337 BLAKE2B 488c14119bb23c3d78d6e3ea71ea808cd398fead5dcf2e2dde61c1ce7de8985b6bc440387a19378f5e123dc64b71e3561fbfe0303e87ff8a4cd79a7923183078 SHA512 e08cba10144c2eb80069fd8d8826053293e9d8d5f1ffce97048c4100af31cac83e672af0945284ba0e1bb169d4e9fad3c0eebb369cb35823b42e5dd4454cd79e
diff --git a/dev-ruby/tins/tins-1.20.2.ebuild b/dev-ruby/tins/tins-1.20.2.ebuild
deleted file mode 100644
index 48ecc71b37ba..000000000000
--- a/dev-ruby/tins/tins-1.20.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.26.0.ebuild b/dev-ruby/tins/tins-1.26.0.ebuild
deleted file mode 100644
index 6b8cb7458da3..000000000000
--- a/dev-ruby/tins/tins-1.26.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Earlier versions of ruby bundled this dependency
-USE_RUBY="ruby26 ruby27" ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby24|*ruby25)
-			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.28.0.ebuild b/dev-ruby/tins/tins-1.28.0.ebuild
deleted file mode 100644
index 3f51213ee411..000000000000
--- a/dev-ruby/tins/tins-1.28.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Earlier versions of ruby bundled this dependency
-USE_RUBY="ruby26 ruby27 ruby30" ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby25)
-			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.29.1.ebuild b/dev-ruby/tins/tins-1.29.1.ebuild
index c33a9bb74a7f..eca4cc63d908 100644
--- a/dev-ruby/tins/tins-1.29.1.ebuild
+++ b/dev-ruby/tins/tins-1.29.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/flori/tins"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE=""
 
 # Earlier versions of ruby bundled this dependency
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index cde4e910f767..2ca8ebf1a40a 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,7 +1,3 @@
-DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
-DIST webmock-3.13.0.gem 127488 BLAKE2B d92deda505469fc7fc5adbf0f7a90a462b03999c0affb79bf67523667af30f582b44b10f554c93a1c98e224edf1f8a5a700fc17c3624a962a68d8e61df84127f SHA512 de7c3d8e079f409db53b316238ce37a80db8eeb257e00c8b3f162e5b4f98c4a383108e6cb21be8b71db34295fdb2354502e9b7457741a935572d9afcb75b30c3
 DIST webmock-3.14.0.gem 126976 BLAKE2B 20dd463c8b784869d4379aeabf892a6b4602091a4cc01a4002161d88f24781bb2bae1e50bd0ce8077c40aab73a2243835d99551bd04d808ffdf019df071c2b01 SHA512 0c9ea5b29446de7619c45d0fb72ab305bf68150c9d657ddc223d0d258a400dc730e3fe401b46c994a5c8eb450db5ee8f7021fe8d2d6c85bc4723c657799c5ccc
-EBUILD webmock-3.11.3.ebuild 2220 BLAKE2B 4fa059c167e4fe9f53faae3c12ca5bda38d2b91b77409ea3606527ecd7ab49e34d10f0ea81f7b59fac23d7e0e5bb9fa42f93b12676c4578809290330093a72c3 SHA512 90cd3d70911853b5759b3d681090d979a3dc5c8a9a377569134c2a9ee58e0b6d1537b3b3766afef320745fbe8fb9f00d98691aa6275a9193de0d783d8a0a4e72
-EBUILD webmock-3.13.0.ebuild 2228 BLAKE2B 1ada6f3cac704d1910982f18cf93c1e8d4476bde20f5aab6faad756b252a2c2faa288f187978e6c841c5b1e390b63eef10afc6820f05702cf2a0d069c7d5ac0e SHA512 3c1ffb3a8822ac4fe9665b54ac73a7661fad6eee9c89455ecbc15c58640d20f61917478f1ed683139dca31caf76a93331024e5ef10e951fe9d54047b4aa8c1aa
-EBUILD webmock-3.14.0.ebuild 2221 BLAKE2B 91111eabe39203394a22af2877f9e48f39929ae4d273023ed08e5bde75b21bb4585f8b996c6ca1b777b41b35d908400a75641b533aa22596708914c426129be1 SHA512 d8347fa5d8b2d44a1ada17e7eb842191fdc2daf4a4b99dc71d5eeae9129398676205f9557b3fafb9e5ff7ca93343e6cdd3619399462fa350575e0f8f610c76df
+EBUILD webmock-3.14.0.ebuild 2219 BLAKE2B 48b0fad981181e8805072819fbee69dbbfd39c732e21096ead6a2bdddfbbc10c21cdc882c4a5f0c176afa430e0ca19b65014ea6446f59d2f18e0d0f7bd910549 SHA512 a933fe80cd76b05ac090ba64b26dc8e1457b9574579a2d0570cfcf0c4a3fd8bde9499ed6a69248c291b957a902ef22be191c3213dccec6ac343db20c08935294
 MISC metadata.xml 342 BLAKE2B 0f0b9d59bb3519e6da06fe5d57cc9ce3cc1f3a1f516006a3d43a6cd3c416b3b5d9d2955a7800a588010b9672f3a03fb6a74bc62c3ead8b2e0f0b3ce0f5af5456 SHA512 0c4f9ce8deb018a77c7ec77417a22d3b95d0701263acc1ff07081e4e7ef995051ad2eba387962ee06b4bd810db5da7e2294e1ca7bb9a50704f7d7265b8462997
diff --git a/dev-ruby/webmock/webmock-3.11.3.ebuild b/dev-ruby/webmock/webmock-3.11.3.ebuild
deleted file mode 100644
index 66f1095e9dca..000000000000
--- a/dev-ruby/webmock/webmock-3.11.3.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3.6
-	>=dev-ruby/crack-0.3.2
-	>=dev-ruby/hashdiff-0.4.0:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-)"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Drop tests for dev-ruby/http for now since this package only works with ruby26
-	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/http_rb/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.13.0.ebuild b/dev-ruby/webmock/webmock-3.13.0.ebuild
deleted file mode 100644
index 37392b1c43dd..000000000000
--- a/dev-ruby/webmock/webmock-3.13.0.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/addressable-2.3.6
-	>=dev-ruby/crack-0.3.2
-	>=dev-ruby/hashdiff-0.4.0:0
-"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-)"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Drop tests for dev-ruby/http for now since this package only works with ruby26
-	sed -i -e '/http_rb/ s:^:#:' spec/spec_helper.rb || die
-	rm -f spec/acceptance/http_rb/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.14.0.ebuild b/dev-ruby/webmock/webmock-3.14.0.ebuild
index 2753db5ef78b..13090d6562fc 100644
--- a/dev-ruby/webmock/webmock-3.14.0.ebuild
+++ b/dev-ruby/webmock/webmock-3.14.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/bblimke/webmock"
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index ac1210db9404..39e91bd5bba1 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,3 +1,3 @@
 DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aafa1549a40e5315cd1d71a2dec5f865e7bc79f6ab2a098e515a930c5f8c83b85c91d7dbe441fa8dfb08ffdbdb03 SHA512 774cc17a8732afea0a854ea22ec860fa5bca65e8743aa800017c06a251dfdb1d2c5af8e541cb56d22a4202a9faa42707ed2ad395d9472360cf64f46ce9b907f2
-EBUILD zeitwerk-2.4.2.ebuild 901 BLAKE2B 4ee6993c4680b01f4d1384f4b6c1a2c1e980e2b9bf1ce258507ab776ad90e612809f342fe479f8c79d8f1665ce1606533186bbafe8ea6f96aac11412b735aea1 SHA512 365fab5e5cae51d26a0fc76208b4805ae3afc79257b8e1efa32a06ee63ac8f07d977ecb376d14e87a43a0872b9e7c2801e60b57409b7e9f0eb1f7905f5f1c15d
+EBUILD zeitwerk-2.4.2.ebuild 900 BLAKE2B f944c93347913374c6f1d50e4cc48d2c499fd6fce7b10f411795fb5bb2708262fda6ede489ae3c32e6b8aa03f3f933d3f878ffc6e928c491d5ced3c203e87e98 SHA512 99dffffb4ed0dff209f0930224cd63b552ed3a3c8f229976d2887ce0cefd4132851e0aff0bcdbd1d8635c1cd35a255d13ce77824a802ceb217a7b1a62dea3748
 MISC metadata.xml 641 BLAKE2B 27f5d9950eee9945425ab5606b78e7c745345e49dcfc201b55bf52693b3882d44206a82af09134696e694e524202d9c43f642c0854bdcf640356db8f8c84972a SHA512 b744fa895c31a93a5566151b3b3d73308ad41a7b43638ccd9aa00c9fceda495279d32f56e9c68cf44adea06f0e6842e38324c2f20b412e46f05b78c35288869c
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
index de329272f4aa..c11b2d4d3e37 100644
--- a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
+++ b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/bundler )"
author	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
committer	V3n3RiX <venerix@koprulu.sector>	2021-10-08 23:06:07 +0100
commit	e23a08d0c97a0cc415aaa165da840b056f93c997 (patch)
tree	4c5f7db60483518201fef36f8cc0712789a08db2 /dev-ruby
parent	391b5b359a346aff490103da7dddc85047f83830 (diff)