gentoo resync : 03.03.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-03-03 10:28:17 +0000
commit: d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree: cf61513204d97974179580065e85df5c8009087c /dev-ruby
parent: 463397cf1e064185110fe57c568d73f99a06f5d1 (diff)
138 files changed, 1111 insertions, 2045 deletions
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
index 8ff0ed900863..b13578766edb 100644
--- a/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.ebuild
+++ b/dev-ruby/GeoRuby/GeoRuby-2.5.2-r1.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
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/nofxx/georuby"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild b/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
deleted file mode 100644
index ac12330a2fc7..000000000000
--- a/dev-ruby/GeoRuby/GeoRuby-2.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_NAME="georuby"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Ruby data holder for OGC Simple Features"
-HOMEPAGE="https://github.com/nofxx/georuby"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid specs that are also failing in upstream Travis.
-	rm spec/geo_ruby/shp4r/shp_spec.rb || die
-}
-
-ruby_add_bdepend "test? ( dev-ruby/dbf
-	dev-ruby/nokogiri )"
diff --git a/dev-ruby/GeoRuby/Manifest b/dev-ruby/GeoRuby/Manifest
index 67a4d0296a1a..5039c5bbf4a7 100644
--- a/dev-ruby/GeoRuby/Manifest
+++ b/dev-ruby/GeoRuby/Manifest
@@ -1,4 +1,3 @@
 DIST georuby-2.5.2.gem 211456 BLAKE2B 67340729118cfb64d78a0ac3e98a6e29414ba0ca111c8a9e608486803c4c1da51e99e06b9ac1abfba0b3781d330ad83e09b72cb5d643d32fc47ce35307045a17 SHA512 f65aca747ff2615ce2cecf0d3a9fa8728b362f211da0433b075e5abd95644daa8d5d8a6e19b051b8e2b78d55e819f07b19b2dfcb95f26f3d678c698fd7126f3f
-EBUILD GeoRuby-2.5.2-r1.ebuild 639 BLAKE2B 7d4baed5ffcbd842416be453b03fe82e2289e88a0a9cc2c269742b03a4a5c1e7086b64ebebda6098eaee360ee3ab60ec581a1e9e01e36a571f07dea22f7b51d0 SHA512 b1ce90e6ceb4b33aff15e580d24fd1b3cf4256c13c46c7f37b6b5a518c0cfe7378f6bf4697faa90ce89cbb8ec0e8889d7270e57f2b076c835864fb728a74b092
-EBUILD GeoRuby-2.5.2.ebuild 637 BLAKE2B ad89f0202a6a8c3ca6a0df88a00d8d0c42bef3b7b2159b88b38cc16b2962bf74e18c3c003deb3418332a3678b80ae4d4d8dc0a5cfa3103f42f7dd23d8f0603c3 SHA512 bbfea0e80e23b8f03a73d69545fb143d626b0c4e4c5ec7046dec38e489c5c9333c409e94c4301ae024f14d1af8744203660342e06bd239b8a94f44b4bb476f1e
+EBUILD GeoRuby-2.5.2-r1.ebuild 637 BLAKE2B 10eea37ee238b949b243b1f7fea31428f7917cbfeb75cc81404c7f944388fb0d4d2e488c70cd8f44a54e31a77d8e71c50f3d16e1cd340b280c1ac102ced5f1e4 SHA512 cee1c1959f4b1b03de3782757ba3347640e7f13d766085fc039267d10ab3e5b3a439b81d644fdfc1b681e26163033a19a9b077ad0a68ef5efea3e914cbcc8453
 MISC metadata.xml 475 BLAKE2B 61cd7a83f8ed2294338504f60c03e01e7144d58825db4732c207531fc78b34929bec9fc5459c4ab1458a0fc95ab97e07d1abe09b7eb5a54f867b214d9fbcc24d SHA512 d77d215e43f829b563daf62e06a06864e6e691784867227e6fc24726f5b6ba5238e356971c24bb1d1ccb5555fa65342da6530c9111a304552111a4deddc46111
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 6d7172fc4278..835b9965eb10 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/actioncable/Manifest b/dev-ruby/actioncable/Manifest
index 0f4deaa45863..8a445ab3f813 100644
--- a/dev-ruby/actioncable/Manifest
+++ b/dev-ruby/actioncable/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actioncable-5.2.4.3.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
-EBUILD actioncable-5.2.4.4.ebuild 950 BLAKE2B 4bc67ba04c5c89eec6a4afdd44984afbd8804663a56782cdf253f145af8ea3b45caee2d38e504eb06a83ef125fb9c232a7a914c2c5bfa6847ead294afb814b14 SHA512 8c82ff547b539b6f06874178cfadb119d573b53e3d7632f6d0e3ca651edc217bc5083d7460f13e28bcf1bd751a2684740e8723073721392f819ed58c3a31a011
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actioncable-5.2.4.5.ebuild 950 BLAKE2B 403c8cfe76ac5cca772aa47b7820a88a5481192ea6c0193fa34bc3ed6c806d94fa7757fd7e2a4edaf482d9f7d457fcedee2741ee9fc218c14f20c3a58e612e0f SHA512 a4f64ce3e42212afacb9d6c05f20a69243ae4db40dc1b7e668c5ba980b38f757169af664ee62593bc591974020be34b25ba83ebad1bcdf7d1bf718d95da73c4b
-EBUILD actioncable-6.0.3.4.ebuild 935 BLAKE2B 1f54c3a4bb9bc0047c76387b467e9808f684c351703f6423b26f0723557d129276c7dd818e81d0c9351c5afdc85fe93ab872341f618084bb1d69f0057668b732 SHA512 bef35598afdd62e8e64e2085478977ae9881abad65fc17cfc9d7b7393156621aa6488b6c9792a54063a81954d9dbec864416fff2f914a1e77c28958db1a73012
 EBUILD actioncable-6.0.3.5.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 EBUILD actioncable-6.1.2.1.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
+EBUILD actioncable-6.1.3.ebuild 935 BLAKE2B f58e9f657cbab6647f69f1842e084bcba4d270f482f8d359df2d81e2e91c1dd746a3b02c37dd603114d742968eabb299c45b2d4155a08b6ba162725ad2208eea SHA512 e66925308abc15016b7e0d43c006abb6f43789a035d531c81c6e334bdd115e60529b56016956dfa96d508225a72d06b4c248b9d22c93ba6acefea1183c8be2fc
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actioncable/actioncable-5.2.4.3.ebuild b/dev-ruby/actioncable/actioncable-5.2.4.3.ebuild
deleted file mode 100644
index a6339fadbd1c..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.4.3.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-5.2.4.4.ebuild b/dev-ruby/actioncable/actioncable-5.2.4.4.ebuild
deleted file mode 100644
index a6339fadbd1c..000000000000
--- a/dev-ruby/actioncable/actioncable-5.2.4.4.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="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Integrated WebSockets for Rails"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# Tests require many new dependencies, skipping for now
-RESTRICT="test"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	dev-ruby/nio4r:2
-	>=dev-ruby/websocket-driver-0.6.1:0
-"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/railties-4.2.0
-		dev-ruby/test-unit:2
-		>=dev-ruby/mocha-0.14.0:0.14
-	)"
diff --git a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild b/dev-ruby/actioncable/actioncable-6.1.3.ebuild
index faaa968abb19..133ed8eb6089 100644
--- a/dev-ruby/actioncable/actioncable-6.0.3.4.ebuild
+++ b/dev-ruby/actioncable/actioncable-6.1.3.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
diff --git a/dev-ruby/actionmailbox/Manifest b/dev-ruby/actionmailbox/Manifest
index 5942d8f077f7..642ec34953bb 100644
--- a/dev-ruby/actionmailbox/Manifest
+++ b/dev-ruby/actionmailbox/Manifest
@@ -1,7 +1,7 @@
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actionmailbox-6.0.3.4.ebuild 1711 BLAKE2B 7675bfd3a16ecb41df77502335bf94672c2694b4371f5885b079f2e5b7a495966651586900cac98a47d05ce9986e39f4c58f45d02e4f288254e2503ada053465 SHA512 0d16c0130f6b9c86310d5315cd6b6670461440f1a03fdeb82004bcc87464fb76b8d07440396777702de13adce989d716a7b1fd189eedbb82d1fa0f4cfc0ffc48
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actionmailbox-6.0.3.5.ebuild 1775 BLAKE2B 90207c1545b4bba3d5751f7441f10f25bcde49bfaf82fc7472f6ff836328095406a99fe6f4332cec9c9851f8942f368b7f703336a31a1b9c8e0428d483fd3e64 SHA512 3ae91c36cb621c167f3cb41a3058fc22d07fb868c90d143f542e397714b123032bfe1df01fc208c4bd260b336cb9919e4d5ec95d003963cb6a4c13e1c60c6b45
-EBUILD actionmailbox-6.1.2.1.ebuild 1765 BLAKE2B 253e473f0ebf088752e80e6dbfdd3b643dc0952e358ad45f5406ca37666890458c6f3d927aa2301219e66f9c17dd47f97f051999f65afe3c26daa81815a516d5 SHA512 9d43f5b9df90bad7292bd1293096ae4839c12e9e71212e6d1c83663f681281b3b91a45841611518c6b902a5f6e762a6d3830b1573a5065fb07b1b1b03aaec98b
+EBUILD actionmailbox-6.1.2.1.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
+EBUILD actionmailbox-6.1.3.ebuild 1784 BLAKE2B ed23b8d6b05d70665d48a3b1baf4172a2069fc52d492c4d95eb71747adc8e30df4649a3f96812587ff40489f0e518f923558dc7491420aa44af968ab6aa18151 SHA512 0324bbc06f3c0327bb213816e300f988387e42fe54675d0cb910206f62f434644c92d1600e075c682d6dde4d4d5619bec643c94c2513801808fdb8aa39841dad
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild
index 152595072405..06f3358e6aa4 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -42,7 +42,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
 		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
 		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
diff --git a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild b/dev-ruby/actionmailbox/actionmailbox-6.1.3.ebuild
index fd3658a8e9ac..06f3358e6aa4 100644
--- a/dev-ruby/actionmailbox/actionmailbox-6.0.3.4.ebuild
+++ b/dev-ruby/actionmailbox/actionmailbox-6.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -42,10 +42,11 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|capybara\|webpacker\|bootsnap\)/ s:^:#:" \
+		-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
+	sed -i -e '/byebug/ s:^:#:' test/test_helper.rb || die
 }
 
 each_ruby_prepare() {
diff --git a/dev-ruby/actionmailer/Manifest b/dev-ruby/actionmailer/Manifest
index 21f6ca348aaa..5f6eaac85faf 100644
--- a/dev-ruby/actionmailer/Manifest
+++ b/dev-ruby/actionmailer/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actionmailer-5.2.4.3.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
-EBUILD actionmailer-5.2.4.4.ebuild 1419 BLAKE2B a2e2a40e32353b81292a491c6b91866eb88366f381d2b1bcd2647dc448efd92a3e0f3157e01dac1e38490f3afff3645fd2628087d4cb8b638cd11b418771b60d SHA512 558320f005e232aabed034c69b83d3690ee60384ed92d7be05dab758782631aa0354944b3da77c79af0d53387cdc784d49c6d61ba1c5738b92fe73f501f573d9
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actionmailer-5.2.4.5.ebuild 1419 BLAKE2B d6aace152a40760e2c49dc536869f6aa382cc5bdb13f4b35f411df66a2f5698bd02dfc6a9114fc9b3691ad785e100bd75cf8b60b337fc8a57ba1d99084d4954c SHA512 4001cbf68a332d36f8f8a5c107c5334779e5f952d39462a65f66ee2441ed7888b2b6cc84ef1d1f7621aa0b55de9ae85e72c5119300ba5831e354e6c821f806a0
-EBUILD actionmailer-6.0.3.4.ebuild 1261 BLAKE2B 639cd68172bd463ec4fc7a117e2e16fa689b6cea31b2eb6c0e2531417210a7b194ac24029f30e98a93729e7585190b2c09b463c9281816e4a786fb401f9ff1ce SHA512 2fb0ed3be14544ba32641c52571f36a5772b274984e1a403312bbcf28ca3f284b350d56c1d14b275f1cc4ff78881ee2c5cf9cdb2913d91ebd117651fca8d1b74
 EBUILD actionmailer-6.0.3.5.ebuild 1261 BLAKE2B adfa0c8b65338e95e0d7f1a768a084a966fc1f4a204c9a7bc32a796ae12a6ac45b4745bfd4e5704ea5c019fc3310b264bc4cc931fdec6087b7a9ce794238c125 SHA512 a31fa8b81382754824398c371fe389114cb1f19d95dc6c5c13525b932e778c5bee83c213a3e9adb11361553a77eb2f5f0de38df5d0a2001e62d01a36757887fb
-EBUILD actionmailer-6.1.2.1.ebuild 1261 BLAKE2B adfa0c8b65338e95e0d7f1a768a084a966fc1f4a204c9a7bc32a796ae12a6ac45b4745bfd4e5704ea5c019fc3310b264bc4cc931fdec6087b7a9ce794238c125 SHA512 a31fa8b81382754824398c371fe389114cb1f19d95dc6c5c13525b932e778c5bee83c213a3e9adb11361553a77eb2f5f0de38df5d0a2001e62d01a36757887fb
+EBUILD actionmailer-6.1.2.1.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
+EBUILD actionmailer-6.1.3.ebuild 1268 BLAKE2B 5753d3cd9c97c7f81aeb7be5070df32a97df5a54f08e28ca571743ddbe94abee8cd1d3ba14f34ba9bbdb16abf9025308e212cf1b848d8749fa205f995bb11d52 SHA512 b5820331ef9c5f6cbac9ed079b3fa1d2ac7eb12183e25e82694a0c4cca5e9f049eb677baf70f66e4dabdcdfdcff292e7df7104f191b23c4062a1dd554bc8cae8
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild
deleted file mode 100644
index 24a51c252868..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.4.3.ebuild
+++ /dev/null
@@ -1,50 +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_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -e '/\/load_paths/d' \
-		-e '1igem "railties", "~> 5.2.0"' \
-		-e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activejob", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-5.2.4.4.ebuild b/dev-ruby/actionmailer/actionmailer-5.2.4.4.ebuild
deleted file mode 100644
index 24a51c252868..000000000000
--- a/dev-ruby/actionmailer/actionmailer-5.2.4.4.ebuild
+++ /dev/null
@@ -1,50 +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_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionmailer.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Framework for designing email-service layers"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	>=dev-ruby/mail-2.5.4:* =dev-ruby/mail-2*:*
-	dev-ruby/rails-dom-testing:2"
-
-ruby_add_bdepend "test? (
-	dev-ruby/mocha
-)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -e '/\/load_paths/d' \
-		-e '1igem "railties", "~> 5.2.0"' \
-		-e '1igem "actionpack", "~> 5.2.0"' \
-		-e '1igem "activejob", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die "Unable to remove load paths"
-
-	# Avoid a test failing only on attachment ordering, since this is a
-	# security release.
-	sed -i -e '/adding inline attachments while rendering mail works/askip "gentoo: fails on ordering"' test/base_test.rb || die
-}
diff --git a/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild
index 56d6cd09f47f..054f20f77e74 100644
--- a/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
diff --git a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild b/dev-ruby/actionmailer/actionmailer-6.1.3.ebuild
index c2daab5cc5cd..054f20f77e74 100644
--- a/dev-ruby/actionmailer/actionmailer-6.0.3.4.ebuild
+++ b/dev-ruby/actionmailer/actionmailer-6.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
diff --git a/dev-ruby/actionpack/Manifest b/dev-ruby/actionpack/Manifest
index 0250167df944..052fae5ec9be 100644
--- a/dev-ruby/actionpack/Manifest
+++ b/dev-ruby/actionpack/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actionpack-5.2.4.3-r1.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
-EBUILD actionpack-5.2.4.4.ebuild 2268 BLAKE2B f3ecf79de396092c66fdc725f7b1b0d52586668b909a86efc1dedd92bb22fb3bb4a64ab0d5890f78d741c89dc265ef9bbf17a165e1fddffb0467e5fd5ce7ccbb SHA512 d7fa7356f01699f7c8535125928853965d900df6326892df060f6bba4d51af6e68ccfa70a35dc8bc1cf779ca67a71d047a0bf10e6340bc7a1fd5f6bbb58dcda4
-EBUILD actionpack-5.2.4.5.ebuild 2269 BLAKE2B 13890237dc32e2682f3a94aa80a9ddc63102fef522ba1c2880e6805577dbac2b53339e5fdde71fd2723bb5cd1537f74e0be8feca5f6aa73704fa854b552c94ad SHA512 3ca8c9b3b2f3883ac292f9a4614437417ba746c257a18d5ca9ff468a13c3708fbd54ff5e06501e531c156fd70cbb99dbe5c5de9f6fc49576c74adc325b3c9faf
-EBUILD actionpack-6.0.3.4.ebuild 1867 BLAKE2B e23587cf2bec7b8fff7f8f8fa217fba7eae6f2955f44501c88795094569c12bc6be1a54600108ca2dacceb97edd7eb16983ea034d0c5231548cb322204436d85 SHA512 096ceb76f013fabdd05136d83eac3652ec7d771d8b2965f2081d84002e5a02dd38bee2b39c50b38ccc5798ac289e5a36b908a94f6b84f62f80a537c4cdafb7eb
-EBUILD actionpack-6.0.3.5.ebuild 1867 BLAKE2B e536544512465af065b47e64e719baf844e15a25ecbd30aeda19dab33e9d856a656a8d6e105c68ff1568ebff7a8106cb6408a8efb14919c7559565b418c671cb SHA512 6d5cc33adc3e788469ba91547bb868d38a1c6b3aea1bc62dd5baddd0b5bb80316b23121d4e95386d1f797cad7fb011df7ab3f4aae6bc412935e4e2eb8b950fbc
-EBUILD actionpack-6.1.2.1.ebuild 2048 BLAKE2B 2cd1e84e158c82068815fb5ee4b1f2ca551962c1d64a7cadff5119396e7409454b2787c6ede97367a36b8c1552bd730d8d80705f5315df02d82cf7b944573e41 SHA512 a79c19dc327d6382987bec5bd8657b20f2a2083d22803186919e1a75d2bc7b7873f627a8eda9ce705ec2ef030706ea9cf590be37aad0258a9cd1c97ffeeba761
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
+EBUILD actionpack-5.2.4.5.ebuild 2217 BLAKE2B a6c65fb3bceb9176abbab2950749f5172f0a90e7d4cc002f8685519f56b69a0f3f949052aa515eeea6cef63c4f532ef7bf68a48b23f38451ba30566a09601185 SHA512 363e0a19a734ad23c9d7a500a42072a6073046dd8deaa7fed4db20a4476f76ca4cf1714c97836001445795e4ee2f28a73f52b48fae1384b8b6b77db7f81e3b3e
+EBUILD actionpack-6.0.3.5.ebuild 1816 BLAKE2B b902dac6018601ef750da4e242fd2ac8860bc160ecb85d4f9446942f15339afa2f2a087b5168d7f92c9bf4583b58eb601be1e36c07af3cb7f3cdd728d3820666 SHA512 bb99bc2c41925cadaaba9b979077823d1375dde7af3f869dfdd7566d90b51d66ea16dbe7d8409f93102bf90a5d3f6243fbcd68a341b1e6ac8e481061272982d4
+EBUILD actionpack-6.1.2.1.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
+EBUILD actionpack-6.1.3.ebuild 1997 BLAKE2B 0c4c7223136d8ad54a947da1eb191eba6ef7b85493cb6ab02b2c2fe956821c8e498dc61bcaa86d33a1fbd8e679b00b5166f3d6f1d553ce89afe87d4bb59499ff SHA512 b3815fbf26534cab8988ae02e5e3b87cdb19cccd0ad5c7c4a93167eb55b41feb374b91a1ca64b89930b389648d0c24812eb7bdd1cc1f470079193dd3c1374128
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
deleted file mode 100644
index 82275986ee8f..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.4.3-r1.ebuild
+++ /dev/null
@@ -1,67 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	sed -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
deleted file mode 100644
index 82275986ee8f..000000000000
--- a/dev-ruby/actionpack/actionpack-5.2.4.4.ebuild
+++ /dev/null
@@ -1,67 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="actionpack.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Eases web-request routing, handling, and response"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
-	>=dev-ruby/rack-test-0.6.3:*
-	>=dev-ruby/rails-html-sanitizer-1.0.2:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha:0.14
-		dev-ruby/bundler
-		>=dev-ruby/capybara-2.15
-		~dev-ruby/activemodel-${PV}
-		>=dev-ruby/rack-cache-1.2:1.2
-		www-servers/puma
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	sed -e '1i gem "activemodel", "~> 5.2.0"' \
-		-e '1i gem "actionview", "~> 5.2.0"' \
-		-e '1i gem "railties", "~> 5.2.0"' \
-		-i test/abstract_unit.rb || die
-
-	# Use different timezone notation, this changed at some point due to an external dependency changing.
-	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
-
-	# Avoid broken tests already fixed upstream
-	sed -i -e '/cookie syntax resilience/askip "broken test"' test/dispatch/request_test.rb || die
-	sed -i -e '/test_keeps_original_headers_behavior/askip "broken test"' test/dispatch/ssl_test.rb || die
-}
diff --git a/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild b/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
index 4a54b4247f07..7d43f2a0a814 100644
--- a/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
+++ b/dev-ruby/actionpack/actionpack-5.2.4.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.0.2:1
 	dev-ruby/rails-dom-testing:2
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild b/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
index 2ee9f0b1be6d..e35e318f6c89 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.0.3.5.ebuild
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.2.0:1
 	dev-ruby/rails-dom-testing:2
diff --git a/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild b/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
index c74100ff90f3..74a56ac801f5 100644
--- a/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.1.2.1.ebuild
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.2.0:1
 	dev-ruby/rails-dom-testing:2
diff --git a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild b/dev-ruby/actionpack/actionpack-6.1.3.ebuild
index e2f269cbd09b..74a56ac801f5 100644
--- a/dev-ruby/actionpack/actionpack-6.0.3.4.ebuild
+++ b/dev-ruby/actionpack/actionpack-6.1.3.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
@@ -29,7 +29,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionview-${PV}
-	|| ( dev-ruby/rack:2.2 dev-ruby/rack:2.1 >=dev-ruby/rack-2.0.8:2.0 )
+	dev-ruby/rack:2.2
 	>=dev-ruby/rack-test-0.6.3:*
 	>=dev-ruby/rails-html-sanitizer-1.2.0:1
 	dev-ruby/rails-dom-testing:2
@@ -56,4 +56,7 @@ all_ruby_prepare() {
 
 	# Use different timezone notation, this changed at some point due to an external dependency changing.
 	sed -i -e 's/-0000/GMT/' test/dispatch/response_test.rb test/dispatch/cookies_test.rb test/dispatch/session/cookie_store_test.rb || die
+
+	# Avoid tests depending on an unreleased version of selenium-webdriver
+	sed -i -e '/define extra capabilities/,/^  end/ s:^:#:' test/dispatch/system_testing/driver_test.rb || die
 }
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index 54d979810c74..91e2e61046b8 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,7 +1,7 @@
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actiontext-6.0.3.4.ebuild 1664 BLAKE2B adfdfe74307d82098e12613d9c0a138974b5627f5e3091b5ee57423f548120bde4f2260de3e05308d8d71572e5acec440300b79ae8320e58d30895619492f6b5 SHA512 4233419cf739f9bca09aefe31aaa9d68cd1ca2ae88311fe29367c659ce83aac2352105155bad713d1e810a1caea1622b8edd3ecaddf5f75a247830684349b064
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD actiontext-6.0.3.5.ebuild 1672 BLAKE2B 5a69dfb27d7b1b2a052a275600c665b353c57d12d20e86a66da020caa3f4df571fbbc5be2e72de5a4f72b7db2b86333dec6a339943439193bd922abfa7817687 SHA512 35b8cabc849112607bb9d2e3888dec82c5b08fbb23d866b765b69d43042984ba8cfe4e140beb9b6845dc755e366823bc589df2d9ba91f5de993136c5bea98d2e
-EBUILD actiontext-6.1.2.1.ebuild 1686 BLAKE2B 22614b3c755372b0d125d1b63ef0754dc68de9e61e50f9a41cb43111cf84512399bb950b51fc5dfc936642479612a6ba6c2f7dd4d62cdf194fe0387b35a0d329 SHA512 90d0945e860a26f39a3ae79519a2b77d204d40e41cb6192cd21517eb285ff0a038fcf96c1299473f192623c978ded890fe8ff2e267b65fae1f257ee7cd0c1713
+EBUILD actiontext-6.1.2.1.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
+EBUILD actiontext-6.1.3.ebuild 1705 BLAKE2B 8bdd8ef80c9820a3d32265d22825fa5aef29be8fae510e2e8330a10a0ebb9cbd1a0c2e53fbbfd9938f429fa2dbb1922cad84d6e210bba79cd7ea3a8c2e959b71 SHA512 57816a85a7751538342ebd97ec1bdf9fcd2d466e915daff604517953e9b64e274600d5fe1d2e2d822763c1853b8b9acbe30d7883e52ad89575362fc21732e842
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild b/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild
index 2ce881cea723..052bc4fa1448 100644
--- a/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -40,7 +40,7 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
 		-e '/group :\(doc\|rubocop\|test\)/,/^end/ s:^:#:' \
 		-i ../Gemfile || die
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild b/dev-ruby/actiontext/actiontext-6.1.3.ebuild
index e7b85321deae..052bc4fa1448 100644
--- a/dev-ruby/actiontext/actiontext-6.0.3.4.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -40,9 +40,10 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
+	sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql2\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|sass-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|redis\|blade\|aws-sdk\|google-cloud\|azure-storage\|selenium\|webdrivers\|minitest-bisect\|minitest-retry\|minitest-reporters\|listen\|rack-cache\|bootsnap\|capybara\)/ s:^:#:" \
 		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+		-e '/group :\(doc\|rubocop\|test\)/,/^end/ s:^:#:' \
+		-i ../Gemfile || die
 	rm ../Gemfile.lock || die
 }
 
diff --git a/dev-ruby/actionview/Manifest b/dev-ruby/actionview/Manifest
index 14b159426b92..e0f93bd58e2c 100644
--- a/dev-ruby/actionview/Manifest
+++ b/dev-ruby/actionview/Manifest
@@ -1,14 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD actionview-5.2.4.3-r1.ebuild 1956 BLAKE2B 909175946e12cbe49620f7791ebce270c0e9815368941f1f9a12cf481d5c2d505a515fd57e7c36c211bacbbd133f1f5b3d5fdcb5fdf831a61c1be0063087e59b SHA512 7d6a55945a2080120c4fa47f1e37f552701321c9fbd1007a45404d62afca15e5383cf141df3f905ca5f37e6baef3005ee1d527ad3440957a5184f945acd0851e
-EBUILD actionview-5.2.4.3.ebuild 1895 BLAKE2B 411ae4e3059ee9cd7634be51eda0fe3de03609fc2e02c9757de3bb0bc209b1167555e62590216050a9143b2fe9a5b98adfdb866b2b172594eb0884bbb050b314 SHA512 ef2e2dd6eb2b442bc7ab850219fb35c4a33782904c0af25535745d540edfaae1b1196455a950fbbb239e9cd667d0c31524248156f85204a71bd121c8b4f68c88
-EBUILD actionview-5.2.4.4.ebuild 1955 BLAKE2B 31cdabf3746e0c736eb193abb24540b17071cb2b779cd97618916d63ba3be85efda270f4e90d90f73bf480aa0cbe6d1a170c28d0804d9eefce64a403d757b716 SHA512 7b0dfc60f0fe2a8c35fa4735b7e21f9063976d617942000b1eef0f85dd9db51aaee332a0aa0bc8f7c2eb5063022403fa25716cc38e6e0b4cb9608ad97fcf8482
-EBUILD actionview-5.2.4.5.ebuild 1956 BLAKE2B 37934f7645f368520cebbad04dc8766c97ae67b9d55aaac0802599f8b18a2204bacbbd42ec2bc37ddf0b1e95b91a17477e7a4872d3d47ce0b96cf0e816338822 SHA512 18e97ecac4de76d0d5f418863ff5d6bc9cbf8d3f5939f2bd62e5f724019e1298176565ee864e85505cda11044821090fe722dfcb92a26d4ca8d3512c7ca5c676
-EBUILD actionview-6.0.3.4.ebuild 2132 BLAKE2B 21c3e39358fbd2c59190fd7b2982399a1eef44925b51ffd824ee5c9b0d908dd69b78d064e8f36f3d1f841adbcadee0ee0f97197c6ab1f6bf3d90e713b628d74d SHA512 fff381e72739f558b5246668c8334d4a648249a4b9f7cf569a11bd0ee16fd3152cb0b8f45782c7d2882ee01f54d64b14c338922478ede621a2e193a07700c171
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
+EBUILD actionview-5.2.4.5.ebuild 1955 BLAKE2B 4c3cb4ce9c908f2ae7e02257a70a75220d0dc8968ffe3fd3ede5c9ba92524bbc215b234149a84c24da68f88a6adb842de09b89dbd0ee8e5388be801851eb784a SHA512 9c28142efeeab99b610da7aa749b7d6c1629e5828dbb90198d4d2e5a07562e7dd9251450f06aa3f8fab4f4298e73995d39a515d2473c77bf614a2b508add142b
 EBUILD actionview-6.0.3.5.ebuild 2132 BLAKE2B 9cc32f050e5e2ec4ed3e893ffc68b45498699dd2c5eaa0e2a04b4b64c7889dcf3a1dfa78656b5e51616be029e23b310d334757ebf3eb4405b0d4ee988d4c4ebb SHA512 34cc51bd9bb1ea703d7a0f074ff29c99587219ceb8579980eb54ff99d7b7ec2dc6d95c932804070cb9db592417488ca80672834d9aeec9da3e6d9c11486c89d9
 EBUILD actionview-6.1.2.1.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
+EBUILD actionview-6.1.3.ebuild 2158 BLAKE2B 77746717c4b741a2a46cb7779fb9319fb445a107730b6dc4a3ca1e0eaa9cfd6a8f425521d7b0d91a2865fc23b09c24dd622f4da6a964bec0b788dc7a97100aa8 SHA512 16f3eda32fccec2688962b7dab25573a7a0e718f2c704a6b0e49446411d9711ae128bb91953800946b61d3ed9f5251fb48049b646e9f1b3794ab39c167215820
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actionview/actionview-5.2.4.3-r1.ebuild b/dev-ruby/actionview/actionview-5.2.4.3-r1.ebuild
deleted file mode 100644
index e9beb5d5a203..000000000000
--- a/dev-ruby/actionview/actionview-5.2.4.3-r1.ebuild
+++ /dev/null
@@ -1,64 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.2.4.3.ebuild b/dev-ruby/actionview/actionview-5.2.4.3.ebuild
deleted file mode 100644
index 87622071e472..000000000000
--- a/dev-ruby/actionview/actionview-5.2.4.3.ebuild
+++ /dev/null
@@ -1,61 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.2.4.4.ebuild b/dev-ruby/actionview/actionview-5.2.4.4.ebuild
deleted file mode 100644
index 619bae85ca3b..000000000000
--- a/dev-ruby/actionview/actionview-5.2.4.4.ebuild
+++ /dev/null
@@ -1,64 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Simple, battle-tested conventions and helpers for building web pages"
-HOMEPAGE="https://github.com/rails/rails/"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/builder-3.1:* =dev-ruby/builder-3*:*
-	>=dev-ruby/erubi-1.4:0
-	>=dev-ruby/rails-html-sanitizer-1.0.3:1
-	dev-ruby/rails-dom-testing:2
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/activemodel-${PV}
-		~dev-ruby/railties-${PV}
-	)"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|rack-cache\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|bcrypt\|uglifier\|mime-types\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	rm ../Gemfile.lock || die
-
-	# Avoid activerecord integration tests because they are very sensitive to the specifics
-	# of the environment.
-	sed -i -e 's/, "test:integration:active_record"//' Rakefile || die
-
-	sed -e '2igem "actionpack", "~> 5.2.0"' \
-		-e '2igem "activemodel", "~> 5.2.0"' \
-		-e '2igem "railties", "~> 5.2.0"' \
-		-e '/active_record/ s:^:#:' \
-		-i test/abstract_unit.rb || die
-}
diff --git a/dev-ruby/actionview/actionview-5.2.4.5.ebuild b/dev-ruby/actionview/actionview-5.2.4.5.ebuild
index f86fbb64d409..982cb573783b 100644
--- a/dev-ruby/actionview/actionview-5.2.4.5.ebuild
+++ b/dev-ruby/actionview/actionview-5.2.4.5.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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/actionview/actionview-6.0.3.4.ebuild b/dev-ruby/actionview/actionview-6.1.3.ebuild
index 74c367a3ec9d..14ddbdd81c38 100644
--- a/dev-ruby/actionview/actionview-6.0.3.4.ebuild
+++ b/dev-ruby/actionview/actionview-6.1.3.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
@@ -61,7 +61,7 @@ all_ruby_prepare() {
 	# Fix loading of activerecord integration tests. This avoids loading
 	# activerecord twice and thus redefining constants leading to
 	# failures. Bug #719342
-	sed -e '/abstract_unit/arequire "active_record/fixtures"' \
+	sed -e '/abstract_unit/arequire "active_record" ; require "active_record/fixtures"' \
 		-e '/defined/ s/FixtureSet/ActiveRecord::FixtureSet/' \
 		-i test/active_record_unit.rb || die
 }
diff --git a/dev-ruby/activejob/Manifest b/dev-ruby/activejob/Manifest
index d02e3bee7090..ddb747ec214f 100644
--- a/dev-ruby/activejob/Manifest
+++ b/dev-ruby/activejob/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD activejob-5.2.4.3.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
-EBUILD activejob-5.2.4.4.ebuild 1095 BLAKE2B cd3e908ec77f73c6894055938e54655ecc7a064a94ebb32490b2f6843e4bc56a3b33ac80f0b2e26213efb8f956400e7b372681f249c5409d5f6f56a9fd159351 SHA512 1229672d7bf9db8cc21098ee930cf976a776b43b7c97f9a4259fd103e8e4ef8b44fee906690ae47e9428302e7538b772ef50485df897bdd4feda969c4858e336
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activejob-5.2.4.5.ebuild 1088 BLAKE2B 18db058ffe71f681ab28cb6668ac8cf7fbe3d922d49520f68bce8f5f69c773fcf5627179b9bd7a365f6113ec992ad5f04ee49907f8c4907a602cd1fdbaebbd0a SHA512 fd23cc4e42417afa6ba2091bf5e8ac0b6332855aa72947c32b367d28336412c36a8f02c69b6271bf5c80d3c6282f46afa7a241a90f6bc95f01e559455958f495
-EBUILD activejob-6.0.3.4.ebuild 1143 BLAKE2B 1dad689e71743f63c8c6a5c7cea7ef574e3a4ba4238baf12c5abef85abbf033c332b3a6a3a6396096ba19d0fe8489ad7811b28ed6427b85535b369d708e5353b SHA512 63062315498ff7c8452ecf233354835c0cd5037b98fb07304f99a7f5f8daaaf7db5167fa3e84756b99ec9a5988c04388d669b577e17debeda4dcc952630b3f46
 EBUILD activejob-6.0.3.5.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 EBUILD activejob-6.1.2.1.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
+EBUILD activejob-6.1.3.ebuild 1143 BLAKE2B 5857904f4c089c36ca0202a47578bed85079d016052efe672c7202f28b69d600de0e4164a2752b843cd83d46f4d79345874f4865a64242ab9223cffee04d4394 SHA512 fa700802817a7ee34ed31a0e850ba8a630c6a2d9714840c589bc6c0cdf83de5d9ea110c9ce98e9f71c3aca6671d387106bbd4bc0aa30a6fff537a2ef3e34710f
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activejob/activejob-5.2.4.3.ebuild b/dev-ruby/activejob/activejob-5.2.4.3.ebuild
deleted file mode 100644
index 7e36b898f263..000000000000
--- a/dev-ruby/activejob/activejob-5.2.4.3.ebuild
+++ /dev/null
@@ -1,46 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-5.2.4.4.ebuild b/dev-ruby/activejob/activejob-5.2.4.4.ebuild
deleted file mode 100644
index 7e36b898f263..000000000000
--- a/dev-ruby/activejob/activejob-5.2.4.4.ebuild
+++ /dev/null
@@ -1,46 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Job framework with pluggable queues"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	>=dev-ruby/globalid-0.3.6
-"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/helper.rb || die "Unable to remove load paths"
-
-	# Remove all currently unpackaged queues.
-	sed -i -e 's/que queue_classic resque sidekiq sneakers sucker_punch backburner//' \
-		-e 's/delayed_job//' Rakefile || die
-}
diff --git a/dev-ruby/activejob/activejob-6.0.3.4.ebuild b/dev-ruby/activejob/activejob-6.1.3.ebuild
index d7cb080da0a2..9d4e3d897654 100644
--- a/dev-ruby/activejob/activejob-6.0.3.4.ebuild
+++ b/dev-ruby/activejob/activejob-6.1.3.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
diff --git a/dev-ruby/activemodel/Manifest b/dev-ruby/activemodel/Manifest
index e8831d7b985e..3033efeee2ef 100644
--- a/dev-ruby/activemodel/Manifest
+++ b/dev-ruby/activemodel/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD activemodel-5.2.4.3.ebuild 1040 BLAKE2B 8c464ea18bbb1ec9297fa0e95812a5857bbb1094115b5f556d2e010783d960518e1f7baeb905ff294e647117fd54bbdc402def3ed3e88cfd4420bde1854db72d SHA512 fe53836eac85fa0d2e567c597f60df351b1efe879936978fcee1c6437e290f1386a5b9ac424f0871e42520e5e0dbb65329f7e8298d841e58d68bdce15cc71fac
-EBUILD activemodel-5.2.4.4.ebuild 1040 BLAKE2B 8c464ea18bbb1ec9297fa0e95812a5857bbb1094115b5f556d2e010783d960518e1f7baeb905ff294e647117fd54bbdc402def3ed3e88cfd4420bde1854db72d SHA512 fe53836eac85fa0d2e567c597f60df351b1efe879936978fcee1c6437e290f1386a5b9ac424f0871e42520e5e0dbb65329f7e8298d841e58d68bdce15cc71fac
-EBUILD activemodel-5.2.4.5.ebuild 1041 BLAKE2B 497fe0b6b849756e07c0cf1a6b16d9e4bdc073160fbb52a457a63cc7aacd416c2cbbc681428eeb0e9312c110a1b3eb9efdc8020a3ee1456f95dbd3312bb0e4b4 SHA512 5c196d0753bef466ac699adb59b862c1d5ffb4d291f6318c6d79e9627edfe0687c9947177719e2ec7c1e20d8129035584428561cd71ef797c026b67a2e5102f7
-EBUILD activemodel-6.0.3.4.ebuild 970 BLAKE2B f7e765c06ae3ef992fc431e9b8c86341aee4a77a1e62c7a038702a4248528b7e70b07072124749529d6a4dc4e2daf913d2a5d15a719eb8b5ecd781fad5cdc6b6 SHA512 53251bfa945a2abcff8c2d8f7e1bedd5b3faaec7cd782565f9a0ce203f67222160b1dcef81d651e5e55d6ed6fc55d12fc71936b05963a932747ec77998579c4b
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
+EBUILD activemodel-5.2.4.5.ebuild 1040 BLAKE2B 1fd431a1151cb50fe1414be304343c94974234af1ed54630a75103641968eb8da72a10bc9d5c894d394677d8edb52dda2ac4cf2a5fe047461c12a106953a9052 SHA512 24fb38b95119ae872d738fb7b0961ef5f94fd0f4d56786304f0876e95bc38ef777aa6a0bfb0951285b9b2dd20bb1bec68e2d73823d1cdafd08d78886653ba47a
 EBUILD activemodel-6.0.3.5.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 EBUILD activemodel-6.1.2.1.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
+EBUILD activemodel-6.1.3.ebuild 970 BLAKE2B affccda26c7dbd7f9a177855fbd848ac70a93bb728cfcb8e364f760dad4764672777683dc5fd60702ff6b09f3fcc268d8d95b3bfd5b78a89cf05807642978f2f SHA512 4dd1b29e0fb9c063f1ed2bda6c77221e9eef9374c595304445e4550462a90ccf8d6180d24406258d24adb643ef1ab456450ac573b9eb5aa66f37820d4dc9bfe3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.3.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.3.ebuild
deleted file mode 100644
index 7a9cd885fe20..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.4.3.ebuild
+++ /dev/null
@@ -1,44 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild
deleted file mode 100644
index 7a9cd885fe20..000000000000
--- a/dev-ruby/activemodel/activemodel-5.2.4.4.ebuild
+++ /dev/null
@@ -1,44 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activemodel.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Toolkit for building modeling frameworks like Active Record and Active Resource"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}:*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mocha
-		>=dev-ruby/bcrypt-ruby-3.1.7
-	)"
-
-all_ruby_prepare() {
-	# Set test environment to our hand.
-	sed -i -e '/load_paths/d' test/cases/helper.rb || die "Unable to remove load paths"
-}
diff --git a/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild b/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild
index 68b187404bb6..73bfa6ce4084 100644
--- a/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild
+++ b/dev-ruby/activemodel/activemodel-5.2.4.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild b/dev-ruby/activemodel/activemodel-6.1.3.ebuild
index c4575caa6a5d..cd76ad67cfe6 100644
--- a/dev-ruby/activemodel/activemodel-6.0.3.4.ebuild
+++ b/dev-ruby/activemodel/activemodel-6.1.3.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
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index ab569a2cbf24..8c2c74f54588 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD activerecord-5.2.4.3.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
-EBUILD activerecord-5.2.4.4.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activerecord-5.2.4.5.ebuild 2953 BLAKE2B 90b3f2cb10f6332b1db43996cb9ccbc3ad7050be55d961de413bbda68f88573fd6cdb65e547804e441af2bf13d0856037d9e2821e4ca34f030a2c22b2d1cab5e SHA512 cf94e6be6c7b2bb5056078c0bb751376ab55555f704897bbb08086a1f6276707eae85221d426637f8d72ee6df712fac0485cddb67f526badafbd020377dc6389
-EBUILD activerecord-6.0.3.4.ebuild 3074 BLAKE2B cc502eefb9493230acf071e157bbe5b9e21d475f59c7495e328800e50cf08218d62587e3b01ba4f1227f4ce9c21aaab8fc428ef3b058c3aeec617256842ff671 SHA512 df8d5b46874e5238a6f81141a7900d86b87e2e60cc54fa32c21110c43b803b3c79d7072e5345cb6d4297d098ea5608bef38dacc81c7e36d7424a40f06dbc6201
 EBUILD activerecord-6.0.3.5.ebuild 3074 BLAKE2B f4ab35e48d0d1362ad6dcd7371634e5b08195e19f238de2ae932124f740bfda1e5cc2a4cb1246672caf00e01616eae708fbc66118179420eb55e7cbd908cbb4c SHA512 25bf9e55dc3b7ce0621af4cd123aca8afd5b52baec2df047c97de9a36c5a6ab9d89b12ad39b1fda46b68fddbfd194a93c116cd685f7437300fad03bc2a49261f
 EBUILD activerecord-6.1.2.1.ebuild 2974 BLAKE2B b8f7f362e585a37d3ed785a79e8a0838c8db28e6880535d4f3abcd52631177a6af47f112aa663a7e52abcc903cb36654cb8d722192e66b1fc96e35b90c35d8e8 SHA512 4c1506931d706e3fc7e64631d7306ea2a5fc69ea0e3ff3c1125b15edab4364af71cd43f57432c0ff51294f5c6da037546a4b2e9147ad76cca93c26845e81d24c
+EBUILD activerecord-6.1.3.ebuild 2950 BLAKE2B 5bf49a2079c6a4d9ae0f2e01ef1510f06c4f5a5858e472474b86ece32e8416528a85251258ff836c249f39da5e71628e06fcdecf640a7fbbdece8a559769c53b SHA512 377cd5c883eae10e66e127bc61697bb1f2216cb8f707b2086c6439883e426649445c4ebd389f1f6ec76a0c3844d11042dbce1202db9d51364c8edcc5e884dbc3
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
deleted file mode 100644
index 3106a4c59f2d..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
+++ /dev/null
@@ -1,89 +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"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-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"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:9.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' \
-		../Gemfile || die
-
-	sed -e '3i gem "activesupport", "~> 5.2.0"' \
-		-e '3i gem "activerecord", "~> 5.2.0"' \
-		-e '3i gem "activemodel", "~> 5.2.0"' \
-		-i test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild
deleted file mode 100644
index 3106a4c59f2d..000000000000
--- a/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild
+++ /dev/null
@@ -1,89 +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"
-
-# this is not null so that the dependencies will actually be filled
-RUBY_FAKEGEM_TASK_TEST="test"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activerecord.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM"
-HOMEPAGE="https://github.com/rails/rails/"
-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"
-IUSE="mysql postgres sqlite"
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "~dev-ruby/activesupport-${PV}
-	~dev-ruby/activemodel-${PV}
-	dev-ruby/arel:9.0
-	sqlite? ( >=dev-ruby/sqlite3-1.3.6 )
-	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( >=dev-ruby/pg-0.18.0:* )"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/bundler
-		~dev-ruby/actionpack-${PV}
-		~dev-ruby/actionmailer-${PV}
-		>=dev-ruby/sqlite3-1.3.6
-		dev-ruby/mocha
-		dev-ruby/minitest:5
-	)"
-
-DEPEND+=" test? ( >=dev-db/sqlite-3.12.1 )"
-
-all_ruby_prepare() {
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	rm ../Gemfile.lock || die
-	sed -i -e "/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\|jquery-rails\|execjs\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|redcarpet\|minitest\|sprockets\|stackprof\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
-	sed -e '/bcrypt/ s/3.0.0/3.0/' \
-		-i ../Gemfile || die
-
-	# Add back json in the Gemfile because we dropped some dependencies
-	# earlier that implicitly required it.
-	sed -i -e '$agem "json"' \
-		../Gemfile || die
-
-	sed -e '3i gem "activesupport", "~> 5.2.0"' \
-		-e '3i gem "activerecord", "~> 5.2.0"' \
-		-e '3i gem "activemodel", "~> 5.2.0"' \
-		-i test/cases/helper.rb || die
-
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
-	# Avoid single test using mysql dependencies.
-	rm test/cases/invalid_connection_test.rb || die
-
-	# Avoid failing test that makes bad assumptions on database state.
-	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
-		test/cases/associations/has_many_associations_test.rb
-
-	# Avoid test failing to bind limit length in favor of security release
-	sed -i -e '/test_too_many_binds/askip "Fails on Gentoo"' test/cases/bind_parameter_test.rb || die
-}
-
-each_ruby_test() {
-	if use sqlite; then
-		MT_NO_PLUGINS=true ${RUBY} -S rake test_sqlite3 || die "sqlite3 tests failed"
-	fi
-}
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild b/dev-ruby/activerecord/activerecord-6.1.3.ebuild
index 5956e5555c2a..a1ef44206920 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.1.3.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
@@ -31,7 +31,7 @@ ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
 	mysql? ( dev-ruby/mysql2:0.5 )
-	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
+	postgres? ( >=dev-ruby/pg-1.1:1 )"
 
 ruby_add_bdepend "
 	test? (
@@ -54,19 +54,16 @@ all_ruby_prepare() {
 	sed -i -e '/rack-ssl/d' -e 's/~> 3.4/>= 3.4/' ../railties/railties.gemspec || die
 	sed -e '/bcrypt/ s/3.0.0/3.0/' \
 		-i ../Gemfile || die
+	sed -i -e '/byebug/ s:^:#:' test/cases/base_prevent_writes_test.rb || die
 
 	# Add back json in the Gemfile because we dropped some dependencies
 	# earlier that implicitly required it.
 	sed -i -e '$agem "json"' ../Gemfile || die
 
-	# Avoid test depending on mysql adapter which we don't support for
-	# this Rails version to simplify our dependencies.
-	rm test/cases/connection_specification/resolver_test.rb || die
-
 	# Avoid single tests using mysql or postgres dependencies.
 	rm test/cases/invalid_connection_test.rb || die
 	sed -e '/test_switching_connections_with_database_url/askip "postgres"' \
-		-i test/cases/connection_adapters/connection_handlers_multi_db_test.rb || die
+		-i test/cases/connection_adapters/{,legacy_}connection_handlers_multi_db_test.rb || die
 
 	# Avoid failing test that makes bad assumptions on database state.
 	sed -i -e '/test_do_not_call_callbacks_for_delete_all/,/^  end/ s:^:#:' \
diff --git a/dev-ruby/activestorage/Manifest b/dev-ruby/activestorage/Manifest
index 08105b111ba1..de9a69a06e78 100644
--- a/dev-ruby/activestorage/Manifest
+++ b/dev-ruby/activestorage/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD activestorage-5.2.4.3.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
-EBUILD activestorage-5.2.4.4.ebuild 1970 BLAKE2B f0cc15b0b78d783b2c85c838959156bfac4979be631db2a7f40b177b5b08b626da65d7d504e9bdae3dc5c42dfd06a152ccfe919e63fe030760d8c530af84d523 SHA512 ceb0fd466449abb1070b94011868a44a14330e07dadd87cb0fa7e0604e152fe572d03023b460d13780a4618b88864a7d67df56f45bdeb77963feed2f18ff065b
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
 EBUILD activestorage-5.2.4.5.ebuild 1970 BLAKE2B 2558ac6c7fee55505f9e4d11cf6ce9b55819e39c6498478486747e28108026949a4df247a15d8318cd0a659aa35f77880c9c0dc288a3dfec3d0c5dfc2939a5b7 SHA512 19afe1f48f4e800e108a1d11f239999cb0a14ba1318d5bf3076bb3a7cd2bde604ebc1035aebfbbb6444a9bce317cff337524cc007631ad4797259ab6637b6b00
-EBUILD activestorage-6.0.3.4.ebuild 2026 BLAKE2B fd9857b4ff0c70660b70c69116b1e83b56167eb19656f15c220f4ae15a02b093f3f26091fe446dba4c99538c33651d98c24cd33056f38e25b505d5c41d08718e SHA512 de586463bbf72e68bb7bbcca46e89d469a897ff9e56e141a3f9eb71a2bf4299760e6539893ecc829a5e9a20266e505ccbf847d9d0a5ed8a855da9e9bf1323b80
 EBUILD activestorage-6.0.3.5.ebuild 2026 BLAKE2B 47d1e7d489971c98b738a21bc674bb99eeaa31c44d9fec6cdce1ecbccea546d89c950998fff1f1edb5432ac45fc13312fa7112c22a96ffd2eeb7ab96d34a584e SHA512 5dd6bd174328f5943fcd1408252b2cf32fe431a06e0ec0bbb0cc79d28f76a9c0a8034cb22c19cfdcfb3d1f67319c94b75d1b4f511f09a1130b54f8b7f7205aa1
-EBUILD activestorage-6.1.2.1.ebuild 1984 BLAKE2B 7d30e15a1a477983118307aca6a409e6faf910ce16b2d10756007a9cde6ada04f37fdd3db2476465856d1b92c76c289285cc3ada5618220694360c70497f2c19 SHA512 6b5526686f652b950e75f3ae1495b9948eb161e3b7e799a0bdc4491270bc2c0bf7461490e67e9d43a926a9014fb5fd3249bed13d94159130651cbeb1597f1a5e
+EBUILD activestorage-6.1.2.1.ebuild 1991 BLAKE2B 1aaf65836d58a871248bac82389bce47cb511c42b95e921c19e5b1c1bc1a1b8c1da662c43677b29932a851637e66ea9ab5acb99916536b8f93823e9b0748081c SHA512 9bd7b2242b09f5be1114b2b5d4e8507980e7c635511f2d9eab85a87e83ccf37b917748f2c35fa866f8cb381bbec79ca03ceee65ad293836ae2422556056493ce
+EBUILD activestorage-6.1.3.ebuild 2106 BLAKE2B f9c415ba867e3594af3aeafd7bdd3e399163fb3b466f763cc9cfb74ce5dc0e0db0b19352331eba7ada08d0ac457bba0e5ef2d32770c3f1e919cf38b74478004f SHA512 528854b949536fe23471a368582907b0a79d4a7faa88cd8668c416699a797d028ad58484df40454f478dbff2260c5a63f2ac4f649e0e28a5e00bd655486bb5b9
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
deleted file mode 100644
index 9ee08a50fdf3..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.4.3.ebuild
+++ /dev/null
@@ -1,61 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-5.2.4.4.ebuild b/dev-ruby/activestorage/activestorage-5.2.4.4.ebuild
deleted file mode 100644
index 9ee08a50fdf3..000000000000
--- a/dev-ruby/activestorage/activestorage-5.2.4.4.ebuild
+++ /dev/null
@@ -1,61 +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_DOC=""
-RUBY_FAKEGEM_DOCDIR=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="activestorage.gemspec"
-
-RUBY_FAKEGEM_EXTRAINSTALL="app config db"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Attach cloud and local files in Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-DEPEND+=" test? ( app-text/mupdf ) "
-
-ruby_add_rdepend "
-	~dev-ruby/actionpack-${PV}:*
-	~dev-ruby/activerecord-${PV}:*
-	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/railties-${PV}
-		dev-ruby/test-unit:2
-		dev-ruby/mini_magick
-		dev-ruby/mocha
-		dev-ruby/rake
-		dev-ruby/sqlite3
-	)"
-
-all_ruby_prepare() {
-	   # Remove items from the common Gemfile that we don't need for this
-		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\)/ s:^:#:" \
-			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
-		rm ../Gemfile.lock || die
-
-		# Fix spec broken with ruby24
-		sed -i -e '35ibegin' -e '55iend' test/service/s3_service_test.rb || die
-}
diff --git a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
index 460e95be2b1f..d60ab6bbc543 100644
--- a/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
diff --git a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
index 945b8395dccf..121a1854f8fa 100644
--- a/dev-ruby/activestorage/activestorage-6.0.3.4.ebuild
+++ b/dev-ruby/activestorage/activestorage-6.1.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC=""
 RUBY_FAKEGEM_DOCDIR=""
@@ -32,8 +32,11 @@ DEPEND+=" test? ( app-text/mupdf media-gfx/imagemagick[jpeg,png,tiff] media-vide
 
 ruby_add_rdepend "
 	~dev-ruby/actionpack-${PV}:*
+	~dev-ruby/activejob-${PV}:*
 	~dev-ruby/activerecord-${PV}:*
+	~dev-ruby/activesupport-${PV}:*
 	>=dev-ruby/marcel-0.3.1 =dev-ruby/marcel-0.3*
+	>=dev-ruby/mimemagic-0.3.2 =dev-ruby/mimemagic-0.3*
 "
 
 ruby_add_bdepend "
@@ -50,10 +53,9 @@ ruby_add_bdepend "
 all_ruby_prepare() {
 	   # Remove items from the common Gemfile that we don't need for this
 		# test run. This also requires handling some gemspecs.
-		sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|rubocop\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
+		sed -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|'mysql'\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|aws-sdk-s3\|aws-sdk-sns\|google-cloud-storage\|azure-storage\|blade\|bootsnap\|hiredis\|qunit-selenium\|chromedriver-helper\|redis\|rb-inotify\|sprockets\|stackprof\|websocket-client-simple\|libxml-ruby\|sass-rails\|capybara\|rack-cache\|selenium\|json\|dalli\|listen\|connection_pool\|puma\|mysql2\|webdrivers\|webpacker\|rexml\|webmock\)/ s:^:#:" \
 			-e '/dalli/ s/2.7.7/2.7.9/' \
-			-e '/:job/,/end/ s:^:#:' \
-			-e '/:test/,/^end/ s:^:#:' \
-			-e '/group :doc/,/^end/ s:^:#:' ../Gemfile || die
+			-e '/group :\(doc\|job\|rubocop\|test\)/,/^end/ s:^:#:' \
+			-i ../Gemfile || die
 		rm ../Gemfile.lock || die
 }
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index 85f9a4b07a63..380d214b77de 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -1,14 +1,9 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD activesupport-5.2.4.3.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
-EBUILD activesupport-5.2.4.4.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
-EBUILD activesupport-5.2.4.5.ebuild 2513 BLAKE2B 400836b07ca7670e6d714de0e9e7917bdc720e3079d63d8bebd40a1e00f84aab532211b468a1618c58fdd7ddc563f54f96bdf4cad01fa75585f26a380c230669 SHA512 31660ea6f07e75334e934b5694cc97e5bce054334666a7aa31778989c0f790a4220bcf87a62970f154be459bedbddee0a116285e69242b8d42cc62aae66ae971
-EBUILD activesupport-6.0.3.4-r1.ebuild 2527 BLAKE2B 27ab01053d5e704b61c7bafcd4dd49df749edea936ebd1911e731684d7115a3bc0b2b7f9232220f7bd34095087f4e469996184b716204c2d53ae42ab13fd7b33 SHA512 618ed158df08cefdc1b5dd634b736beef357c66ef6cffa7286ab18206f53c0b6bd0acb68935927256392fbee52530ff7508b02e717cc6f9026b667003987e6a5
-EBUILD activesupport-6.0.3.4.ebuild 2517 BLAKE2B d138806cbe294858b40360af25615ead52a0ed7f1eadb77ccaf6344f18b8616365f19d1548e5fe5a5748700ad9e75c34123421ebf9d57892331aa0174b8bc9b2 SHA512 30d49e2ab7c3334bdf253d4c9f866937e493d693f43d7a450c2103156baab04a918dcdfee67db159002841db3979f0e9a9ab898ad75eba6e4518a1a629e6b942
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
+EBUILD activesupport-5.2.4.5.ebuild 2512 BLAKE2B 19b04f012ba252ec9887c43703ec8408a3a1c3f17583cf3f3bd6d565f70291b3f3be78b48a5af0f3a74db38959a6eb60a4741ffe0112f14c2c5763d20049a35f SHA512 2db42998c4766c0e017f4031b6fe9ef7eb2d067b885a969eea41eb59ec5a909b40bcbbd9cd0ac065d1ed4c68902bc66f59ab950d11f4ec4603f46b031c1cd09e
 EBUILD activesupport-6.0.3.5.ebuild 2527 BLAKE2B 54901c557010951c87ccb187b3995e351b75a08bc733a63a75da1f7093fb765cbe89fb409ff8a636020ae94092d1a5a5690689ecd8b01a402f184a332614f52e SHA512 671953781017b8e14c2d09bbbecd4cf388c1a9cb857999a4aea8511e36da90994e71d045a8e4a2a9d6bd0a63b9caa3dc5ab8f96c1b06ac4b6dad8198c43b68a7
 EBUILD activesupport-6.1.2.1.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
+EBUILD activesupport-6.1.3.ebuild 2651 BLAKE2B 01618016b57bed2194c199aba614c4f72a01a375431922ecb9b3376a9a7280405fcce5f3bad869e02c2744266cc8eb56f883226f9286c172bd58c4c1c715b489 SHA512 592f97d4ea7c879e6684e3b5e6f8da4f300cc5683c0205d2953cebe21f20fa0d9ac9bca2f288255d9e233897a4f2f64cbb7fd7496b43c63c988b777c94778d50
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
deleted file mode 100644
index e74656bd99b7..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.4.3.ebuild
+++ /dev/null
@@ -1,72 +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.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
deleted file mode 100644
index e74656bd99b7..000000000000
--- a/dev-ruby/activesupport/activesupport-5.2.4.4.ebuild
+++ /dev/null
@@ -1,72 +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.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5"
-
-# memcache-client, nokogiri, and builder are not strictly
-# needed, but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild b/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild
index 3b77bfefe2d9..e74656bd99b7 100644
--- a/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.2.4.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~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.3.4.ebuild b/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
deleted file mode 100644
index bf4536107f91..000000000000
--- a/dev-ruby/activesupport/activesupport-6.0.3.4.ebuild
+++ /dev/null
@@ -1,73 +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_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Utility Classes and Extension to the Standard Library"
-HOMEPAGE="https://github.com/rails/rails"
-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 ~sparc ~x86"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-ruby_add_rdepend "
-	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
-	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.1.8:2
-"
-
-# memcache-client, nokogiri, builder, and redis are not strictly needed,
-# but there are tests using this code.
-ruby_add_bdepend "test? (
-	>=dev-ruby/dalli-2.2.1
-	>=dev-ruby/nokogiri-1.4.5
-	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
-	dev-ruby/rack
-	dev-ruby/mocha
-	)"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Remove items from the common Gemfile that we don't need for this
-	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
-		-e 's/gemspec/gemspec path: "activesupport"/' \
-		-e '5igem "builder"; gem "rack"' ../Gemfile || die
-	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
-
-	# Avoid test that depends on timezone
-	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
-
-	# Avoid tests that seem to trigger race conditions.
-	rm -f test/evented_file_update_checker_test.rb || die
-
-	# Avoid test that generates filename that is too long
-	sed -i -e '/test_filename_max_size/askip "gentoo"' test/cache/stores/file_store_test.rb || die
-
-	# Avoid tests requiring a live redis running
-	rm -f test/cache/stores/redis_cache_store_test.rb || die
-	sed -i -e '/cache_stores:redis/ s:^:#:' Rakefile || die
-	sed -i -e '/test_redis_cache_store/askip "lacking keywords"' test/cache/cache_store_setting_test.rb || die
-}
diff --git a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild b/dev-ruby/activesupport/activesupport-6.1.3.ebuild
index a688f36aa364..077b419f7711 100644
--- a/dev-ruby/activesupport/activesupport-6.0.3.4-r1.ebuild
+++ b/dev-ruby/activesupport/activesupport-6.1.3.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
@@ -26,10 +26,10 @@ RUBY_S="rails-${PV}/${PN}"
 
 ruby_add_rdepend "
 	>=dev-ruby/concurrent-ruby-1.0.2:1
-	dev-ruby/i18n:1
-	>=dev-ruby/tzinfo-1.1:1
+	>=dev-ruby/i18n-1.6:1
+	dev-ruby/tzinfo:2
 	>=dev-ruby/minitest-5.1:5
-	>=dev-ruby/zeitwerk-2.2:2
+	>=dev-ruby/zeitwerk-2.3:2
 "
 
 # memcache-client, nokogiri, builder, and redis are not strictly needed,
@@ -38,7 +38,7 @@ ruby_add_bdepend "test? (
 	>=dev-ruby/dalli-2.2.1
 	>=dev-ruby/nokogiri-1.4.5
 	>=dev-ruby/builder-3.1.0
-	>=dev-ruby/listen-3.0.5:3
+	>=dev-ruby/listen-3.3:3
 	dev-ruby/rack
 	dev-ruby/mocha
 	)"
@@ -49,13 +49,12 @@ all_ruby_prepare() {
 
 	# Remove items from the common Gemfile that we don't need for this
 	# test run. This also requires handling some gemspecs.
-	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\)/ s:^:#:" \
-		-e '/:job/,/end/ s:^:#:' \
-		-e '/group :doc/,/^end/ s:^:#:' \
+	sed -i -e "/\(system_timer\|sdoc\|w3c_validators\|pg\|execjs\|jquery-rails\|mysql\|journey\|ruby-prof\|stackprof\|benchmark-ips\|kindlerb\|turbolinks\|coffee-rails\|debugger\|sprockets-rails\|redcarpet\|bcrypt\|uglifier\|minitest\|sprockets\|stackprof\|rack-cache\|redis\|sqlite\|websocket-client-simple\|\libxml-ruby\|bootsnap\|blade\|aws-sdk\|webmock\|sass-rails\|selenium-webdriver\)/ s:^:#:" \
+		-e '/group :\(doc\|rubocop\|job\|cable\|storage\|ujs\|test\) do/,/^end/ s:^:#:' \
 		-e 's/gemspec/gemspec path: "activesupport"/' \
 		-e '5igem "builder"; gem "rack"' ../Gemfile || die
 	rm ../Gemfile.lock || die
-	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
+#	sed -i -e '1igem "tzinfo", "~> 1.1"' test/abstract_unit.rb || die
 
 	# Avoid test that depends on timezone
 	sed -i -e '/test_implicit_coercion/,/^  end/ s:^:#:' test/core_ext/duration_test.rb || die
diff --git a/dev-ruby/ammeter/Manifest b/dev-ruby/ammeter/Manifest
index 2c011ad8d062..fcb5b581f431 100644
--- a/dev-ruby/ammeter/Manifest
+++ b/dev-ruby/ammeter/Manifest
@@ -1,3 +1,5 @@
 DIST ammeter-1.1.4.gem 19968 BLAKE2B dbc773e4db83d820e5ef1c6ae3af2e65f87ff1a10a09759c66a4dad87cd175e5e8af857435b6df6cb93167869d31fb1f43dcf220e063db03d048aa8926c7daaf SHA512 57d24c67be85fe34ded8feda045771974be7cdd828780a82ff0b2f6b52d0b35b48c2eb7e59dae70700fba676242918ef6463448090d7729d49db0f05f04b0131
+DIST ammeter-1.1.5.gem 19968 BLAKE2B e4a7af65c8ee798b24f0c8a312315461779f5e1c31d97da1663d73b1a9cc65b99ed9f693259eed01a4152ab220d34ddb91ee4632657035fc1768897fae60d60e SHA512 35758fccaa51c9873747f24710168bdc0a0b25bd825d15e434cd17341d07f73a5078293d5045dcf88061765e92fe08f9b2470b4f206d859e82ec7befe64c1d93
 EBUILD ammeter-1.1.4-r1.ebuild 1603 BLAKE2B ff60de580e6934d7f0d2a8b3c233e19667c174c769e9bb6b0bb78431f91fbe9520a3d39cbf44be1b05bc2d2388602185c457085ce08af747c5bc6b066d76e03a SHA512 7c205c8fd66eaa67a39595c877a866814c6f9d3b77e312dac918c78685ced25b029ca5bbf6eb0928c75cfd3ebd1e185028d6f3b76c54415a9a535642d4481d78
+EBUILD ammeter-1.1.5.ebuild 1589 BLAKE2B f6a7690d853908ab94ed9964af20649b992045bcb0aa4df697631f3f21ae816b9c4c78f6252b2a7115ace9b625af013d39eb1f9a70d5a6487de5c5556f7b795e SHA512 6b98780c315a37592fe87dab6c31aab0dcf10f8f01f811763d47283edada178dc2cea3a5ea0e3393e5b95802b8dbf46c88a2c6ea30e79cb6c27d57f44c2ad949
 MISC metadata.xml 348 BLAKE2B 1eae86b63a0e04b8b5e8d8d9438b102b029a919af6fdb0cf2319b11a3c50ee282a255dedd7bad0bc3098ea8d1c0c05e17a5d98b382fa454feebbd304b18d3f57 SHA512 f81eb53098c1d67a4d5cfe32c9b3aace294cb90788775c639e189cf3932ef8101466d9a1541ceada391ebdacfedf926d9549f4591b42efd6c391e5fe6b0e72f1
diff --git a/dev-ruby/ammeter/ammeter-1.1.5.ebuild b/dev-ruby/ammeter/ammeter-1.1.5.ebuild
new file mode 100644
index 000000000000..00f45c94f10f
--- /dev/null
+++ b/dev-ruby/ammeter/ammeter-1.1.5.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Write specs for your Rails 3+ generators"
+HOMEPAGE="https://github.com/alexrothenberg/ammeter"
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+# Restrict tests since they now require the specific rspec version to be
+# provided in an environment variable.
+#RESTRICT="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-3.0:*
+	>=dev-ruby/railties-3.0:*
+	>=dev-ruby/rspec-rails-2.2:*
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rails-4.0
+		>=dev-ruby/uglifier-1.3
+		>=dev-ruby/rake-0.10
+		>=dev-ruby/coffee-rails-4.0
+		>=dev-ruby/sass-rails-4.0
+		>=dev-ruby/jquery-rails-3.0
+		dev-util/cucumber
+		dev-util/aruba
+		dev-ruby/sqlite3
+		dev-ruby/bundler
+	)"
+
+all_ruby_prepare() {
+	# fix the gemspec; we remove the version dependencies from there, as
+	# it requires _older_ versions of its dependencies.. it doesn't
+	# really seem to be the case though. Also remove the references to
+	# git ls-files to avoid calling it.
+	sed -i \
+		-e '/git ls-files/d' \
+		-e '/\(cucumber\|aruba\)/s:,.*$::' \
+		${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# haml-rails is not packaged
+	sed -i -e '/haml-rails/d' ${RUBY_FAKEGEM_GEMSPEC} Gemfile || die
+	rm -f spec/ammeter/rspec/generator/matchers/have_correct_syntax_spec.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec ${RUBY} -S rspec-3 spec || die
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 4c921a188c15..2993d4e0272b 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,11 +1,7 @@
-DIST autoprefixer-rails-10.0.1.0.tar.gz 682273 BLAKE2B 9e3e2450726e7bdfc89b4b5c430a4c6ce0053ad7d6d041f70e93bb56d242a278476ae7c57b5baed42b4feccb7311f8134f19d8bb8565bf3959f471fa6f60400b SHA512 a27db1bfe558154ccfb4a7d1fc5a06fc8da3147c488d4a0ac589d304f3316417c92c0efd118b79ced1f7ee4c20aff0842aa1bf56402b74458892cd3578e8e8e4
 DIST autoprefixer-rails-10.0.1.1.tar.gz 684843 BLAKE2B 06cbfe473f29acc24544f7fff23adb5d7419b2bfc7b06a809f04e656fd1b5c961a9fb1379da63ae76c8b2626044ce6f91a5a378ed2569f1631fd2d0e23c021f1 SHA512 1b22fa901e7d54fa465ce04cadb81e6391a75b6f6719b075a33ec3b7183c07c008420baa5ffdccf6880472af3fa75fac5b9c03769dd04e748e4e8cdb644b45b7
-DIST autoprefixer-rails-9.8.5.gem 231424 BLAKE2B 94e695613784c954d6402b144edd08dfbec0018a02ffafe2c2e6deecc010c2193137e8ea97f00bbac35881eaf4129403cef9db78736f9618f76bcfd8df5e0598 SHA512 5ef382ba88b1adeb51b41e818bcc3364740809f3576db5228a73eca83829248a618c2e886f68c057d46a68861b6f1ef408f12ec6597f272533c8797273d2e324
-DIST autoprefixer-rails-9.8.6.3.gem 231936 BLAKE2B 63f201a73ace0d8f328281521137712f21715bba3fd7c8d098fe81b161d00cd215d6cc89ed786bd79689b81e1b20198d594e307794de527c9cfc0fadb50ccc9d SHA512 f00cfe85742202a1f0fbe672c3279adbe7b3f97155a3696ed274c6987d4f3283895a2f75d4ec6b1709861d72277ec3cf9f0608ad568f5c32ac8df693dc105f8a
+DIST autoprefixer-rails-10.2.4.0.tar.gz 720604 BLAKE2B 1f1546f1917ef7dd98aa1f699906865ceb78e6092e1a867569deb1b4a68d66d32d7e5cabae1f1acb2f80220f6c3e55601b7e9d33d6a3a4cea281da1e121fb0d9 SHA512 fbf65914af2962ffa8092405a82f18dc483516d3ba53f062dc17df70b1ed7b41996294a7f419aa24a0cf66d5ea9f273e5cc8e98138b65cd856758eb448a67c9f
 DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
-EBUILD autoprefixer-rails-10.0.1.0.ebuild 1022 BLAKE2B 53d195a7519b0dc8b5d70ed92f7f53c939d36d27272e639957b00a8f0f9f6d792ed812fd7511fedeeadfd7684a87f9182bdb33aa2082a28b701e90e471fef5d8 SHA512 bb322f730d707c081483efe71263551c824d34bee5cd4958905ae4ac374ef6656a92c49456393bc21686f3cc561ca69ddd5e615b2813bc4926453e0a2e3b3ac8
 EBUILD autoprefixer-rails-10.0.1.1.ebuild 1022 BLAKE2B 53d195a7519b0dc8b5d70ed92f7f53c939d36d27272e639957b00a8f0f9f6d792ed812fd7511fedeeadfd7684a87f9182bdb33aa2082a28b701e90e471fef5d8 SHA512 bb322f730d707c081483efe71263551c824d34bee5cd4958905ae4ac374ef6656a92c49456393bc21686f3cc561ca69ddd5e615b2813bc4926453e0a2e3b3ac8
-EBUILD autoprefixer-rails-9.8.5.ebuild 946 BLAKE2B f2c0e16792f3419aaecab7b112b21321c7c7640895fbcf9f5710f56807ff8828e4a2545617b5d4affbf20b77b18138276f592506175575b7f975e3a06574d415 SHA512 bbe425f71a781271fda28d0907fbe328d2d7672fb1c0f878b12c1efe4f28c0065d831bbe509ecc298391b7d1735c98cbad87a49ef09bc8f92a7a8e572ecc4731
-EBUILD autoprefixer-rails-9.8.6.3.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
+EBUILD autoprefixer-rails-10.2.4.0.ebuild 958 BLAKE2B 881faff328d11768a8abb03ad75fa87f3d7bf24e05d4c5b53a87c01a8f0a1c47a20160b2a8eb17fe9fd39eca61c8be2ee5006c0d0782e059fdac6122ccdbbc5e SHA512 7553d515aea72929fef1d6ca75b387d432f15d9038b74f7ba6ec27b343814e594993b69b1c81fdef57cf76832a8b1fb1c98f8c6facb9985d858168cfd8f39529
 EBUILD autoprefixer-rails-9.8.6.5.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.4.0.ebuild
index 8fb38afae29a..664833352cf5 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.0.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.4.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
@@ -35,6 +35,5 @@ all_ruby_prepare() {
 	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
 	sed -i -e "/Bundler/ s:^:#:" \
 		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
 	rm -f spec/rails_spec.rb || die
 }
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.5.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.5.ebuild
deleted file mode 100644
index bc06b1290578..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.5.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"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/,+3d" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || die
-	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.3.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.3.ebuild
deleted file mode 100644
index e9b103efbd7d..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.3.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 43ae7ddba95f..d5db8577024a 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -2,8 +2,10 @@ DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028
 DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
 DIST backports-3.18.2{P}.tar.gz 158492 BLAKE2B 7ad924758939fe50b26fb845e96583a57a06e0039780eb96c8df9c535bd5aace261a6b3619ca3bc3a772c0db51162e9d340a6a1515c746acde91d8cb608f83be SHA512 3293430331f217c13f754242848f2541906ce930a8683f0ed65a64f93dc1d2387ef33501b1d8129872d536bf2f59c4e975c67abc2cd966277fd62ffbc68b5522
 DIST backports-3.20.1{P}.tar.gz 178390 BLAKE2B a21ba2035e83ab309582a9ad6b01006079ab38d0990724942ffb591e2ed536dbb6f176c940ccc019bd374c38ca9a0ebd271e32563a41a71e06d1c631084e0445 SHA512 4330c1c8928d914fe85dc5d3797ab0b02b37e5ed3fed1899d6368504dc64c2241fc87357bc5155e708902ae93bf2160276d60a6b1ed5a23fbb234e2598a1b441
+DIST backports-3.20.2{P}.tar.gz 178633 BLAKE2B 2e2f2f31099763bb218f3ada9f9d040d4b41fc842bbc8b91d703e91b89bab9d6e7bbf3aae1ecfe34abe6099d6cb34929ae72ba66d4ee473841563257fa85cf3c SHA512 a91a2c9186315fca8e0b33554ef26986abe8565e08a79b9f150f8115f998b2a7a440bbc64b92f89c4e95e1c5e852bfeea6ab337804cf017517e77229f10820e5
 EBUILD backports-3.15.0.ebuild 666 BLAKE2B bd4254e19f91ff02bc0cb3153c0271e5640bb8aa71cafd37f5122759d0e7ceea8d67a8919227bc33d97e162382506fc19377f7ea92303016062749beb964400a SHA512 e1154aa957300f9cd5e7459267dbf2252f20a01fba5de072730b1a20ce1b84489c940faddd0b994974056bce25c67091aaccad5f3bcb8ac3609a07046568b086
 EBUILD backports-3.17.2.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 EBUILD backports-3.18.2.ebuild 793 BLAKE2B c44bf9a13dfbce3d8713b93edeadefc69407bf7f0575ef5629bb9401fccb82dab893ce806daaebe3b4c703a3680aa202a88cca8466ef75a9b55d1f98a0112d33 SHA512 60444bf27bbabc3ea8bf28ae0c54d6dce880933e58d386fee988f5dab15885ad401919a554d103d1577aa938cf58f66ce0d144dec11304301ec382130c56c738
 EBUILD backports-3.20.1.ebuild 800 BLAKE2B a98edb4cf21157da67f6106fe0aa5954c806f6e0a3625a9b8548123b9134a2859e07ffe0de90a451f758f79bfb0090ddc723763373fde81ab925ccb25ee87c98 SHA512 cd575010a83d810f16fe33b421ed7903c2ddb7e5813ff68e95d0ae86cec104fdbdf8b48675b3f8aa19d347d8597ebce360aa4f4370d9cbbc88771990c9820d9a
+EBUILD backports-3.20.2.ebuild 800 BLAKE2B a98edb4cf21157da67f6106fe0aa5954c806f6e0a3625a9b8548123b9134a2859e07ffe0de90a451f758f79bfb0090ddc723763373fde81ab925ccb25ee87c98 SHA512 cd575010a83d810f16fe33b421ed7903c2ddb7e5813ff68e95d0ae86cec104fdbdf8b48675b3f8aa19d347d8597ebce360aa4f4370d9cbbc88771990c9820d9a
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.20.2.ebuild b/dev-ruby/backports/backports-3.20.2.ebuild
new file mode 100644
index 000000000000..79bd0df839fb
--- /dev/null
+++ b/dev-ruby/backports/backports-3.20.2.ebuild
@@ -0,0 +1,28 @@
+# 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"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index 1d6a67a40135..6019bb47b705 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1,3 +1,5 @@
 DIST binding_of_caller-0.8.0.gem 87552 BLAKE2B 9097fe2dbf1e5ea2361bee94cb83ce8152f7e1357caecf1217b1643be225e21e5aa793e7fccbef5c983d5c204b95e633ded490158dfdd1d4e99fca81c51cb910 SHA512 d6ea4e893415eaf3614b109f8f36c3fa2378da9997d013fccbd0fc1e598886d11f7843023ceed2468184d5b8df01e2329ef16c7af57bc60bbd47304a53b43974
+DIST binding_of_caller-1.0.0.tar.gz 7473 BLAKE2B 2a8f3cee555e11c9eeb56935d0ee51deb037ea5fc631b4ef5eb50a831e48ba47c6a94e9104456bd8e6c4910bc76c5bc7e268db7de8c5ed283886b80c3feffd62 SHA512 89c58fec180b7bc25c5124035ed69692961148a3ddcb561643e7b8b1a78c3b103795408b52e70264db7c4b62080991219af977c5b981a135d573ecd56cebebba
 EBUILD binding_of_caller-0.8.0.ebuild 576 BLAKE2B e78491de6adb0de769ebce72fbabab41b4a26ba3410e26452ee177e60fcd770369c44969a6358398de130c373c90981d9c5b6400b549a9039a2594bebb523959 SHA512 4f832eb9a856fb0d6377786a6d0e2d6d16270bfdf1d9d60a40f66fcee6d1e2906fea0c8eed63c64b3dff2a29bd80ca3f65611df7b95a87abebdf5e6085bcf9e5
+EBUILD binding_of_caller-1.0.0.ebuild 808 BLAKE2B 58e4df4996d67fe3b9d850c7b9be3ba598c5baac264e9771dc51947240c37d1aa3703c1b5b2246f6c6a246fa068fd916de6deaea3cb50335c258655926ea043b SHA512 12ce0383563bdffc384a93d5d4c019e31ba4c3f75b14671f9784f14053ff9509af3492d55303ff7c858b0562cd5325a0597e20d1ce8281757028bd87bf832b40
 MISC metadata.xml 352 BLAKE2B 1ff945eb6a72367cd1901603d59de20bc43ac45a07bcb525d7cb8641dc9cbab8493a19919a3600356d49082bc5563471926fe632cd0ccf5c0ba34d2445e31cdb SHA512 3774a75d46642d38c562d1a2cfe3c432cf3857801fb44b3da21ba2bbe9bd046b60d1bf4b5712efe66b9d875d407717a53f0a00a3516b631d05335f045f87fa23
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0.ebuild
new file mode 100644
index 000000000000..47de67cdbd75
--- /dev/null
+++ b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0.ebuild
@@ -0,0 +1,30 @@
+# 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_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="binding_of_caller.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the binding of a method's caller"
+HOMEPAGE="https://github.com/banister/binding_of_caller"
+SRC_URI="https://github.com/banister/binding_of_caller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index de93effebd29..e566d79eb1a2 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,5 +1,7 @@
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
 DIST bundler-2.2.10.gem 388096 BLAKE2B 373142f7e40c2c8a0df6acf9c4c85df70e86b5737b641efc2a5201310226e81cb441bbcfbbec48068d386f23fc62c218f1650a5187d2f71f811eeb554a5819e7 SHA512 8f46fe4fd9e04df35bce82e3238b5d9137ad86949ce3fa7ebf6c30871d927dbc09d0e610efb8e68cd60fcbae4719fa4c43429c9d76d1b7dfedd5e19119254d9a
+DIST bundler-2.2.11.gem 388096 BLAKE2B 15f8bc7a0091859c4a52ea11a95efaf2ec2941aa9ae765df761e0027e1951c4bdb9a699bacddd843173d9ca8d70f6a4b1aca567364abc29eef169184bb8aff59 SHA512 a67668a9b82fbd468f84c6a6523dec0504349e4289e31f3c8e12f3b10a60b6fac523e3eba59296f890bc466b6688c655e0a3cfbe9876bde5b58e55d519c27dd0
+DIST bundler-2.2.12.gem 388608 BLAKE2B c9ab5f710dd1f240e651501c85dfbdb436f784326f203352c1eed6d442192fd191483933d58a1d185826035939ce59aaf3522d94d8359e510743bc3257c4eaec SHA512 538dc4eb6f342843045f6b0b8123814f8fef25b5fe56ae3b5e43639b292e674fe3a647613707a7f7f9067207a7a8c0729d2bdd9eb33ab1fdb3ff6f5d5f88d03d
 DIST bundler-2.2.5.gem 386560 BLAKE2B 070f52338e9424e571ae40c01ba559158fd9938910be4d5b1d4c8990cdaac4f6a2cb7d2a554a2e7bbb35b18a31e9d1dba5c4e711556294496ac6978ae63a94f0 SHA512 d985168531ad7415841535a496717faff2cbdcff04c8b701c0e29533f3fe5c87cb5815e6b219ab1d536c29c8c8d80b051f4f05aeb2b6fe279dc12404bf824742
 DIST bundler-2.2.6.gem 386560 BLAKE2B e1e3f50425839bbb13360fc986f98588aa09643b6fb5b8c13911b5680ef0ae2ca0b19f71ffa99234f6f6a39ca6467564f25ac26874c67b493e028f086e89c211 SHA512 58e80bb313c132125e2b601113e6e262d00f768ca75adbacbff2e98cdcd83e40aa68a8f92aa56e477c66cd396687ad6d9f54f4df9366fd6b51424b6ff5429504
 DIST bundler-2.2.7.gem 386560 BLAKE2B 30d2f113f30cf4cff2d85ce06b36b947fd2d3cc0b1f03f1a0eae023babaa43820249f6b727095c5590e96adfd9914922454dbf0a2a42b8d8a6b0c75adcc5c04b SHA512 bd2fe4d7ad10fa98004514a93e2e5634bf0ca16a41410d01ed78e320d53923c6690c4564b70e5efcaf21636ef860ef56c425ce0a8e4b240fd97e05efae48c089
@@ -7,6 +9,8 @@ DIST bundler-2.2.8.gem 387584 BLAKE2B 867f900ce427dba595bd8588772b361fe6366e6077
 DIST bundler-2.2.9.gem 388096 BLAKE2B 252ca168f2fb2a8f1cb9c37ee0cbf1bfb7808c9d65ccc0d055ff2131283e0eee61fef994684b663f125a0181d697156dd39419983b26160bde86de392e0453b7 SHA512 cf9ce8aa0b9573f808e8f2cb1fc3159f68433dc415c2766cd143fb080a78bc9ad94595ea539344cd1cc7bdb030033df2bfb97f5117a6c558265547acfcb4434e
 EBUILD bundler-2.1.4.ebuild 929 BLAKE2B a79ad4ac2dd54ceb6163218b366b45bdaaa8e5b927e232ec6a7cfff0aca675b0b994065c837778619ccf27938d5971990fe3e6357adcfad721910b24a0b4a436 SHA512 c1b5d4cb99131409fd72849a5090366c4ab180ebfbfd9c0416304e0eba18fc502ec51c56120a1545369309c9ebc16b2b4b109760aeb3a1123a2851d85357c91c
 EBUILD bundler-2.2.10.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.11.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.12.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.5.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.6.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.7.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
diff --git a/dev-ruby/bundler/bundler-2.2.11.ebuild b/dev-ruby/bundler/bundler-2.2.11.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.11.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+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"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.12.ebuild b/dev-ruby/bundler/bundler-2.2.12.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.12.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+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"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/capistrano/Manifest b/dev-ruby/capistrano/Manifest
index f56ae747d812..7cff055ea948 100644
--- a/dev-ruby/capistrano/Manifest
+++ b/dev-ruby/capistrano/Manifest
@@ -4,9 +4,11 @@ DIST capistrano-3.13.0.gem 69120 BLAKE2B 394f60d9a3acfef44eacef356908d10d5c7f640
 DIST capistrano-3.14.0.gem 69120 BLAKE2B e9c503a43cdb5f943c84882cc728cf4004afae194a94de763872c8f20eec80a9b6fc05c723cbab0e5ee41d87cfca8947ea62a28ca1d32e6bd2b86f52d1ea859c SHA512 5f117a6efec1a35a188f1ea57f1738bc41bdf3614b77a61ca2e941480d36d74e392400543948a55c054871beb88563489115bb69fb34bfb9f0c32a371966cd42
 DIST capistrano-3.14.1.gem 69120 BLAKE2B 33e351a98aea540a5903f68be6fbdde8c104be5ca66de707963f0a3b5c3460a086b5656fbc1cf98e37bed1507fb98856821a0633c2b86694112f5d357dfe8186 SHA512 10071c5b2ccadfd41ca321f21731dca8bafcc8efbcbdaf8099c562188d1cf802bc8c3845644c3ba301e4d9954fd8ab2c9022ee734f580a8be55b6dd8918cf11b
 DIST capistrano-3.15.0.gem 69120 BLAKE2B 07887b773b9ec3570d9103a35880fe84b1205ce7a53b15584c98b0ea38e236816d68ccae261e35e4d79b09f7f6fe48d1f4fa9b2daf41350cb119345c7ff597c0 SHA512 087825839239f66f004c2c079a3b1d3553465c2ca4da8bc67e737fcfadf22b618ff70542ba5c255cc47e2047245aa5b57148432a68afcf48dedbe96e0257931c
+DIST capistrano-3.16.0.gem 69120 BLAKE2B 3e1c4f639c2d5cd36ae305746f53e68350d5eee39fbd5c5ec828ea5b69f47a3a5f8b4e6f4b65de2e24717f71cf4a9443879fc3d076474ab020e2023372085180 SHA512 ec5aa465065cd115f0a1b7db06b7c68f2034e81feb3b814b730a6aca464756e545fd5c065ea941a3076bb637448e2a0f04aeb56de2578cdf22a6f208d27a2219
 EBUILD capistrano-2.15.5-r2.ebuild 1233 BLAKE2B 224bd9e8f1429a7857c2d00fcd49ce5c4a5938926f718e676687437b15990d2437752f974e3967ad3562d4f49b2da1c57cdc44f60eeaa453f956478e3971edcc SHA512 5c8278e6fa7ccd6fdc8db10478396b6dc00aac73f36d37229d3773a5df43c4b79982390bc44aa7ac0ad7f32280d41f00c2c4b0cc5a045c393ee37062fc9c51cd
 EBUILD capistrano-3.13.0.ebuild 925 BLAKE2B 4646005c51f55dacc6142c68f5fa35c6a9b35fd5cacb4f10f5c7d1bf662f2a005d53caa97d7c2d859145f5c0d79ca1a6c2e3d043edecc8a59dfc0a100be07112 SHA512 e5a5475335242113c096e4945ba74b9667d84ce0146f605aca880d4317b770fa1f2ea4773aeb22504cd7be9cdb394f9dacd056f6ed477980d9a9e575acc8561d
 EBUILD capistrano-3.14.0.ebuild 926 BLAKE2B a4d7e28359be35573c458107ba17d05e6470f367dc1c71bcdb5809be0e128ceb6129775850353cb8f7ee0a22d992c9158fa6888aa7a474113e7c58f5e12f6e30 SHA512 4d64494fe679729de181bd24d508f9689a3479e18d726960e87599ccdc4b8b8a89cef120aeea24ed9dbfe3fb1e37fb628a78a614d7ef48045e84fd8cabea8360
 EBUILD capistrano-3.14.1.ebuild 926 BLAKE2B 221720b5ff0b5e60d376cebb57cc5ed8b52f1fa0e1745e32e79160d1d848e8ff0a94ea61cf75e58426e48b5dd45a72eec1e99f733bc8a8bec50ba7ae92c93bf5 SHA512 e510204b30df795c1954d1b645d5f6b7b7708f72af2868659d4ca33b7053240ddcb63c2de163000223ff13f2582b1ef2c65b25d10198c0aa26df8dd919b83e88
 EBUILD capistrano-3.15.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
+EBUILD capistrano-3.16.0.ebuild 926 BLAKE2B 45f336d61b7a2273384f424ec80b1d299c7d217a2d0aa6397da9300ae952b46cd23783e2784e60a537b669af4c89524ea9b69d59fbf8928a0c954acd863cf3d9 SHA512 e9dff6c2b92578982aad9588b870234fccdd7b51c53aafbfbb8ea3e52b7c5b1c584558cd6a9a19eb992e37c162bc5bca6a6cd54e97caf67d6045d9339f937720
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/capistrano/capistrano-3.16.0.ebuild b/dev-ruby/capistrano/capistrano-3.16.0.ebuild
new file mode 100644
index 000000000000..5972f35d3692
--- /dev/null
+++ b/dev-ruby/capistrano/capistrano-3.16.0.ebuild
@@ -0,0 +1,37 @@
+# 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_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A distributed application deployment system"
+HOMEPAGE="https://capistranorb.com/"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/airbrussh-1.0.0
+	>=dev-ruby/sshkit-1.9:0
+	>=dev-ruby/rake-10.0.0
+	dev-ruby/i18n:*"
+ruby_add_bdepend "
+	test? (	dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Avoid specs that depend on capistrano already being installed
+	rm -f spec/lib/capistrano/doctor/gems_doctor_spec.rb || die
+
+	# Avoid specs that require a TTY
+	sed -i -e '/asking for a variable/,/^  end/ s:^:#:' spec/integration/dsl_spec.rb || die
+	rm -f spec/lib/capistrano/configuration/question_spec.rb || die
+}
diff --git a/dev-ruby/debug_inspector/Manifest b/dev-ruby/debug_inspector/Manifest
index 223fd0de2a52..800e8e1435fe 100644
--- a/dev-ruby/debug_inspector/Manifest
+++ b/dev-ruby/debug_inspector/Manifest
@@ -1,3 +1,5 @@
 DIST debug_inspector-0.0.3.gem 8192 BLAKE2B c7605f246519b245d0b997e10cfc1271c6cd5a31dc44097546d51265eb6ce1d88686b1dc922addce0a58b6bccae4fa5a40611942b6babbf8dfc6b4c528949422 SHA512 38cbe0ddf2eb4285f4f7d6f12428747495230425352e1850a4395a5c27ad4c2f706eeeac1f684baea488f6e3bd4b65c8c9e0d5807d5af93d3350fa7b9d45da43
+DIST debug_inspector-1.0.0.tar.gz 5567 BLAKE2B f6a571ff9b0d4b260f2849780d795f1d89907bbdcb1bb2b13f4ff868be494dc2943d4b2b46678d159cd3d75f4f798260b87bca1b06d05d414e1ff555c66f91bd SHA512 779b44e215d5439037eab5c219a8b34ede13acd604d29996610a97ec2a4c1bab3ef69d6a47560cd1cb338e599448d1f71c13c0ce7cff374278770ae18016aa40
 EBUILD debug_inspector-0.0.3.ebuild 579 BLAKE2B 9ecee12113838eaf79c27a747b5d22eefb91f849b3c85424e193d1bd52f893501e56150aec7382845214973384d5cede9d0dceda5ec0d8e9918f819502a77f86 SHA512 27d2b822f33a5463c7a67f5beff97ed9a5648a361d7d6018efa10e8577c83d62ab41476a8e591130b137b22e1792e017db717de0f3720a2b2c753bf44de77714
+EBUILD debug_inspector-1.0.0.ebuild 594 BLAKE2B 03e7820b1dde1f93ea5adc21df5e0bb9d404813bc90c02f5dbe2c6cfc05ac552c6ba6411f1d546ae7f1c719e424c626cfef230b5b382eb4f0c2e93cb7ebec7ec SHA512 f866deb4aaa9ee15dd2f93bf61091673c48c592a66101f45f796290aced403fe1ff457df72fb5d2c3a2d1601958495ccf8067f2769508d269bde1491a8333ae0
 MISC metadata.xml 350 BLAKE2B 1dd62d682b217a24d9af313c9c81b84408466b076d7e170aa84491520ee7813efbf7f5d6a1bc4c7a86cc7d9196aed3b675a98cc361002807dbf59f96794f4c91 SHA512 032b694988de00daeae365ac600fbfcd4cb9434ae8e43bbfe0b5736346594d3f026e29af7aa87cdf29723d2140cd890d9039c6de1b6f850a162c02f8a7ecaae0
diff --git a/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild b/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild
new file mode 100644
index 000000000000..381ef8b18a2b
--- /dev/null
+++ b/dev-ruby/debug_inspector/debug_inspector-1.0.0.ebuild
@@ -0,0 +1,24 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/debug_inspector/extconf.rb)
+
+RUBY_FAKEGEM_GEMSPEC="debug_inspector.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A Ruby wrapper for the MRI 2.0 debug_inspector API"
+HOMEPAGE="https://github.com/banister/debug_inspector"
+SRC_URI="https://github.com/banister/debug_inspector/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index b7f45ac3b06b..f8e636a88c0b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,9 +1,5 @@
 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.14.tar.gz 407276 BLAKE2B 5f911581773ef9a19ee42b5ed64114e2519ff88e024490d74bf9b1e777221d92d3ed502c8e6a0df573a5390fca323fcf0bcfdce6aeed25826c84efb3971307a5 SHA512 22e0ff0a9280be129f7587e24109f76f34660d99086378dd7e9ccc004c08a4fa5dd6f9ba50957c146ea40e26344ee87dbafd45b885f8f576192b6e572b084af7
-DIST facter-3.14.15.tar.gz 407293 BLAKE2B 0f9bfe78314144e920695e678fa7ce8b4656ba424240e7e7621fe048e15e46db6fe507bc859448fa22f31e28caecadc33877ebaee8dab85c8e87238daf140157 SHA512 45deb530991883ecb1235d6a6166c36888c3c2c4a42a694e041f4d0911ab4bed880bee56034871fde08cc723b7270166e7d0dfa626bbc205d3b1f495c8d74691
 DIST facter-3.14.16.tar.gz 407315 BLAKE2B f9637841bd2c1d369d262c77876f08bb248f6a98e0fcb10573c872d521473790ba6eaa8dfcd6a8f0da2becd2f10c2bc7fbfde0d3a44f6a3d38c9e5f363e27e66 SHA512 3adcb7c3ce90a9cb71486c5d86eeaf1f0794194f51faf149052333d2f55a8a8fbe1e5772ecf9a0ed53196cfe732effeb383a42a43942a7803aa8b27e23939d23
-EBUILD facter-3.14.14.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
-EBUILD facter-3.14.15.ebuild 2140 BLAKE2B 230753014d081e4f4960ea8da9bc6f67556f372ea291a8c13136f1ab08bf4ecc52cae9a9f961623f92ecde6e84c232c04c5f830a111ca8e7a385a8fde9453ab5 SHA512 01fe42671b8cead735468a78cc7c9076bff32beba95d1b1bac8188e0cdd2c16a07368f8a26fbd3c9c2d414fec34aa49bb32d7bf5dec9c6642dcea7bcd2e7884c
-EBUILD facter-3.14.16-r1.ebuild 2104 BLAKE2B 4b154757d004888f958fbb7d6d916fb44c540b2b46322134b8b5d4e2a1aa14939e85f76d7c7ebc8c594a16f6842de998b9135c1c69ecdd51a702ff097a09cac9 SHA512 1f345cf8e7fadcd7f95266084c0a5cf8e8d3b1e2b895127a6de610b6c63fc1d7ebda5f3093948851e7dd0718ac52e5ddd71f1fa9911cf3a269b43341ce3656b7
+EBUILD facter-3.14.16-r1.ebuild 2102 BLAKE2B afba1a731812d9927d40d1ef098217ded54abcdefe0bac9488344d0786609ba4aefa28212dc299348995496a9fe09cffcbe2b2cb35985c1a186b2acf04965768 SHA512 a08dd0c33f5b89adb6f6b55b455e0297a69baffbb3cf5e54c8b758abc6bbc2765fad1f46a4cee1937f12ff25b6099eb0c61e2f5521bdbbd8c5df3bcb8cf1b680
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.14.ebuild b/dev-ruby/facter/facter-3.14.14.ebuild
deleted file mode 100644
index f2b40c9e3b70..000000000000
--- a/dev-ruby/facter/facter-3.14.14.ebuild
+++ /dev/null
@@ -1,99 +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"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils 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-utils_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-utils_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.15.ebuild b/dev-ruby/facter/facter-3.14.15.ebuild
deleted file mode 100644
index 0feb8baceeec..000000000000
--- a/dev-ruby/facter/facter-3.14.15.ebuild
+++ /dev/null
@@ -1,99 +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"
-
-# git-r3 goes after ruby-ng so that it overrides src_unpack properly
-inherit cmake-utils 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-utils_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-utils_src_configure
-}
-
-src_compile() {
-	addpredict /proc/self/oom_score_adj
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-each_ruby_install() {
-	doruby "${BUILD_DIR}"/lib/facter.rb
-}
-
-src_install() {
-	cmake-utils_src_install
-	ruby-ng_src_install
-}
diff --git a/dev-ruby/facter/facter-3.14.16-r1.ebuild b/dev-ruby/facter/facter-3.14.16-r1.ebuild
index 249ddd7569a6..b69eea0e499e 100644
--- a/dev-ruby/facter/facter-3.14.16-r1.ebuild
+++ b/dev-ruby/facter/facter-3.14.16-r1.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_BRANCH="master"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
 	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index 01371ffd9bce..8cc570f69da6 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -2,8 +2,10 @@ DIST ffi-git-1.11.3.tgz 157081 BLAKE2B 57459d3aba7f54daf9c4d94993a083166efe5c37f
 DIST ffi-git-1.12.2.tgz 158344 BLAKE2B 903825d7a6d77e26be47ec7e7991253e1ba58b0f0049fd812f8c26dee6eb31c17388dd5f23270e84cf53c02ab3a73c79ecca870814e14993496d1ca0e99a5390 SHA512 2590ff3fd704334fe00de10ec5e08184c350feac36418e08680def0b4742c488f8168fa82759317e93cc3d7969af366254aeb157c84d07565e1804ba1678d119
 DIST ffi-git-1.13.1.tgz 161660 BLAKE2B b8a6c3f4b9bbd94378ab2adbf40c0bbf56883e34c6a1c12b9e1496069b8a4935b04012820699260f9cffd47efd78d7aa2d08e71a5bff9de740aa96ad11f499eb SHA512 f0077518c9ced54881e40a0047440edb4e40ba0ba89fc814a489bcbaf52e08e9a773e28f453f579162439e247151b994936695fe0b1ed5fb429d9bfd85b845ef
 DIST ffi-git-1.14.1.tgz 165025 BLAKE2B 020b3954ac08fc9fe077cc9116b21e40de8458eb79cc6ae1664d638c8a36df1e919cf6a603332f9513167b3f8d8bc342f04c2c1ee60fc9197d75de74fd69ca2e SHA512 8f3e97aa3fc3e5c404864d56b62d568ca464db741c1e526f971df4d96e61ebb8ce5899ecc207ba3d094efeaacd20633a250f2f072392a7369b179166bb780712
+DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
 EBUILD ffi-1.12.2.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
 EBUILD ffi-1.13.1.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
 EBUILD ffi-1.14.1.ebuild 1641 BLAKE2B 56bed9dc915a805e160af30e7f883d9cf30660937768ccfefbe38abc1f04934b98af1a90c05095855a8463f21f24a30953c8ef55e5a6311ee9463d447205e242 SHA512 8592be06dccc1b8c1464997dee29dfab2b6f3268f7ed5904d4fba10a239a3b4c3c368f46f84376fa023f37b243c2bed3111df8b75c5852b2f8cbd121cde092d5
+EBUILD ffi-1.14.2.ebuild 1576 BLAKE2B b8ea5c66d926ff7d2b7bf4c9443935e4a2274afc1a8bcf84abaafde9ec71e4313bd0392ff34aa12c47bb23852b53b559445e0b212142caf4a2d33641460578d2 SHA512 b5f3415732613101f21e60d12cfc5349e56b49eed982687d1ee98a76c4e88cd5868a6212361e41ccfedee70f237b5f7a8e9c4be8b7be3dece295e9cdcb658d20
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.14.2.ebuild b/dev-ruby/ffi/ffi-1.14.2.ebuild
new file mode 100644
index 000000000000..cf4a8a615ffd
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.14.2.ebuild
@@ -0,0 +1,64 @@
+# 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="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+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
+
+	sed -i -e '/require/c\require "./lib/ffi/version"' ${RUBY_FAKEGEM_GEMSPEC} || 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_compile() {
+	each_fakegem_compile
+
+	${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/httparty/Manifest b/dev-ruby/httparty/Manifest
index c010b0ff64be..a78e4165bd05 100644
--- a/dev-ruby/httparty/Manifest
+++ b/dev-ruby/httparty/Manifest
@@ -1,5 +1,5 @@
 DIST httparty-0.17.3.tar.gz 97444 BLAKE2B 773e40fc35ca44cd3b14a30e7a7ea5783c0c158cdb8488b34ffa36af5a572d5f6eef697cab147c5be1448906c35071284947ba598409be35af54a20846f4d98c SHA512 c06aa4456c692e2a32f8e44b2316d46f664c4e2c8efb370607796f6801d96e989a54e61bdf125cff679b8c5f5abb1557b87aef48d8f3a392c1942ac4821db84d
 DIST httparty-0.18.1.tar.gz 97813 BLAKE2B 3192ad5f1e8c292456710529f4e1595ea5b70ae4ad61695d6d0b036872d40b2afbc0c958ffb25b0c1222ba8004593d20c4d3954c530d6c836e915b87150d954a SHA512 fca9de534199fbf6a058c39c3ebe28587c34df2bffee313a0e05204258fb6b6b6643bd0a28deca9d0b42de21c90c54dab058124349e4774489578fb23e8bacf5
 EBUILD httparty-0.17.3.ebuild 1652 BLAKE2B f22b76a26c3f2239daa9f7e9fc83ea04bb38bb2585b32136e3838883af771e01f8b3cce075883e3f361d0596a1b3a12aee5d99eec92cbd5a641f85acad34f33d SHA512 cdd87ab32eb7ddd4ee31671b18278b7d686d9375e666b10e71f5c036d1bddc9b36b55341937c1ade07098663f5ce64d705d4e67faec39c8c18d3a349485a609b
-EBUILD httparty-0.18.1.ebuild 1844 BLAKE2B 3ed7dc85bf0663f919367d91327b968f9e9c08eaed030f86901a7e25ca950dbcfcba2d2878bd012ea7a30d6deea5a011271a8971057911134e17e2f900f1a6ad SHA512 f253e04f27a4853c6ddc197423267cb7699b7254e2f798803d041cdc848595d96ae440091e4bf21976d4d196a3773346bbe44defdeea5715f476c5c05eaf8b9f
+EBUILD httparty-0.18.1.ebuild 1844 BLAKE2B c87bfaf634693c705a7764045dd3345bcdc60752a011ead976b1a6b97abfc4eb1549746716a040fd0d8f783f6ad43b999a893128bbcdf700da088b5c13f4b1da SHA512 f5a53e3fa6f43a9b430916da69469e8a14de0583840a61ce91af6e9681d8278ebefa1f42a2e981f6954cf7a12c5bb631f72fbdb7299ee6b71f77490a3dbf7f55
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/httparty/httparty-0.18.1.ebuild b/dev-ruby/httparty/httparty-0.18.1.ebuild
index c7782d5184c8..0ce0a25a8724 100644
--- a/dev-ruby/httparty/httparty-0.18.1.ebuild
+++ b/dev-ruby/httparty/httparty-0.18.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index 8bf2766f7271..3854f55a5d0f 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -5,5 +5,5 @@ DIST image_processing-1.12.1.tar.gz 986447 BLAKE2B cd3fa67c7f9890835d86fe669c5aa
 EBUILD image_processing-1.10.3.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
 EBUILD image_processing-1.11.0.ebuild 1253 BLAKE2B 248f68b3a1571a435b03fb742b43b1b431749676d39785a9bdc96444e5d77fa9a54b11d7dd23f6a538eb2172b9fe47706fb5a029c073175d375878933f59aacb SHA512 dffc1d21f2788bcd53afb71b8b776dff7766196b3b379e49c4aa3e1ec3852066ba5239c72f561c0064ba11916d061f51be0d7a235ea4bd18c1caada3d99e0cbf
 EBUILD image_processing-1.12.0.ebuild 1258 BLAKE2B 27f9318f386cec54e81ee9ff490523b660e0db89f6fe3a58780668d54258bf57b18beb85fbd1025aa86d7206239ab1d332007e46513018625003e26efe3e75db SHA512 f556b8e5055262261cdd1ec35f472843d26c8fcebd2e5ebb7d2c1733e0b47da7a7ef2ff45517406c201929c83c5d6181db6527dac36a6b08c6b6352d2bf3cd98
-EBUILD image_processing-1.12.1.ebuild 1270 BLAKE2B b49a38c2765b859bb4b942afe57c85ea6a4b55e2a133c9146141fce1a44b052c060c7e62cbc34b21835f2db306a1f8b788d1d2f4a5d3ac0726be020375b11e3d SHA512 495d1822e35103c79e026c4c3aae1fe658101780479e97fb4c6a66a08410725f2dfd83f7817ef73b267c617d3a050219e9bd6cb53b97f5f4c805fd3922355f6a
+EBUILD image_processing-1.12.1.ebuild 1277 BLAKE2B 395d331d16ebc2b726b229cf1a39ea4cf1e0dd48b0c8b83ec18873f8e330cc34c5b77d08c26f4810687bf95735bdd83c9daff0ff2e3ac5aa2221aaad5441b97c SHA512 43293eb06b7215eccdb9c11b7a6573469362f22a02f6f11ed0110d07b10078f007eabaace7c3a03962f4eacbbed37d1025a746f18bce8e72e95b39cf5ce21c89
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.12.1.ebuild b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
index 2ce41c80f42e..d983c4e2111d 100644
--- a/dev-ruby/image_processing/image_processing-1.12.1.ebuild
+++ b/dev-ruby/image_processing/image_processing-1.12.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_DOC="none"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
diff --git a/dev-ruby/mechanize/Manifest b/dev-ruby/mechanize/Manifest
index 4de8d091fdb9..5c6208e02d42 100644
--- a/dev-ruby/mechanize/Manifest
+++ b/dev-ruby/mechanize/Manifest
@@ -1,3 +1,3 @@
 DIST mechanize-2.7.7.gem 139264 BLAKE2B 9a60b65fce16058e24e40ec50433653975b41210d3e26a560f6c3627c3de363c24fc0bf3325548dba87c9aaebebbe7fe9bd972c422989e5968e0447cec13fc94 SHA512 759bc6b2da8e0288edbe484b2ced02ce6ef49686a7a4c4ab0065e0f88799d23bc536a0ef160703726e83136857e893135a222aa295974e12f2b6988ecfbe7530
-EBUILD mechanize-2.7.7.ebuild 921 BLAKE2B 99ed269af162f1dc413960d1ed0f7076498069b133c06128f82c3dcd524cb17592b1b43d9b7f5392e2bd5d83dcfb8c233ca81b6d236bd8f23aa7ed639e4a726b SHA512 a13faa5ffc4919f86ec2f1e710de55785c1973d01382f3a18cc7778eaf9bed70707e94c386f08469e93fc5671e873419bf9b4742b68e0abe176de2ce4bfedcad
+EBUILD mechanize-2.7.7.ebuild 928 BLAKE2B 52a0fd4d9fcd19da5e2a3dd8815bbae51ef59aa5dd06dba6013f82b76a63a98c808568b42bd392a5ec8b0b0e55bcc124e97b03755d42033e7481a7762d4c94d2 SHA512 901935feb7d0038a9bbaf71c1eaf83f3e5a103af3d1aa28f7a3f6da398fe63cdb02c80898c1ff1c887424ebbf4b09fd531e090edf393974a10624b0848bb004d
 MISC metadata.xml 349 BLAKE2B 9d63a73c5a28fb2fcef06d4c7b8da3b24d108534b999e76d0d1df86bdfe615e53248deae3d9450824c700a0740b75d0f7c897c8a8c9e5b4339021e30edab51de SHA512 1bc38bd045fa219ec2c86bd942055c0188561fee4ec5e7e6ba4ad2268f653fdeaac40122ed0605af7d47f8dfceb0781d65aeb68bf2fd62e3b8ae5a939f61076a
diff --git a/dev-ruby/mechanize/mechanize-2.7.7.ebuild b/dev-ruby/mechanize/mechanize-2.7.7.ebuild
index 030bcae2ae97..b7f581b89094 100644
--- a/dev-ruby/mechanize/mechanize-2.7.7.ebuild
+++ b/dev-ruby/mechanize/mechanize-2.7.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.rdoc EXAMPLES.rdoc GUIDE.rdoc README.rdoc"
 
diff --git a/dev-ruby/mime-types-data/Manifest b/dev-ruby/mime-types-data/Manifest
index 67f7321ff971..af908c50ea85 100644
--- a/dev-ruby/mime-types-data/Manifest
+++ b/dev-ruby/mime-types-data/Manifest
@@ -1,7 +1,9 @@
 DIST mime-types-data-3.2020.0512.gem 164352 BLAKE2B 6884cb029386dbcc3ee433dbe13baba99bc67f1ae409aef5f698731ce141b00c44221b667c2efd3d3b949d5ecaa0b4f0a3ad5a5fe5ddc99e309cf4a925db8e0d SHA512 019e45ed63ec86ef3eb4784a1526d4f163daaec676786b21c345bb8e1c57b26444ac7ee11fb25ffa9bbc687a60ae98d1cbc5d9ef60b446f50c5896a30299bd71
 DIST mime-types-data-3.2020.1104.gem 166400 BLAKE2B c657b27508a61865027b33a5184b963f7335878dadfda2b836723e1bcb782fccf4372490fa2f6405e0632681aa26ee04a65e16efd0df953995bae7517f76d77a SHA512 674e43205b17aefb3f9d2bd79110165c287631197002604ff0efaca0aa638a0e51a3b9a78bba2a7845d31183cd3810e4f2477ceb1788c1b614e2a5058f565f6e
 DIST mime-types-data-3.2021.0212.gem 167936 BLAKE2B 17073f9072b699f9df6d67600ef406ebd7ac4b0d3f956eb06369539176a7873500dd3c123f28fadb53eeac3282f9489b9f14321798ed4c9d7aa078f7bd8bf066 SHA512 50b11cab56b4a141afb7c66dfe3bc24464320d61702b3044099c5d753f94dd7c96ec0a5dc68932f36f09c8c8627f56b6aa840b8e528d2ea9decf9670b93af8a2
+DIST mime-types-data-3.2021.0225.gem 167936 BLAKE2B 59d4b3a347fc19537c4e94bced938f8fd0412653863702529c443f26bd47f63c1ab7232137cd1efc38be5335a179f5e9e50915c7c16599fa016e8a97e0ab9048 SHA512 348ccd1cbf0336dd512dca48d706fdc7b3c66eaa5d24da16eb0c823c69888c9af03837aefb3fb7449c6fc084167c12eeabb8fddedabbc24a42a72c2cc23d3c6c
 EBUILD mime-types-data-3.2020.0512.ebuild 620 BLAKE2B e426367954031a30f20788ca9427bb2479e671ea73e6575c72b6c5ef6fa62a3a924161830afc61e24e6d124aa361bf8892f7c914b0442dafaf1c4ceacfdff64f SHA512 0c5a7f3222bdc871e818c63368c6e55063d45c03120e2a6229ac8a765bc197d116e789ce5cb41229a41bf1618ae810d44c152af02279b6fcc2ac53f6be491225
 EBUILD mime-types-data-3.2020.1104.ebuild 613 BLAKE2B f3a0b4ee032f6358fe61fd9289047898c17e365eb741b0f3a985fc510132c93ead0afb63aeee71480dff001f745e05438df2e1c29daf0f218342447943eec146 SHA512 9ca058c3a817b845aa09b084db8c01798ec30177710ba71bd1febc76bd0c936d8f8d61e864b3ca5ec357bd65854ed28f5227a012acdb654c59d888a2ea7e6e26
 EBUILD mime-types-data-3.2021.0212.ebuild 621 BLAKE2B 5befef9f59ecc1fbb287ec9006599533c625c65cb3cb53c6b9d3cf56d79c2f06caef15ba220583bb69610eb75d5650ee06762086eac4fb787e7e5ad87363b8ab SHA512 dd443b2b182a8f490dc6686d8c46045e26a1114907820556f132a29b0155f53580573304b6d282935788d18c0a5fbf357a20f5f6edbfae920dda4003b71e5f96
+EBUILD mime-types-data-3.2021.0225.ebuild 621 BLAKE2B 5befef9f59ecc1fbb287ec9006599533c625c65cb3cb53c6b9d3cf56d79c2f06caef15ba220583bb69610eb75d5650ee06762086eac4fb787e7e5ad87363b8ab SHA512 dd443b2b182a8f490dc6686d8c46045e26a1114907820556f132a29b0155f53580573304b6d282935788d18c0a5fbf357a20f5f6edbfae920dda4003b71e5f96
 MISC metadata.xml 352 BLAKE2B 31923bc222e1b0230ff1b03dff06215d199c9f0de7c7def0a0acfa7e6d74088efad1934704aa817ac91a8ed7d8a6287c059ae72d925fb83b2a15226b9a2f7dd8 SHA512 b994c7733a66987a405c5e03c34cc1c5c33a102d6121843147b846b2c6c0eb5eba2e5bfb6b8bdc27c39adfdeaadb1f5a525de3667ee7b22f9362b8539f42ec44
diff --git a/dev-ruby/mime-types-data/mime-types-data-3.2021.0225.ebuild b/dev-ruby/mime-types-data/mime-types-data-3.2021.0225.ebuild
new file mode 100644
index 000000000000..2c61323cab5a
--- /dev/null
+++ b/dev-ruby/mime-types-data/mime-types-data-3.2021.0225.ebuild
@@ -0,0 +1,22 @@
+# 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="History.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Registry for information about MIME media type definitions"
+HOMEPAGE="https://github.com/mime-types/mime-types-data"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~alpha ~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=""
diff --git a/dev-ruby/mini_magick/Manifest b/dev-ruby/mini_magick/Manifest
index 6967be0271e1..55a8947b85aa 100644
--- a/dev-ruby/mini_magick/Manifest
+++ b/dev-ruby/mini_magick/Manifest
@@ -1,5 +1,5 @@
 DIST mini_magick-4.10.1.tar.gz 1192455 BLAKE2B 269f0fbf0e49bb14c3a39124dfeb8171775db7a9e51e4662e5dac0a98c4668156bf5bbf22af62a9f62d7834d2205a9475e5631b768d27cac0527cab0baad25fa SHA512 28e4a4cf213db69182adb56daa3e09eb576e96e8ff4ad95121f9a16f8ecceb98ad790d3897463fa1ab3b7d4b9925777f9e71302adfd3f31b3f88aa520371e77b
 DIST mini_magick-4.11.0.tar.gz 1193122 BLAKE2B b736bb1b147ec2b1f926ebf5a3b908e659d6dfcaca0e7199932086e09cfd6be21046dff3c4e0edb7877c40c5bbda73aa0f521b305c15abb6fab931242b4561c9 SHA512 7201a94345aa95bb9466369c78fbc48108b245df77435e839a3f0df7694f4da4eeff3a7b3da4aaabedefd93859abde1145baef6f0f01580f66255653be88f5d2
 EBUILD mini_magick-4.10.1.ebuild 1997 BLAKE2B e6ccc6f39fa802bf01b275e76692a06afa03a86995110a07a53396bc9f3742bf8124bfbd66786fe300e3dcf461f36acff68ba926ccb3fd9b99a8d19bb0dafa64 SHA512 c6fac624c0ae3fa0fc047ff940f7621d248ff1b0cfe89459a46e724cdf1a8ccd66e12140db152eae483b5528a2f72fcec1add7bbdc55ee2932466dae662badb7
-EBUILD mini_magick-4.11.0.ebuild 2066 BLAKE2B 20edc1c155ff203765e7a8d0373ed7536364f99cf798e700a79cda1973ff7cac025fd56975fd4a4207c09f5755f3cfb98e0ebeb2b073f4b1fc6f38cd6b74fb91 SHA512 333aa2ebda3e9507aa9a022eb3195e8bcedeeed966e60c5c4c1b57a05a1b660b762e055032aa534359b88ae3e257a000c6f4f8105b3c0ad5e5720beafbae0c57
+EBUILD mini_magick-4.11.0.ebuild 2073 BLAKE2B 5874157821dc45e5d10606b89bebe4bc54859bb376fdcbd663f153222992d011b1ed2b10e2cbb4227b511e2b4ec80470aed9fe3aada20b1d4bc8860f76081260 SHA512 57f18a6fbe0ab9da5d39a5cc1da572b5c5826d3cc7674028668447f161f29b9a8d556b55153231b485038cb8072a5aafd6a43eb64aa5bc4900dc91d35f14d3d5
 MISC metadata.xml 347 BLAKE2B 679c10bbe1e22a6374f3a45b14364514d2cb3c23e0b965e9418d1c8f10b1b036bbf019539d95fbf19630d6f315a930142575da49d237c782f7a11b100fa7fd2a SHA512 9b98a4a0ec7b4c2945df5300ad26d8ffe1394294d0c6e142dc7e55e2cd270327df70fed857ff7d6f12f6b0212d6c25b8043be7800fdcca20bd58d14ac75fe6d5
diff --git a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
index f98c002b1596..28c13dbcc36a 100644
--- a/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.11.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_EXTRADOC="README.md"
diff --git a/dev-ruby/minitest/Manifest b/dev-ruby/minitest/Manifest
index d6c93ace5923..4fa87037840c 100644
--- a/dev-ruby/minitest/Manifest
+++ b/dev-ruby/minitest/Manifest
@@ -6,12 +6,14 @@ DIST minitest-5.14.0.gem 84992 BLAKE2B 3bf733ae992e83af862773b6b76997b7a3262290c
 DIST minitest-5.14.1.gem 84992 BLAKE2B 1bc258ea21ff887381ce9d13ea08f07d6242bf1daa8e65063ac9bfa41c5a9363d0c7e25356d803e780814fcc62c54b9f62e76c7db8e0666f19dbb52bd94e171d SHA512 57a205ce8f71a494d9d8b0343cbc39f8d3ee22f33145b53b6b0bebebc0a2ed542eba3e1df91bf115be0910f0c2e65d5c24be6b595f13e6ccbbe417e06c54ffce
 DIST minitest-5.14.2.gem 84992 BLAKE2B 2cca1cbbd7588d2bd77458008a0dce0dcf34e9e68fa0ab7eaa79a72515c3d2399030db61905e84835596dea5e854a4a0708096f3b401ca8fb61c3da0823a8ad5 SHA512 c1cdb87824382233d4ae0570346a6888ecdf0dddbd5fbc9bc136e1c8ed9e1ce57d08d5994f57ba1eee99a38e48a04a10a32288d34ce10ca4ecdfa15587cf602e
 DIST minitest-5.14.3.gem 84992 BLAKE2B baad3e8198bcee1b2748f81a7ea822785423c2bfb07130397b2c21993c686aa6edf58811cd58c4c9685b63b8a7373948a0aa2eacb6b02383399847edbad5deaa SHA512 2aadb99c5eac8d29c78865f8ce3fae51f11c2e1dd17157b6d0c6684733a3b870146df16fd26626c6f9c56806422e1e2457208afa1c69238a2bdaa4a859c23645
+DIST minitest-5.14.4.gem 86016 BLAKE2B 1f7b8c72b41e1f4e47852021dd99df411a427ac8bbe564a2b86edbb727a4976030176331442a3a44f734347cc42f80444f8d3937e561f0063ec6bb3132d4c402 SHA512 f967a11cfce82e167879905082859273b270e8d8e663a0c1c553964a345fb8564547627b8cf97418ac5bda544bb76c1385438ad74ec8e846666dc2952d55c9e9
 EBUILD minitest-4.7.5-r2.ebuild 855 BLAKE2B be819c08a86dad67f4f72be519b5ea978658ae98087c1171879db92656649ccde4755a29a50f4f05816d5c41476f316032102bcb2062e7bbf4378f1369da042b SHA512 326d2ddbc4fc143ef9086ac0582ec76e5ae2739a31b3c80ba5e420682f1b1d2f082f94adb12971450f3df8b9007afd62d8320561dbb40f476373f67421235fcf
 EBUILD minitest-5.11.3.ebuild 751 BLAKE2B 07e8bd48258eaafa3810e7122695024910d50ea4a8ab529fd8a3fd2cdc3a027af48f4807bc95c242988ba56d7daaacfe770614c32a8196b63445326d0b18f0d2 SHA512 692ca391bbfc7927d31a9e663b584cffbaedcaa27774bc7eaed4fd0080c1314f98e90fcfd547df462882d9e5935b502a7deb99992041fffe1227b6c0f2cb25b3
 EBUILD minitest-5.12.2.ebuild 721 BLAKE2B bf109a1758943ee0f8f4d7d876ea27dcdda8ff21fe81cb6a5fdc621e0ad83dd3aa44f9fdbd2e2f16d22bb745100fc433deac24c2227358ae669985e653536157 SHA512 44802ee3cdcb312fbe791f9cbcc9d205186fcc4e3c8a05bd7572cb52714d0ebef26d6cb317740a8db9ede5e6c6fc4abf2c970eba2a003370e2a82eaa601c60d9
-EBUILD minitest-5.13.0.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
+EBUILD minitest-5.13.0.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.0.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
 EBUILD minitest-5.14.1.ebuild 728 BLAKE2B 2fa50d6a799270116cb7a2a27132b74d7116e3295017a17df7d8da7e8069b156b64c6a6270048ee8c417af4c34da49992ae3590a2001a7aab3ffe9f58109b26e SHA512 4458ac2dfaf0ebf2bbc7a1e6fd18bf7841e5871e1e769f82b27e612e53a9a313524d486602fd7423935226844c2cdf71947a0374fe28ddf3be65dd128dcbd018
 EBUILD minitest-5.14.2.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 EBUILD minitest-5.14.3.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
+EBUILD minitest-5.14.4.ebuild 728 BLAKE2B 1005d9c83954d6cbd0d61c9a86130a84326df283dc31a369ccc2ca77c4dcd0fb871a3ffa31b53eb97d2e8450c342ec5614c3d65315acf1ce7abd7fb3051ba569 SHA512 5c2735d7dedc124a3532bb28241a4ff8eaa00f7813980c1ceda8277566c70f654e7b8672e9b4d286423f2c0390d30eab69ee9f3758ef0cb164752e3c2ac8bfa9
 MISC metadata.xml 344 BLAKE2B a719762acb7e752051fc25d212f40e610a1a00644f8a09a4122bd874ec15af826d9360697b8d63d68fafd6596a8ea34439540894d8b8b9606baf5ddd4573d152 SHA512 48a43ffed154ec65035a6e84ec7e7e9ec222698b4dd56a81b6ca84844d9835c087fd7972d38ecc40fdba7f74acfeb2004bd1084d2cd123ffd09906e644c59e00
diff --git a/dev-ruby/minitest/minitest-5.13.0.ebuild b/dev-ruby/minitest/minitest-5.13.0.ebuild
index 2e7cac7c3ae8..414bf91afda4 100644
--- a/dev-ruby/minitest/minitest-5.13.0.ebuild
+++ b/dev-ruby/minitest/minitest-5.13.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
diff --git a/dev-ruby/minitest/minitest-5.14.4.ebuild b/dev-ruby/minitest/minitest-5.14.4.ebuild
new file mode 100644
index 000000000000..414bf91afda4
--- /dev/null
+++ b/dev-ruby/minitest/minitest-5.14.4.ebuild
@@ -0,0 +1,22 @@
+# 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_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit"
+HOMEPAGE="https://github.com/seattlerb/minitest"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+each_ruby_test() {
+	${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index ed8fc5644e3f..fe6d6988ddab 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,6 +1,4 @@
-DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
 DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
-EBUILD nokogiri-1.10.10.ebuild 2713 BLAKE2B 57dedd5488570432b5202d72ea9427ce220fa3303f4899ec04802969cef5e2b151fd0f97f6fdb912f5fb1ad876ebc5c4a66f0b84e7cc2eee573d4ce24da217a6 SHA512 fa8c7d4e2dc79676837763c9b114fa9d4fc53b387dc94293fde7902b3506d99fca95ea7c8699caa284a8eb8b49bb46bc7a8e6e8d6b7eef32caeeac1ced927b2f
-EBUILD nokogiri-1.11.1-r1.ebuild 2883 BLAKE2B b450c4a0e7944cc4d6735d74c206a2c3efb46c337afd57c547a0ed7cb5f18584feee1c0d6473c90f81a3cb56ebbaa5c5af6a8de5d55ae5f416d74e7b49bdd6fc SHA512 8f5180a4c05ff1134e0414b454dbfe214021a5dafd779519239004d93edfe3122696563b168c14584b5bf1a37abdfafe5a063c87e3aa74e736cc7c01f52bdf3b
+EBUILD nokogiri-1.11.1-r1.ebuild 2882 BLAKE2B 5f4ab084dcba0d83a28f4ece88aeeadb1ec77260ee8fa721db030f7432fef997161a2dcb66b86260f616affc0f20499e702cb220abcedefb11ef1f6d8669ea55 SHA512 8c6ff1bf9dbca9d3c945808e14664224e056c7c329015e314becafec284820ae784206de511952869ff0b1f58b6f2eb6834f283142737919f14e38ceaeef17b2
 EBUILD nokogiri-1.11.1-r2.ebuild 2941 BLAKE2B 706ef2bbe6dbfe420479372e5e47fbee24486346cd6a5219eff21c21d6d3bb9dceeec8e94c06b3f9bce701321f222d1e19c7de0cf0612a5f8f77c1fdf84a16d5 SHA512 80d0038279ba7d0f324a654b4cc0c95dd748c0983aa855a9bb5c09e07b351a0530736e9f15814f28d32f8d30695085e408d519348f9569b9b9fb138d266313f5
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
deleted file mode 100644
index 259d53fadc8d..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
+++ /dev/null
@@ -1,93 +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_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-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.10:=
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.10
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.7
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	dev-ruby/racc
-	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 -i -e '/simplecov/,/^end/ s:^:#:' test/helper.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() {
-	# 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
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index f9fca629b608..12f3cadf0f20 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://www.nokogiri.org/"
 LICENSE="MIT"
 SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ppc64 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 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/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index cf6c94e645ce..d6a2a96a379e 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -2,8 +2,10 @@ DIST power_assert-1.1.5.tar.gz 17326 BLAKE2B bd5e0627b681ccebc546a8b95170a3fe20b
 DIST power_assert-1.1.6.tar.gz 17331 BLAKE2B 1165f092f7a6dea45c8f12d61e2ea77d30091e1a450cadceddaaf709f9e3dc6d805489780021d978ebfbe5dda15e302f0cbebc7a03e247d2e654fcd0eafd149a SHA512 e2a42fe3c4dd5f51315d4076310971b2678605d448730855c53664f638b7e8b8926776d006be1c40ddaff59d5715838f601c5ed86635cd8a1bbb214e147b0ada
 DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
+DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
 EBUILD power_assert-1.1.5.ebuild 1411 BLAKE2B 78a8625e6b7a12c3da784d3055844ff3f6f33e6ef5ff72f9468dbd2e6ae55fee237722f07153ce2cdea3d0017e0669e97785959b93df480f47769b2f8ae26034 SHA512 7083f1c05d866416e7f215acaae24ee8ce7b7ef4b3570139e326aec5f68b248c375266fc9e965028521d99b06d046c0cbdaf4c8d263f300c1ad218bec675c3c3
 EBUILD power_assert-1.1.6.ebuild 1420 BLAKE2B 1064ba29ae2ba017ce13b7da5188b40121cba718e5e7fef30d9e0fc27173a8a4820309d608f3f69f2905f80e7b6f2f86fdde0b039c68a17482a5cc62e04731e3 SHA512 99ec836a53a313f4195248613847180dccc7ad952bef0b84a3d8cc865afa470b11b165303766bd3eecf751f86a3b6be8ce7e591a1f17058c1ea72db6d4eb43d1
 EBUILD power_assert-1.1.7.ebuild 1420 BLAKE2B 1064ba29ae2ba017ce13b7da5188b40121cba718e5e7fef30d9e0fc27173a8a4820309d608f3f69f2905f80e7b6f2f86fdde0b039c68a17482a5cc62e04731e3 SHA512 99ec836a53a313f4195248613847180dccc7ad952bef0b84a3d8cc865afa470b11b165303766bd3eecf751f86a3b6be8ce7e591a1f17058c1ea72db6d4eb43d1
 EBUILD power_assert-1.2.0.ebuild 1418 BLAKE2B 718d355df9a75002823eb6ef8ae10dc4ddff649c314be77db00252a34a7f5daf95a5979195f2fc3e8d7b28ff3af86ce4bf9b2e5d5faf2484ce3eec325a7843fa SHA512 fb221535b77d9e84daf56cfbbbbe5bc9d05d0ca93c68d2d9bc6b2a09023f7eed2df7cce5221c5c9f50b687f97d29b78f079b5ace1cbe17ada16b6bf8507362f5
+EBUILD power_assert-2.0.0.ebuild 1416 BLAKE2B 5542aee8023b5e64fc666b509d767945d13683c5bc439b5abef0950310c7d87b686c6e5fe48f79c473662c9a83eed9552206e513e4fee3075c172885a259f4fe SHA512 720bc07e6c6dd0aaa5441eb68ddc4afd66c1c5a2bcbea1715955473f3dfde554f739aff9fd2222cc3da3107fd463ec0282fc5ad4924d8fe14bd7feeb9f73a1d5
 MISC metadata.xml 343 BLAKE2B 207ac229bb41b7ab904b4d6e69ac07d36375964057ec90c69cc6d0be5dd90a5bf27b995b5daaa1802246aa7342db9bc904c1ee872b7b2faaa495318ab030537c SHA512 2c8420b8b06271c1bedadef4e94842e6fb80d49eae669f6ae62678c769a7b3af29af42dbb4660c6bd328b54a522902c5bad49e81fe0fe47d2bd3c1d9f89a7d4c
diff --git a/dev-ruby/power_assert/power_assert-2.0.0.ebuild b/dev-ruby/power_assert/power_assert-2.0.0.ebuild
new file mode 100644
index 000000000000..c44044ae7943
--- /dev/null
+++ b/dev-ruby/power_assert/power_assert-2.0.0.ebuild
@@ -0,0 +1,41 @@
+# 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="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shows each value of variables and method calls in the expression"
+HOMEPAGE="https://github.com/ruby/power_assert"
+SRC_URI="https://github.com/ruby/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+SLOT="0"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
+	sed -i -e '1igem "test-unit"' \
+		-e '/byebug/ s:^:#:' test/test_helper.rb || die
+
+	# Avoid git dependency
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid circular dependency on byebug when bootstrapping ruby
+	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
+	rm test/test_core_ext_helper.rb test/trace_test.rb || die
+
+	# Avoid circular dependency on pry when bootstrapping ruby
+	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
+}
diff --git a/dev-ruby/prawn/Manifest b/dev-ruby/prawn/Manifest
index 6ece0a3034af..adee517d7717 100644
--- a/dev-ruby/prawn/Manifest
+++ b/dev-ruby/prawn/Manifest
@@ -1,3 +1,5 @@
 DIST prawn-2.2.2.tar.gz 5215413 BLAKE2B a906491b60e68de0308fec74131286d3f3c868a38dad9a4cf2ce28424cd746f96b530c7e9ea49a74af58d63a7ed9669f2b110dd8dff315c4943272e3a6b822b3 SHA512 8bd47f80d7873f9435eac7f42015b2ca87f703b5d091ec0e9710f2d4b26e3c7b83aad03de3bf44ca5d5fe07a2bf9af32c59d479373543459576e7a0088715a1b
+DIST prawn-2.4.0.tar.gz 5239492 BLAKE2B 5435d7715d2b3020316a04cbf2db1b7793435f2d05d34aae4832e12908a928f689c86d358562e7cd1c2675171a1743757097f0af3357eb667e4e2b9462890590 SHA512 e9fcc31ad2b5aa23592a8bf9419153fcb3080e00e53c9a91b50edc526631227fe86769eeb09336d267ea8f0a94f12336f71b24adc4d5cd9e750367d51f07c867
 EBUILD prawn-2.2.2.ebuild 941 BLAKE2B b383bda90f6e5a594b2c4faf720757a4bb1893c8e07e9bcbc1493a3449be53244eca611a322a9698385302f9daa4207eff80ce50c8a2dea0d9b05dff0b8dbca7 SHA512 d3f5af6bc82635807bff695a556d124b657ba69d0d06a9f78c0746e8fbdf1019aefc6b6a0714cca841383a9be3d6d11026be2393e9b358682dc2558fa1f5cdec
+EBUILD prawn-2.4.0.ebuild 984 BLAKE2B c3f715ab99824c60bcde950ba510174267ea3ee7c91a4001f80b53b1de3f0977fe06e95cf78204f2d3828d005dd40e4452b98fc4bcb3056bfe0d0acb37666b4b SHA512 dc65484f77c168f59580846abdb81a7d8c6f3e241384dce7cf672e4b44f04d2fdc48f13b6ba0fabea53add119b78a0d36228f546876504cd0479609099849b0e
 MISC metadata.xml 340 BLAKE2B 4d87947e53d3063f83e9cd52f2c11eaee8b5460d3272302eaa91b93c572bd536e69c38d69dab0f94cef4507a6cadc48f4c81d2b98ca4787a02541657e3f370bd SHA512 ce287fd4dc9d9442611b519fa8c8607b37072965c8d1902f25e9444a375c9b6907850a9d9f3bb3ccae31a7994bae05a6235bada27837dc28fe045c12cde61358
diff --git a/dev-ruby/prawn/prawn-2.4.0.ebuild b/dev-ruby/prawn/prawn-2.4.0.ebuild
new file mode 100644
index 000000000000..db051feed412
--- /dev/null
+++ b/dev-ruby/prawn/prawn-2.4.0.ebuild
@@ -0,0 +1,37 @@
+# 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="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_GEMSPEC="prawn.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Fast, Nimble PDF Generation For Ruby"
+HOMEPAGE="https://prawnpdf.org/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="|| ( GPL-2 Ruby )"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/pdf-core-0.9*
+	>=dev-ruby/ttfunk-1.7:*"
+ruby_add_bdepend "test? ( dev-ruby/coderay
+	>=dev-ruby/pdf-inspector-1.2.1
+	>=dev-ruby/pdf-reader-1.4
+	)"
+
+all_ruby_prepare() {
+	sed -i -e 's/__dir__/"."/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e "/[Bb]undler/d" Rakefile spec/spec_helper.rb || die
+
+	# Remove test that needs unpackaged dependency
+	rm -f spec/prawn_manual_spec.rb || die
+}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 3f5da2a50767..546d1128f6a3 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,3 +1,5 @@
 DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
+DIST pry-0.14.0.tar.gz 238895 BLAKE2B 325a7eaa03836cf78c8599af15aa6758bc36cccf20937c3a7f222a5a831d2ffd8fc990e005b587779fe2a15077e0b8b38628c6f075b2b73de7ea44b5642e8635 SHA512 c10ba16d7dbd05308079f98a68fbcbb367d07977fd71a7077a80938b10c7588f585651e046d29a2f1499f136f56c062598f77ada8fb47a31608a4ea8536c5ef8
 EBUILD pry-0.13.1.ebuild 1254 BLAKE2B 6dcd658e86ddb9421b6203956870e7912f4e6d1eaa5eae93d4f66071667c3f288bcd5fad93855604fe49fe676dfd152a83d45eb410ef4c3fe200e6e9f45304f6 SHA512 c3fb2f31965fa566d0e52ea9e379e25b68cd9b0d608e8f0d9b05306be560fcc1a2fed16deebd9029f6d068eac3ec8917cb5ac47beaa9d482c1ab5a3fdfa4c22d
+EBUILD pry-0.14.0.ebuild 1247 BLAKE2B 0a5f52028f4852451a983346890a76d1f3ece5c7f50edd08cc40defc774ebaf1f3d3fbb593f04d7bcd95d6ea453496d988b5d862f26f18d178340f3820792a84 SHA512 b9415e69093b048fc080746e06d1fd5b3997209a00c7e59d1d9dac8056b2f28cf74f306957e70cce96dc649dacb34f4fe11fdbe47ee128cae79e182a0031531f
 MISC metadata.xml 333 BLAKE2B 0c32ac9d2cb59e7aa1dfca56e88a2a38b783bdb2779c9336eca40d06770f02252442afb3372c1a786bc491693548c145079b3aa8e61fefeb0b81209f0afe3fa5 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887
diff --git a/dev-ruby/pry/pry-0.14.0.ebuild b/dev-ruby/pry/pry-0.14.0.ebuild
new file mode 100644
index 000000000000..16efb0d3f5fa
--- /dev/null
+++ b/dev-ruby/pry/pry-0.14.0.ebuild
@@ -0,0 +1,45 @@
+# 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="yard"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+RUBY_FAKEGEM_GEMSPEC=${PN}.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pry is a powerful alternative to the standard IRB shell for Ruby"
+HOMEPAGE="https://github.com/pry/pry/wiki"
+SRC_URI="https://github.com/pry/pry/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+IUSE=""
+SLOT="ruby19"
+
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
+	=dev-ruby/method_source-1*"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/open4-1.3
+		>=dev-ruby/rake-0.9
+		>=dev-ruby/mocha-1.0
+	)"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on git.
+	# Loosen coderay dependency.
+	sed -e '/git ls-files/d' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -e '/[Bb]undler/d' -i spec/spec_helper.rb || die
+
+	# Skip integration tests because they depend to much on specifics of the environment.
+	rm -f spec/integration/* || die
+	sed -i -e '/loads files through repl and exits/askip "depends on parent directory"' spec/cli_spec.rb || die
+}
diff --git a/dev-ruby/rails/Manifest b/dev-ruby/rails/Manifest
index 4684f237cb6e..8e5c18a8f901 100644
--- a/dev-ruby/rails/Manifest
+++ b/dev-ruby/rails/Manifest
@@ -1,13 +1,9 @@
-DIST rails-5.2.4.3.gem 6656 BLAKE2B 36519aed8bc34ed303125857ebcc4cbc860b530f6de1a7e311c878533b69a2c7026ca39c7979e45411bd3e68256835abead35e4336a0130894c88115e030fcba SHA512 856b7a73bccba7ddc5f10d5acba025da0c7546a70f484d685f009adcda79f0f40c5cc21d1a99edfcb6114cc7643e806240d545fe6fcc6e8d97abf4d79644a695
-DIST rails-5.2.4.4.gem 6656 BLAKE2B 232562c858d2f487cec1916d1c8afa229028262c7c58cb1f8e021f90ec4f4a309b1cb3c4e91d22f1cad3ea83a78ec7a3e16d83c623060da48545c49f9a87a2f6 SHA512 01c2ae7537afef84a583d42b610791a6c1bfecf3f45b9dcf1295f60978fe60a4cbc286a3f091430144c7fc5e4c89d3c3616fba9045188d53010abf199cee869b
 DIST rails-5.2.4.5.gem 6656 BLAKE2B b6e0b99fd9316c8ed04a817465c89ee9aabeaa60e1f81e0e65c900e19904a5c50fdbb47a6899a8829f9c5ebdacdf01d9dea4ff9a5f84b34262de0904b4d99731 SHA512 28b91ea8f9a483cc4cfe02f2173b308fd34b16f254266f19a7a8f6fd7895546b8cffb08f48eceae80658e32e564595cefb1695047a9d58390cbfe112d4f1dfd2
-DIST rails-6.0.3.4.gem 6656 BLAKE2B c2b1d1573a6555073441baa02bd7f06a3151ea39e4b4845a6323efe9834236e1ac1f4731014f8fce7563300917449f3d1c92d5ff169b951164b8a17c4ca16e53 SHA512 6206864e3d70870a6b9a31e63cc05d7d58eb5eaa3df78ad96de7adbf1c884c2f28bf62291a8cc628d8d702c67b4080ea7389fd7518f1bc59b72ae403824bf83b
 DIST rails-6.0.3.5.gem 6656 BLAKE2B 0c1a10bb92a249bde203adf128052258f2471b85d7bdf8efd6f4293b34d51157b31d21a51c37f5ffe46b360866a9a9d570276534dee246d81f1feb7715174854 SHA512 308571595e54d1fc92fef1332ae449f484d9b6f66504eff43da61b74341dcb32671f84a5481899ded1a0b32f1b78702b2dd4a671db5b47d267b60d67bc04041a
 DIST rails-6.1.2.1.gem 6656 BLAKE2B 5a1407b4ac324acd2a1c9bf45222cc7fe1f35fd4e666fbcf74df37e78afddebeb4910b48ed90b2c481734dcb324fa8b050b2bd757f9a9d41a0ed440c9af2c6b3 SHA512 a604ed34d3fab4a549d7bbe1054ba396ee201116b1cc26e466776ba3bf78a6c09b7178d79927b87c04ab17ec49801c7c1a41683c9ff50559b06ee986c88e00b6
-EBUILD rails-5.2.4.3.ebuild 1049 BLAKE2B f83e6236526c6ca1d7c61b8eb60022720cda90e152aa598df59556e1574756f72c4fc7c319da1d9fa97c671eb96bd73fa0ece185e26dac8138b30d341ff66d6f SHA512 719097b30a977f4d34b90ab785ba457a860dbbfd302630cb392ae1c24f355362cbeb76f00a8806ed9570ddd8c0545e9149c31893deb608b6374227381caefe05
-EBUILD rails-5.2.4.4.ebuild 1049 BLAKE2B f83e6236526c6ca1d7c61b8eb60022720cda90e152aa598df59556e1574756f72c4fc7c319da1d9fa97c671eb96bd73fa0ece185e26dac8138b30d341ff66d6f SHA512 719097b30a977f4d34b90ab785ba457a860dbbfd302630cb392ae1c24f355362cbeb76f00a8806ed9570ddd8c0545e9149c31893deb608b6374227381caefe05
+DIST rails-6.1.3.gem 6656 BLAKE2B 68ceedd4857d9a3676fe493e79aa9c7b448598b5cfa2ec2469be4a64f70f495326e032204cec3ce63367bd96559df7fa4eccf041a4e59be9f63ecbec9992bb13 SHA512 085d05096d14c1132c43291b4082f7db9ddb4ae0674e058e38f821524c17fe86d302c56b28b30fbda6f0883e9ab079fa9afdc2d02a9121478e8c2d7d9b39b8a4
 EBUILD rails-5.2.4.5.ebuild 1049 BLAKE2B dad39d6f247d08f10dfaf1f275d2976198b3345292eaab303e468358e1908199b54f13295a4b62ad3ec3efb999d9b40df8e58dec638141ff095289f2a747b26c SHA512 068d411668b29eb2713e63e03b3d1b50576ea753f60956f5bccbb87c98ea78755102f7582e77e946be8ef3d4666f311fb8781186ca0c355a83a082051693b2df
-EBUILD rails-6.0.3.4.ebuild 853 BLAKE2B 07e8ae0f3c85f07a9cb9940a8c2db21356a8c4f96defd8b1e9ff699abdce492ce6475cb3215d13e639cf1d1c44cb3d42149d30899e7938f742c3800a08d5414f SHA512 70868a2ba88eb834c316aafc6813de9b50d72b4be72f53b76b7c92565df36e53a0e523149449f22a8b154ec636212eb5589cb0319a22987bccf4aa3d97b805ff
 EBUILD rails-6.0.3.5.ebuild 853 BLAKE2B 031f75c83a9ccfd985f38325c00a3297293859ab898efb6304e3683bd006d699c62d8a086c1b1db3258a072f365d07d5a4a6109ef2c9914d0f4c8e9bdff21ac4 SHA512 b8c050a95d72a2a0bfea3a83475e86f10963750ef35b98c0688adf5d7b73bc06e6c361c2cf3a536036bd9dc76555c29507f85d5aa5f43fac5db864a5e45792bf
-EBUILD rails-6.1.2.1.ebuild 853 BLAKE2B 031f75c83a9ccfd985f38325c00a3297293859ab898efb6304e3683bd006d699c62d8a086c1b1db3258a072f365d07d5a4a6109ef2c9914d0f4c8e9bdff21ac4 SHA512 b8c050a95d72a2a0bfea3a83475e86f10963750ef35b98c0688adf5d7b73bc06e6c361c2cf3a536036bd9dc76555c29507f85d5aa5f43fac5db864a5e45792bf
+EBUILD rails-6.1.2.1.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
+EBUILD rails-6.1.3.ebuild 860 BLAKE2B 734c9789819dcc96864275748bd7a38e4130e958d6b560fc59e7e5d186bdd1e7cae969ace6ee49a630acb830de97fd17f08feea35b3dbf8d6fd37b7a091f982d SHA512 c00d8c993ae3ad90203bfbbdf7ca0af0ca6a91efa8f12d69f94b0904b51a84b67490fec2692c6db9344351189051d7a88ebdfdea501f99f977950b3a4ae6fa74
 MISC metadata.xml 491 BLAKE2B 83b3fd3239655be2b30f22235bac80ff14e4c7480a50a32921ce1be24e898b62b68738d635f037ee2a5c5e645b616aa5a2f9e3f1f7df09ca59378ff30f35b6ab SHA512 329f17a58eab42893f554965a142409c32b26e1b195ee315a833ccc96f3081e8920d2c97bba0230a03c882c027a0184f340b8c7760d4e1b3765041f56781769f
diff --git a/dev-ruby/rails/rails-5.2.4.3.ebuild b/dev-ruby/rails/rails-5.2.4.3.ebuild
deleted file mode 100644
index 218aaa26b3b9..000000000000
--- a/dev-ruby/rails/rails-5.2.4.3.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_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-5.2.4.4.ebuild b/dev-ruby/rails/rails-5.2.4.4.ebuild
deleted file mode 100644
index 218aaa26b3b9..000000000000
--- a/dev-ruby/rails/rails-5.2.4.4.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_BINWRAP=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="ruby on rails is a web-application and persistance framework"
-HOMEPAGE="https://rubyonrails.org"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-IUSE="+asset-pipeline"
-
-ruby_add_rdepend "
-	~dev-ruby/actioncable-${PV}
-	~dev-ruby/actionmailer-${PV}
-	~dev-ruby/actionpack-${PV}
-	~dev-ruby/actionview-${PV}
-	~dev-ruby/activejob-${PV}
-	~dev-ruby/activemodel-${PV}
-	~dev-ruby/activerecord-${PV}
-	~dev-ruby/activestorage-${PV}
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/railties-${PV}
-	>=dev-ruby/bundler-1.3:*
-	>=dev-ruby/sprockets-rails-2.0.0:*
-	asset-pipeline? (
-		dev-ruby/jquery-rails:*
-		>=dev-ruby/sass-rails-5.0:5.0
-		>=dev-ruby/uglifier-1.3.0:*
-		>=dev-ruby/coffee-rails-4.1.0:*
-	)"
-
-# also: turbolinks, >=jbuilder-1.2:1
diff --git a/dev-ruby/rails/rails-6.1.2.1.ebuild b/dev-ruby/rails/rails-6.1.2.1.ebuild
index a6d73b63f618..8e4850d7e743 100644
--- a/dev-ruby/rails/rails-6.1.2.1.ebuild
+++ b/dev-ruby/rails/rails-6.1.2.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/rails/rails-6.0.3.4.ebuild b/dev-ruby/rails/rails-6.1.3.ebuild
index 3be9b73306e0..8e4850d7e743 100644
--- a/dev-ruby/rails/rails-6.0.3.4.ebuild
+++ b/dev-ruby/rails/rails-6.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_BINWRAP=""
 
diff --git a/dev-ruby/railties/Manifest b/dev-ruby/railties/Manifest
index e86cca9e7830..d8f9625a37b6 100644
--- a/dev-ruby/railties/Manifest
+++ b/dev-ruby/railties/Manifest
@@ -1,14 +1,10 @@
-DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af752aa91016a559fb380ee33b5f1822576120940995968efa6351165af0e21f97ff2e201bc8250f7e3178089 SHA512 b01b454f38593b50788cecef4f2b25938b0e176d24476bf0a8145b581c7327e0d8572a62fab4256372b51d75a9463431bbd98470a31298a6ff4d5f81f7ff92ce
-DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-5.2.4.5.tgz 8826076 BLAKE2B 41a13708f72f0c281af7b6c97828d873b9431913315e155bec2f798b83a9fd214a0176a93ba74d96b48718dc900b6737a62f5d6593ef7f5bb0b8430c96e5e234 SHA512 452e0649638daf57e8f7c6131bb048c0d960e875fbc3596678404965fd1438a5151858b22c2441a927509337b6a256671b53c24ee35ff477e18153af358b08af
-DIST rails-6.0.3.4.tgz 18568864 BLAKE2B 8f554a25ce02e4752c1a964257836a5cb0a6c01c3453ff11cd8423a9153e90ab833a32cadfe939a34e094cefd553f5514abd7817004b464b054889ab7dc05b76 SHA512 147f76792ce2d2484071fe247c8f1541c9ca27dcc405ff7a780771e3436a9acf3d326bbfd7c6dceca510b6f4d5209ee0a0859867174b8291d796ffd519fa2ba9
 DIST rails-6.0.3.5.tgz 18566999 BLAKE2B b07d1d6c1e2ebaaf3c337350bb08fe339e324818543dcd7163fe3c7ff56f50c5556f369badeb4fd48afa6d95449e18e57fa1b05db6ce544d38ee2f58bd3aa513 SHA512 c9d6bf689aeb40fb728fb681b65c48ebd51de893060ddac37a1fdefbb0d420cee3a456f148d96d577c651c9d7b994efdb3319fa865cb012af8712052a20a0bf3
 DIST rails-6.1.2.1.tgz 10990239 BLAKE2B ff1c9781eab32fda320cb2b9efc92e52ed155b659a43385781bfa422d03653879367bedc7ef4e3accb0a51b7962054eecd5202fd1e1a49ff7946c2f9388a69df SHA512 61e8bf0568c0b06a2c8f6c5e4ae6becc521646a5cdd3d6832c3b52998326a4bd437ad2bd284c010d445a3dc54bf519f7fbd2e9d4368c91b7d2a9abe46e3a276d
-EBUILD railties-5.2.4.3.ebuild 1677 BLAKE2B d601f23359cdf576011977ff20c04163a20143a9e24248e56afab2eac46824535f9c22df9b8575e7f9bccecbcda201412032fe70a2a89333e901597c81895564 SHA512 5240fec770a505a3f1748ab74f6edb2abbfae76ab6e0323c715aef497a945162f3c15c84aab1da41a7fe39d319f7c0afca2d136d48dae3ab0751915b0655848e
-EBUILD railties-5.2.4.4.ebuild 1677 BLAKE2B d601f23359cdf576011977ff20c04163a20143a9e24248e56afab2eac46824535f9c22df9b8575e7f9bccecbcda201412032fe70a2a89333e901597c81895564 SHA512 5240fec770a505a3f1748ab74f6edb2abbfae76ab6e0323c715aef497a945162f3c15c84aab1da41a7fe39d319f7c0afca2d136d48dae3ab0751915b0655848e
-EBUILD railties-5.2.4.5.ebuild 1678 BLAKE2B fd4ff8c44c6f49f573de3ce5f4a92b3e0d1e863d0bf23e33c4399e302fe0f1c492b234de879c28d3f75840ab1171744b90e5de7530d3989af4ef8bdd168f1eef SHA512 57aae1f1414d90f2bd1ec2c6462c48bdba9672b901e1452eb2b957b086155f3215c84b1265bae491b47afebd55d9b83049390c218d85b82ed5219e221596e2cf
-EBUILD railties-6.0.3.4.ebuild 1644 BLAKE2B 3e67b4f6f883620d2a763ce7fcb7eed2d80cdfaef418ef48457024832e07764d42183dbb96c86674be1f54e92e8c08779ecc7f880f317292fa5a3985236a30ee SHA512 2a00fb68fb7e3908048e97722f8000c5263226e2b64f6aec9d900147ee3720b1e30e55d44dab9291234e3fb440ed491c5d64e6bf8fc4379aa1680ecd82e76d5a
+DIST rails-6.1.3.tgz 10991190 BLAKE2B d7a01ad39d4caaee1eaeed9909255fe16c3bd224c61408aca8e319e21ea36566a5be4bbaff37d4d19ee88ec2914e08f85e4e71c970ba39ade8b86f8ba4603b25 SHA512 ec6e871e3226c3efa5dc7f59cbd1819b45ab0d1a21b39b8c2d76022fff761fb268f79c7b560b987af245d9e305ecc4517379de3769d468b5a548005f8533044a
+EBUILD railties-5.2.4.5.ebuild 1677 BLAKE2B e2d2423c876779e913dff56c258f51f506a85f10c30978da55e9f28d660a1dfb215e49218a5c75d6348903af91764372af191087f4c3e618d6e4f8149d79f407 SHA512 2cfcbcdc7918972ff33d3535be3758aeb029476a2ba59bac84b6d33bbd780307ae57268eaa21edac627b3b90bbd966b0ea744aca2e26bcfe11c1e651034bbf2c
 EBUILD railties-6.0.3.5.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
 EBUILD railties-6.1.2.1-r1.ebuild 1612 BLAKE2B 2282f8266ec199411356c3e2885cba3bf8cfd57f196c23fcddcee8b73e6a4e8016e7006b906262ddd7d8ec03bf538cf0bc7c7bc169297e4e922578a40beb9148 SHA512 420246895bdb137ca40b6f3dc64d6695201fa1b5fc34b15d352951a83d69a39bd4de5084aa1b847e752a7e37d4fc8d635f8bceef95fe82be8df0b6b6fd47361c
 EBUILD railties-6.1.2.1.ebuild 1644 BLAKE2B 68c7a591e1d878187527a47971fb5b9b9aeeed214cae78306ec2fb025fe085385cc873596dc9ea40546c69ea62efe835f4bf440d6f15d4081d278d8733914eb7 SHA512 e3cb33817af6e18781f4e80ee3cb68cab35f50852bca0cc8f658a7f2d84c456f445d22b9fd3b994766c61478a103bc0c1613603c805bb84130d3fa6ec96388f3
+EBUILD railties-6.1.3.ebuild 1612 BLAKE2B eab6f4e79d43a55178dd268acc187d7e08591e445832ba401e0e9e47281a952d739ca0022ffe365a550cec54366f2de2fda932275ddb44670753af35e99e36d1 SHA512 2dd04ffe832f7fb2da035e1eb4a9c6f32eb53de3af20283d80dc8c5878ea6909e6e701021e531d29603d2ecc3b9fb59d6ba6baa3b6c6eb70c6d5c28edae386bb
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/railties/railties-5.2.4.3.ebuild b/dev-ruby/railties/railties-5.2.4.3.ebuild
deleted file mode 100644
index f63f0925afbc..000000000000
--- a/dev-ruby/railties/railties-5.2.4.3.ebuild
+++ /dev/null
@@ -1,71 +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:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-5.2.4.4.ebuild b/dev-ruby/railties/railties-5.2.4.4.ebuild
deleted file mode 100644
index f63f0925afbc..000000000000
--- a/dev-ruby/railties/railties-5.2.4.4.ebuild
+++ /dev/null
@@ -1,71 +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:regular"
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
-
-RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem eapi7-ver
-
-DESCRIPTION="Tools for creating, working with, and running Rails applications"
-HOMEPAGE="https://github.com/rails/rails"
-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"
-IUSE=""
-
-RUBY_S="rails-${PV}/${PN}"
-
-# The test suite has many failures, most likely due to a mismatch in
-# exact dependencies or environment specifics. Needs further
-# investigation.
-RESTRICT="test"
-
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
-
-ruby_add_rdepend "
-	~dev-ruby/activesupport-${PV}
-	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
-	>=dev-ruby/rake-0.8.7
-	dev-ruby/method_source
-"
-
-ruby_add_bdepend "
-	test? (
-		~dev-ruby/actionview-${PV}
-		dev-ruby/mocha:0.14
-	)"
-
-all_ruby_prepare() {
-	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
-	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
-	sed -i -e '1igem "minitest", "~>4.0"' test/abstract_unit.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	ruby_fakegem_binwrapper rails rails-${PV}
-}
-
-pkg_postinst() {
-	elog "To select between slots of rails, use:"
-	elog "\teselect rails"
-
-	eselect rails update
-}
-
-pkg_postrm() {
-	eselect rails update
-}
diff --git a/dev-ruby/railties/railties-5.2.4.5.ebuild b/dev-ruby/railties/railties-5.2.4.5.ebuild
index 5781d98c6316..dd4edc018545 100644
--- a/dev-ruby/railties/railties-5.2.4.5.ebuild
+++ b/dev-ruby/railties/railties-5.2.4.5.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/rails/rails/archive/v${PV}.tar.gz -> rails-${PV}.tgz
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/railties/railties-6.0.3.4.ebuild b/dev-ruby/railties/railties-6.1.3.ebuild
index d8cfce5dde5f..c0b9e766ecfb 100644
--- a/dev-ruby/railties/railties-6.0.3.4.ebuild
+++ b/dev-ruby/railties/railties-6.1.3.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
@@ -31,12 +31,12 @@ RUBY_S="rails-${PV}/${PN}"
 # investigation.
 RESTRICT="test"
 
-RDEPEND+=">=app-eselect/eselect-rails-0.24"
+RDEPEND+=">=app-eselect/eselect-rails-0.25"
 
 ruby_add_rdepend "
 	~dev-ruby/activesupport-${PV}
 	~dev-ruby/actionpack-${PV}
-	|| ( dev-ruby/thor:1 >=dev-ruby/thor-0.18.1:0 )
+	dev-ruby/thor:1
 	>=dev-ruby/rake-0.8.7
 	dev-ruby/method_source
 "
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index 884b421692d8..93bf84e03f56 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,5 +1,7 @@
 DIST rbs-1.0.0.tar.gz 497065 BLAKE2B 3cd0d583f3048e11c70882c783766ed4bcd5e464562900d4528da2218a7fcc773be8b36eb79a517314cba0db8360d6b9312531fd07b618d70575c7aef54d0efc SHA512 512e8abd883403697fde537844c99a0780e9f8d1dc59ff827c0372274573967981735065b670afed50c13ca87c6abc44bc6cf47caa9cdc6e6c117c6d0907c405
 DIST rbs-1.0.4.tar.gz 512875 BLAKE2B 7d301e2f6c20d13249e031e8728089ac6291a1ab9bfd81513dae1633604bd45b16bef94c7ccc680c8f78e4a954aab29dc5d1025b05b5f8e00e830c09c5192b3f SHA512 d998a1613b7653278460f5cee19f38bbdd13aa46d9deb8e4da8fd710a78c6ede2784580481cad43700f3d2c4c51d0d0b70eac23b156215ad3df2d227d1f6a3b6
+DIST rbs-1.0.6.tar.gz 519090 BLAKE2B 1614320b8f77fcf4880cec6b7e4dc5fcb6b73f59410aa4dc51fb61b2868313acb242dc5a572c6cb96d9a819bade4b1d3aee2196189ea3fcc84d718ebbe9ff1d7 SHA512 a63c5781e6f73e998ea10c1a821d4f33388387caf6cd8e1ea607a9cd009d3f793e59c93b140e2539291a6b1d50b6ac40be7b484a8de0594f0ccff8a2db1e8425
 EBUILD rbs-1.0.0.ebuild 1083 BLAKE2B 9ce2d41a1f2ddbe8c1b4c012c985cd1bf1254ae8048ffb3d7100d928e896c9f4242b2180170223d7b3ac3365a1b32ddfcb04d7338686a98acb84662137664482 SHA512 a0177e009dfebf89c85cb50f3bbaf22a17012947ee53ea9c95d0ee0dc9b021030ccfe638a75724f21cc647beaf2b0a6a4c44454dbff547c8ce1d7f7d60ce1165
 EBUILD rbs-1.0.4.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
+EBUILD rbs-1.0.6.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.0.6.ebuild b/dev-ruby/rbs/rbs-1.0.6.ebuild
new file mode 100644
index 000000000000..74d2c248f835
--- /dev/null
+++ b/dev-ruby/rbs/rbs-1.0.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-2 )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 3baf41925ed0..47749fdbf695 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,7 +1,9 @@
 DIST recog-2.3.14.gem 331776 BLAKE2B 62aad2cf8252c24cd7adc456a022555f05924e501fd5f2fafeb87c2587e049ee41a501602bc1b5d97370a69a6b98f1ae77df22bfb7ae2c9e80b38b5e0a1518df SHA512 1154ca3d610fe8f554a15846b49f978d3798c9a43893c40d58c8421e8012c0823368d374ecadd351fc1479037c898966dc2dba9debb4c46ce6b743c7782a848f
 DIST recog-2.3.15.gem 332800 BLAKE2B 4a6360f72d5ee48e066a30abf875fba18e8dcdcba6d36bf8d8de28b36405870819a1b91edee1a5877b1ddda99a25918419bf42bdd4851c7d814a2acf558439d3 SHA512 a26f722da886be22332330a9b0407ec28431ca900b43d6cb7c6fe65938a026a51d54f90cb264652fb8a70352f5e548a7ed013a4b136a7a21df4a9987b36faf0e
 DIST recog-2.3.18.gem 331776 BLAKE2B 8a44b13c73e4487fc41c00b34d907fc91b6c3b9bfcf29a7366e3462a946db51e9ae8cefb09d47890c8bb71fed6b6277f117f96b5a6f7e611c8583873049ec4ad SHA512 023486b1812c7e90f1eab6f6b49733c77207b725f82adc71d0d79eafad07a13cb368b5d02c23d8f00341cbe94d77ac1b590430f0c891ab7095643af1a1772ba0
+DIST recog-2.3.19.gem 343552 BLAKE2B bf5aa0e2c5e8d7a27b23f03250a3fa952dfa0ed5a2844596b00940fce2e1080ada009a46b5eeb2418845ea12f803580040fc3a3aa6871675efff1a8f4d5a4ade SHA512 f09a0ee2b4a7ecb7ca6b587a70e115e162fbca8a7a1736017305346ed03207de66f71711e78593ed242c63c3c8be9af2b341c2d06c08a6592fd3d8ecbdc60147
 EBUILD recog-2.3.14.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
 EBUILD recog-2.3.15.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
 EBUILD recog-2.3.18.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
+EBUILD recog-2.3.19.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.3.19.ebuild b/dev-ruby/recog/recog-2.3.19.ebuild
new file mode 100644
index 000000000000..18077246bb19
--- /dev/null
+++ b/dev-ruby/recog/recog-2.3.19.ebuild
@@ -0,0 +1,37 @@
+# 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_BINWRAP=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="xml"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Pattern recognition for hosts, services, and content"
+HOMEPAGE="https://github.com/rapid7/recog"
+
+LICENSE="BSD-2"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/nokogiri"
+
+ruby_add_bdepend "test? (
+	dev-ruby/regexp_parser
+	dev-ruby/rspec:3
+	dev-util/aruba:1
+	dev-util/cucumber
+)"
+
+all_ruby_prepare() {
+	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	ruby-ng_cucumber
+}
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 6f4a504e09c5..fc69c44aadbb 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -3,9 +3,13 @@ DIST regexp_parser-1.7.1.tar.gz 83865 BLAKE2B 1aab4f5c4d399ee48951a9fa9f24fef140
 DIST regexp_parser-1.8.2.tar.gz 85592 BLAKE2B 55333dbf59606d1f203c84cc3e712ddba9551be492745f2a0ce9ca8ba56e9a6eb1aee0c9d3d5079114c65747746f6ef4df3cbbf5a917562f413ca3426fd16efc SHA512 8192ee4334d2da13af5552eccd4fed82b24ed57489e3e0d8d083e8cf72e52fa185c2e007e9adf1ec6e59b0cf4e4055eb8def28d5cc94cc7a9ab7981d14f8e727
 DIST regexp_parser-2.0.0.tar.gz 85985 BLAKE2B 6d206de85e85cd5f3f472f6b2cba49bc03aa43fc246af145188c2ebfe3da1c23e0b8b5d307d8902662abcd220b3c7a439825ada2012a09fdfffd9c390865a0d3 SHA512 a896f81988c8fb8074e05abe6c9723a314b147ac2098d11324842b79a8b74ae3a8237ef1ec0f80cadc223c13b06fa0ba231013ffdcd00710381e5c2fc7ebf175
 DIST regexp_parser-2.0.3.tar.gz 86862 BLAKE2B 261703b7f005d234bbb2be655b6f9974e9f160b36af9082339653f469b9a18cffd39e04878a0a007c09252be747928bcd04e59af1c5572bc3f627495432bcc3d SHA512 0df0c6a023b26c48570ec5761af4bc90ab78afeae4f6f6864529102b826301b11b8a2cbfa7dbdd4b18221be7450ccd0d69c603a4cdd800c0b68fd6e5cc3c0eff
+DIST regexp_parser-2.1.0.tar.gz 89371 BLAKE2B b63dea78a98b85566ac45078350c545ba8b0e77398e1307aa530b160b607aa98c6605dc2c01dbe51eaef15720067c9197a50c81c442e04ee39473a58567c01ca SHA512 007c1b3a0d90fa0667dbe7ee85ed35d5b45bf511f8d90feb787d7f8d5c017155987368459b64a635ef3af529b6f73920e3c566f37ea7cf4bb68cb641aee9f55c
+DIST regexp_parser-2.1.1.tar.gz 89399 BLAKE2B 7632b1e65e929f610e6bedc7954f81ca080f4f290794da617dbaeaae324186581a6e0ab78fb8d7311c33876b8cce090fdb6d4b868eeb80b82fa8461da5d82bfe SHA512 809b8c5f7bcceb0c31e97256d5a40a04bb7919cfa0a139e972e90a72ba15eee6dce8ac1f8e65f5e8f7a5f992a2fab91d6ae19f27a1f5ec7795fcc082ff037e13
 EBUILD regexp_parser-0.5.0.ebuild 878 BLAKE2B 065940af48ce7c93836019f0a9325e04db4e0ff31f0e9af6a13a637e86ced811bb38cd9c70b971e244df857e1d40b2ed2049fc0321a82141c43478822cac8b04 SHA512 c91492b8ea59137258d941e79659f1f511621c0d7da8af6e6c13aefa39f5473c2881e0893b68a56b428ce8da9a135e20371e4d5e0c6d5fc6996e6a77af5c22e6
 EBUILD regexp_parser-1.7.1.ebuild 876 BLAKE2B 82bacee65732f0f87c38e5f0e6044efb35e628f512de34a1dc55e866ebef3e947c0289c5aaa168fc136b5042e2e8e2af9aa23a77e5acccba5c8899ebd41ad5b6 SHA512 eec1e3db2f3bb6463ca114977281a0f50d5360eb8953e986f7f99a8b7694d817aeefe073e88f23bac4f7fef4eec2be516f457c4fa4d60b2c33dc6bb8d5ae1403
 EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b111490dc0291dd4b050c2e0015ab6c77ee845b5b8dc0e34c4b223737e983a259dfa46a5c43cc0b10f825f8bb170e5e3168b SHA512 6ae591ed9ffa40bb8440cd05cec581a9a5126a2fe85768a0805d2c2e5b152aef482426a18836d2076e5cef313ce96484c686ab982ddaeb7f2a6f038ff55498d5
 EBUILD regexp_parser-2.0.0.ebuild 888 BLAKE2B f4c4432751aeba693e2d7ef3769b96fdea6ec480a0fb7d0393770cd9c98c32181cbcc12c0dc185e7996f1e4cffc4ceba47123d1246d123456a420316f58e3752 SHA512 18364c915f58475c0ae9175a928d3c033211048ecb33ef0787f5ba3e10416fb619722cd37280f74610ebe49b8c382ef524bebf37a8a9184f3dcf791829a5f708
 EBUILD regexp_parser-2.0.3.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
+EBUILD regexp_parser-2.1.0.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
+EBUILD regexp_parser-2.1.1.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.0.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.0.ebuild
new file mode 100644
index 000000000000..f159a54f45da
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.1.0.ebuild
@@ -0,0 +1,37 @@
+# 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:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.1.ebuild
new file mode 100644
index 000000000000..f159a54f45da
--- /dev/null
+++ b/dev-ruby/regexp_parser/regexp_parser-2.1.1.ebuild
@@ -0,0 +1,37 @@
+# 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:full"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="regexp_parser.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for tokenizing, lexing, and parsing Ruby regular expressions"
+HOMEPAGE="https://github.com/ammar/regexp_parser"
+SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND+=" =dev-util/ragel-6*"
+
+ruby_add_bdepend "dev-ruby/rake
+	test? ( dev-ruby/regexp_property_values dev-ruby/rspec:3 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile || die
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel:rb || die
+}
diff --git a/dev-ruby/rest-client/Manifest b/dev-ruby/rest-client/Manifest
index bf75a13d9622..14f895eca9ca 100644
--- a/dev-ruby/rest-client/Manifest
+++ b/dev-ruby/rest-client/Manifest
@@ -1,3 +1,3 @@
 DIST rest-client-2.1.0.gem 147456 BLAKE2B 602e3cea1bdb117ad8b783d30741f699b18085fd6dd4f0d26a8a8f3b658bc6f807357a7412eaae312566f1b4d5ee7e311f51d5fd4a8eb9063e8552335b019a2e SHA512 fe5d44409dfe607566b4c0324441d9a3981776699027bfbc92283b1cd425f204211fc872593cb0784e0ca7a5e061e98793540eedfeb1891d9a8afd53a5ce01de
-EBUILD rest-client-2.1.0.ebuild 870 BLAKE2B 755239a4b1392f9437a1a75ba536f4f83d42fc18ec932b9fee85f4f42c3d52718ca46c60fd3f670ec70f874394a3a6f1b97346105f76fb4cca66acfce26bb7e2 SHA512 47c1087d20926c426a725c04529385844feb17604e246c9e3b54ede486edb2b2bfd18265ef534f327e03ac508ed70e426fed7d9182809ca18b01db6f0d93afae
+EBUILD rest-client-2.1.0.ebuild 870 BLAKE2B 37ac664708d1a85f6bfc12b890fa6c0e3bb902ece733f09182c4110ced924490e2cf86798a8c6422f5d6c938bdeeb30879083594b8a7ecdff11551ed2595999f SHA512 4c74e8c2869d496d1d3bf5e9ecb64d624985636bde8b1c92faea6b2770b17dee253c3de95ab2c406b6cfce886f3d0bdb82f64636d3f4d0c3bcef8d239d2644b9
 MISC metadata.xml 349 BLAKE2B 99e76fdab475e288f31b22ff45d67935e478ad816beb445d06f8602b31f81fa97ae3064e42272f7001a28fa55f1cd1f540949c76c18a634b7223d87236b3741d SHA512 0de0478ef4db822316ad90b51766f339bdba8b8259ee6d3532a464368f2b6d176b82350792c29e67def0c4ab6b8c75460e3b87e76ba657f71f81c2c85c25b47a
diff --git a/dev-ruby/rest-client/rest-client-2.1.0.ebuild b/dev-ruby/rest-client/rest-client-2.1.0.ebuild
index c4bda40b4646..165d50bc2b26 100644
--- a/dev-ruby/rest-client/rest-client-2.1.0.ebuild
+++ b/dev-ruby/rest-client/rest-client-2.1.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/ruby-oci8/Manifest b/dev-ruby/ruby-oci8/Manifest
index e46a45535f19..e0a935bf65ad 100644
--- a/dev-ruby/ruby-oci8/Manifest
+++ b/dev-ruby/ruby-oci8/Manifest
@@ -2,4 +2,4 @@ DIST ruby-oci8-2.2.7.gem 337408 BLAKE2B e5f9d620e7df2b64643981614a3df877fd2bb9c5
 DIST ruby-oci8-2.2.8.gem 338432 BLAKE2B e1db0c29ba71fff190b94c5946bc5025d4809ad92e154ddc5de2c2e1a4ccf856e81e33589ed17e303fe8708cd9f47e131e803bb534981da496f9f5820d895d0d SHA512 4184a7899384a6dd6ce9f152371015aeb1d6f09c37c48a368a1919168ddf0eb340bc8d576abdc1f804c2c776685ca9afc660104e35e2666d7c59cc16fd2c84f7
 EBUILD ruby-oci8-2.2.7.ebuild 887 BLAKE2B 61222901f8d00c13f9bb50246eb9f98e3ba1444dd737d0418a8c3858e06e5e38ab2e39557e31d8feb82a6719b713b20db2f16625a0c10e1f6811ce1fcb1c7d01 SHA512 6a99ea3783c1116a8d8d3943026037fa016f3137831f58d2c6264375bf84d73d01cf19aff0df5776980fc39e7df01dc35b3ba8aebc33d8190cd5c7f37786970e
 EBUILD ruby-oci8-2.2.8.ebuild 864 BLAKE2B 289fff9bc904390015aa8eb34ca90b2aa55265eaafdde81a29325a33163d80c7e9286c2af67ad186342c422764fb91914a747dbe8cb4c492ed0dc7f51695e36c SHA512 d1b70fec1611e6d70160370ca123b0e23079873edd60f108d337c385c7e0a9b37353dac472c83f6900d9407349b10729fa504f8fb6ba51a723af9bc9d23050f5
-MISC metadata.xml 545 BLAKE2B a5ebf69fe1b547734d26705b62ef3ff195082d5a8ece966237ab634d15116fcfd33ddcd721adcf200e2787f4dc00913868cefcd5601e96d920dd5b471677550d SHA512 ab7a2dab0b10665d96de0a87c7133d6922bfc9ce4998148c5cc61875ef0082fd2a3b704f3e6d77c5c70577ecbc3b6b833c176a93e6e6d7cfbb455c297c75088a
+MISC metadata.xml 327 BLAKE2B 9811e410dd7d02afbede5ab77c86fb63b0dcb4a59823eb18d935b4364ccbdd6bf186d9aa49e4511aed401f046f6dfc4f5a2201e4f6298347808414fbc7588678 SHA512 ea4202f5b49bef7ed75fd0651d26dd63cafb09bb4ee58dd0571725f5c80e9ab545158dcf7daf6c0014d0cc1c4502daad52078183fb4921c0a03c0f6efe3eb838
diff --git a/dev-ruby/ruby-oci8/metadata.xml b/dev-ruby/ruby-oci8/metadata.xml
index cf6f1b712bb5..1b76a1139e85 100644
--- a/dev-ruby/ruby-oci8/metadata.xml
+++ b/dev-ruby/ruby-oci8/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>troy@lump.net</email>
-		<name>Troy Bowman</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>ruby@gentoo.org</email>
 		<name>Gentoo Ruby Project</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<upstream>
 		<remote-id type="rubygems">ruby-oci8</remote-id>
 	</upstream>
diff --git a/dev-ruby/ruby-oembed/Manifest b/dev-ruby/ruby-oembed/Manifest
index 5be258f82b62..d8df02e3349b 100644
--- a/dev-ruby/ruby-oembed/Manifest
+++ b/dev-ruby/ruby-oembed/Manifest
@@ -5,5 +5,5 @@ DIST ruby-oembed-0.15.0.gem 4528640 BLAKE2B 3bfb6f6b7b23d82b89adad5b329072d050a5
 EBUILD ruby-oembed-0.13.1.ebuild 795 BLAKE2B 35cf25fb62924a8f66d2296490e51499c7066e73d2b802b142712876822d91a9f4995c40828718429891a7bf25738690559081ec6dd03b1dc862589857228955 SHA512 d9f831c5f7030f153a9263d7cbdc75acc26f90b24a1b108b168a315e2c392536d506f20c7e3a1c3f526f656f236028fb88b755b479d5272fdc7f56f63e0e5847
 EBUILD ruby-oembed-0.14.0.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
 EBUILD ruby-oembed-0.14.1.ebuild 788 BLAKE2B 8f8cbd67da65b1e0dd1bf5a9f9c23a9880aab28d20ec1aa8336329b869a66d4460eecf960ccb983de08bb71c304eec93971228d37058c645c20c767246494aca SHA512 96c0f8e2d7e39e85e5287abf80807f20b3d6830fb076b2778c1d4e87bd712d060ef4b3a433ab44a2f57980df2a4f1a4e634d227c1622e1e756ec7f7c64d032b8
-EBUILD ruby-oembed-0.15.0.ebuild 788 BLAKE2B 6e73f3581385bb0c31fd07840384c2f667244d407a8924fe42f3b2552caee1117c58da1397bdd0df719eb5a111ed38e4cf2eac4c1042937a4c22046ffacb6184 SHA512 dcea11996e1cd5003078b4ce8ca5b617edb4693b897167e8275fd5b93ab0c2e6bed9390e458800b926c60dd565eae395d6dcf0586072990f603a27c3411a6d0a
+EBUILD ruby-oembed-0.15.0.ebuild 795 BLAKE2B 071152f52acdd5a673eb9e3be0f3ad898ee67d1a8506b3ef0f0c2ac019b47d896cb58be97ab233979df930b9c69de32bba8c1c56a8ede904949f9dbafac51bd4 SHA512 22af7ead72344821e7030393fce918429fa90b8789632ad1dacaada5b276570f3e7f202e38721025d5ccedfd25400851325acecaa2386fef97d7537f7ae93bfe
 MISC metadata.xml 345 BLAKE2B 575c6ff6aaa60be02f4afbaa5b6855e9e0a8e24992c7ae7db0f3f23856403c3f223a4e6c861550a96b967585bc0f7aaf937b2a98c6fad69fd6ab69466e98613c SHA512 e0c3ea7c1c5057b74e8b03b5d314050ee21f8a235dafb981888ebec4d8cf866d13723ac1dd6a96a685380f9b30e61c513e1f83328c778a524ecb52f9adee8e03
diff --git a/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild b/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild
index 5372f0a42526..9e47a3d2e2aa 100644
--- a/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild
+++ b/dev-ruby/ruby-oembed/ruby-oembed-0.15.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index e69554d296eb..c980cce1db75 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -10,13 +10,15 @@ DIST rubygems-2.7.11.tgz 861642 BLAKE2B 6632296d8bcd47d52d92db3c09a0d95118c72877
 DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
 DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5a9481c406e51ab125fa9da0e4e1ebde79c6a663e8847125c1ed8657f6af69000cf0d7191360e7aab99ba508 SHA512 1a6d7b3b08024d95988e033c772bfb6b5ed8f94ff4ddb194280bd3a7530cc384cb90fd56d44b6d56760cffbb23c5a6ab5917737ca46ec85fe61e1ae79d7ba4ca
 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
+DIST rubygems-3.2.11.tgz 987152 BLAKE2B 589c862ed4ae14d66437587adfbe9c57e4b95b8911115425098463f7be77a597cb9df3e3962da58da3a12139799afca34ea002983cbd4406947278c7db9e8e41 SHA512 686d35175891cb098c1efffc957296af6526622882560c8ecdc19eff19f50a5769fc7df122c2a863cfd17b09c375a70f8e554345cb50075693219d68ae81edfa
 DIST rubygems-3.2.6.tgz 984320 BLAKE2B 846202460722a9212df0958fca9bc8df9e3b0fb9aec3fbd0887f166ee5d25226d5325918ada816b5b166544e654d501a8db80ca2d9d7f1de42decddfb39f13d6 SHA512 b9303994bc2ef8a4e66f14f745f8ae493ee2725737cea6caf557f8943ac165a4934c865542c7080bf2d7b0c0be441d4e818ee8d42fdd9ae4419540943ed695ec
 DIST rubygems-3.2.7.tgz 985071 BLAKE2B f8075429c42a53b648ddd11128c91789b214f04f048261fbb071c0ee1250241a06c0dc2ab4e608f2282a0fc9690a35df371c02f5d7f0b6397a631e4a2af36b2e SHA512 b01c9d78ac172981650aa94e26d9b07fb97e63a2d1cfbcb55462d6333c45ce16635491dcfa95a177ead429f22a5ec450ab049a7024e14e20466f5f60cf4c53b7
 EBUILD rubygems-2.7.10.ebuild 4512 BLAKE2B bce66fda261d27daa57b853de1b1605003c6557de15e3471ae9d426f16990da292e19cd48f0dc29bc09c2652adf521b93fa6a059dd1a6967fac692bde4d084d2 SHA512 9cf064646d60eee8037ffde0a059af6d408cfec13cde5715f8f172012e3f9c402a46139781f7e99c18a80d1fc9f81fd7519b3f7c19bbade22adf7c277b11b949
 EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
 EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
-EBUILD rubygems-3.0.9.ebuild 2637 BLAKE2B 92beea46458c932844fb1d138d90b252fffafad8078f6c68afa41cbd64f4f13e01bb9fc66e964f91a8e9ed5524190fd8551598d9f75efb0e345f603273e9575a SHA512 dc8454153a77a9543bfe984d5b42bdad542cb9bcee4fcd8828686f48fdf0a6d98f30594b220366f61e91cee6c38e427a28f2aef5ecc47276a951405b968d25de
+EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0
 EBUILD rubygems-3.1.6.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
+EBUILD rubygems-3.2.11.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.6.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
 EBUILD rubygems-3.2.7.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.0.9.ebuild b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
index f21b238a2f80..2293e7bb26e6 100644
--- a/dev-ruby/rubygems/rubygems-3.0.9.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.9.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 || ( Ruby MIT )"
 
 SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
 
-KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~mips ppc ppc64 ~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 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/rubygems/rubygems-3.2.11.ebuild b/dev-ruby/rubygems/rubygems-3.2.11.ebuild
new file mode 100644
index 000000000000..e97a3f747765
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.11.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+	# Remove unpackaged automatiek from Rakefile which stops it from working
+	sed -i -e '/automatiek/ s:^:#:' -e '/Automatiek/,/^end/ s:^:#:' Rakefile || die
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(25|26|...)"
+	ewarn
+}
diff --git a/dev-ruby/serverengine/Manifest b/dev-ruby/serverengine/Manifest
index bc0adf540a88..d2f34179703b 100644
--- a/dev-ruby/serverengine/Manifest
+++ b/dev-ruby/serverengine/Manifest
@@ -1,5 +1,7 @@
 DIST serverengine-2.2.1.gem 39424 BLAKE2B 0c68bfd59c0f6abbb294ecd8003c80853413b38b05ba1553230a2a49ffbf56dad43428eafbac4e77a012d66fdc30d4445249aed53e6eead11f52f5aeffd91c1e SHA512 920dd828561b44525dbef2a45144a40f456a5fbc2a56366a7831b42e9f6e115895a0156adc10114a007c2487d1bd1488f73c9c00373fd90648ee272c9c872111
 DIST serverengine-2.2.2.gem 39424 BLAKE2B 113ffaa6dd1c35ba0796aaec30c4b3bbc71d63abb7214bd0ed30c7d38195bb2caf4e12d79968ca2750fb522600ac9494848984248fe1645ae3d7c1e97fd6a608 SHA512 ec34af108017468e3981861b4a4ae84d071dd31aaca78d458512bf430a1c7075deb64134f899dbde14e8f18a0e163f0f61236a7b3678173030c093d3362eecf2
+DIST serverengine-2.2.3.gem 39936 BLAKE2B 20f36d60b3f9a01c3768c490db89b8adaade75fc16c1ba738135d24bb858f44c10ab5ff1d0b31f0a287b2ddb3a69f958eaa155e7a54a26bbe5b6a480e52c4325 SHA512 4f95dd9559e7ea79e1f276554a94459b0ef250c639d2ecd17509651a5585dc1688936048b636a3d9f09f84eed3d4b16aa5bf50537cd14ebbb7f0e289600b6e60
 EBUILD serverengine-2.2.1.ebuild 787 BLAKE2B 89e0c43add0b47e665869c0b044333721a7f8e4247fb5cec3b5746c94f768139f51299a1bb4eaa6671bd084b5e975d05c8c90e898358f53c81d5e90230c8c558 SHA512 9bc7cdb7a98cc45f022e7d32127b6d3572febdf2292e3e91737f0d8114f3b99ac84b60a81ec0d69eb2ee6e4a6b8bccc9df5e9f734eab2db142760a74f8a1f262
 EBUILD serverengine-2.2.2.ebuild 780 BLAKE2B ea88557e63b858eefa3f78df226437bf60a2c98b8f7e74f76c7a7f37400a2b9a3c4419db5a7bf8c09bdd7172f0f83cf238bd3c4f813d9681d55a8c02215559b6 SHA512 b52559dd5d8e2a43a7d30cc27665d1920ca7d1e5683b9db7e2adf604c2ae5ee4b21355ce3e1b0ed4afbe51d60be4f73ec093687b03678542ddc67e2c878a1b7f
+EBUILD serverengine-2.2.3.ebuild 781 BLAKE2B a89e232904b8f266c280f9bcfd20933119dfceff9b6e41d12dc4426b657df06826a3fb95b737d67546a56e9592bfed90c92dfbf7d54614436873aa43ed2c4396 SHA512 4dab95efd9bbf456f7143bae49099344e693c75a1daf34821042276fc718215ef67ed048f4d7c49214165bed43ae9406b21313e0d04faa93299067738742de18
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/serverengine/serverengine-2.2.3.ebuild b/dev-ruby/serverengine/serverengine-2.2.3.ebuild
new file mode 100644
index 000000000000..0b16849df73b
--- /dev/null
+++ b/dev-ruby/serverengine/serverengine-2.2.3.ebuild
@@ -0,0 +1,34 @@
+# 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_EXTRADOC="Changelog README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A framework to implement robust multiprocess servers"
+HOMEPAGE="https://github.com/fluent/serverengine"
+LICENSE="Apache-2.0"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/sigdump-0.2.2:0"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	sed -i -e '/rake/ s/~>/>=/' \
+		-e '/rspec/ s/2.13.0/2.13/' \
+		-e '/rake-compiler/ s:^:#:' serverengine.gemspec || die
+}
+
+each_ruby_test() {
+	# The specs spawn ruby processes with bundler support
+	${RUBY} -S bundle exec rspec-2 spec || die
+}
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index 6f32a74dd6dd..373c6d093016 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,5 +1,5 @@
 DIST sprockets-rails-3.2.1.tar.gz 108682 BLAKE2B 842ce4560c7537f12c3aa2c068da89d99b410c4ad27f44b69abeead90518a4d9bad92fe6a70406c2f52d1124857419e845e3a1468cddcdce8a534c5f1210c3a8 SHA512 2c108370dfbf945e912505e854cdaf799f08d4374aac57a33bfc298d6e9bbf136877978458f7a8f48e5d120f578d3c7a88d91c058c12f520dd10b8271f82c49b
 DIST sprockets-rails-3.2.2.tar.gz 109408 BLAKE2B ce589e18daa4f664ed56d909a0eff082a69d756ca57e6e7569723b5da0b1dcfbe02f4a00e42b3d9d34b1cac37b663830ede046715c04c8bbfd48be7407e13431 SHA512 048f48930325316ac28d721a2c33ba60767dfec9456b0705e90363a1c81c8876ec6f99d65ce533d5a0704e1f67a33fcac5cd675aec5cc3c3f1cd896d518865a9
 EBUILD sprockets-rails-3.2.1.ebuild 1005 BLAKE2B 0eacd0cdc317b93ed582ce7cb3365ff0dbb78c36184b3b2b78cb837e299d26c5c9563e1370c119553dc15ffba80b87a61b952eae97ef5b3067f20beca8dc81ed SHA512 05feac0068e6b4d2c9dd4ace8f0bfabe8ecae9721fc597cbb2aa6a060ca2dad93a2b9facc318fa520f4e4541106c400fa90d3a092e7c29a58c8bedcef376120e
-EBUILD sprockets-rails-3.2.2.ebuild 959 BLAKE2B 2aa884abdbaf3919e23b89ea25313984759ad82d99db7f9488d6c399faa3c31849af20b71de43ddbe8d7b3dd485e4ef4f361ce11d71a6ae444a909dd71dac6c5 SHA512 8a5c3f0ea945905ddad21f15e1e29eb2a2ae199231bfd1dafb4126b875f83f7d71a310e9a456ca065bc66ca3190651044bfb8d7162a8621e5f719bbee42b6fa8
+EBUILD sprockets-rails-3.2.2.ebuild 937 BLAKE2B 0c630e39659651cde1125acf3ffdfb86d26f8389ef68d2400a63f1ace0034bfb228b4a3ee9d4c24270f69841bfbc1102bb1d3d662a3dc95ca1e5e133d6fad198 SHA512 cd1bc4ceaf3cd0cf0f119724864496a6f2ef0cf0baba90d1fb51ef570769de7ecbdc9e036cd06c2f33f6428fd09e79580e23a546934099a37f90ee0d945f6929
 MISC metadata.xml 347 BLAKE2B 762b3943d802321b3eba7cb5bc4f47093dce9890fa79d7c8ec25aea5c352dfc4509718465d6791d7c194975b3a4c4653ed0d9be06e69b0cdef5aac1713d44412 SHA512 3eb588d32f48bb0f9e497c1d219314b2edfa33b48f245e35816fb34c46f0796b437d2064fed4c32315ee93fa6ed904be0a46fd136e820a3965a4240bd9db3c81
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.2.2.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.2.2.ebuild
index 3cf772493a3a..d79ecf90b880 100644
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.2.2.ebuild
+++ b/dev-ruby/sprockets-rails/sprockets-rails-3.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_TASK_DOC=""
 
@@ -21,14 +21,13 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE="test"
 
 ruby_add_rdepend "
-	>=dev-ruby/actionpack-4.0:*
-	>=dev-ruby/activesupport-4.0:*
+	>=dev-ruby/actionpack-5.2:*
+	>=dev-ruby/activesupport-5.2:*
 	>=dev-ruby/sprockets-3.0.0:*"
 
 ruby_add_bdepend "
 	test? (
-		>=dev-ruby/actionpack-4
-		>=dev-ruby/railties-4
+		<dev-ruby/railties-6.1
 		dev-ruby/test-unit:2
 	)"
 
@@ -36,5 +35,5 @@ all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
 
 	# Help load correct rack version consistently
-	sed -i -e "3irequire 'action_controller'" test/test_helper.rb || die
+	sed -i -e "1igem 'railties', '< 6.1'" test/test_helper.rb || die
 }
diff --git a/dev-ruby/sprockets/Manifest b/dev-ruby/sprockets/Manifest
index 3ac75761e979..6d4f1b92f03d 100644
--- a/dev-ruby/sprockets/Manifest
+++ b/dev-ruby/sprockets/Manifest
@@ -1,5 +1,6 @@
 DIST sprockets-3.7.2-git.tgz 369053 BLAKE2B 3c40de921d82b2f5c71e3ecaa114576293946352415da1195e60cdda6363066a6be05474eb7842ab1122e29fa6c19fd2f7a38fb0a7cf9972de0640eeb29d03f0 SHA512 bc7d79ba696a072644852b7a3a73ce086d297662309deb1d00318ad453f50ac6e494e6489632cb282795de2f334700155cfd21cc80be638dc471a3215422591f
 DIST sprockets-4.0.2-git.tgz 418502 BLAKE2B 0ae8d0e47708967a4208af852f21baf9d00c4216660b081170d7f68631ee1129fb78341e6012664fc519a0f330fac23203e314c1831d7031af50844e6b91c1f0 SHA512 f733b96c78be6466b63999aa7dc900af653a5b35f6482d84c41edf47f22b093231003f8874eee2ab31e2a2cfb7049a8109a314b51a0ef36ba30d5f6e8bd81f66
+EBUILD sprockets-3.7.2-r1.ebuild 1682 BLAKE2B 7a7a1851e0b5c7de0c211592bc80bdfff9045fdca7608f268ed682f8653f4b0fcf88ef757d38f7a9ea10e7f2956abe64abf6bb705b1705155fd6a57e9c68f6b3 SHA512 fc014d59ab8d05ec967a562ae35d75a2e37d8f85b45d2c0053c08682608161830318ebf62a892f4359b81bb8618cd77459626adc3a441aa6d45b681cb85fa9bc
 EBUILD sprockets-3.7.2.ebuild 1664 BLAKE2B 8281c517276e6e2535700784ffce12701b799fe2870b429fbba995155272da13bd97e310487c57636c036601694ddb2c731f95bdd2cc60ce548264593d2650a1 SHA512 e7abb4c060749720a0e1c6052118a2433d564aff59a9dc36c0ec5f61d3dad784186a08921f1637998150e5b4af9396a9d74c868ec42949deee952ae8dd5d3d45
-EBUILD sprockets-4.0.2.ebuild 2067 BLAKE2B 47949a678b8c533c4e6f06ba4a1b55186e1a8c1afbbf15a2d98cb990b5823b532e229da5baae04958cb34f277884754c7864250a94fb1772514b410bec9ccea4 SHA512 7981dc0a0ae138af2e0b609f1c401ca901a8f6a8a564635abbe88e0d9f06255f8786f9fcfe8614ed157919838ef545fbb720283025ba260d59cc1c93414bcb2f
+EBUILD sprockets-4.0.2.ebuild 2066 BLAKE2B 2261f3a1244301d065b2181fb21b003e7ded09e2edaf8efc0d48b81530865139a4aed818efec2c305d6d8d497947e6bc948323ee25fbe556e5b4ef659c6b38d5 SHA512 521bd8c022a4e6333c5c16dd3d5040c3c920db120fd2d4d07263babd3163c13cf2902f62222df47e1688d07ed9d6e73d00f98fdabd68a65c31d5eaf63928776d
 MISC metadata.xml 341 BLAKE2B b649927de729737d95d006cd0f45484827a9628ca6cdf92589986b371059bc424f9888a5c727396b7aabc0326e94cbbbf0cc49d60c8e4c8ff09f44dafdae89df SHA512 4339a35e1af44e24e5b447c3a331e79609c0ece1b9a1a54a1e23a3c40eca5d4f0b3d788e965f102115565c45a9aaf3c59d8b1997c61bf584d1c3545f1e9fd55a
diff --git a/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild b/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild
new file mode 100644
index 000000000000..0b2f62510c15
--- /dev/null
+++ b/dev-ruby/sprockets/sprockets-3.7.2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="sprockets.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem versionator
+
+DESCRIPTION="Ruby library for compiling and serving web assets"
+HOMEPAGE="https://github.com/rails/sprockets"
+SRC_URI="https://github.com/rails/sprockets/archive/v${PV}.tar.gz -> ${P}-git.tgz"
+
+LICENSE="MIT"
+SLOT="$(get_version_component_range 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~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
+	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*"
+
+ruby_add_bdepend "test? (
+		dev-ruby/json
+		dev-ruby/rack-test
+		=dev-ruby/coffee-script-2*
+		=dev-ruby/execjs-2*
+		=dev-ruby/sass-3* >=dev-ruby/sass-3.1
+		dev-ruby/uglifier
+	)"
+
+all_ruby_prepare() {
+	# Avoid tests for template types that we currently don't package:
+	# eco and ejs.
+	sed -i -e '/eco templates/,/end/ s:^:#:' \
+		-e '/ejs templates/,/end/ s:^:#:' test/test_environment.rb || die
+	sed -i -e '/.ejs/ s:^:#:' test/test_asset.rb || die
+	rm -f test/test_require.rb test/test_{closure,eco,ejs,yui}_{compressor,processor}.rb || die
+	sed -i -e "/bundler/d" Rakefile || die
+}
+
+each_ruby_prepare() {
+	sed -i -e "s:ruby:${RUBY}:" test/test_sprocketize.rb || die
+}
+
+each_ruby_test() {
+	# Make sure we have completely separate copies. Hardlinks won't work
+	# for this test suite.
+	cp -R test test-new || die
+	rm -rf test || die
+	mv test-new test || die
+
+	each_fakegem_test
+}
diff --git a/dev-ruby/sprockets/sprockets-4.0.2.ebuild b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
index cbef97b50292..5d9da86eb6a4 100644
--- a/dev-ruby/sprockets/sprockets-4.0.2.ebuild
+++ b/dev-ruby/sprockets/sprockets-4.0.2.ebuild
@@ -23,7 +23,7 @@ IUSE=""
 ruby_add_rdepend "
 	dev-ruby/concurrent-ruby:1
 	>=dev-ruby/rack-1:* <dev-ruby/rack-3:*
-	!!<dev-ruby/sprockets-3.7.2-r1:3"
+	!<dev-ruby/sprockets-3.7.2-r1:3"
 
 ruby_add_bdepend "test? (
 		dev-ruby/json
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index 26ac21d35a4f..8e2f969e0e71 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,9 +1,11 @@
 DIST webmock-3.11.0.gem 125440 BLAKE2B 8c57ca5b49922a61590595cdeeb5d3306edb3be616fd8e5c68617838831537f2106664201580f645de58322f11e684dfc8404d91139eaead5810c0cb40d5dc1f SHA512 dda7318d32dd88dcd4bc1fee9d1f4644f272348b532cbb59afde2e6a1fc42f359125b28d605ff1a18edac4ed71c00aceb1c67a364c15cfa56092e226588b449c
 DIST webmock-3.11.2.gem 125440 BLAKE2B a0a3bd2294ccfd5a360736edbd70fcb3a2734048dca933798502f07583f8b08a0d5aa5e25d4b0e262ada82e0bf9d1fccc28b932e0648180922db402a84f6f101 SHA512 757e2c19853b7e7a934cc308970ec4a2174df3592ed1eb1e1b7e1fce9cfb99720d826bad069f821d8271a7b5b04ec4f30009d124ae86b2a93604c1bc24f9f65d
+DIST webmock-3.11.3.gem 125952 BLAKE2B 664253079457cdf400be869b9e61092b12872282057540e42e6fb73a5fbaa38666757f7f8bd336e4f5c45ea1ec52f9af4b444ba67ae24db62a75b5c18636ae08 SHA512 80fd2139126e1e9d6907dfe93021d77179ae6c31cc2a63eb3ee47c011c2a48f18bb84ac08322da8def014f2293564f5669eb41037edbe72ffccfefb7ea281739
 DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
 DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
 EBUILD webmock-3.11.0.ebuild 2065 BLAKE2B 4e57a1a85b7d559719b0d21d72c7971e30765b7bb289f93991a6a5c6b87b8a03f6004099395ccf1b3b1cf19096f76bcb5f0a3edb417b057b874aa870beba60e1 SHA512 3fd8316bea269e5898db3beb2a57bcf5b15c6647f60ca448e5f5da91b511224118c9ba2c7bf83b9fdd60dba34db1a121d7a63b8cf0694bf53e3ea1484403fbe8
 EBUILD webmock-3.11.2.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
+EBUILD webmock-3.11.3.ebuild 2221 BLAKE2B b5426673d3d7a104adaa980026361e59a43befc5a89ce4c09eff1b6f9415789952b50e625543db2015d7321fca570804911924fee5e00fbc714bd6741f748a4c SHA512 43b599a71cc5b1286031a69e81ed6f3f8c07b8fd22d93c81df9e32b068fde91f525c9305365e7c89a8e0c890e1e60edbde9d5e4d70d507ea6359fb95994533bd
 EBUILD webmock-3.7.6.ebuild 2059 BLAKE2B 21417ac451a0b70df72a05a8848c8ddf7a2f0f939eb498a5d71f91dd3f2bcd065f15d3ea8ed047c64b70c421562b337054a5388d96d497f52a1b684b58417ca9 SHA512 6b94a52934ada134df94b263fd8fdc9a3ea1388c742a11c2eee24e011fce9f99e86436745d56a646a0e3fb925006f7048a889e2cf82b47ebe39b2d505763b897
 EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.11.3.ebuild b/dev-ruby/webmock/webmock-3.11.3.ebuild
new file mode 100644
index 000000000000..0b2512f21dfb
--- /dev/null
+++ b/dev-ruby/webmock/webmock-3.11.3.ebuild
@@ -0,0 +1,69 @@
+# 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/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 93c8b340153b..38267f454742 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,3 +1,4 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
 EBUILD webrobots-0.1.2-r1.ebuild 947 BLAKE2B c250be6eeb9011cfb3c3d51f1bb441b5cb68da78e414d1501cbab79a08ede2a320223a17162e37ced814118030d750354e366554675064d61a4b05196db50952 SHA512 c31c9bae02cf589bb86e205967dd2cb84526ff880ac596668d68ca289ca8a30df206172ac8941e025b27949b7b1f025248c2c168269a496299a06bb348eacb2b
+EBUILD webrobots-0.1.2-r2.ebuild 910 BLAKE2B fe4399837756c04d4d637967dc49fee807d08d3aa124b654efed54be71cdabb2df49baa7a6a37565ad3608e9fdc80843daa3b47d13b5694b63e559e77b51d10d SHA512 500148101f51d6a5bd1b536894772b7aa0b3e0108400d6ad3a8349c9307fc41c935014d6a9d5e2e4e919220809c53b1d3dbbfcdce168d5bde83fc490c8518136
 MISC metadata.xml 380 BLAKE2B 9be818846cc0906eb21d32c72ed1c129d65e10133d8303535c65b942ec24dfba85f422186b754d42dedc9a0a0cb5bd7c28b9099f17543b007f012aec123fbb90 SHA512 0c68a9a014ac9459f1ed9639517189109e50cd101e8bc7c21ed2a3631e22ee7a7fc31c7f4518463170a63d710cb4b1e03a1bffa1275ca8e6629afe89cfa31b44
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
new file mode 100644
index 000000000000..0a5a75709837
--- /dev/null
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
@@ -0,0 +1,33 @@
+# 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_DOCDIR="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library to help write robots.txt compliant web robots"
+HOMEPAGE="https://github.com/knu/webrobots"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
+
+ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock dev-ruby/vcr )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
+
+	# Avoid tests for live websites requirering a network connection.
+	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_*.rb
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-03-03 10:28:17 +0000
commit	d99093fb4bb5652015c06274d64083daa2439e4f (patch)
tree	cf61513204d97974179580065e85df5c8009087c /dev-ruby
parent	463397cf1e064185110fe57c568d73f99a06f5d1 (diff)