gentoo resync : 23.09.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-09-23 10:22:15 +0100
commit: 8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree: 230f3135ceaace633cf93e9838b185c4a6664c2e /dev-ruby
parent: 9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)
98 files changed, 358 insertions, 892 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 7aa72e84011f..1e4af516e645 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/acme-client/Manifest b/dev-ruby/acme-client/Manifest
index a584bdd25d0a..3869e093e9c9 100644
--- a/dev-ruby/acme-client/Manifest
+++ b/dev-ruby/acme-client/Manifest
@@ -1,7 +1,5 @@
-DIST acme-client-2.0.4.tar.gz 206295 BLAKE2B 5758a940e91036de04183ace9d076649cce220e18c92abbbf683026fd4fc1d05b3d2c735553648daac0f57f5e4c5c865679607d38f663af7623bd60fac99eff1 SHA512 3e8998ddedc69c6d2a15927be278ef055d1be0fe906c499504ecba811189e5ebbd9c1f54df8692bc0135766dfc8cfbd80f27ee345eab8bcd0126fac62be33742
-DIST acme-client-2.0.5.tar.gz 162456 BLAKE2B e01ffd790f404e0ac7a5fe42ef6d4819387dc810bb5c6856e51810b125f5020c3790003eb99e9560ab1618d7d3a420b63e4c1de9cc98e97a4a742ade6bfde54f SHA512 f2f59f2536a5de918147c3b26285c9498eaf082f67d8e3c96036b61a05e3c265a37d7e23f91c03ef7a02ca99bcfec755bc0a9e2bf766ee7b6ffaae1ad1b7c4ab
 DIST acme-client-2.0.6.tar.gz 162500 BLAKE2B a32b2d0361d202a6a799e5ed61eb310ec51971a7a7e3e5747c0ca37a597114d1964cf336d053277cc45ae91640c706e39a1e70d5dfe77abea5bddd1055c5a0b8 SHA512 aeb2102971f4d09b07f7b9a793ce9a5e35bed77fa50f3c74558e85a81023e6ebe6317e56f5297e8b26fdaedfdb95041b73240a812d849828fdd99c4dc93684de
-EBUILD acme-client-2.0.4.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
-EBUILD acme-client-2.0.5.ebuild 961 BLAKE2B 28f1105c3dac42d7685b06b1f2be9f3df32e6d1c1f870e42127ed05424b5ba21c5d3733c59096c80d70a8be272900dbad72439afc842ec3587b670a2a35bbfd2 SHA512 4f22950365f0af89a798eaacef9abf4861390f149c93597979e1ec3ca5fd103ab2a36d0c958dc86815fb2d350c3a5f557590d6f9adebe553c4d373364503e6a9
+DIST acme-client-2.0.7.tar.gz 177325 BLAKE2B 607de0c4512f4f369ea3725e8a4116082bfa6b069121c9a5af0cf893cabefc9eb0c05a581d3773f8e8d5023b5a250956b5d596c2c11bab116f75e3e35d96ac78 SHA512 1c77c3380e861976e7e3d1d05d5642fa9bd2275182a41a7de6645b07a61a4055b00cbc6723d633e939458754dbee88802793ad7de80163df9e713996c4e5b378
 EBUILD acme-client-2.0.6.ebuild 968 BLAKE2B 43870427ec3f23e90cb6c69e16baac817641c2860a0930accf3aa21a21075ae4722927002ce94ef8a7d890a458c62a0473b2fdd7887ac944f10d688ff47ef2f8 SHA512 c3b0ca3f9056f2fbc8d924acf2dc3d33d468a18c30a36eb97d097c38462b381178187d61a8f60c04d09df42e2235ef69339441f65d9c93d1e1549b6ddee764ad
+EBUILD acme-client-2.0.7.ebuild 809 BLAKE2B 60fae8740790a7bd14968a03b6c9a65de09c0a45b3d56c8e691eb037f1ffe2176dbf98db555fc76febcc705e3e6c34ad23411ff24164b6e4d0627b9bb9599740 SHA512 9daa30d72fb8ea3e157b1416667402cfe648b9879a32685950f2d2ecd9f22220782886d701bf79e4c32e7bc9e6f52616d9c4cbe39bb2f658d903c13720a5ccf9
 MISC metadata.xml 450 BLAKE2B 981b78d9bd544a21e79ee4cb05bcca1fa3d1c1b85191280a0dc6479c02b34b59fdaff4b07c6e1a30c0dde292374c1b11c69eb781fbe4ef0ab7e0b7bc9bfc1c59 SHA512 eef055abe907321efdcc317ccdb7613ce860e9e41cbf2eac0bde436ca41f6470de49400f837bd0bea0f98ce115ab27938acf95c926d18d1f80b415dd97cbefb5
diff --git a/dev-ruby/acme-client/acme-client-2.0.5.ebuild b/dev-ruby/acme-client/acme-client-2.0.5.ebuild
deleted file mode 100644
index 24a1c78f83c9..000000000000
--- a/dev-ruby/acme-client/acme-client-2.0.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_GEMSPEC="acme-client.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby client for the letsencrypt's ACME protocol."
-HOMEPAGE="https://github.com/unixcharles/acme-client"
-SRC_URI="https://github.com/unixcharles/acme-client/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/vcr-2.9.3
-	dev-ruby/webmock
-)"
-
-all_ruby_prepare() {
-	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
-	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
-
-	# Avoid dependency on git
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/acme-client/acme-client-2.0.4.ebuild b/dev-ruby/acme-client/acme-client-2.0.7.ebuild
index 24a1c78f83c9..0ab0d2e5eb9a 100644
--- a/dev-ruby/acme-client/acme-client-2.0.4.ebuild
+++ b/dev-ruby/acme-client/acme-client-2.0.7.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_BINWRAP=""
 
@@ -23,17 +23,14 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/faraday-0.9.1:0"
+ruby_add_rdepend "|| ( dev-ruby/faraday:1 >=dev-ruby/faraday-0.17:0 )"
 
 ruby_add_bdepend "test? (
 	>=dev-ruby/vcr-2.9.3
-	dev-ruby/webmock
+	>=dev-ruby/webmock-3.8:3
 )"
 
 all_ruby_prepare() {
-	# Skip failing test where incorrect der value is retrieved, may be openssl 1.1.x related.
-	sed -i -e '/assigns the public key/apending' spec/certificate_request_spec.rb || die
-
 	# Avoid dependency on git
 	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
diff --git a/dev-ruby/actionpack-action_caching/Manifest b/dev-ruby/actionpack-action_caching/Manifest
index 5e5ba642a44b..ce2acd8b4f45 100644
--- a/dev-ruby/actionpack-action_caching/Manifest
+++ b/dev-ruby/actionpack-action_caching/Manifest
@@ -1,3 +1,3 @@
 DIST actionpack-action_caching-1.2.1.gem 16384 BLAKE2B 5bda3597a10bdba21fcaf6f2a854832b79c7bec4791f5ca736e3ebcc266ee1d604b932b653df592892a6c59969bb7e405f55e5ac59400762da23a1392e1e7e5a SHA512 340a0159596fbc36706cef2dd11a542353cbd2b3f5941e005e5e8e2a2bcadbdfbaa000e79db1aa6b438c9e9f2d21c125071c40e2e46b2d30c876490553b386a4
-EBUILD actionpack-action_caching-1.2.1.ebuild 771 BLAKE2B 0171cc97f4bd197b1d2b68ccd379dfa55bb92c2370bcade15ea6bfd3ba0ce7199f7e41dcfa82a10f71a32752a9781101bd7f7b811b353beed8fcb5624f918652 SHA512 934acd4226e45c09b95f1e86470eff8b39e46905f16727d05f32fd8ee34831d1c4f03e2e29971a70a588173a23d1d4f67db1f4f226068f22dd63d27d80587d11
+EBUILD actionpack-action_caching-1.2.1.ebuild 771 BLAKE2B 2017092c23f9c3a5f25b549743c9a1a4b752241e7160eebf7389174254e213ad1797336ef388cffc2dbc590f17b9c74d7c210cb0bea76879474caf0d07259cce SHA512 77166292cf986698463ae445e0643283cd15c4c40a0798555540f07bc19bb07951e99cc7ad08c00217fdd67da5dad6369ce063e8f86d0140867974f848080bce
 MISC metadata.xml 347 BLAKE2B 885ca968041ad39c80688816503b1eb3921c0e0fc578cadef525c31885ff575774c8e86edae38fa0954b9989e5fccf585f25e524c740d730fc9f4c9fea43e308 SHA512 e34065996ea03c85599296773c940adfd1b19f6b67f2f87caec145f9c5ceeb849d86d1a037b76a547747abe90ed0d76b3d7b9bc18eb388fef1848ad4b3c4c47b
diff --git a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
index 14bce484fa62..3b747d08b775 100644
--- a/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
+++ b/dev-ruby/actionpack-action_caching/actionpack-action_caching-1.2.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 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_TASK_DOC=""
 
diff --git a/dev-ruby/actiontext/Manifest b/dev-ruby/actiontext/Manifest
index cf7e6965cc06..fef2c471bda0 100644
--- a/dev-ruby/actiontext/Manifest
+++ b/dev-ruby/actiontext/Manifest
@@ -1,5 +1,5 @@
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
 EBUILD actiontext-6.0.3.2.ebuild 1632 BLAKE2B 44123592c0926e9d0b5d55bf9219c7770eeb4f4261a62b5ae138b21f351694204ee46e53c4875342475d45edba1d2a5561308b94df3175cf31b3f1433ee593ec SHA512 3488b55a41431d365ccfc6aeb2715effc81ddf0981cdb5d8989f22e2dd8ccbe6c21bb8fb15624e56a8d452bbc82b37f143184e2cd1cfd2d7090b59c838ad6cf4
-EBUILD actiontext-6.0.3.3.ebuild 1642 BLAKE2B c6d75fd93ea23b5c85fc64c39f1cdb8376ad23a703c8f56b07bbee10caadb819b759bdf08ef6ed47c49b551ae16ac8503f570c6d6251140e2996e8dead9e9aad SHA512 4804d398c10fcf4e9ee4698c55daecd5c58e940211589c68d0c4a2d008b83329878edf6872115bc480200b2ac9b277c782bfb7e0ff9e9c894f944bf093443235
+EBUILD actiontext-6.0.3.3.ebuild 1652 BLAKE2B bebaa44dd837ad2ec43f67f37960ff250856253d928f0b5ac2943bd58757a249378c082bd83785a1228cba51f1699624adbc0681dde11b4003eceebe5257fec6 SHA512 f6b177b8193cf608643e619f0c5373b971ef287d85a66ecf2c8e4180cd0664a8452343afc6e07d61488ff4dbe2f135fd56f7653c45980706cb5ac0e97fb47e59
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild b/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild
index 49794bec3489..a228d2e2d075 100644
--- a/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild
+++ b/dev-ruby/actiontext/actiontext-6.0.3.3.ebuild
@@ -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 -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\)/ 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\|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
 	rm ../Gemfile.lock || die
diff --git a/dev-ruby/activeldap/Manifest b/dev-ruby/activeldap/Manifest
index 55df9005959b..bcba3e3febfd 100644
--- a/dev-ruby/activeldap/Manifest
+++ b/dev-ruby/activeldap/Manifest
@@ -1,11 +1,7 @@
 DIST activeldap-5.2.4.gem 226304 BLAKE2B f13b5a1cf423b44087d55d3a4957be1444d598ab1d1bd7d83ee545a2806b77b47124edcb326fc567eb06e866c62a2ad0c3dafd903232588f824bc2978c197d60 SHA512 da37cfa20c8be7151669ba3b409994c668b037a2f318b1b034f6fa9c0e56a9a778b03a26415cbd98c8ba3fa1d487d42343bc0532665c1037880e75474a1c708f
-DIST activeldap-6.0.0.gem 226304 BLAKE2B ea200a672e1d77cb2eeca343479d39652441403737db9e1fbed14e594749cf33e00e8ca98ffaaa5f473e683faacc2f8d0b046b1ecb3dedf04efa7a23379f7439 SHA512 8b3ce2356612be4093210391102fb5fea51ba9e33ed9ee8281445d8bd13574af88cffbd35122b8cca69ea6799dd31be8fb2f2086f6ed773078b877a4c2ac163d
-DIST activeldap-6.0.1.gem 226304 BLAKE2B e61ab86d1a39313f3f34debfde47e4499579273b666ceafc51e3a62cb73293d31a124dbf821428ac33437ca8e604bb4f4c1e1e43b8be58b9a67a73872b6634b8 SHA512 baf3ae0975348f94b00186a6c8569aa9371ae28f5a53654f18da9e6eb8eb50750730c1813c45318148eefa0a37fdb06d27efe13293ab4386637e0fbc1906334a
 DIST activeldap-6.0.2.gem 226304 BLAKE2B 513ee26d37292ede2142561d36039747df7d50211151776c14d140fe565adcb3a6005c0923ca3a6d65befa72f91a7e9eff19fa1e1cf35c95111285f5d37de264 SHA512 817a394f3715c53b3ad67fa063c96d0974855be3547daf378064559fc690a0471322a8869fa7d6110661813da50a150c54f8a3b69d3a64d00e64d48ad7125788
 DIST activeldap-6.0.3.gem 227328 BLAKE2B 71819172fcf792631cd958c7329ac1581ae7c3887dc71b76efa9836d2a39e7bac4d4d4dd80c15760f0ed13afc0ee66eecb8546470cf45c7ba45203f94f620b7d SHA512 6b7148d23f2841bf614ac9d853e1bf18f50f2512efcd2397b10c07c30d3418b910717aba3fcfdc4ff67fadbbbd5d29b2ba4261fc126d8498e66e389fce13db3b
 EBUILD activeldap-5.2.4.ebuild 840 BLAKE2B d51d1ab0a92be710711fe64920b1eb8fa02f7a984d0180199fbf977560a90eb542d2d5be5439e2204eef3d8928aead03686b3c774e11f7032f11d41473781fef SHA512 8c1283dc9484998ba2dbdab269849c63450bf324c421e9488c57464ce49504cd0f7685f9f5d458880e108274e36a5390eacd1aa5f8a2ddfbd7b0c7734dab43ba
-EBUILD activeldap-6.0.0.ebuild 836 BLAKE2B 061120646c38ffffc666a240e8d3743b94b0c7ad8a07f8fa98dd1a9619e5f09ff97b38f0d36a8511d935ed32c32f4d9be93920c06a447b501fbea7c1ff193d31 SHA512 adcdaa65b6b8ee0b3e8e040f5698a300634c3feba765c778afd1290784ec05934bf7586d449a68c6e1174996e02ee80de827a19d8dc95845e9e5eed95a9a0554
-EBUILD activeldap-6.0.1.ebuild 836 BLAKE2B 061120646c38ffffc666a240e8d3743b94b0c7ad8a07f8fa98dd1a9619e5f09ff97b38f0d36a8511d935ed32c32f4d9be93920c06a447b501fbea7c1ff193d31 SHA512 adcdaa65b6b8ee0b3e8e040f5698a300634c3feba765c778afd1290784ec05934bf7586d449a68c6e1174996e02ee80de827a19d8dc95845e9e5eed95a9a0554
 EBUILD activeldap-6.0.2.ebuild 837 BLAKE2B 273997529dd4431e4a3dbdff828dd7cd514e0742ffada2154179f91b6e6dd1a03a32e4aa0522961c191d2103d12c257090dd28d7e32f3873824f530eb8b507e0 SHA512 abbd47353d894556b0eb49a69dc15125e748901cc0cd6466a8b5d927a28021c82de13c17915c2f90381e748a6b08941bb74709ca2f4b62afe8fab5185b62ae7c
 EBUILD activeldap-6.0.3.ebuild 830 BLAKE2B 51be55b0dd4596bdab3c800b1295ab6cdcce64d4a3ed01af9f9de473bde7269602241c4fad144798db39f67f22e87fbf12dcdc4fe333a5e8470b7b34c8bc7710 SHA512 aaa3a0cd8e9778df1ef25b6bc68a0fa654f39c257cc56c92d8c046305705648061b9d2ee7d4dd3939ea93db5bb098b3fa57d8b0b08640beca8bfb376058b190f
 MISC metadata.xml 347 BLAKE2B 14d83abbee66dd0fac29431f2e219444dc61b0a27861dfb3eae63a245fec285627ec788f4da897dadf81f3cf2d94406121c565a3c29121400498d1f96ba7fe17 SHA512 642b21533d2c7665de55d54190762be8b6c295060ad0d20ce2a65b81d86cdd3156571470189acdc142b4f54d7b7eb60e4e7e2be8d3534f220c299f8cf3c1f555
diff --git a/dev-ruby/activeldap/activeldap-6.0.0.ebuild b/dev-ruby/activeldap/activeldap-6.0.0.ebuild
deleted file mode 100644
index f83f8e45f9f7..000000000000
--- a/dev-ruby/activeldap/activeldap-6.0.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>dev-ruby/activemodel-4.2.0:*
-	dev-ruby/builder
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-	dodoc -r examples
-}
diff --git a/dev-ruby/activeldap/activeldap-6.0.1.ebuild b/dev-ruby/activeldap/activeldap-6.0.1.ebuild
deleted file mode 100644
index f83f8e45f9f7..000000000000
--- a/dev-ruby/activeldap/activeldap-6.0.1.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="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="TODO doc/text/*"
-RUBY_FAKEGEM_EXTRAINSTALL="po"
-
-inherit ruby-fakegem
-
-MY_P="${P/ruby-/}"
-DESCRIPTION="ActiveLDAP provides an activerecord inspired object oriented interface to LDAP"
-HOMEPAGE="https://github.com/activeldap/activeldap"
-
-LICENSE="GPL-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
-IUSE=""
-
-# Most tests require a live LDAP server to run.
-RESTRICT="test"
-
-ruby_add_rdepend "
-	>dev-ruby/activemodel-4.2.0:*
-	dev-ruby/builder
-	dev-ruby/locale
-	dev-ruby/ruby-gettext
-	dev-ruby/gettext_i18n_rails
-	|| ( dev-ruby/ruby-net-ldap >=dev-ruby/ruby-ldap-0.8.2 )"
-
-all_ruby_install() {
-	all_fakegem_install
-
-	dodoc doc/text/*
-	dodoc -r examples
-}
diff --git a/dev-ruby/activerecord/Manifest b/dev-ruby/activerecord/Manifest
index 1c0d4a4bf209..3f0ffa1f02b7 100644
--- a/dev-ruby/activerecord/Manifest
+++ b/dev-ruby/activerecord/Manifest
@@ -2,8 +2,8 @@ DIST rails-5.2.4.3.tgz 8824955 BLAKE2B 7db1bdda581e345713b796152c68e13911076c0af
 DIST rails-5.2.4.4.tgz 8825200 BLAKE2B e56f828f46ef72a2ec59006f37410aa53ca33730452d74d8deefc3975a24940500a48864c18523fad1141e025192b8bfc0c050abc04a01a88333fc825640d4b9 SHA512 6ea50009f769e2e2e6df6cd31fb10e8a770c61f28496432cb7a30265f9064fa8e61c8a0c2569fa056baf31d273ab25cc8c9bd02523214a35e3bbd94e4db293e5
 DIST rails-6.0.3.2.tgz 18568792 BLAKE2B 574d4b7da1bf0ff308ca1a64369c16e29396c8faddf741bc0f2b7d0c0761e440d64dade6ef67ba4923045c7eab1cd0689d45b6b26f3e3077020157a2b29fb17f SHA512 ea019bef7facc1b8b0d2f181da45d70456a895f2d57eb2410e4a06ba7bea0165dacc0f15fe5080150e4b4ef3c81dacee70b200468232da857fdf60def85b5aec
 DIST rails-6.0.3.3.tgz 18569231 BLAKE2B 6e3e90433d655768a8d4da7824178e61bfeeb4645ae77f5e50c0e4859bcbad1f9cbc9391d3ab78ca15be096372abae1085e3e68ea9065cb76ec3c8fa0b12f50b SHA512 750a66613dce04058bb787479be2794b5e20879170640862d1ae3ac12faf3e2b6d7e9b536bdd1e94a2f4934f759228179c4e6f21dfccf6d7461fce9d9bd13892
-EBUILD activerecord-5.2.4.3.ebuild 2980 BLAKE2B c4942f74b7d161c71e42ca4bcc9704c9bcb6893f7e85c95fddee345d15026796de48da0f5a169f6b29d0fbb38c2c99a6463d3012fa0040260257617c53e6bb53 SHA512 72cf8132feabee80fa1819d0dd8ad0d8676a6743611a9171b4ae919a274143329feb2e2a3bec80cc23cef1f55f102507235cd0cd7d07525848760fd0641a8a3d
-EBUILD activerecord-5.2.4.4.ebuild 2980 BLAKE2B c4942f74b7d161c71e42ca4bcc9704c9bcb6893f7e85c95fddee345d15026796de48da0f5a169f6b29d0fbb38c2c99a6463d3012fa0040260257617c53e6bb53 SHA512 72cf8132feabee80fa1819d0dd8ad0d8676a6743611a9171b4ae919a274143329feb2e2a3bec80cc23cef1f55f102507235cd0cd7d07525848760fd0641a8a3d
-EBUILD activerecord-6.0.3.2.ebuild 3097 BLAKE2B 1acbfcf414f8bb99beac8eeb2341332cc6fbf1ebf489813c98be5fe580223e007df35287de15f2e7f633b5bb0f7faab82160c1bff658f142d7a49eb251e01a6d SHA512 00dd3caa9543df95629c80a9d30ab84b3843ab4d7fa9952b5e0f3af69660663f396d176995e5a439f8ff0c74d2262452068438a2f5f4c75006ec5e6c75e8361c
-EBUILD activerecord-6.0.3.3.ebuild 3097 BLAKE2B 1acbfcf414f8bb99beac8eeb2341332cc6fbf1ebf489813c98be5fe580223e007df35287de15f2e7f633b5bb0f7faab82160c1bff658f142d7a49eb251e01a6d SHA512 00dd3caa9543df95629c80a9d30ab84b3843ab4d7fa9952b5e0f3af69660663f396d176995e5a439f8ff0c74d2262452068438a2f5f4c75006ec5e6c75e8361c
+EBUILD activerecord-5.2.4.3.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
+EBUILD activerecord-5.2.4.4.ebuild 2953 BLAKE2B b639e12fb2c32c68d24d9d998896a4c3027700f52a25ebf13e712bf90a5006464d2772c65a6ee0df1375ba4ccfd1e87662020015a93dc6ca86560aeca56a489f SHA512 05ca145d46752de84124f2e1dd473f35101f28ca46814a4d87b29813c0d5185485fbdf53ab205a482e54e3245029e5357e9340c6090a4b515d979a4d59a41bf0
+EBUILD activerecord-6.0.3.2.ebuild 3062 BLAKE2B ad2c2551146105a6c5be57f2c8251b3ecf2dcf55ae840594162fda4b8b3c1e9ed31261eeb746ed8deb1c34d65a68de1e62db49af35d4ace0c58323bf3840185e SHA512 f295e6d943c4c03696ff29dfa52edef7a88dddc5447741724bd35a1479d58dd099a916f9834ee936b20551fa7e44fc484ac14637f8348a6458ed798e75f23d02
+EBUILD activerecord-6.0.3.3.ebuild 3062 BLAKE2B 10a2bd53e4ac5910695b27e9f6cb63adaa5964ce68337aa08d812c2a5e3ac582548fc2ebcdc75bcb18dac9e4a4db98a320b36f3c03c3e343f8cb15c8eec40d96 SHA512 9602513ec7f136e965aa23aca87f19f68c3db6af9d0fe26f2527701011459f5938b0efee7d4b107ff0a2ef1361b704ff71c4eeb17023e43797da8b383388c58f
 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
index ade4146d39dc..3106a4c59f2d 100644
--- a/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.2.4.3.ebuild
@@ -31,7 +31,7 @@ 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 dev-ruby/mysql2:0.4 ) )
+	mysql? ( dev-ruby/mysql2:0.5 )
 	postgres? ( >=dev-ruby/pg-0.18.0:* )"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild b/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild
index ade4146d39dc..3106a4c59f2d 100644
--- a/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild
+++ b/dev-ruby/activerecord/activerecord-5.2.4.4.ebuild
@@ -31,7 +31,7 @@ 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 dev-ruby/mysql2:0.4 ) )
+	mysql? ( dev-ruby/mysql2:0.5 )
 	postgres? ( >=dev-ruby/pg-0.18.0:* )"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild
index 952512d4e312..9080f8111e8c 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.2.ebuild
@@ -30,7 +30,7 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
+	mysql? ( dev-ruby/mysql2:0.5 )
 	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild b/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild
index 952512d4e312..1194b35b4808 100644
--- a/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild
+++ b/dev-ruby/activerecord/activerecord-6.0.3.3.ebuild
@@ -30,14 +30,14 @@ RUBY_S="rails-${PV}/${PN}"
 ruby_add_rdepend "~dev-ruby/activesupport-${PV}
 	~dev-ruby/activemodel-${PV}
 	sqlite? ( >=dev-ruby/sqlite3-1.4 )
-	mysql? ( || ( dev-ruby/mysql2:0.5 >=dev-ruby/mysql2-0.4.4:0.4 ) )
+	mysql? ( dev-ruby/mysql2:0.5 )
 	postgres? ( || ( dev-ruby/pg:1 >=dev-ruby/pg-0.18.0:0 ) )"
 
 ruby_add_bdepend "
 	test? (
 		dev-ruby/bundler
 		~dev-ruby/actionpack-${PV}
-		>=dev-ruby/sqlite3-1.3.6
+		>=dev-ruby/sqlite3-1.4.0
 		dev-ruby/mocha
 		dev-ruby/minitest:5
 	)"
diff --git a/dev-ruby/acts_as_list/Manifest b/dev-ruby/acts_as_list/Manifest
index 75a6992b6f00..7470ce6389f9 100644
--- a/dev-ruby/acts_as_list/Manifest
+++ b/dev-ruby/acts_as_list/Manifest
@@ -1,7 +1,3 @@
-DIST acts_as_list-0.9.19.gem 37376 BLAKE2B e676d970fecbf81df92193e62e3cd9880c3f3f7b03cfbdb7e9e3802aefe209f55d034a4e7e2b9ff09ed84ef7ba7fdbd3d625fe79d86ca1e826f7ebd90bd96e8e SHA512 890d396647c770df754abcde2ab69f022d6fbc2417a1672f41fec2e03e2db7ce2df08126efb757e18c7f0f2faa1230ffa49f099b94ee9035068d6c04c38c7476
-DIST acts_as_list-1.0.0.gem 38912 BLAKE2B b48b554590343271156c4e4275ed6f7c59ea03c4a0c9a88cf549e9cbaf2fe428957c704f4fe70729c027f87236b1b347e3ff37978a775028c940dadf99b0a872 SHA512 850ec3b148a0123e7393109987aab321b75567dae8be2445bf0b40e089bf07eaa121c09997ccf725ca947dff440c57186e43c30a7c82e229002d226109a1f59a
 DIST acts_as_list-1.0.1.gem 39424 BLAKE2B 278705cd57bf3fcf2d1d9e2f4ad8757c9842f768bc36470e5b9a2f52f0d695f4c7bbab71200dde8e1fb099840495ea5a6ad131d1a213b8389dce49e08240eb3a SHA512 15a0cd7e6c89ba6ed218c5e866b15c33ae64f5ed1587de67ec6ea20480fa622ec32f3131e714ff0d5196189a46d5d745ff5de026c451a485ebb735df73ef9ce5
-EBUILD acts_as_list-0.9.19.ebuild 917 BLAKE2B 598b03e8ef3b919257ec5eebd88b55f0617e5e725bc1570df01daab4fed7849688c158a467472b18a01a66300f68f9bfbbc11b7f6bd6f3aeec944c63485606e9 SHA512 ffa006cb6309fc50ef4a93dd183d24931d807429e7d649dcd7cf0a20711f3a2e6b0559c6c0a992c691ed127016c7517c77ad5231a11f9b569497b8dc4dc18d76
-EBUILD acts_as_list-1.0.0.ebuild 880 BLAKE2B 375d580d308f52522799ffd054a4bbecf106298fe6946961d4d99c274cc43534c54d41b9053ea6a27a10d9517cf1b2110f6aac85d3e809663bd5ff490abb0dc5 SHA512 fd1ac745c6f9d54213a2aa1a1521c8b9fc81b41725427a25a08d1f8dbd17cbf92beed678b95615735718076221baef0a5bf145c077e3a43edf1c6921013d98d9
 EBUILD acts_as_list-1.0.1.ebuild 897 BLAKE2B eb10282a70dc66d4dfe17f748d480076ad0a39d83ef4d0033ae35d30be1ec7e96fe092da7069d312d26381a7fdb0847756e10636057e4d3e1f54326c9c21f150 SHA512 61151c7c5a11e5361d30658e1b995ff7f7253278f7cdc5952c143241400d2c832179c0f41a7ca8596bb88f3ef016b054ed720b24a0316860e42cb564a542f38f
 MISC metadata.xml 347 BLAKE2B 11ae895c0930e176c32dcc84c734b89066c53adad8df298faebc5d0a27a7dd408d5c18d91dbd89ff1b4ab825b40253097a516c75a4f267fabf5c84a0d68cc3b1 SHA512 eb41ba6c7f23b2c30522692f730bc0c7e360faa577c0bb25b4c386c09f1274890475a537d1dba9ac214a39e05ff56bae6f5bf7e3eda5de163159961171883085
diff --git a/dev-ruby/acts_as_list/acts_as_list-0.9.19.ebuild b/dev-ruby/acts_as_list/acts_as_list-0.9.19.ebuild
deleted file mode 100644
index 8385e27ab64b..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-0.9.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-3:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/acts_as_list/acts_as_list-1.0.0.ebuild b/dev-ruby/acts_as_list/acts_as_list-1.0.0.ebuild
deleted file mode 100644
index 8c9eae97880a..000000000000
--- a/dev-ruby/acts_as_list/acts_as_list-1.0.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-fakegem
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-DESCRIPTION="Capabilities for sorting and reordering a number of objects in a list"
-HOMEPAGE="https://github.com/swanandp/acts_as_list"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86-macos"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activerecord-4.2:*"
-
-ruby_add_bdepend "
-	test? (
-		dev-ruby/test-unit:2
-		dev-ruby/activerecord[sqlite]
-	)"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/bundler/,/^end/ s:^:#:' test/helper.rb || die
-	sed -i -e '/git ls/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/github_changelog/,$ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/airbrussh/Manifest b/dev-ruby/airbrussh/Manifest
index 712f22f7587e..e6b210c0cf0a 100644
--- a/dev-ruby/airbrussh/Manifest
+++ b/dev-ruby/airbrussh/Manifest
@@ -1,7 +1,5 @@
-DIST airbrussh-1.3.3.tar.gz 1449872 BLAKE2B b5c19a61bb16d3b4c7379929894c3f58e0e0758ec79b590cae1eab1d8478195ce4959f9e2e026cdfd6a307ba006de54cd5982593f5041cdf0d03d47911619cda SHA512 e4f8a02f000ef26be4a121b16d8ab421c8f0de198e5407980116d1b5f0caa83a214112ec8b3bda00b09d72872f8b5d95a3207a3a157d7eda8fbc456a224a4796
 DIST airbrussh-1.3.4.tar.gz 1449949 BLAKE2B 26b7a408e5453554ff422d4da2f53a3fddc6f68ab652673445db24fa53ef52f0b8293d1701406a63d6b6323e5219c9cbc9880879e58e394b2a912b9a1dc22cce SHA512 8fbca27a115b5bc5e87ffaf3a0e91aabdf3e64b22b7192b5e6a38efe862a7ad6720447241eb85dc20a459f07054c298e8f71fcd80a1d461375a4136fab4db409
 DIST airbrussh-1.4.0.tar.gz 1450070 BLAKE2B 94f128cd25c5af48f17fa771c366d3cdf744dc4e7ccef23de583b1ed60ffe1640dd7d02d76fb78573936beb3412c277151b36a870ac3e11222c3135f34b0e140 SHA512 e3a5cb80365a963875e89d15fa2b4dc86985d6b5f13ecfa9baf9ad599b5780ef8ea2c2e4040bb35498a5ecd1c6becb081b3e917cfe082d2db63fd74ba54755b7
-EBUILD airbrussh-1.3.3.ebuild 865 BLAKE2B b482c6bec1ddaea50248784bd3da92831816233e84543e3c631a56b6417a5bf44d0fb3c1b71ec2d0615cc1ac43123bf8655d292068b003e088638ebb04d350ed SHA512 06df970320d26526272c06fdddb482eac2639bdc21c15c1922054f8e5580f5fbe955ff7dc03f2c913af66a5b3be26a4bdbd0e7cc53e47e0d8caee6a160e4c61b
 EBUILD airbrussh-1.3.4.ebuild 865 BLAKE2B 8affb973ef0539e6e626f65d6e4d1774ef880a913f53eceb86234eb5dfa654a50e211ba27fe599252b38c05d1bcc11ad49f9db4137684c97258c947b998bcb38 SHA512 f6359208830ad4b5baa9dd7d0f975a98089b7b5f9591d539ae2e684a55f6ccc44efda2991041540b48d6d44556fec10f3070b7edccdebff482a43530d99267a1
-EBUILD airbrussh-1.4.0.ebuild 873 BLAKE2B d3b5372a5769ebc560cbe54d0ad53adb75fc9ec89e07c2763aaa7f628a79da7cc8e3ae54b7cbbe92554207e335057feea000304ff6e7d417b5683f68d1148c92 SHA512 baacd7ba27e7addbbc85b0f33026fed17d222a1213b645976ebebf5b70a5e3c4a2fe8a457ca35c8b20064f62325d321af76d15d844d99205e84808d00d897eed
+EBUILD airbrussh-1.4.0.ebuild 889 BLAKE2B a2b6121b61bfd7a21e2c1942be0ed9cae00c8ff2a62ead036a7a00c7125ebfe46855ecefb9fd278b57b13e603d3a505e93fab81481b9d394e1d5fe95b11c195a SHA512 2a6280d45b3d9684d0bdc9369895bc7bb024a2c54e8cafc5aa9bae566276a64854f91960f18daa2043d4124afc7930af893c3b17c3c7d89f888e504fda9dca20
 MISC metadata.xml 395 BLAKE2B de7df6f620f49f99e10fb18c145f58369dc5cbb85b70a2c10fa05c8bb12fd8700ee5fc57fe1c695fe8be2625f82d7b96e1b9bfb24af23eb7776231c763ac64c3 SHA512 c969db304610c45088a5efac1e694bc7ccfcf0360631fa43fe10f48ea045f6c400ec6cf3faa97e153b95133a1d1e1ebc9fca48c1d3ea1b63f73bb33d5546bc28
diff --git a/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild b/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild
deleted file mode 100644
index 3f9afd070160..000000000000
--- a/dev-ruby/airbrussh/airbrussh-1.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="airbrussh.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A replacement log formatter for SSHKit"
-HOMEPAGE="https://github.com/mattbrictson/airbrussh"
-SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="amd64"
-IUSE=""
-
-ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
-
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	rm -f test/support/minitest_reporters.rb || die
-
-	# Avoid a test poluting the environment
-	sed -i -e '/test_color_is_can_be_forced_via_env/,/^  end/ s:^:#:' test/airbrussh/console_test.rb || die
-}
diff --git a/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
index fe3d447edd01..07c738f0bde5 100644
--- a/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
+++ b/dev-ruby/airbrussh/airbrussh-1.4.0.ebuild
@@ -16,12 +16,12 @@ SRC_URI="https://github.com/mattbrictson/airbrussh/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 ruby_add_rdepend ">dev-ruby/sshkit-1.7.0"
 
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/mocha )"
 
 all_ruby_prepare() {
 	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 47350a97e71e..a190bef9dbda 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,9 +1,7 @@
-DIST asciidoctor-diagram-1.5.18.tar.gz 11705290 BLAKE2B d5c1a6047af1a1a5c1b08ccb180dfa57057213df2f8a9ec8aef6608bc34501aa979cb30c2c8b196e0039be24d8c5ba9e81d902f603e9624402eaa7e93d800169 SHA512 f3341ffd0b9f7eb994b478ebb81f668a30fa338cf76cfba638032d5b80203b304776cee4d1f575270105af9b51dc6d0a80604e92e2ad54760dfa9b73ffa794cb
 DIST asciidoctor-diagram-1.5.19.tar.gz 11707367 BLAKE2B 2088d2a7b424b9a716204e607d6e4c3bb7521b2098caad131210c163ade6f8a07872793945829d6b1e6e88a9d04126738eb439c968e99f326baddc310b48de0e SHA512 14270c8ea0e63163e01171695ecb99f5ef9667e2ec50b26e56495a1fc2c0e8af97fc784f5decb8fc75f1830581a9bc658d699af6aeee52adc20adad82cb1aed9
-DIST asciidoctor-diagram-2.0.1.tar.gz 12026822 BLAKE2B 867d35415d4259533047bdec40ddd7984b62356fb8e84a2cc722188b64691098b598e58d7e6760df2609956b7bc2c8dfd314f742da83589c2f1e4c7909e86899 SHA512 01e77a6d8a278d5f79a039ece6c79f4e500ec4477231cdadd8e36c8935ce71118beb4f1ec6e691b208977ea14243db0e799b2ff5e2f1f6326ee13a321628393f
 DIST asciidoctor-diagram-2.0.2.tar.gz 12481283 BLAKE2B f0b12514a7b16f6ab8c3a072aa9550ecfe0c8139e8f9ec1ea660a805813f942530519e4d90357e9b28d5d0e6c48bb9aff5dc1d56bfbe1cb15095653a8311c62c SHA512 8a72ee61b7341c516d1d34610a7cd0cd6d0c8dbd4b970b79c3b313f1230a0cc79ff47fcf553c2de144bd3f1f922183f0236354651a255023ce14b04f17195ee7
-EBUILD asciidoctor-diagram-1.5.18.ebuild 987 BLAKE2B 96570c68b021a8336dbb44f25b4f6e904328d5cf884af51e69b91a6c5256c412696e1022a9afb13a77da629dcbc575d6ed08899b722a601f0838c8d44164b179 SHA512 a12c69cc0792446b8b25d7e4d4c74d8978a3779d121d5ebc0884a24f2d6e9fb1ecf0c0e29d43b767bf0f1ee98a4751131f905ae132e9c15e0f97bfbb103341e1
+DIST asciidoctor-diagram-2.0.3.tar.gz 12483731 BLAKE2B b907ff1747b440ddabe83ca9a562ed9ad7b4b04b07d18fe7d3214f0eea035d4a9b340a121c91a7a5d1f5dc9011d6e56958b784b229a571b6cd2d902205eeda13 SHA512 19bd0263b6d159685f1d0b7955f11428bcce9afd66157903cb797499652bfd587d41d0bd8493f7e97ccf3ee32cfdebcab10c4001b50a21060a890289573adbf1
 EBUILD asciidoctor-diagram-1.5.19.ebuild 961 BLAKE2B a150cfaf63fd872b605a7abd71d00d8acd6cdbe8b82b93bc35c38b6f12aabaec2c87f77e7ed2a9be06211e53cee4d653b8aa6d9f4c9ae6691daa958280c12d05 SHA512 0595efddc4c05fcea79b51e68cb496b1a6938f334d128b0c63e9ce8631e0be9c856d1b401800093aa25aa44188942e4f3ce41a57f99ad6b6b0e0e12afec9a23a
-EBUILD asciidoctor-diagram-2.0.1.ebuild 967 BLAKE2B 568eb8c788985f0a41b2d3ab86c30568dfc8100480ea0e5f71e61dd1b6577a0db8270c3266bc78bc08356503a8072cfaf9e360e56c5102198b0cb3ccc21e9a8a SHA512 34661cd053ddd1b121d4d14a60e63f6dd2016c85c6b6fcc799345fabd4fc4eb41e0bf205ccdef67b12ec9c94cd6c60355cee74db7f16dbae88285114473d603a
 EBUILD asciidoctor-diagram-2.0.2.ebuild 977 BLAKE2B 195fe0b6808774c5674e4d00cf8695fa6450a98420f2ceafe689fb59c7dae4da3d09e14c9a090c413996e0682481612534a650d0f7a5159fd777638ec6356588 SHA512 b8d4eff86649bfb97a28c43013dbb7cd7a9690dbc461fbc3a06f0a38fb5263e9e3cb4f3da284087096bb67fb4531a17ae106ea05485cebc7cab36ced910584a0
+EBUILD asciidoctor-diagram-2.0.3.ebuild 993 BLAKE2B 58d7b55ff1cea292bd569a6c785771f562f112d37ca4416266e3ce7709f1cddf8facbaf2173eb7b6b46723f0c0fc0471ebb5bfd5910a1c0702ddaa768a33ed02 SHA512 294339607556f38298a2319b55c74cd8e6ff4ac7bf5568809de92d3988c864be943d5f2fa54e24259317d296cea217e7a7ad91fc9651d6c97bcd40c6661d4052
 MISC metadata.xml 357 BLAKE2B 967e1f1518c38ff81d15df5b62943b278acf74a80938d488cca0d2489f268ba0d41ad74e78b7b53bc1fd4ed646880ed36defc9c110d5af3535970c364d8c923b SHA512 711af8ceb9724236076e02a077672296a835981c7a78e4f5f5976dc190b2df640d24933cc2d92e81f84e695f473d187a7e83d2b60c3573a675ba30b01be85db8
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.18.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.18.ebuild
deleted file mode 100644
index bda3f3cf2bb2..000000000000
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.18.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
-SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.0 <dev-ruby/asciidoctor-3"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
-
-	# Avoid specs for unpackaged tools
-	rm -f spec/{a2s,blockdiag,erd,mermaid,msc,nomnoml,shaape,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-}
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.1.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.3.ebuild
index f0df40348617..9a6dfb6b1969 100644
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.1.ebuild
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -29,7 +29,7 @@ all_ruby_prepare() {
 	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
 
 	# Avoid specs for unpackaged tools
-	rm -f spec/{a2s,blockdiag,bpmn,erd,mermaid,msc,nomnoml,shaape,smcat,svgbob,syntrax,umlet,vega,wavedrom}_spec.rb || die
+	rm -f spec/{a2s,blockdiag,bpmn,bytefield,dpic,erd,mermaid,msc,nomnoml,pikchr,shaape,smcat,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
 }
 
 all_ruby_install() {
diff --git a/dev-ruby/asciidoctor/Manifest b/dev-ruby/asciidoctor/Manifest
index 4e3e42187f1b..b09d4257081b 100644
--- a/dev-ruby/asciidoctor/Manifest
+++ b/dev-ruby/asciidoctor/Manifest
@@ -1,5 +1,3 @@
-DIST asciidoctor-1.5.8.tar.gz 583484 BLAKE2B f0c654c5e43a0ed061dbf80eb382fac1ea393870c7c2530649a5a41f1a5bd5e72ffb11e8ad8dd2925510e18f4528079ae532b623e6e7f38a119565df01139f58 SHA512 3f767cdf945361d81b0a89137fb1e77377cbb4171da790027cbb9cd8cf1deb03f24a8ec780b427b7bce34538e851a44682515fbaccf8558d61e22356b9d216dd
 DIST asciidoctor-2.0.10.tar.gz 613180 BLAKE2B 46125c85276eb0c7cf4404ca04d854449233e2cd14e24687aed9f95eb64ceb6ebac3d3ed73918679b9a5b047e41d82d02383d0e08acd0df5cc9bc216f14c79a3 SHA512 9ef908081569188d9903c7a7619fe0b50197f6f0cc922c4070e116bcd3f988a55da87443e84b6e260aabcc653a804fcaf29b96a722ab36f7ebb27ec11eb7ddbe
-EBUILD asciidoctor-1.5.8.ebuild 960 BLAKE2B 9d86a4941af51a7000636ca77cb49a00586a9887137db078fa3e042ffe780b844cf2d7b1c8b591104cd741d219a72acf42572d7d1bf05aded09f969a8f29bb41 SHA512 7bd9c94f4f5067fc7538aca45d631897ec6f8d682077c8a105e47d2bd870b4a72abec6bb22f6197fcb285c6e974aaa82d156bca6cf4d7f2c5166ea3c7aa73da3
 EBUILD asciidoctor-2.0.10.ebuild 980 BLAKE2B 6354ab319cea99da9910e2dc39a9bdc52d9c001e873cf5321a351ebb1343d1c2e6d5907472982e2553ea62f327dc4432d7bd0ea25b36eeed2795c62c0bfb235c SHA512 f3c8b9d68dadb3f5c6b2bab76ab9532352f1bd96db23c062c16bfd570b63ea10567e1c3477d4c507a2c71536c6ae576f2d28a7b47aac8fe0368f2281090db262
 MISC metadata.xml 349 BLAKE2B 65a3f6dbbe523d1017d78e939c291e40edc3429d06ff16bd0f8150f3879e2b0840619653115be43c876d1cfeea8e95a3e29fea7447b18bc28bb0218ac03f11c1 SHA512 e3ed6253349df933eb4656c972f1a6cc71567c27a721195abceac0d28bfbc991cbda8772f661021c3cf954d2a917730bad54982e319655a204b6b30c1c67c6d1
diff --git a/dev-ruby/asciidoctor/asciidoctor-1.5.8.ebuild b/dev-ruby/asciidoctor/asciidoctor-1.5.8.ebuild
deleted file mode 100644
index b37428a5020c..000000000000
--- a/dev-ruby/asciidoctor/asciidoctor-1.5.8.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_TEST="test features"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc README.adoc"
-
-RUBY_FAKEGEM_EXTRAINSTALL="data"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 x86"
-IUSE=""
-
-ruby_add_bdepend "test? (
-	dev-util/cucumber
-	dev-ruby/rspec-expectations:*
-	dev-ruby/asciimath
-	dev-ruby/coderay
-	dev-ruby/erubis
-	dev-ruby/haml
-	dev-ruby/nokogiri
-	dev-ruby/slim
-	dev-ruby/thread_safe
-	dev-ruby/tilt )"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/asciidoctor.1
-}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index ede6513cd413..2de92cd575d6 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,5 +1,7 @@
 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-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
 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-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-9.8.6.5.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.5.ebuild
new file mode 100644
index 000000000000..e9b103efbd7d
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.6.5.ebuild
@@ -0,0 +1,37 @@
+# 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/aws-eventstream/Manifest b/dev-ruby/aws-eventstream/Manifest
index 2419edf5171c..bc8c141810b3 100644
--- a/dev-ruby/aws-eventstream/Manifest
+++ b/dev-ruby/aws-eventstream/Manifest
@@ -1,5 +1,3 @@
-DIST aws-eventstream-1.0.3.gem 9216 BLAKE2B 32cb1d14562365bd9fc579272f6f5a56d542662dbca765431a980c278aa1ecdc4c61ba4875c52c83d962771e89f831c4b167b176882bf45649cea7732ec68c04 SHA512 bd2babd7ec1e3190b839925116cfe315f09087e106970603941ce4e1eea64cb4fcbf59d16c547a5ac4968792839de3dbb2e4719a05cd4433c611df44567029b0
 DIST aws-eventstream-1.1.0.gem 8704 BLAKE2B 52018f2466f24b5c4ca9463321d4bad94579c6c98ef7fe0de34376da1e9ecfa0171de3485f65266a8b6be99c6eab956b88b367b8431c62aac1b46107f47925db SHA512 40af0ad738341bd879458060c5d5b1cda3d539ecec18e3e14f2c36582368e246a1dd510480629f7f29e044dc6f9d3a028af72650a0386491931f5a2691ac5d8a
-EBUILD aws-eventstream-1.0.3.ebuild 401 BLAKE2B 0e891093ea7b627705db9e4dbc205372c5ffa6ca84febe3419615dc487783d290e82dbc6cca302f4558911443682cef7df86a1a46e793353c0047dcae473db0d SHA512 128d6144c2ed6bd69b449bdb09647e1591cb37dff94a93654940ffda9acf69741dbe417ca78db3834d228adcd4f6609e07da1ba9ab9df4631b9ba8dc3b509f63
 EBUILD aws-eventstream-1.1.0.ebuild 408 BLAKE2B 7450e30d9a088f38b944e75d2e9c0d8c10f610878c87256a18473265efb4e2f5eafbfc2ccddf4b602faa396e934af4fcadcddbfcc8de4c90c17fbf34c2137093 SHA512 e8acc99850612a172972399a51efb5eb5b1f2129698c12a6400ace35a48dbf16fba20a003514065405db5a338c97e21835f6ab57e50cfcf5ab17b1f6c73f6775
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-eventstream/aws-eventstream-1.0.3.ebuild b/dev-ruby/aws-eventstream/aws-eventstream-1.0.3.ebuild
deleted file mode 100644
index 0fff340c1e82..000000000000
--- a/dev-ruby/aws-eventstream/aws-eventstream-1.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Amazon Web Services event stream library"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/Manifest b/dev-ruby/aws-partitions/Manifest
index 28856baf2931..f2024cad6c1b 100644
--- a/dev-ruby/aws-partitions/Manifest
+++ b/dev-ruby/aws-partitions/Manifest
@@ -1,9 +1,7 @@
-DIST aws-partitions-1.248.0.gem 18432 BLAKE2B 2232b8786f599c677984ecd92e256863951822402fa523ecf85b16a2c65659477132baa3831133db9cccbc07404ac5cb14bf84aebe1e03ee4a76aa265b6b457f SHA512 b055be405478a981e2061ceb217a781c813fc8779124d4078014003ff3c14bf22746a6f0211199c1d5f8ca1b46359d5b1b817dcf4600ec5a8da105a6eefab789
-DIST aws-partitions-1.281.0.gem 18944 BLAKE2B 723ab683eceffb0873afa9aa227826b1e0ac797258858ed55ea5e1413826a1d6818f732600d081711f0b989bbd2c81cc4f7102e96e5f86faedd2bd893c4c1c2e SHA512 329c353ee2f2762a7202ee6297e6f4f10d8a47ef6f660858f1bdd118fd77e19a2e4ae9424884af0007b2a000d291d9eb8f47d6eb20541dd3378fba6b261526ca
 DIST aws-partitions-1.297.0.gem 20992 BLAKE2B df538a03fc579ecb65dfcadc0fb5dbef93a896a3c21d1e6cdaab75572aebc354ffe0a41cb82d5bc34e1414d560105270ede590e9a79ead1ac43a78a225bec861 SHA512 90d3484cb6d06597b1122512185dc8b0f5964a1c0748855b89c3efbefd410432ab7e88e6698d9532db7bc3db51f9dbce1f236e6745c31bf1312c6e0a1cd1f76e
 DIST aws-partitions-1.298.0.gem 20992 BLAKE2B fb6776a6f5a9d75b32142129da38470cffd8383c77ea705567220902c90967926bea149b46624ace941e9dfd67e7dbb59202d1134b392c35acaab4f858d21f2c SHA512 fe42afbc96899637918938ecb84335efdbc8746ac46a173621f176df924b857cf95de9756f242ee61adba8048192626b47b6e49a51dfb5d1f2e98b20108278a7
-EBUILD aws-partitions-1.248.0.ebuild 476 BLAKE2B 94b40d5f881ba4a05677b756d1a1a57fb4a1d1531b240c620938a35417323a4a1cb762fcedd360def4ce7552a4b8954d939fea75bc441e4a334fd7d3db9b70fa SHA512 8b8932580f0279194567adf628d62a11c41a2023369da073ee1d1881fd8240bd965dc684fc149a4ee431887db710d698bc99cf4c67c2809cb1fde9c856477452
-EBUILD aws-partitions-1.281.0.ebuild 483 BLAKE2B f943c5124445a47fa44cce13fb8e0cf50da463ddffa65a548bc8f4b95ab60aa707764bc0c09a9782c4a28e5e55e1cfaa5cc6846bb6a7b8d92d9ded6f4812b59d SHA512 ff59918cc181d923927769e600f312039fd1a3cf55efbd9221ea41d807f5c76cbd5fb899e6cafdcac199885fa0f1cbf4104559e9e3547fac95aa5164169f5fb1
+DIST aws-partitions-1.370.0.gem 22528 BLAKE2B 504b25a41da2b948b00c3ea4b7e94a553ad77a471849d7e8d2d9a714860e9efce06c788dd22e6600b6885939987a1ea481dd0ef9f0e6c6ba9fa342ae24f4d627 SHA512 49bec442cad737c4781f759b7babef3d45daa49866135b4fb15aed9e248e737e95a589c0b17b86a6fe4e042c039fcdef7f2088e1eaf6738801fb314c71e0cc56
 EBUILD aws-partitions-1.297.0.ebuild 483 BLAKE2B f943c5124445a47fa44cce13fb8e0cf50da463ddffa65a548bc8f4b95ab60aa707764bc0c09a9782c4a28e5e55e1cfaa5cc6846bb6a7b8d92d9ded6f4812b59d SHA512 ff59918cc181d923927769e600f312039fd1a3cf55efbd9221ea41d807f5c76cbd5fb899e6cafdcac199885fa0f1cbf4104559e9e3547fac95aa5164169f5fb1
 EBUILD aws-partitions-1.298.0.ebuild 483 BLAKE2B f943c5124445a47fa44cce13fb8e0cf50da463ddffa65a548bc8f4b95ab60aa707764bc0c09a9782c4a28e5e55e1cfaa5cc6846bb6a7b8d92d9ded6f4812b59d SHA512 ff59918cc181d923927769e600f312039fd1a3cf55efbd9221ea41d807f5c76cbd5fb899e6cafdcac199885fa0f1cbf4104559e9e3547fac95aa5164169f5fb1
+EBUILD aws-partitions-1.370.0.ebuild 476 BLAKE2B 58cd5a02074cf5cedbb6e3b242bbf72ba2cbdfb7774533f5c01b1fede2783cd64f156c8d26b821dbaa207bfb535944749279f9d9850c443ab55bbefff837852f SHA512 d977d6cd8829879b22e241a3f33f210899429b2f031a61ddcd8d506681372ef7b9ba1c194e5a141fd772165da3404441414c807983d1d049c1b54031c761ef65
 MISC metadata.xml 342 BLAKE2B 6cd0a4c722db535a0555e9b6d95582a7af8cd359048bd131be7ec238ef4218a4d9212091e07bf29286ef3e2112a332253c05f0f84ae76dc17e2975e71414538b SHA512 d2fae2955cdd0eabe6ba09de95fb39bf44a0af875f04d250dd8458b8855c4af16a50bf84e6c131466663c6589e534bf96ff522de409b2d9a3f21062ec416d3d0
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.248.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.248.0.ebuild
deleted file mode 100644
index ced0919facc2..000000000000
--- a/dev-ruby/aws-partitions/aws-partitions-1.248.0.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-# Not packaged and upstream not tagged.
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="partitions.json"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Provides interfaces to enumerate AWS partitions, regions, and services"
-HOMEPAGE="https://aws.amazon.com/sdk-for-ruby/"
-
-LICENSE="Apache-2.0"
-SLOT="1"
-KEYWORDS="~amd64"
-IUSE=""
diff --git a/dev-ruby/aws-partitions/aws-partitions-1.281.0.ebuild b/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
index 864a129dbc72..6fc742295d70 100644
--- a/dev-ruby/aws-partitions/aws-partitions-1.281.0.ebuild
+++ b/dev-ruby/aws-partitions/aws-partitions-1.370.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 # Not packaged and upstream not tagged.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/bcat/Manifest b/dev-ruby/bcat/Manifest
deleted file mode 100644
index 374e7e3318db..000000000000
--- a/dev-ruby/bcat/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bcat-0.6.2.gem 22016 BLAKE2B abfaec6d9db25990838019d0e9f4dde918f260c01340e34ab272f8a2e02155674ca38bf91843925df31102982cba02ada69abbf7e9ec4b91d4f2cb87b27be339 SHA512 142f853ca0931e5ba300276b1db0977fa275b9b13602940fbaca2c5d32ff881fe753dee25632526a348d71cf71eb6e390aed821b4ba1f48e380d6369ad87ead7
-EBUILD bcat-0.6.2-r3.ebuild 1135 BLAKE2B 90b286d856c16ab0888a51c4186d4eaaa47756f7ebd1b25dfa7642277b3278d500465f0c5be5b1518aaef12b5de0359f42e74eca16b4d961b8d947e72214a6b9 SHA512 c791af7eca779178b76e016a66ed0e0c241f20b4f6c47c7886f80b816c28fc5a7bd3bd2ea0841d92910d350eb60cdd90e08af3a576dd07dc3ce687c38a9fbf65
-MISC metadata.xml 339 BLAKE2B 747035022afc3a66f3a64ab7614290ebff948570e77f0a184eee2cdf20f838e92a6608569714b0c3672660019b1e6002ee65afa3d88e5fc497e147c59cdd2f37 SHA512 e128341196b2b542a7d3a7cdbe576e667ec176b3e231a627cedafbaadac4ede41fd6710722ca880551cf9635e9a8768cf273a6784b276647cf4db250404521dc
diff --git a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild b/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
deleted file mode 100644
index 3a40db62ad72..000000000000
--- a/dev-ruby/bcat/bcat-0.6.2-r3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC="man"
-RUBY_FAKEGEM_EXTRADOC="README"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pipe to browser utility for use at the shell and within editors"
-HOMEPAGE="https://github.com/rtomayko/bcat"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 s390 sparc x86"
-IUSE=""
-
-# Collides on /usr/bin/bcat, bug 418301
-RDEPEND="${RDEPEND} !!<app-accessibility/speech-tools-2.1-r3"
-
-ruby_add_bdepend "doc? ( app-text/ronn )
-	test? ( dev-ruby/test-unit:2 )"
-
-ruby_add_rdepend "=dev-ruby/rack-1*:*"
-
-each_ruby_prepare() {
-	sed -i -e "s/a2h/#{ENV['RUBY']} -S a2h/" test/test_bcat_a2h.rb || die
-}
-
-each_ruby_test() {
-	# The Rakefile uses weird trickery with load path that causes gems
-	# not to be found. Run tests directly instead and do the trickery
-	# here to support popen calls for the bins in this package.
-	RUBY=${RUBY} RUBYLIB=lib:${RUBYLIB} PATH=bin:${PATH} ${RUBY} -S testrb-2 test/test_*.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	doman man/*.1
-}
diff --git a/dev-ruby/bcat/metadata.xml b/dev-ruby/bcat/metadata.xml
deleted file mode 100644
index 644bab734fa8..000000000000
--- a/dev-ruby/bcat/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>ruby@gentoo.org</email>
-    <name>Gentoo Ruby Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">rtomayko/bcat</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index fa4e42ac17d4..f7770d40f9b1 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,6 +1,6 @@
 DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120c22c5f76423c6c5f4e4d33206c8ef41c64e54ea53eb610a0d865beba19d3c033e8f65913564963319bb523f SHA512 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
-EBUILD bundler-1.17.3-r1.ebuild 956 BLAKE2B e2e95d112dfd76c69f08634237d46c3b0f4a78a7c2edb5f551c22e9b29909c9c69a82d36e30ee12a8bf517595437c2b441e9822d1536e54fe9e418b9289d6532 SHA512 cc5e28225d5a10f2aafe4161ce1717a3a5eaea238ba7d5bb389ffad871d498396546be3526b6e8815c7d17ec1fb8c837bcb42254e9e5f1e367856dd3257f378a
+EBUILD bundler-1.17.3-r1.ebuild 948 BLAKE2B 40c498f2fc6858151b90bbadf70bdbb32a3b9d8ed64e09b388937b67a02ea4d5013843abb9c3f366ca0ac5ac98087b63db50677a32dc0abeaee6d051488bcc31 SHA512 179ea9ccbffdad03770264756278ac3fbd4dc6773bf50e3a5dbb6dbc120519ca0f8d3bbadb7bb5c42738e43f85ac09db1266eaf2d42708473932270f3a06b20c
 EBUILD bundler-1.17.3.ebuild 923 BLAKE2B dee890006e077eeffc983ca29b2de37f337d5c32fc92dfb720f0a225f7431fa2c7e6195b739ec7c028670b26d9b70f7d66fbd9c57e621656d49f2da4d38f80a4 SHA512 647ca0538317fbd7f6401efba0033fb5f9225df5567eac234ddde719131edf074254cbab631f162811a2a0c4742eeabc747b8f6e0bbad6f2fa43f0eb6c24a875
-EBUILD bundler-2.1.4.ebuild 950 BLAKE2B 3e662ae3ae517c4d85d56dffd1dac74d8ea377292ecb705e13cf5b810b0fc6dc0e27203c2b1807e9ec97f7918d3dd8f95a8fab557080a2477e9bbfd09119b29e SHA512 981e2e056a8eafd5ec932a3a77bf280c11a4911751b1c2110fc6d91a94d1b542357f771bc9cce676619cd797c17e5dae90d064c740ccd21e06a323e078e5b48a
+EBUILD bundler-2.1.4.ebuild 942 BLAKE2B 254eb97ee9cf6dcb49a567e069af71f69c52fcb5a363d1e6c0e6a0efdc5f719cefa52621c5b713fb034de10598db710dff03fb97527c7497b1389fce419017d1 SHA512 d0930d4952a9cf9b77a1b2eb20c26c971d8e5e166731b430a9f770c333bf1337b618c86033ac7a7e7dcf16c8362aceb3ac31a6a320326d189317880d2bb7e539
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild b/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
index 90009dfb0a5d..1ec89ad68595 100644
--- a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
+++ b/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ HOMEPAGE="https://github.com/carlhuda/bundler"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/bundler/bundler-2.1.4.ebuild b/dev-ruby/bundler/bundler-2.1.4.ebuild
index ca8998020469..a5107b1f839f 100644
--- a/dev-ruby/bundler/bundler-2.1.4.ebuild
+++ b/dev-ruby/bundler/bundler-2.1.4.ebuild
@@ -24,7 +24,7 @@ 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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
diff --git a/dev-ruby/coderay/Manifest b/dev-ruby/coderay/Manifest
index 8688d9ce105b..a349bcee439a 100644
--- a/dev-ruby/coderay/Manifest
+++ b/dev-ruby/coderay/Manifest
@@ -1,5 +1,5 @@
 DIST coderay-1.1.2.tar.gz 220645 BLAKE2B 85405da2b148ae23573abf2c3fcf94a643024756308e83c4cecf0a5edae2fedc4ca7c7bdf8fb5936310f6699ca8f06f91cceb475e00511a54af0a96dd517c234 SHA512 cfce5e9f0a0d988e7920912e064ecbef3b54200a08ca2e07453452edd7f382a1eb9292bc566e069f5d1b784033e816f13d9ddfb39520e8e44a8d1e898aa33591
 DIST coderay-1.1.3.tar.gz 229139 BLAKE2B a900cc5fbac950f66814d9300876d6a273b296d07139297d5344d26c5710d23c37761e5743ef972f523afa20fa663f239c03d9d2ad47232b77e53fe5053736f0 SHA512 a5208965e8dbad53d179fdc1c57df59ba4e13522a1a57c371ccd3f9369408a1c7d878867df48b201a1d590b46ef0f9bada3f3e7810866f17d244b5b370aba3fb
 EBUILD coderay-1.1.2.ebuild 1359 BLAKE2B f3a61690a53eb8a154173e73f1b3e75e417b56284f9a52e7308934d8bcbb44826378f2a736c9c8204a1ebdc7db86dacbc6d7ea1cc6fa7bb9d52de187a6b18076 SHA512 94df2b72f6f343630d3cf10176a0f30395f77cb8d2b124b0abc6b96c9b64daef5b0b9ec91cc21ba4857fa2e4388aa1ba12091855f80e24a5def6cbe66878c45b
-EBUILD coderay-1.1.3-r1.ebuild 1424 BLAKE2B 9f1f584d767d530732e5cc5a1f5f9d4feae1ba3deebc251ab47c21665e2bf6db78816432f409bff6d14e490f17645021dcdd281016120b5c95981135cfd5a5ef SHA512 10c64b1169844ad146b86bbc962075a53daef1c14ec06daf1929db5aa54fc7746d7f3d86817dbb56de4d9481cd976b0d67ebebc1f2f03b33c29ed78cb9c141b7
+EBUILD coderay-1.1.3-r1.ebuild 1476 BLAKE2B b9e92866486d5f8555e727d556aa0d586d0bc7537d074cc2c424a91f189c911905fb305fb87f77b76aa0afdfbb3696e5eff8f1681e30fcb614e068692d05eccd SHA512 87bb4172a71d1e5b27752d0bfffd994ab01067119202a767a2e8f7be85e6a7f9386db44b3f0c41c1e8841c3ed34c9d2d8856c88013e1c2cd987649c031e7fe84
 MISC metadata.xml 342 BLAKE2B b907829065b996e9bf467150216ce92b7fa4bedef8dbe9b9d79a1ba6831c706c312ce0d1cbb418df6c5b43dad59509c132187637025d4c49e9b29e21fa68a107 SHA512 13f33c6d77b3297dab6c125c2ebc9a1f7584dd5374e7f13d416d5a80ffe04e39ecdddd93de30fceed22e110e1c68e4b853fdd5b6ab5ec4d254c05b17f624ca4f
diff --git a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
index cf223d7b17de..1cc2fec61d45 100644
--- a/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
+++ b/dev-ruby/coderay/coderay-1.1.3-r1.ebuild
@@ -7,7 +7,7 @@ USE_RUBY="ruby24 ruby25 ruby26 ruby27"
 
 # The test target also contains test:exe but that requires
 # shoulda-context which we do not have packaged yet.
-RUBY_FAKEGEM_TASK_TEST="test:functional test:units"
+RUBY_FAKEGEM_TASK_TEST="spec test:functional test:units"
 
 RUBY_FAKEGEM_TASK_DOC="doc"
 RUBY_FAKEGEM_DOCDIR="doc"
@@ -32,6 +32,8 @@ IUSE=""
 # bootstrapping rspec with new versions easier, since redcloth depends
 # on rake-compiler.
 
+ruby_add_bdepend "test? ( dev-ruby/rspec:3 )"
+
 all_ruby_prepare() {
 	sed -i -e "/[Bb]undler/d" Rakefile || die
 	sed -i -e '/git ls-files/ s:^:#:' -e 's/.rc.*"/"/' coderay.gemspec || die
diff --git a/dev-ruby/crack/Manifest b/dev-ruby/crack/Manifest
index 7e79bf8aa31f..2ff81a01fcfc 100644
--- a/dev-ruby/crack/Manifest
+++ b/dev-ruby/crack/Manifest
@@ -1,3 +1,5 @@
 DIST crack-0.4.3.gem 574976 BLAKE2B 4b6f23277ec17a516d06e6e6785889996172b3ec077f022d1a52ab4b8e938b2735abbaecc71288b55654ff09a428c33eb944b627cfdc827ea1f4ddc6289461d9 SHA512 c6577bd86fe2e36b2a37693729da9fc35c5d4deb860ac1873265ccb6fb38056fd76d8c17bb4f779b39f4bc13b9db37c1768433f518c17090ccbb0872a103b386
+DIST crack-0.4.4.tar.gz 586633 BLAKE2B 26e2cda6e9447fb3c9fe02092a6e9d6a8097c7bca6a483a3af42aa8ba491b737bc0dc3ae1936ef8ffb5c5d5cbbed3fde69c9641f05b9e3eb3beab87c375f68fd SHA512 3f86c76718a3c2a65ee11b15434035396c2355a8562bdb642432a659b52c3e811e930318e0dc2df3ff06bd53ac14d0694471e425420ae3b7971f5d4f818bba87
 EBUILD crack-0.4.3-r2.ebuild 1061 BLAKE2B e5aec6b5b4029a85473b0123fd4d6d53e5ba4baf933ce9e3ac7226f29b2b4e875721edeb49dce642006e05209c64203111138fdbec21c3feeaef73ad5befe339 SHA512 faa1f612a706a9d83c8506f5f2667f079c19e2a22c980835004fac333322ff06077d67aa494bbc63acb0d57c8944a0dac21694f3e54c5f94ef20ed6ae6206c34
+EBUILD crack-0.4.4.ebuild 1097 BLAKE2B fc66cbb21c73c7601bc0b06f51395732ff4bd4972c4205538616612385f168361c9378b06bc05d17b6301caf4bd46f21bb68c45499ae87475661e86c62f1cffc SHA512 b6cd60463585a193f165f977439f241fe99f007ec2239c48467a999940213112f4e4e324db6311536f56f4412368f11f0b68cafa324ceb61b0e01f71d0a00fb1
 MISC metadata.xml 342 BLAKE2B bf1bf4fa826a68ba0c2344619bd3a18ea9f3944f41ee9edda5b0cdebb46d8790a39dd6ef738f996a3c15672a1fe7242c55132eefaf719f21725d9b4372eb4f07 SHA512 2f890aec4b5c1bf8a31bd079d8e0b8e17242e262b7ba2619e5f791da25e2e7510a52086b4103ed257726d0a47e999dd22d0b3c60f8dc77c515f5fc61b122f2a8
diff --git a/dev-ruby/crack/crack-0.4.4.ebuild b/dev-ruby/crack/crack-0.4.4.ebuild
new file mode 100644
index 000000000000..ed7b46961a5e
--- /dev/null
+++ b/dev-ruby/crack/crack-0.4.4.ebuild
@@ -0,0 +1,34 @@
+# 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="README.md History"
+
+RUBY_FAKEGEM_GEMSPEC="crack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Really simple JSON and XML parsing, ripped from Merb and Rails"
+HOMEPAGE="https://github.com/jnunemaker/crack"
+SRC_URI="https://github.com/jnunemaker/crack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_prepare() {
+	# Remove tests which fail when run by portage but pass when run by hand
+	sed -i -e '/{"regex": \/foo.*\/}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/i}/d' test/json_test.rb || die
+	sed -i -e '/{"regex": \/foo.*\/mix}/d' test/json_test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -Itest -Ilib -e 'Dir["test/*_test.rb"].each { |f| load f }' || die
+}
diff --git a/dev-ruby/curb/Manifest b/dev-ruby/curb/Manifest
index d35dc42f35be..066bf92ab88a 100644
--- a/dev-ruby/curb/Manifest
+++ b/dev-ruby/curb/Manifest
@@ -1,3 +1,3 @@
 DIST curb-0.9.10.gem 88064 BLAKE2B 8f761e752bc1fd0775f012373847330d3ced9d394e5159b74c8e329247f6221bbc26978755d84b91e75b4082b7bb50c7755db299f90f291516f355b4ab1ddc7c SHA512 eab82d3c1b34bf8e5bfd334abca38a80eaab255d31164ca189185b8b98d7f3760fb116babf50dce5aef01be30b15e9374e7a84e1b0926dba13c3e9f8d36c54ca
-EBUILD curb-0.9.10.ebuild 1383 BLAKE2B 2b58f14904369322e15cad63f9a7d50e09e73eca9be805f813b501c073a99184a8295210893b94fa30504cedf1a97398be3fba5e9202db08be1aa4cc0f5ffa6a SHA512 4d07cb971240cf1d27f7d84c48ce1cdd147fa46b717cfde32833bf871f4fc5044a4a01ea9f756c09c84acc381627f507283e11eed94504b9e016986f8cfd9d95
+EBUILD curb-0.9.10.ebuild 1382 BLAKE2B 691f384283cb988aee2cbdaeae453b538a551974583a913a93720f04ba28e3688173db154c272c93157336877faaaa83358e316fba21bccc985597a8813c7ae3 SHA512 ba77ab93dfc7c36e9094b5cba39ad0ef256e979bab2352f731d795590f5ba0efec653fd4871596e5379b11e04f27ca129d0c70a654e5b064e03b78fc43d443b4
 MISC metadata.xml 335 BLAKE2B e68d36e70f8859cbc9d47397720949fdb7d048601e46c7380575f6c5ce43b04dccc2eb3bb0396a72beea0840f197ceeb5325e935431ef45022bdb2749e1cb57f SHA512 993073ca664dcfc0698a820063013ae20e431f0d2d1b5fa27e0871ba33ebcd09ac70de516ad943934a3a4783d3df4dc93e533082b3b47f245908a5eab4e94658
diff --git a/dev-ruby/curb/curb-0.9.10.ebuild b/dev-ruby/curb/curb-0.9.10.ebuild
index a5668b1b81a9..254c1ed7ff49 100644
--- a/dev-ruby/curb/curb-0.9.10.ebuild
+++ b/dev-ruby/curb/curb-0.9.10.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/taf2/curb"
 
 LICENSE="Ruby"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND+=" net-misc/curl[ssl]"
diff --git a/dev-ruby/did_you_mean/Manifest b/dev-ruby/did_you_mean/Manifest
index 5a1d223bee84..6936e371e0e3 100644
--- a/dev-ruby/did_you_mean/Manifest
+++ b/dev-ruby/did_you_mean/Manifest
@@ -2,6 +2,6 @@ DIST did_you_mean-1.2.1.gem 20992 BLAKE2B e8827b3f6797145c1adf5fae2a681ad8f437c1
 DIST did_you_mean-1.3.1.gem 24576 BLAKE2B 939dc676dd7ba5dc4b64e5796b59e2901b36e5b9e1d4ccdd8809fdd008a82377c6bbd35b8677fa273c2196615ad3b7a09cd3bb57267ba2dd9216f13cd0599aa2 SHA512 14e672540a93bcf89fb41e27cca31190f9c621c5fb669256a26ccd6c1042437a69911b7ee886305b23fa94fcd0979188b423cad88f87b0adbf6c9437ecffc84c
 DIST did_you_mean-1.4.0.gem 33792 BLAKE2B 9052b7ba7028f963595eeb79e668296b48db8659bd07c6e00076efc372f6c64eb3ad81981013bf0ae3c37b942a459146af96fa001ba225ebf1f5486d717a7a55 SHA512 bd8e47e5d0135807d1ec0a5dbf536649cbaca13fd056cefc6f57293b7869608ef92a8cdcbaf4a4c4453738ecbe8a6d8bc450826a8dadb46fc69560ed05a97f2d
 EBUILD did_you_mean-1.2.1.ebuild 664 BLAKE2B 121c4009b2900b0e5238afd321dccc6a175c86ea341dd91f7fbad7cb754468ce1c216b524f3a79ad32a930c1c9c9e667d3912963099936a8c066d877462af68e SHA512 ec1562b01d8c556fa535db0c4beeb381cd9ca8c92c2be5b29be83e8c8bdaf71cd8d737bd174b8acb3592459f766938edd54589de6ecbb00b2945c367c02410b8
-EBUILD did_you_mean-1.3.1.ebuild 674 BLAKE2B 9f5f3ade7892db1da87471c85df305d44ebc5ac325ff3bac77c76d362b491548c5db205586cd695f9d431dae4d49b7f3c7c531922b46e761e0cc158bc4666c82 SHA512 cbea6ccbe41726e85d937316baa03688fed3c664fb837bc28fd824d01401aa39bae8e6c4f64266d9681840691adb8275ce8a6185adaa0af0b445225fe7b91de0
-EBUILD did_you_mean-1.4.0.ebuild 687 BLAKE2B 554c91847553ae2537396effd0d448d6ec397640c15ba30a32f89a218b85449dc7dcbeb72d71b54af29fded9798b5cfd5f2fd29727e676d40764b681313b48f4 SHA512 4aaf69a075f6c891ec892b07f765bef7a20ea0729515588f10e2ec8255d29985217b65ad0cb4348066bf2d12d8aa0ca6f61d6cddab2f24c3950293372af6176c
+EBUILD did_you_mean-1.3.1.ebuild 673 BLAKE2B 1d6a7b78401a5b16b6854ddc2e0dce5050c3421b1c6b91ae5ffa44621258fc20426e1e4be6fcb0a7afd9e88d971edb5c56eb1576e52163ca8bbcb62428b91720 SHA512 e159c56c9f3e6b3892f214a84ffda3504283bd40063f64e3bf7e1219f0deac79bb117a5287ffd1c37f9f97f28d7400258680e55d9a97009a90a9134add334409
+EBUILD did_you_mean-1.4.0.ebuild 688 BLAKE2B beb196945865195bde6978f1bd92ec5524e4cb4b49464804883255ab0957ab94cb98a7c8affad5f51c2d618172c217de408287872c1de9ed362440d099ec31b6 SHA512 a71d74011e989288f6c665067d1cbe1eded95d81228b95c0b502e62e1e9d86ad9d72cf2feec27ec5f4435ed5f08ac2cc47b0c77cfb4eaecf346759e2778e37a0
 MISC metadata.xml 345 BLAKE2B b3764e5648286cb66e03f3343a41b460ea2bb24f51e1c25e89e386c2b16769c9b1f88888b1e10b2c2d0a2346659195454e4ee8262aec0d4a9066795759cad053 SHA512 418114238e3e2db16ebcdd3de5213b3bc0f0a45ed719de1be60cb19015966cf39912f38d0858e22aa6330ac2e7fb58a1452e9623e7559c26161d70e0f29e66cb
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
index 1490d96f0ffd..35befc717427 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.3.1.ebuild
@@ -14,10 +14,10 @@ HOMEPAGE="https://github.com/yuki24/did_you_mean"
 
 LICENSE="MIT"
 SLOT="2.6"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
index b85b28bf0f2b..c7913abf6a0b 100644
--- a/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
+++ b/dev-ruby/did_you_mean/did_you_mean-1.4.0.ebuild
@@ -17,7 +17,7 @@ SLOT="2.6"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
+ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
 
 all_ruby_prepare() {
 	sed -i -e '/bundler/ s:^:#:' Rakefile || die
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 5ac44be169f0..6a765495624e 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -2,8 +2,10 @@ DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a
 DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da5c407e030d9722ed8ccc4ed1a0a8b2d5534c96b50fbe79e84fe71e4268f3228c223dc61fe4c74cda0de18a790 SHA512 9adc03cdef0714656738d354d787a99cb9fcc85718847db7b183b02f38d550ff86d65c8e6ed13be3c839cc64f36f3e95ff25dd5d2f8f45c7207dbe5735238e0a
 DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d
 DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131
+DIST faker-2.14.0.tar.gz 1150487 BLAKE2B 51343e8d45d2615d180fac4845d2cc8a6509b3710528c2770e52f2e4203e458ba07e3fa4f8f7559704598379b54fe38d8d557fc6cc0b614f3695cee8265adc49 SHA512 3a65a65c587f9e2a12c0d7a1e5ecbb12d059146cfda944d5bca950dd2b8cbdb509722b7b181fc619f395ebb526c3f99461ed74803a79cda1b74df83c203db518
 EBUILD faker-1.9.6-r1.ebuild 720 BLAKE2B 19d8387ce2fe15cf1fff88f00219e630526321f37645f5011920c68056646c55c5f983f9f3bb8c291a4a90ee6503e118d4c6758a93f39cc78c881c46f4e0ae67 SHA512 50c6bffef40a9ff278234abc58cf4ab71e187dbbc9b48631f547ad6d40637150ca2dc040f5d3208126e1aba09fff97cc8a499437777b7113ba5be934510fcb10
 EBUILD faker-2.11.0.ebuild 799 BLAKE2B 3cb0a41f26666e42f9afcbb64b533cbb80c5624d5b04447f6c8136500f65968097c2476f6da5a13e1579dd463c4ee387f8482dc62c9a76fa67616cc0377a91a5 SHA512 cb773add5e5a637eb2a27e98b5229bdf4380f8c9ff2ac9d6061b1cbcc896331b458aa11c17c925749b5a4bad9aaec5b291f9dc121d9a68cfa3ccc6150d9b944b
 EBUILD faker-2.12.0.ebuild 801 BLAKE2B 609e08547e03c49ac7d62e9d5240aa3d8d8640d00d85ce44e1e6d22b3f5cdd73b0f1a43e7b4010ec608c53d4001ae94e169c4cd98497b271b9d7dbe6619bf21e SHA512 a65527c7764100b86d8399f0caa3b882139ffc4981cee878b20bd3e15e3b12f20fb4b11013f2da6e5a66310eb010f524dadda30193b8711bae03268f9cd283f6
 EBUILD faker-2.13.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
+EBUILD faker-2.14.0.ebuild 794 BLAKE2B bf8cbf0dc5a7992dd7bf20b2352783abbd1d23e71e7ad710641473820fca5ea3e8828f132edefcac7b1c0d992230bc4da6166c0c29386214324fd90af4d0f1d3 SHA512 a953537117984f3169944b80a4707901a654f46f64240f94bda20676de0927ce2be8946412c27dd8599c6d59f49df88e0d6f919decb870bce69fff50e1182a1f
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.14.0.ebuild b/dev-ruby/faker/faker-2.14.0.ebuild
new file mode 100644
index 000000000000..e02e94be8040
--- /dev/null
+++ b/dev-ruby/faker/faker-2.14.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/image_processing/Manifest b/dev-ruby/image_processing/Manifest
index 11c9aa505bb3..cfc895bb56e9 100644
--- a/dev-ruby/image_processing/Manifest
+++ b/dev-ruby/image_processing/Manifest
@@ -1,5 +1,7 @@
 DIST image_processing-1.10.3.tar.gz 985090 BLAKE2B 9626dd41ae97cd0c68b857ccce2dd2b5eebbc04a5a3fc145cfde681b8ba9cc78806ddf1e7542afa2799ad707ced592149304216875297fc1bac112501dfcdbbb SHA512 7883199b2ccd693ae91a5d028a7c7bf5834cb36c7a48b4d02d1d92d7681e382a4e6605ca80cb0ca2f9949bfa95d8dafac3057e2508bb2932c5c3c0c3dee99b12
 DIST image_processing-1.11.0.tar.gz 985565 BLAKE2B 2ab1cfcdb0637dfbba50558cdb0b778cbb2f7bccf2a12aff5515171e252b0f41624d1867a2cb825d7200b5c09eb57d4f002cd086fdb987a9513a2ef3401a2db3 SHA512 2978ab351f6afaa9bb4ff08be6f89a27a634ac49a239a88c59cd40c877ffe4da57bdfe0d02af31577be113f04d7dc736e891b1edebc09fd4829bbe89085c4282
+DIST image_processing-1.12.0.tar.gz 986331 BLAKE2B 765906d2cfcb63ef8257144bc54744d9a43f4673fb5d1f99d7230bee52534ebae1e6d39009203a1fa080e42889c55885e8e828be1d282d8d2de7358cf69ad2ca SHA512 b1bd8b8da8aedc348591c900dfc0f6a862acfb7f12f10640ce4db181b738a145efc8c1ce8d6f0863930fdd7989670e1114dc8d91581a22e7f9093cf6ae9ad61c
 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
 MISC metadata.xml 348 BLAKE2B e9ff7002a69662a1f143cd31bf22379fa85f2548c0b1ca4b3e57e833d1f0090323b1e239f4ae53477effa8641a8435049a2835b2f054e90a06bfecd1c72ac536 SHA512 1fb1b17616eb7f7f083461e60823fecdbefeadfe1c3728a7e1ff381a453998164de3a0d64daf3714f079cbb456fba78acd9e09bafc73d2b562b75c5cf2064e96
diff --git a/dev-ruby/image_processing/image_processing-1.12.0.ebuild b/dev-ruby/image_processing/image_processing-1.12.0.ebuild
new file mode 100644
index 000000000000..b5cac1d48840
--- /dev/null
+++ b/dev-ruby/image_processing/image_processing-1.12.0.ebuild
@@ -0,0 +1,45 @@
+# 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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md doc/*.md"
+
+RUBY_FAKEGEM_GEMSPEC="image_processing.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="High-level image processing helper methods with libvips and ImageMagick"
+HOMEPAGE="https://github.com/janko/image_processing"
+SRC_URI="https://github.com/janko/image_processing/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND+=" test? ( media-gfx/imagemagick[jpeg,png,tiff] )"
+
+ruby_add_rdepend "
+	>=dev-ruby/mini_magick-4.9.5:0
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/minitest-5.8:5
+	>=dev-ruby/minitest-hooks-1.4.2
+	dev-ruby/minispec-metadata
+)"
+
+all_ruby_prepare() {
+	# Only support imagemagick for now since vips is not packaged
+	sed -i -e '/ruby-vips/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
+	rm -f test/{builder,pipeline,vips}_test.rb || die
+	sed -i -e '/assert_dimensions/ s:^:#:' test/*_test.rb || die
+
+	# phash is not packaged
+	sed -i -e '/\(assert\|refute\)_similar/ s:^:#:' test/*_test.rb || die
+
+	sed -i -e '/\(bundler\|phashion\|vips\)/ s:^:#:' Rakefile test/test_helper.rb || die
+}
diff --git a/dev-ruby/jbuilder/Manifest b/dev-ruby/jbuilder/Manifest
index 080e01f2f655..87789a0f27b6 100644
--- a/dev-ruby/jbuilder/Manifest
+++ b/dev-ruby/jbuilder/Manifest
@@ -1,5 +1,5 @@
 DIST jbuilder-2.10.0.gem 28160 BLAKE2B c277a59d53f30132ebe88d6afda5c221d74a399b01cedf6a4863f29e94d329137669942957a21ae9c5c192177dc9e78b6d66d9b5a29c7d4667a0432556c6b28c SHA512 a429422d65ed3eec55f46597f73a97b267fe7d6c7554ec6a6d60e1e1c0a9306b81f7283524602a30af11a141f7cd466a0f7b0a804172bd4008787462f0fa4ffc
 DIST jbuilder-2.10.1.gem 28160 BLAKE2B 07bde14ee6a75b5e1cec8ee1fead688c613e76713d32d419433b0f7163a9622bcc48e4b36333eb06960a9a566784d7f31843d71259226539fe569cd178315d55 SHA512 340e9d9cff969294e22a3eea57001e69402cd47b791660a1468702e046edfe4a3cc4f8fe18b87ba63e13352d020cd8fd78fcc070a287bb8da108c531f4dc22a5
 EBUILD jbuilder-2.10.0.ebuild 614 BLAKE2B 4cc2fe888b7be708ede6be6de5e9c92e7ba6fa2545f14c73efa5b718dfdad2747e8d726adee41b27961de6f81e8832388c4421003944af48556195f5bbf8a856 SHA512 2d4a6439dd2e6fc4ff9c7e9f024c1491b32d5a6d3e3d7ef70fbb270d120cd4550364762d6d3c66c65875c7cad43221af1ef16f5a089402658f2f27f27f64cf6e
-EBUILD jbuilder-2.10.1.ebuild 614 BLAKE2B 4cc2fe888b7be708ede6be6de5e9c92e7ba6fa2545f14c73efa5b718dfdad2747e8d726adee41b27961de6f81e8832388c4421003944af48556195f5bbf8a856 SHA512 2d4a6439dd2e6fc4ff9c7e9f024c1491b32d5a6d3e3d7ef70fbb270d120cd4550364762d6d3c66c65875c7cad43221af1ef16f5a089402658f2f27f27f64cf6e
+EBUILD jbuilder-2.10.1.ebuild 644 BLAKE2B 89850b0a764f25a24d1680206aeb4b6bd1ac7a531fb6d46245790ca5c640185802f05d6f2076dd957523ca22a1ae39d8729191e6f8df88a2c338836b5be6aefb SHA512 db7d0a374a0af947ff8a57873e177e883cdf279eb6c114dc5298316417d52d05b69b16a0f42254887d45ee0ac58ec4aa3560fd6885a60adc117084981e6a5c55
 MISC metadata.xml 326 BLAKE2B 205ea196c26e50f19fae65cb1b0cbb295b08406f3fcd6bb51162f52c48aef883b05aeea5092100e53f00ce2dc5f8c5f5a0c32c810af822b6b4ea0d95730e1ad3 SHA512 935898503cbfde9f698968794d20797e973227e1441489359520aa0ec2966c7cfb8df8c9b64ae4738cb55393ae4d001f38eef28cf379fb9e7ba29feaa18cd37d
diff --git a/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild b/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
index 6198e4aa3ee4..b37ef8d2e4b1 100644
--- a/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
+++ b/dev-ruby/jbuilder/jbuilder-2.10.1.ebuild
@@ -21,6 +21,7 @@ IUSE=""
 ruby_add_rdepend ">=dev-ruby/activesupport-5.0.0:*"
 
 ruby_add_bdepend "test? (
+	>=dev-ruby/activemodel-5.0.0
 	>=dev-ruby/railties-5.0.0
 )"
 
diff --git a/dev-ruby/mysql2/Manifest b/dev-ruby/mysql2/Manifest
index bcc56c7d91d5..83e90d9578db 100644
--- a/dev-ruby/mysql2/Manifest
+++ b/dev-ruby/mysql2/Manifest
@@ -1,5 +1,3 @@
-DIST mysql2-0.4.10.gem 97792 BLAKE2B 4978a3fbc8e516e47907d73276b244e614248c031db7c0b7d76d20f1f845be11f7187795d3a989629ff849e2e1bd0454fd56bc7be6b692d9840838861bafdb4c SHA512 1f9c8eb1b120cfc940b3aa26b2dff54735ccdf54fd6e6745e347179d29803b4a4d1f3b80a86f92dd534089f625ffcd6055458f27aaefebe58f8332890a842b43
 DIST mysql2-0.5.3.gem 74240 BLAKE2B 9de25a34173ab952f6842f01d9207405c8bc6ed5937fdf66de4062129fc20f425635956f6d12f78466c8c341c49916f7d00df845f84a4101d34a98b1585b9919 SHA512 59a0ee00261b09e8bbfc586a6f75af840a465a94fd8c9463a3d7767e5ea6b7e64507c9571fb90c6d0cdde3cfff560c97fbf3f3c32b3916aca852ef5c41e1bce9
-EBUILD mysql2-0.4.10-r3.ebuild 1120 BLAKE2B a2dda8eec16444a968295669eb1c0e87b751e6670c9ab585498d52420b74217d76678483db241b19967401c82840f9d8eb7e72a593654e23953880982c1280c9 SHA512 36ae456ff0cc2805d34415b312e3db3b42b7472ed3f117913f5c0ce1bc32d1c57ba83176cd3c35bc8eb5c9d22aad8dbe6951244f50073da329a9d1e815dd962c
 EBUILD mysql2-0.5.3.ebuild 1122 BLAKE2B 91ffb62ba5d07031cf9dbe061f02cfd4a4932ce156674f5321689096531a1fe68dd2f9134e9a531031c0a243d26d595bb1b45264ca17bf2142fe02ae91cffb38 SHA512 f010e01ba6d67187b8dfe40775d4f621e28691fe95989603b824406fbc677905990a60943bf70c4e5b0804730671bd51c9aa768d35460340fd19aaa94c96529f
 MISC metadata.xml 413 BLAKE2B 1fdeec661490aaea22676fa4af618fd6458c8bf67c61ea0233f1c68629e89cfdb5f8c29572b9d75c4dc010b1a774b0c703fb6ef4cce1e3e1649452ac0e0aac75 SHA512 1e2e76b14e8c3b44693f0a1d9f83d8b1c95f4eb65490c914fc925fafcfda58fab2764c8b54a87a8e347d53ddb8ce9ce6ca2a08564c97bddae0d0cba0719dfb73
diff --git a/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild b/dev-ruby/mysql2/mysql2-0.4.10-r3.ebuild
deleted file mode 100644
index aee0813a28e3..000000000000
--- a/dev-ruby/mysql2/mysql2-0.4.10-r3.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"
-
-# Tests require a live MySQL database but should all pass.
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A modern, simple and very fast Mysql library for Ruby - binding to libmysql"
-HOMEPAGE="https://github.com/brianmario/mysql2"
-
-LICENSE="MIT"
-SLOT="0.4"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="mysql mariadb"
-REQUIRED_USE="^^ ( mariadb mysql )"
-
-MDEPEND="mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= )"
-DEPEND="${DEPEND} ${MDEPEND}"
-RDEPEND="${RDEPEND} ${MDEPEND}"
-
-each_ruby_configure() {
-	local config
-	if use mysql ; then
-		config="${EPREFIX}/usr/bin/mysql_config"
-	fi
-	if use mariadb ; then
-		config="${EPREFIX}/usr/bin/mariadb_config"
-	fi
-
-	${RUBY} -Cext/mysql2 extconf.rb --with-mysql-config=${config} || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/mysql2
-	cp ext/mysql2/mysql2$(get_modname) lib/mysql2/ || die
-}
diff --git a/dev-ruby/net-telnet/Manifest b/dev-ruby/net-telnet/Manifest
index 3543902e41ea..a8c65570e558 100644
--- a/dev-ruby/net-telnet/Manifest
+++ b/dev-ruby/net-telnet/Manifest
@@ -1,5 +1,5 @@
 DIST net-telnet-0.1.1.tar.gz 12794 BLAKE2B 5a82e62e47cb9153b17dd6042c7e5c767ae3a9cbe0739ad769aab2fe798c7766819b89bc325f148791ce37a55ae267eb5854142d2fcb7d387fd29c32e118c169 SHA512 769d83bae55826bb99f189d06a8fb8a6d497d6c7687289f5aad2efced6f282484e5f766dc95f0158045b824532cd8f0a674ecc69883018814a009bc29d6fe29d
 DIST net-telnet-0.2.0.tar.gz 13299 BLAKE2B 6b87974281b4e1857a1e05efdfc751a5149f9057598c89b8b288219b95268955ee3f80e21cc787ac767ef3126c9ee23d9b62e29ebcb8c317def703f0e0dc1fe6 SHA512 a4473c42d33c10594c4445c29db73f4d611555710228cce263f7fc273e71140423dcbc2e89eec2a26f35f98de48aa72eca9f44cf0cd4626d702709963ce7b02d
 EBUILD net-telnet-0.1.1-r1.ebuild 936 BLAKE2B 41029eb1acea3e68a96deae0087b89d9d55f6775348699962bef4a61406cbd527eff90c32376a20ac896213bcfecbac73cfe41cd43a2e20d0812469d059ed22d SHA512 13f7f3be9bafc045c90f4ee1826725afef8d22dfb5343b864deaa8309da277d90ddeecc72081879e685a027d04f26678c06e26248efbf9e6377d08dcb7597408
-EBUILD net-telnet-0.2.0.ebuild 962 BLAKE2B 9383c0f82ca6dc21ca5dbddd49a4fd70c6c59701a698b517995372c6aa0607b03ab3080f4b0809898c3101997fd6d266fd0b0f811f1b3913c29a98386adc94d8 SHA512 8bc318f951e9df1ae23b9761ef44ad511afffbe7f218bede5aec66e04a85238bd5196da6ff28c354ae6d27e5d9c4fc118e3945f8e80200423b2ebe0e7091a998
+EBUILD net-telnet-0.2.0.ebuild 960 BLAKE2B 09ce0bb5d248fd562bb9f64fe9ebd93c6b46e006790ef965ad6cbfbb9e7027d7084b3b975ebcbb2c596f24fd94fb4698a31f5a4e45acc3a7d1426cf2c38529e1 SHA512 a9bb84fd0a06351ae6343ffa39e3909ccde7c8dfb31d268c3091ece14f803eab5308195302c66f4e8dd4119876ec1d28cdff1f2160084196ee8f09243658a3df
 MISC metadata.xml 341 BLAKE2B a3489378bdb1735168037d2bf0c8798de575e898bb5a686efc06d1d2c41cb1cc674a387c8b042ee789e1bd4694a1e744759637cb820ee7d820b130a966db9573 SHA512 e536a7ac7e41bab692cde766da2aebc72df4a9392921dfc2b81df82ac128ff85cfd58900ff157046eb316cb927d58fcb48605fb364c7fcf25e82c3ed676e22ea
diff --git a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
index 4c5a4e2128d7..5f6c8af750fa 100644
--- a/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
+++ b/dev-ruby/net-telnet/net-telnet-0.2.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/ruby/net-telnet/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( Ruby-BSD BSD-2 )"
 SLOT="1"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ppc ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/nio4r/Manifest b/dev-ruby/nio4r/Manifest
index 5684f274c3e3..6a1d949dc66a 100644
--- a/dev-ruby/nio4r/Manifest
+++ b/dev-ruby/nio4r/Manifest
@@ -1,5 +1,7 @@
 DIST nio4r-2.5.2.gem 110592 BLAKE2B b632322d0706f97a30601e7135daad9ee5a66e57ff7dea1eb0b8365e45f896e7b8a7c228c4eb781d2f44ea047eb028549bc172b68a0540d041ad83bd79d25075 SHA512 3db567c9994e9186749e37c3ebc07f744e7a82c1163d44222475cf491f945745c6c070f4a0a8c77e331921147cc1f5f7bfffd86cb3455d5864280c4e4945b295
 DIST nio4r-2.5.3.gem 110592 BLAKE2B 8a22839a2431f3128832733ef1f814e2743939e3128c689c1ccfea7537ac92c497545182525a8305ba9348092b897a22c4d21044cca695f17d95c08dc17b1f77 SHA512 dad68688faacf110f08e3252222fed7696e557944c56dadf47a1fb037c5627ab88fa82e70c2e28f802f81ed6c93e38bf85daf28dc42a51f40e455558609b0b58
+DIST nio4r-2.5.4.gem 110080 BLAKE2B 9aaed6cd4d74cf6ff3fed114d7c0c9162afb646aa6eadf294e0a6710dfca1e6b4ccf1eb8850c8704f3792eb6695034612813db08fbf74814556455db6ab48b4a SHA512 f7e383516ac6b55fd49339280e624a4c35f9cd2d31915b3d117189506522d967fc53a43cde75e8601f3fe0530e1322aeaa8c94a09289ddbefb2afd8d067341ec
 EBUILD nio4r-2.5.2.ebuild 1095 BLAKE2B 39fb353b75619c4497fa355e7faa3bb4d1b4612ac3c90111c235ae7846a0242587e45070292b1a102a99b136f80d9e50ea4a9ca2d36b6ff66c69cb2baf8d3305 SHA512 d81fdf5f2b56bd4e8a28dd4e78fd42fc5f9d4ec2e5fccc01a438ae946c60482bdba2d8f18076f54839bccbf1c472951fcfaf841978b0d3e0de844e922f7aae85
 EBUILD nio4r-2.5.3.ebuild 1113 BLAKE2B 710563c5b3d6985788c0faf7df8aaade5e799a0d1e2ab0b83ff8dd238f747f22d141c0fc7306846187855a83b892eb3b9da40de8a8efd2622cca15f313583c1a SHA512 31350b10dd12d9db510e5c1451a5e8c1744e39e6f71995f8210e50e25d662f12aceaef226aa94b1bbdef0e85160d07dc2b8a7bda6eea2212c43714b63916b0ce
+EBUILD nio4r-2.5.4.ebuild 1113 BLAKE2B 710563c5b3d6985788c0faf7df8aaade5e799a0d1e2ab0b83ff8dd238f747f22d141c0fc7306846187855a83b892eb3b9da40de8a8efd2622cca15f313583c1a SHA512 31350b10dd12d9db510e5c1451a5e8c1744e39e6f71995f8210e50e25d662f12aceaef226aa94b1bbdef0e85160d07dc2b8a7bda6eea2212c43714b63916b0ce
 MISC metadata.xml 341 BLAKE2B 97c99a0ec8181c92b543ec63b8d1a40c8cbf88905afe02e6f13fa5e8906755bafadf426b7845f2e9bb0c1244168796d661a44e5138eca44068b142a39d3ad4d4 SHA512 8ba86bd5b9b9823cca53bdf18023db7385332c31fcaade177d394a36d60b892fcc632fc91b60addb77fbe907130682b435ab6103a33c71f2ad172b345e6f389f
diff --git a/dev-ruby/nio4r/nio4r-2.5.4.ebuild b/dev-ruby/nio4r/nio4r-2.5.4.ebuild
new file mode 100644
index 000000000000..cf30cac81ab1
--- /dev/null
+++ b/dev-ruby/nio4r/nio4r-2.5.4.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A high performance selector API for monitoring IO objects"
+HOMEPAGE="https://github.com/socketry/nio4r"
+
+LICENSE="MIT || ( BSD GPL-2 )"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note that nio4r bundles a patched copy of libev, and without these
+# patches the tests fail: https://github.com/celluloid/nio4r/issues/15
+
+ruby_add_bdepend "test? ( dev-ruby/rspec-retry )"
+
+all_ruby_prepare() {
+	sed -i -e '/[Cc]overalls/d' -e '/[Bb]undler/d' -e '1irequire "openssl"' spec/spec_helper.rb || die
+	sed -e '/extension/ s:^:#:' -i Rakefile || die
+}
+
+each_ruby_configure() {
+	${RUBY} -Cext/${PN} extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/${PN}
+	cp ext/${PN}/*$(get_modname) lib/ || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index c9ca8516cd2d..e758628807d6 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,5 +1,5 @@
 DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
 DIST nokogiri-1.10.4-git.tgz 5792963 BLAKE2B 80223c7bda39c56ced8e98d1d9f6858907f2814eb2d9f28d13c9f26fe29ae7f057e5a19765a3b304ffc4f9edd3dd0f77b99d5a673923ce95a8f02135aa9882ca SHA512 c27877297d432b9a9baf3e0639600d6ca5b382a87ff0dc1efb5d9bb3c79aaa31a589a4491f938283e4f9d35e8d29b6f88a60e27a5d4c81e7b491e100f8d06a9d
-EBUILD nokogiri-1.10.10.ebuild 2731 BLAKE2B 952e8741ad4018376bce7ce797a6bd6602ea65968881d976fa919d7b29a5fb4e308bd2ce26f076f8eb3a1adb836891b1e1f559d3024bf7f146774f843ea3824b SHA512 c9fd56cdff14a6855649dcc194cb8dbeb3cb7add7908cc43cbeb0d7f24628dcf954f48ecc67d8b5a46e6dba517ec3af255680c26378f3b5ac62577cd7617cc9f
+EBUILD nokogiri-1.10.10.ebuild 2725 BLAKE2B a2be1a97945a675c995534b81fc89c48c433b7058832f83be55064867aab14de3b1e7b2bd3fa068963388c72b42084664fd58689425f1f32a86eab202e838b47 SHA512 f0c7b066aebb6699d8f42c9b5fa7faec7da5e41d9861afe077ac5a04c452e91f92c9a0bb2a48e3107f2b262e3b0a7abef782837742c9f95bad2d8372dac2421d
 EBUILD nokogiri-1.10.4.ebuild 2705 BLAKE2B 1ce2dc0a22679f24d3e1080e4558145983fbae4248dcc8084a75bafe0ad0b292cafc789bc742856da8449cd13bd89a9caa38b324ca363a15128183063659ec62 SHA512 f2332676b2539698cde6f7f11e636a6c1cc19556c676e0d8d6f4e1872b0322a2a3966e9aeaf4273d24e4f66ac36641ee5a2624ac344d38c2c1908010d4f4a45c
 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
index d3ea36c38422..17bb2ca54b30 100644
--- a/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.10.10.ebuild
@@ -16,7 +16,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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/open4/Manifest b/dev-ruby/open4/Manifest
index 0ae0ca79c686..afe34023da58 100644
--- a/dev-ruby/open4/Manifest
+++ b/dev-ruby/open4/Manifest
@@ -1,3 +1,3 @@
 DIST open4-1.3.4.gem 18944 BLAKE2B 00ef3139cbf6ae175aaa40526c105d39fdfb07c69f0a3aaf607feb799f0a8adac99cd5ea5caac29c884374af6591f4049b3888626c24b3d2371d4c0c9019cc7a SHA512 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb
-EBUILD open4-1.3.4.ebuild 629 BLAKE2B 5e88f5a6732daa1976fa7b07dc7896895d992ddb1485f57974f44af8ef3465de93f6a930ba1176cb26b00a766a3bba53b270c43231753228851d5e81de78a596 SHA512 a18a4af2ec569a95a63db617b2cb8116ba71ad8946658a95f9b6bdf0b366c6c433b743d4b66fcf982a48ab2bbb0d73f2bbe2806dff6d11c0aca167359aaa999f
+EBUILD open4-1.3.4.ebuild 636 BLAKE2B 762cb1ecdf3d7de63f0f407a423172e2c69919bb74776c8e9db88e398ef4b897a2d43ced60fbe2ec25c168f2236092ca0f9bb0ad7baf73fc3a32b8e2a82f76f8 SHA512 c49fad0fa4eb2902e7a5a3f1123aa4231bab547eb4df94c63385a7c22cf6ccc86c431203bdb43c053c66d5d557393d1abf5847fba53afa66d87dc8da75524985
 MISC metadata.xml 339 BLAKE2B 560d764d73e28f2679a134b33e3f281b678aa2cd53a0a271c646949fe1cd63a3d7399d33774888c8f3fd8cc55c44a5151629a8e376abc4d45f8b87f43bb9b8d9 SHA512 1a79e7584a1a8a3ca0df51e0b3f0631eb6a61f1aa529b464a15dc94abcd7de2385ce68f50db14b5041fcbec5b5d86d50d9584c524c43c89b3648f35caa23f1e1
diff --git a/dev-ruby/open4/open4-1.3.4.ebuild b/dev-ruby/open4/open4-1.3.4.ebuild
index 16eb7f32c6ed..3184e7f55d27 100644
--- a/dev-ruby/open4/open4-1.3.4.ebuild
+++ b/dev-ruby/open4/open4-1.3.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/ahoward/open4"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index e98df46a338a..1e7e6020a52f 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,7 +1,9 @@
 DIST ox-2.12.1.tar.gz 202784 BLAKE2B b42a364e4e2c1bfbefd06bd0b5162838e473cbd48582e20336cd50173278a81e56eb6cefb826b1155a19ab7ed1484f0e4a4715d640ff0ff7d4fb82d3feade647 SHA512 0bf3b4d21e5b09695595b3846ed893a0d23f4479388036447dc2bfa5440d1b4350289ef023176a9f1fc14383c76388d3ab906ba6c8c919b519bb029438cbd1b1
 DIST ox-2.13.2.tar.gz 208893 BLAKE2B 15e9fca55cb58c10d6336c1399048e72c059889da0b9df8050a6e4cd00393d11507768ed1cab23d452e792f4001a5935e70ba0be24186a1f96a43a7f272823fc SHA512 bc7d8d14c9e3a45529d8a4a32c01d7f51523f814407d437a7dfed0184fad16a9edf4a2b2317c28039613f8f0e0d367b42b4eb8fc00b01287b0154d520e37ce48
 DIST ox-2.13.3.tar.gz 207702 BLAKE2B 23e690fcbadb2f3903b50ff7cdaea397fa4a65503f3bf81ea9266f6f935ac08271bac4f514d080ce538666f05c94a7e3f3ecdc60ff412741233f599aa4aac863 SHA512 346513c696f6cb969429f20f1296f8ca999cbfed5ecd2ed8fd96b3bc5a0b512ff41237d6e5b616c100fa98d4606026f8ec9f4356e96831b1d1d7c968c2a22762
+DIST ox-2.13.4.tar.gz 207814 BLAKE2B 8a94569e6e10b92574fa330d60aacc069a558003c7b285cb1178dfe0e6cfe02a2590283249f7a1b5adc89b41c3414b1a919367889b0296cf909eeafd88cc8a27 SHA512 a97fef40eee3616bab32394340c452138fe1cf5cec92e6457c3b2ce8866f7e5b143ee7e0191af09d96128a2d7a0ee3eb58fbcea16074ce33db8a845867175423
 EBUILD ox-2.12.1.ebuild 714 BLAKE2B c9aa77a2d6d14cdc0793cba246055a689cdd1b9f4246be84eb0b4a615c291f85a3484ca3f892ff613837523348c9768c134d312f9bd5dadd3be22c62222ad7cc SHA512 c8964d8c4742b570cc5b080a7df6cae736ff965075261e600126eaf7e298be09cef5a9474e2316760ba6fe0718b62deeee388c453974e0f7cc3b80d902eddf07
 EBUILD ox-2.13.2.ebuild 715 BLAKE2B 916ca3f9ce3fd847de972d8fe94973a23ff47a6c676d512ae027cf9a9b9fdd649bb058acce5e8f3f388156010e3a0ade09c80cfe9e7c6e7ae1ce929b4388ffa5 SHA512 301d0292cecbb395f1466b53dfeef2784c333e88ccfef93e663cacdbdcf263a5ea40a121b4a2af87933636bb2cddbac35528becbe2999a0d7460d40c7f679b66
 EBUILD ox-2.13.3.ebuild 708 BLAKE2B b73770ef9835c297afabc649ccd4472a29ff182209a5f9336fbd029c9246dbfdc450d9ce777a1bf5c208b142b19bf20c22df7e3e7d270075f215f0fb07eff3ef SHA512 7bb13132c4b87e254ba69d2e56037aadc14817839690f27d6d834f5e88019d1f2001e363b105b736b84b290d8bd12d329b1be72a877d0929fda9b1cbfa53bce5
+EBUILD ox-2.13.4.ebuild 708 BLAKE2B b73770ef9835c297afabc649ccd4472a29ff182209a5f9336fbd029c9246dbfdc450d9ce777a1bf5c208b142b19bf20c22df7e3e7d270075f215f0fb07eff3ef SHA512 7bb13132c4b87e254ba69d2e56037aadc14817839690f27d6d834f5e88019d1f2001e363b105b736b84b290d8bd12d329b1be72a877d0929fda9b1cbfa53bce5
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.13.4.ebuild b/dev-ruby/ox/ox-2.13.4.ebuild
new file mode 100644
index 000000000000..ca6de7a13bb8
--- /dev/null
+++ b/dev-ruby/ox/ox-2.13.4.ebuild
@@ -0,0 +1,33 @@
+# 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="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast XML parser and Object marshaller"
+HOMEPAGE="https://www.ohler.com/ox/ https://github.com/ohler55/ox"
+SRC_URI="https://github.com/ohler55/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_configure() {
+	${RUBY} -Cext/ox extconf.rb || die
+}
+
+each_ruby_compile() {
+	emake V=1 -Cext/ox
+	cp ext/ox/ox$(get_modname) lib/ox/ || die
+}
+
+each_ruby_test() {
+	${RUBY} test/tests.rb || die
+}
diff --git a/dev-ruby/pry/Manifest b/dev-ruby/pry/Manifest
index 390d357b4e89..e784593005ff 100644
--- a/dev-ruby/pry/Manifest
+++ b/dev-ruby/pry/Manifest
@@ -1,3 +1,3 @@
 DIST pry-0.13.1.tar.gz 240103 BLAKE2B da4797e36aecba8bf1a785738339ed4be1e06ab28b329b66551a908898cd0515fc0da2434ba96e9fa0f350c9d32c13f850660bc0236c6c0218a4bd3182ec4ced SHA512 bec52c75dce365db68504634b2eaf6b0f312527031401199fcdbaa3ec5a9272148239d93305f8e66c4d36513f9fec3fe045e978c5a10f012a2880ab4a16b7e85
-EBUILD pry-0.13.1.ebuild 1241 BLAKE2B 5f69bbe4e681d3abab4773152098e62ba8bd8d89579322cf1f59d4b040a8ce1f370f75607a5329f2e382d065962d24768ce7a58aeda0b51b8dc18a807aa4ad2f SHA512 f610cccd1b330854c8444a44b6a5361b4ef2501183c4d42b5aef5e22ffa8ddbf2525fafefb9ef67067e7073330b6e2d340854a55d77645f3897687a36e75387d
+EBUILD pry-0.13.1.ebuild 1248 BLAKE2B b5dcbcd9acd0f436c5853518d9682a33cc89c5083def9709db75d86dff2f1d688f4f1953de12e13d44bac2eb06589187f197bc4500b457167e388ff287cbd924 SHA512 c3097a4b8acfe440ae28546dac14885cc2c8c17bb9d87dd513791581e9ea9a43e6bdb359e5b5d4cca629eaaaf70784ed4e159dbb054beb76bf9961bb5259c156
 MISC metadata.xml 333 BLAKE2B 0c32ac9d2cb59e7aa1dfca56e88a2a38b783bdb2779c9336eca40d06770f02252442afb3372c1a786bc491693548c145079b3aa8e61fefeb0b81209f0afe3fa5 SHA512 4bd968aba7e36044799dfb4abba1a0127c4aa4ccb4e7d1830dafbf27c6c9e94fcc29ad008dc527cf2c409c8308dee14f803946afbf716bc22d9d3f716b951887
diff --git a/dev-ruby/pry/pry-0.13.1.ebuild b/dev-ruby/pry/pry-0.13.1.ebuild
index 4b735fec0735..c8dfd0ca4f1e 100644
--- a/dev-ruby/pry/pry-0.13.1.ebuild
+++ b/dev-ruby/pry/pry-0.13.1.ebuild
@@ -19,7 +19,7 @@ IUSE=""
 SLOT="ruby19"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 ruby_add_rdepend "
 	>=dev-ruby/coderay-1.1.0 =dev-ruby/coderay-1.1*
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 7ac3db416b28..aeebab78f194 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -3,5 +3,5 @@ DIST public_suffix-4.0.5.gem 106496 BLAKE2B 1b581b2d08e78b156d70f25d1af66f825f7e
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 EBUILD public_suffix-3.1.1.ebuild 831 BLAKE2B 968e319d13936e42e934d505804b591c04326570af9c782bee4f69f95d11b0dcd5851bf499998e5beff5f00b57ccfaf2e890257ec82d0154847abad72adb2a28 SHA512 17f9bdf7fc3b2e7a4a2f120de1edde11160529cabb3037e793b3161c7b0b26da38526c2b63307fe7f9303998edb8ca8e40adf3bb7883fcaec7771ac2a5d64075
 EBUILD public_suffix-4.0.5.ebuild 820 BLAKE2B 37a13eff7a950424858cf7daea0f614369326cae62fdbd80f14d0b314ec1641d4263b9f414ce9f31b929d67f771e372b63cfdeb0307ec35c628e2b9b46b20c9a SHA512 6f328162c2a0f96c9e7a57ecabf7ee28ef82a7fca9331b9e94c92ec8b5f49d627a298a98f08aa10dc6294e71d1932d2d968aeeda6912c7d31033ba0e426c4cd1
-EBUILD public_suffix-4.0.6.ebuild 813 BLAKE2B 8d9221097e7a7d7221a6ad4e458966dbd3fccb10da0583d0127255f0293e2f12c58e87bf26bab102a23405417c041aac8fe9aa687f2c4c22a5e20632f89ef2dd SHA512 ae4dcbeff9c6239ab5d60b89b4ed66fda30e52731841a550b4d04ad9f50c4c035d3d4b31afac79cb4ff8ab71640aefb9c9a3689f1d9ce84449c6d8b733ed835e
+EBUILD public_suffix-4.0.6.ebuild 817 BLAKE2B 3b795664ca3374e3fe235d440717a1b6660dfd90eeff0b4025ff0c8b5f8a7a47bb4335400f9b9fef9d21aef66a8bd8d161cd5e2a71e2f8968105932474438580 SHA512 9767ff0daeb65c7d8726a907cb8c0eea7d52064a9d75b7583b3b5d24962a697556365a908c7b15b8ba8a823867440ec644b2970db558d78f4d97092c03d541ce
 MISC metadata.xml 340 BLAKE2B e5ff0b06a3e6205a270389a1aaec9cb8902fad8e9b815e650b9be53276545b401565d8f7b1167ac415766a809fa2358289811196001e840d9d8641bbe2ff281a SHA512 e5091bcfca152fb1301ce5969cb5ce1e65db3452926c5b75db5afb284e28f44655495663fcce3ba5718b9817d1e3f6db491fe8da96732181926ccd58b36d7f20
diff --git a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
index 6cc412056769..e7114d519365 100644
--- a/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
+++ b/dev-ruby/public_suffix/public_suffix-4.0.6.ebuild
@@ -19,7 +19,7 @@ LICENSE="MIT"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
-ruby_add_bdepend "test? ( dev-ruby/mocha )"
+ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
 
 all_ruby_prepare() {
 	sed -i -e '/rubocop/I s:^:#:' \
diff --git a/dev-ruby/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index deff4bbd7625..1e2930b58607 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,3 +1,5 @@
 DIST rack-protection-2.0.8.1.gem 16896 BLAKE2B 013fc8a5ceaadbfde52a7aca0dab8116cb01d6f034f3370d22a09545885a61adef92ad5ed9f82faf4434507a079ff9a0c3781b906ab6aba69fa032216f276fcb SHA512 264aef904d9ae1c38197ad4ad44f1638905bd180fc4bb402c47856c37168059e8e975ca2de5518b1e5cebf79b970024b7d9f5f8b8908880451357dea5e428562
+DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded
 EBUILD rack-protection-2.0.8.1.ebuild 736 BLAKE2B 20d3813d03588afa80cadefbb7bee5edc16e76c567bb811535ebdeffc4c99ba3ffe17d5c27ad1a6b46d5d55d6dd2b090bf8580f38ded35da19c6a4f1e4a3f7b8 SHA512 2486daa5f4559df33aa1ab9b0277ee8feddfca9b946494f46d5f3844760c6b74a35323d0f8e8ac174e6fb364e0ca03e8a42a0c5f8f51c9f8fdf44dae6ca9a6bf
+EBUILD rack-protection-2.1.0.ebuild 730 BLAKE2B a531477bb23513c4e27b00d03b2591371140663fbb618fdcbaeb3d9e31950792ba75f58db2448246e954e9a9cbbf40247eb9c2168c684d3e031af5a82dcd96e0 SHA512 3111e1b8fc22872bf828cc3074969eac1bd478dffb4fcfc19832c3e226f928ac1b1442af4275f8718acdd9ea695431369978f7fd891d52835a033f8dbf5e89ac
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
new file mode 100644
index 000000000000..06b55d8939fa
--- /dev/null
+++ b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# There are no specs in the gem and the source cannot be downloaded separately.
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="This gem protects against typical web attacks"
+HOMEPAGE="https://github.com/rkh/rack-protection"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+# ruby_add_bdepend "test? ( dev-ruby/rack-test )"
diff --git a/dev-ruby/rbst/Manifest b/dev-ruby/rbst/Manifest
index 05486bf2d630..fa8b291774c0 100644
--- a/dev-ruby/rbst/Manifest
+++ b/dev-ruby/rbst/Manifest
@@ -1,5 +1,3 @@
-DIST rbst-0.5.1.tar.gz 14039 BLAKE2B 7399e92f98c650842464ea9240775ad776ec8d574c578d8da764778bbe8050be429e2521df82b3b04a0bf9cd18bef4f114890d54ef8d6f34c797f0f2f2e35bc2 SHA512 a7fffc1ccf495c1858d6d9fadd38a4d6a2c27a2da8eda8dad038f4ab881f4521223a35f97d4018d25b32c2621132a623040ba930494b36e1385356ecb87fecdc
 DIST rbst-0.6.5.tar.gz 15760 BLAKE2B 3bace4401c8c92eba286f242c1e074aa833094c21e4b00bfa2eee982ad8cbb94024dda2210eb1c72ab88293b1a63a62a5bdeafde2615b0430bd0a7cc21ced14c SHA512 2d4a28c70a4925e1ffe0cd2ff10c275f67cae4a918c1064bd73cb8e7e490be251acff09670d78fef1edeb1a7dab8995aa0b4737563a0797ff66c0fee3f89bba2
-EBUILD rbst-0.5.1.ebuild 1208 BLAKE2B 6b1d9578b7281248c0249c8cbc86040dbf218551396ab2be63df96425c90e1b52a959feaf9179bffd264a9dc4880a45d84b70fcb63fa2cd03f1da53062f5f2d7 SHA512 3e3a542a342be779260e4a5baffe62c587068c2311339be6d7ca554c465605fb7d6263d208cb83cbc23ed9eef3cb3e311da5de18a1735af320586aa6d5629f7b
 EBUILD rbst-0.6.5.ebuild 1132 BLAKE2B d50df289abd1c67e6d06c342bde67d2556ea0787f38171faf25f98feb59cf09f67c1e0497a1444a4d51ed0e9dbaefd53c15a8acb579d83efaf77db6b4ada9120 SHA512 5dd657ce76ac99d54db0c934a87e4ee5a4e3f2787725ba862991dd4a97beeda906d911e0baab684f568a61651352582520efcdf4816d24e416e93238bff48abb
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-ruby/rbst/rbst-0.5.1.ebuild b/dev-ruby/rbst/rbst-0.5.1.ebuild
deleted file mode 100644
index d26acad50ed3..000000000000
--- a/dev-ruby/rbst/rbst-0.5.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_6,3_7} )
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_NAME="RbST"
-RUBY_FAKEGEM_GEMSPEC="RbST.gemspec"
-
-inherit python-single-r1 ruby-fakegem
-
-DESCRIPTION="A simple Ruby wrapper for processing rST via docutils"
-HOMEPAGE="https://github.com/alphabetum/rbst"
-SRC_URI="https://github.com/alphabetum/rbst/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="dev-python/docutils ${PYTHON_DEPS}"
-DEPEND="test? ( ${RDEPEND} )"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-1.1.0:1.0
-		>=dev-ruby/shoulda-3.5.0:3
-		>=dev-ruby/test-unit-3.0.9:2
-	)"
-
-# Tests are pretty much useless as they depend on very specific output
-# from an unknown docutils version.
-RESTRICT="test"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ruby-ng_pkg_setup
-}
-
-all_ruby_prepare() {
-	# do not use bundler
-	sed -i -e '/bundler/,/end/d' \
-		Rakefile test/helper.rb || die
-
-	# force our python version
-	sed -i -e "s:\(python_path=\"\)python:\1${EPYTHON}:" lib/rbst.rb || die
-	python_fix_shebang lib/rst2parts
-}
diff --git a/dev-ruby/redis/Manifest b/dev-ruby/redis/Manifest
index c10d9882e6f6..572a4f5fb26e 100644
--- a/dev-ruby/redis/Manifest
+++ b/dev-ruby/redis/Manifest
@@ -1,4 +1,3 @@
-AUX redis-3.2.1-local-redis-server.patch 1710 BLAKE2B 8ade0ba31d4d4466e6f874e2303bfb661d4773346f8bc2ac2144ecb8466da4173289d57d9c71f9e90daf4b560724aaf4a854f623c9f09f098f45498c16f08c6e SHA512 e10f59dfb7249874b0e882b888904901fa780ad1687b5000dc73851fe53e5bd2319c4418847ecca4e22efac404a4a283e108755a03f0615d76e0f23583602576
 AUX redis-4.0.1-local-redis-server.patch 1273 BLAKE2B 108c8baef8beea68327c3b9bce8e56d133ff6357068407db08e93b70305726cd061585ec62ae28f8450ccb29b950eb20495c890234c738890aa0228591e97d79 SHA512 0eef2e7535ce06c4f0a86fe3118d12b95ea36f968fdc015fd68faa410041911eb62ace26155fb628751a3e3d264a1fad41890095cbadeb230630c64009b273a0
 AUX redis-4.1.4-local-redis-server.patch 1454 BLAKE2B cfbb707109cac75fb38a614c41b3cd0cb9b9f70bc9e62a2fcdcf9208e7b1b0c3709101d788d1158b0cc3c4e47f9817a82e88ea2165b85304474f47cd1d1cdac6 SHA512 903d186c9a834208f89b06c4ea2ae2d8e8559e0d8d5d0e71a0c7ab8ffd212463e34b1da551b5ad1267a3283eb4c735fb85a94b696d403399368d3d97a2b50abb
 DIST redis-rb-4.0.1.tar.gz 87859 BLAKE2B c53f9a4ae96195eeab9f8fd0eae1ec8bcfeee7b717faf5b85c127ff90a88fbf9a0cfcef9d4c002ef7ee07f12a8e813bfd3e4d284a616d8637029d51a6c067f34 SHA512 c377512e0103a1aadb4aef3e64983fd4b20a26d67320ff0c500b7617c8b3bd5b4ba2240488a7d55be1301bb0b926398835f5c242ae97afe9141b3499da358eb9
diff --git a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch b/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch
deleted file mode 100644
index 3c6b351db485..000000000000
--- a/dev-ruby/redis/files/redis-3.2.1-local-redis-server.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- a/Rakefile	2015-08-11 22:16:04.474139810 +0100
-+++ b/Rakefile	2015-08-11 22:19:01.024398679 +0100
-@@ -1,14 +1,11 @@
- require "rake/testtask"
- 
--ENV["REDIS_BRANCH"] ||= "unstable"
--
- REDIS_DIR = File.expand_path(File.join("..", "test"), __FILE__)
- REDIS_CNF = File.join(REDIS_DIR, "test.conf")
- REDIS_CNF_TEMPLATE = File.join(REDIS_DIR, "test.conf.erb")
- REDIS_PID = File.join(REDIS_DIR, "db", "redis.pid")
- REDIS_LOG = File.join(REDIS_DIR, "db", "redis.log")
- REDIS_SOCKET = File.join(REDIS_DIR, "db", "redis.sock")
--BINARY = "tmp/redis-#{ENV["REDIS_BRANCH"]}/src/redis-server"
- 
- task :default => :run
- 
-@@ -16,9 +13,7 @@
- task :run => [:start, :test, :stop]
- 
- desc "Start the Redis server"
--task :start => [BINARY, REDIS_CNF] do
--  sh "#{BINARY} --version"
--
-+task :start => [REDIS_CNF] do
-   redis_running = \
-   begin
-     File.exists?(REDIS_PID) && Process.kill(0, File.read(REDIS_PID).to_i)
-@@ -27,10 +22,14 @@
-     false
-   end
- 
--  unless redis_running
--    unless system("#{BINARY} #{REDIS_CNF}")
--      abort "could not start redis-server"
--    end
-+  unless system("which redis-server")
-+    STDERR.puts "redis-server not in PATH"
-+    exit 1
-+  end
-+
-+  unless system("redis-server #{REDIS_CNF}")
-+    STDERR.puts "could not start redis-server"
-+    exit 1
-   end
- 
-   at_exit do
-@@ -52,20 +51,6 @@
-   FileUtils.rm_f(REDIS_CNF)
- end
- 
--file BINARY do
--  branch = ENV.fetch("REDIS_BRANCH")
--
--  sh <<-SH
--  mkdir -p tmp;
--  cd tmp;
--  rm -rf redis-#{branch};
--  wget https://github.com/antirez/redis/archive/#{branch}.tar.gz -O #{branch}.tar.gz;
--  tar xf #{branch}.tar.gz;
--  cd redis-#{branch};
--  make
--  SH
--end
--
- file REDIS_CNF => [REDIS_CNF_TEMPLATE, __FILE__] do |t|
-   require 'erb'
- 
diff --git a/dev-ruby/regexp_property_values/Manifest b/dev-ruby/regexp_property_values/Manifest
index ca959870b9cf..377061c6c464 100644
--- a/dev-ruby/regexp_property_values/Manifest
+++ b/dev-ruby/regexp_property_values/Manifest
@@ -1,5 +1,3 @@
-DIST regexp_property_values-0.3.5.tar.gz 11410 BLAKE2B adcf7848af9df53707a878ee35443583b03f96f60f9b23fd5f146e81b4b12a4e3ada2c48d6509b15c848b15c668d9430ef93b34f08491ce13249ec458b2be0eb SHA512 5ac91331deb12fd77ee6a5ca8f942c2b2ea0ccb42bc63548444ecfe85c3a60bad385831b408f21c848f0c0ac2db3c68f8391fd68074acb0187ae9de51ca76e47
 DIST regexp_property_values-1.0.0.tar.gz 12884 BLAKE2B 82f63d21a1e1508cef79afc2f1b5cca842c1e5bc96b197efa90ec0d02e7bd213cc67ae99f4f71cae6e632e0804fa2d6e935c7d30f27a940c767f5a83dd9edd21 SHA512 f51946d93c255c3b51bfb8055d2c0548c9656db9f208de74b569df8799fa97712a76b509546e149f71e3176ae0e979f295b225c171cedc687e1871f204c1e0d3
-EBUILD regexp_property_values-0.3.5.ebuild 1274 BLAKE2B ce3ba4a919aa88233ea9cb751d8dee1be4103b7ad4947cfb3ac54c21e1e6e0a068dfeffbf60bc028eb7d5e9154f31f49f7123c3538b3bfaf6a4632b7b8bd591c SHA512 dc9834d6f7c155c7ed777d6ec6bd12f029b1d2855f5e0d666cf765adb3c684a2785d0ce865833a5d62b481dc042708a33f21edcfad83d71ad121233fd9f8e1db
 EBUILD regexp_property_values-1.0.0.ebuild 1270 BLAKE2B c2c9c136a08b01620919289499c185d698f526116dc7db35a313248d8eec8d15f4ad2f42bcb52726f696d26c799027f28e6f9e07086b66c8458d61636ffc4d65 SHA512 5bfeba5c9f900d41750f1def93b906df051538e761577479e17662eafd03e2f9e6a952cc6105c0411c234b6ce97d30a37677f4104adbfa4329e84d9ee402c939
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild b/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
deleted file mode 100644
index 8f92cf25165d..000000000000
--- a/dev-ruby/regexp_property_values/regexp_property_values-0.3.5.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="See which property values are supported by the regular expression engine"
-HOMEPAGE="https://github.com/janosch-x/regexp_property_values"
-SRC_URI="https://github.com/janosch-x/regexp_property_values/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
-
-	# Avoid dependency on character_set which would lead to circular
-	# dependencies.
-	sed -i -e '/returns a CharacterSet/askip "gentoo circular dependencies"' spec/regexp_property_values/extension_spec.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/regexp_property_values extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/regexp_property_values V=1
-	cp ext/regexp_property_values/regexp_property_values.so lib/regexp_property_values/ || die
-}
diff --git a/dev-ruby/request_store/Manifest b/dev-ruby/request_store/Manifest
index c2c10542aef4..f93c713b8a14 100644
--- a/dev-ruby/request_store/Manifest
+++ b/dev-ruby/request_store/Manifest
@@ -1,5 +1,3 @@
-DIST request_store-1.0.5.gem 6656 BLAKE2B 2bd96d3dd40e846e8b36cae338c1f95ec812d6121db332e60c85b4c8e043fe81229e9e2f7f8f3c1ef3d7c592515bb69d5dae3cc4755f181fd29a1eb7e7c6254d SHA512 0d69ebdb8d3f6df11f89780c250b5fcc702258e19d7fbf8e2273614ecc220ee25e059a596a8a7e39bcc426f8d834cab38c161c0c1a800cc7ebdba3daa810e727
 DIST request_store-1.5.0.gem 9216 BLAKE2B 75dd49c33cfebcf0deef78be1fe054feb7198b42409ec4b339cefdbdd4fc066159bd18ae6db8001edd0fe20e1e8be1021812e6ffd033eed0bd9730603aaa2daf SHA512 c01d4505d2bc0b88456d0bc49416fcbea67da1e2ab6ef0c7fc900fae8856d82157dc39d2e1d2f299000f74b140f6f13d7352f4684e247d103bbaab7b1705910f
-EBUILD request_store-1.0.5.ebuild 463 BLAKE2B 7df54319509ab1e2755c57463586a436ee94308ec8232d23e8e8b887b61bab3dca3a0320c85936eb1ba45f72a476dfd2c0649faae4883a400db1b78d64c1da8e SHA512 940b617a4dce693da882ab943c1a48cbe0147d6a44967241ca6f2ecfeb25e6918ab71c333467a45aa2e8564ff309bdfd9353470b9262aa4425c0d947ef169fcc
 EBUILD request_store-1.5.0.ebuild 483 BLAKE2B fb8097119fc727cf85319c873a8f93d2b05646a6da22ff2065cf7fad6c96989d2c27c8a41119c96e4de3cfa20d58e188d673399bdcc74ced9553f7e153f1f6b7 SHA512 5913f1afc41b25c924dad740af3b09b50a9fde0443776873f0d9d8d01f126089f806b83069abf834d866251ed77e95d650cafe823adbe40f04ecb70e8e7d91de
 MISC metadata.xml 352 BLAKE2B 96f0c7bc363401045297f0819f643d6bb4673c196b9edc4d40ec6aa3c66b9b4921cfcb0e5d5082778a720a68d7fcc26f6d814843f0177f7f548cc0d1f56f34d6 SHA512 ef219e94da98dce395d21d81db23380925391207d00dd4e39d2000ba841f62b237b13733ded2fcd67c36e3d18e9ba28b33fa3905c7d9cd7466fc8c942d577c39
diff --git a/dev-ruby/request_store/request_store-1.0.5.ebuild b/dev-ruby/request_store/request_store-1.0.5.ebuild
deleted file mode 100644
index 2a630a4ab724..000000000000
--- a/dev-ruby/request_store/request_store-1.0.5.ebuild
+++ /dev/null
@@ -1,22 +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_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Per-request global storage for Rack"
-HOMEPAGE="https://github.com/steveklabnik/request_store"
-
-LICENSE="MIT"
-SLOT="1.0.5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_all_prepare() {
-	sed -i -e "/bundler/d" Rakefile || die
-}
diff --git a/dev-ruby/rrdtool-bindings/Manifest b/dev-ruby/rrdtool-bindings/Manifest
index 3e8816cf0acb..3bf69b1ccc6a 100644
--- a/dev-ruby/rrdtool-bindings/Manifest
+++ b/dev-ruby/rrdtool-bindings/Manifest
@@ -1,8 +1,4 @@
 AUX rrdtool-bindings-1.4.8-graph-ruby.patch 1857 BLAKE2B 4a36c4dee4e755bd39851c5c333fddacdddb53324017290f15345687b577caf9efb41d97ce55cc0bcd57554746e1a90d9a2d9fd92c0acd48b405eb02957e491c SHA512 1803247c9949a6d28d7027242604b5d61bc9da38ff22ff9d6302ca69743e49328372b4e51554c868b19a459c4341fa6d1291d09d62ea6a414a81d4558a7ef66d
-DIST rrdtool-1.6.0.tar.gz 2186538 BLAKE2B b56ef79b9d45a65cacd7c1d8da2158dcaaff3ebc2ffc0640081cdc2fa3ac643be1ce48a2cac60427a836dc3e457ddb042c95533d0ffbcdefa2978f5659150391 SHA512 45a8f16a2bda9d497c5f39de80236adb7a5bd054a14755c4d130f21cd6430bd0a76caef9632994be56fd1ea2364eb218687ea8ebf945a71ca411221c248f3ebd
-DIST rrdtool-1.7.1.tar.gz 2881346 BLAKE2B e538c6ba3fb6726f0515ed655aa8d5e184f6d3066bb32e981b3254e41c53e29529698da5ef73f8365391180c76d15808d1d727a0834b8025893b01c3b9af8f46 SHA512 ee5c9ff234493442ccd9bfc7031700483011de3e05c01e026509b699cb0d7d3e286e2046357c5fff5807f3e709043c8f218b48b43f8b126a23e228a3927d7b14
 DIST rrdtool-1.7.2.tar.gz 2883737 BLAKE2B f3ff6cc4e325cdec42a6f9e67a1644f501c11edc47bc281df58c2e1d7be4c01767c35166f4301f68cf9c22dcd5c159bb51ee704a5e36776acdf166100122cebb SHA512 453230efc68aeb4a12842d20a9d246ba478a79c2f6bfd9693a91837c1c1136abe8af177be64fe29aa40bf84ccfce7f2f15296aefe095e89b8b62aef5a7623e29
-EBUILD rrdtool-bindings-1.6.0.ebuild 1367 BLAKE2B 3455abcee11a899fa33f558abe25e91658537e5a62afa1b50500bed126baf1d1f3f28542ae60ad2105a199565b0186453eea73d804ae50015e88b2210ab449ad SHA512 5e3215de973ca0445d5342eb54f81fe775dbbee389f725c43e04eb90926462cda1263d9f6125caab6a6af835108a2ec0676de1a01d66f36cd1e3bc55e07c8590
-EBUILD rrdtool-bindings-1.7.1-r1.ebuild 1381 BLAKE2B 3b3c799c16670c1aa030a38297418c72b7a7400870dcbaf3b21612e11aac4d1fa3588e199d62ec9f60def083d498dca278e22305762fa6daaa4eeab00fd769ff SHA512 da3f5306267fbe335c6dc74f7a49e6e187af0c040a0d78dc9f7e3e8fcb13be50bd607b8bcb3027e022bdca4103449baf1e5e119e48fec7f458933e29dc9bc3dd
 EBUILD rrdtool-bindings-1.7.2.ebuild 1387 BLAKE2B fb488aefa1589c5e1fee962be1e24c1350eb57cc1a2395c3b9d0764b5d29a3c4e4f0bc43bf2dafeef7483f14d33a978b788e703b30f035e3ed118189fac6e0aa SHA512 bda59a6365c10f8a41676d77fa2c4ed7552cf0d4f57ec35a34ca0e7f74adaff523406f468ea6dcbc81cde105dbb3cb741150108576e379a5a6c21d0426d690ae
 MISC metadata.xml 463 BLAKE2B edb3b1f3703163a7f6c28ea7d16a79158d108721a2a775e30967885fb6b7b31d6074585951cc5b1c7b640c88b0694b95f0aaf62b71df43a8d6d6a0d6f78e07c9 SHA512 60732861cde4604b50875b6bbba205f232a52c4d91e6e21bce49a46bcef824bc542140e73b07ce4c18518a366ff8c9bd34569895741b0ac292124f43b0f02aa1
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
deleted file mode 100644
index b0e52ca54cd0..000000000000
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.6.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-inherit ruby-ng
-
-MY_P=${P/-bindings}
-MY_P=${MY_P/_/-}
-
-DESCRIPTION="Ruby bindings for rrdtool"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-RUBY_S="$MY_P"/bindings/ruby
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="graph test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( graph )"
-
-# Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph
-RDEPEND="
-	~net-analyzer/rrdtool-${PV}[graph=]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
-"
-
-RUBY_PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
-)
-
-each_ruby_configure() {
-	rm ../../src/rrd_config.h || die
-	touch ../../src/rrd_config.h || die
-
-	${RUBY} extconf.rb \
-		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
-}
-
-each_ruby_compile() {
-	emake V=1 ABS_TOP_SRCDIR="${PWD}/../.."
-}
-
-each_ruby_test() {
-	if use graph; then
-		${RUBY} -I. test.rb || die
-	fi
-}
-
-all_ruby_install() {
-	dodoc CHANGES README
-}
-
-each_ruby_install() {
-	DESTDIR=${D} emake install
-}
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
deleted file mode 100644
index b9c82b87c592..000000000000
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
+++ /dev/null
@@ -1,62 +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=""
-inherit ruby-ng
-
-MY_P=${P/-bindings}
-MY_P=${MY_P/_/-}
-
-DESCRIPTION="Ruby bindings for rrdtool"
-HOMEPAGE="https://oss.oetiker.ch/rrdtool/"
-SRC_URI="https://oss.oetiker.ch/rrdtool/pub/${MY_P}.tar.gz"
-RUBY_S="$MY_P"/bindings/ruby
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="graph test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( graph )"
-
-# Block on older versions of rrdtool that install the bindings themselves.
-# requires rrd_xport which requires rrd_graph
-RDEPEND="
-	~net-analyzer/rrdtool-${PV}[graph=]
-"
-DEPEND="
-	${RDEPEND}
-	test? ( ~net-analyzer/rrdtool-${PV}[graph] )
-"
-
-all_ruby_prepare() {
-	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
-}
-
-each_ruby_configure() {
-	rm ../../src/rrd_config.h || die
-	touch ../../src/rrd_config.h || die
-
-	${RUBY} extconf.rb \
-		--with-cflags="${CFLAGS} $(usex graph -DHAVE_RRD_GRAPH -UHAVE_RRD_GRAPH)" || die
-}
-
-each_ruby_compile() {
-	emake V=1 ABS_TOP_SRCDIR="${PWD}/../.."
-}
-
-each_ruby_test() {
-	if use graph; then
-		${RUBY} -I. test.rb || die
-	fi
-}
-
-all_ruby_install() {
-	dodoc CHANGES README
-}
-
-each_ruby_install() {
-	DESTDIR=${D} emake install
-}
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 2ab9e351d423..bb45422b7fd9 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,5 +1,5 @@
 DIST ruby2ruby-2.4.2.gem 26624 BLAKE2B c7ad5c63829bf03cc166d42f2ae67b47790b4652b1973367881a4c242866acffabf6783cc3296ca7ea91ff3e9967f703852be6c4bcb53dfaaff0f822b50747db SHA512 ae8a34a77d48a97d29bd0ea9e2653e6189666564e971b985e7a459a562f8f03fdff4ec8775a2184cef578249aebbc8a050b57613b63d3c09b7a84aec5f727a7c
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
 EBUILD ruby2ruby-2.4.2.ebuild 915 BLAKE2B 53f564adf0858155db647b3cbb283e85e653fb6cfc1ad867414179aa5718ba6023ac17335aa7fba9bf2c57ed6bdbf161f0efc762a331cf732f4b3e8cfb636e46 SHA512 53c160ca6536d1835ea68c563742934efe736dcdc7bb719facf8674dc3f58c9856a50dd2539017775a5ad8953746483792a7e07b18b89a3ea379aeb0a0297ca6
-EBUILD ruby2ruby-2.4.4.ebuild 857 BLAKE2B 08a0e37e7d4c602620eb63b977559c91f80e2243210e57215c417eb286b4173054864315aa34b15ed5ee7730261f1b8fb61e39950a8053ad6f38cd0d4fd4e5ae SHA512 3c5fbbabb7710b4b815f67504c3b198d6b9aec21e791dc5f042dbd38d20fa0d1b1c2e26e0d392a25d0e29afb12f6814115829d4cbc34f6f6f15bfe4db70e95a5
+EBUILD ruby2ruby-2.4.4.ebuild 856 BLAKE2B 05a0193b1f788d251f03ef48582f0e21f681201fddd8392ae21db5ae7a289c34692a58e88d563c7bf796ea78a9a5ec933555fcc50af39adbad1818ebd30c70ed SHA512 db968bc85f3a5624bb9872486a8005504fb68f308aac4305d9e0553d2d85324329b732fefa3f1ebc77bb81c360dc75e438b39c2655c7a2f741856124697112aa
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
index 8e12abe14932..9b3609e0f520 100644
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
+++ b/dev-ruby/ruby2ruby/ruby2ruby-2.4.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 7346e838ed9f..808c1dad2cc0 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -2,6 +2,6 @@ DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57
 DIST ruby_parser-3.14.2.gem 466432 BLAKE2B 2694888b5b705733468eaf074f7f059814e2a230d1ec7390ef6b093c717534bfc6648a00240fd07d0f108ee1dcdc9f81b121a0ff0446d4ebf75fa5bf87006fa0 SHA512 65b8977fff322d4ecdbb8da1276d76318f08a13a25d8cf8429ba5ca7097c2b58c03431d60b05eec6cb62be316cf9b1efc753b86e8b67e076fd413d2324bc6655
 DIST ruby_parser-3.15.0.gem 527360 BLAKE2B c27b98052c0850df8decf123a471fbe541190b611b6abc803bd868749ab2c020d15935264d607ee617b8e75df44871b2985bd11bf17062051a172df935fedcd9 SHA512 f4d64a7f86d94a324b47f9354b8962a5b96d62ac41b6fedae602b0c3782bf2871ec3d0131770d886c5f58de188a7ed71fa3c31c548f53b75ff04474962b442ee
 EBUILD ruby_parser-3.13.1.ebuild 1141 BLAKE2B 41d7efd0833ebae44cdb5f8a419d711429540beae4881a171bc512a2889d50d6cb6e9b857aed0a172ed44f17a84278311323216f1400167b09cc75eb7e51c449 SHA512 9849ffcc86e1cf4ad64f36bf94d2928ffd65f98a692d5afca492b9db2e6a9ed7f54f79e620ba018a4c0a952e985beb08b5039b2a927cc14a705521b558aa92cd
-EBUILD ruby_parser-3.14.2.ebuild 1080 BLAKE2B 42fd115d446ed2e6847108d3f84d8380eeae91e305e3488a549e623be7d9e08e3de863774a88280ecf58c3ad4115d4d74b6e6d04b5b6a5287d1fea533ebe50c1 SHA512 ab96851a8de6cef78325513c561b2f5360c89f6a444fa46dd653af1f908bdca3f43cbc71d9a1ab8d299981292d9c3fbdcc7454217b23dfd7cb45dffe7d2875a8
+EBUILD ruby_parser-3.14.2.ebuild 1078 BLAKE2B 10807f7c85408ffafa24ba203d6cdab42c0aadadb65af32614ebde70db4b0b009be1c370838a2dd79c3a4178594732024e82df7266eeddff077d77ab62fb9505 SHA512 f744fd776d5679ef5add54d272552eeacc9321f1a61c86d0a7bb6c34cdf4e15e303149b16b6c91beeb3d869970e8655f10a441e06a9bef7b50c1c73adecc766d
 EBUILD ruby_parser-3.15.0.ebuild 1073 BLAKE2B e14966a3c65135e7ce2ed79fdf979057fff99c98e407a4d012be22e2991dd0cb03d7c74acc57cd1d9162642fe8c91a4db6b08981e16031cb69f177f6946b4a62 SHA512 a3eb8ade3971a29369474cd79ae23d8716140440c14cf5d19618d5062e9c51cab1ae420755323290d1483e3bda1ae6787c81998cb3bf6ee1712b74d18118971a
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
index cc09e5c49971..ccf169068242 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.14.2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/seattlerb/ruby_parser"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 4cb24b41b484..117230046a1c 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -14,7 +14,7 @@ DIST rubygems-3.1.2.tgz 995386 BLAKE2B bddf5dfc3568402257a2218642e6a15fe904b8371
 DIST rubygems-3.1.3.tgz 996881 BLAKE2B 0dd3bad8420de742f5ce76db977bee800f1abf2beb48b9d8f32332c4d06814d5febb8df0a2e70f6c4f26a1aa6adbf802e041019ff1d15e2c1f8f9d2ab65974d0 SHA512 8ca0c869a53c4b99072f220bca3455edee6126effb2bc5abb9265758083688b523303e8d2ca0e6d612fbc40140c06570f990fff50cce104f443d86458b190c3b
 DIST rubygems-3.1.4.tgz 997835 BLAKE2B 21b8060f28e2228b7400533fa1d9fa1ae8bcaff3ebf9354e64f7d70ae35366147805a6f169986c956766bf41f34ce458d30c326c2b6f996620b14761fdf224b3 SHA512 86bb42736ccf320929eb12c83b3ce55fe95053ce5b38434902604d8d61d78c3f3cd8f20858d0fed66c473ef9fd70d7cb596c077cd06506caeac3e62ee6812ad2
 EBUILD rubygems-2.7.10.ebuild 4523 BLAKE2B a93a70350e32efe702f346e26416eb7043700e5f2ba437889463f1a2af0218c2eb3fdf2687fd10b834f9413ce2e8b9588eb94042ee33d18b577c680d410796ed SHA512 2ebbe7993a7492c54e85eda668bf9349270ec4fa57a7ec8e90597a8e2a3ea955ad925e21b01352c386e29f95e77df015fac9258a16b9d7823b7629bf2e4410ed
-EBUILD rubygems-3.0.3.ebuild 4659 BLAKE2B fe779d125948e6724830cc1f9f9ec32c5a077e98c3b2e210d633138f28d4b7c7fc0a417b62cb72917fca82abe345623db7c74e0c32e8b702f7231a4dd9251874 SHA512 486593436d96f8d586609b396f8ef93010956780c0c162bf9d4e7f35f1233964053f7f94de75c7747b14c69094f33c1e51c1cd20daf462df6e3c0193675e446a
+EBUILD rubygems-3.0.3.ebuild 4657 BLAKE2B d9e420f4f03dc09d68fefebbfd535624e11a8c123f95fea95fbf5466ad6738977582eed9fd581ad3a5541ac74c9bfe2479a247d57410b8fb273f67fa92e9a218 SHA512 9f533aa3433562bc45acdffc01aff82dd017a76be8c2fe32e377f2dcb65276cf97212eeedc3f99d6c16a6fc15471adaad7c6e599524505b7a6e0f7df0f6203ff
 EBUILD rubygems-3.0.4-r1.ebuild 2519 BLAKE2B 7a76a3c3d984445c0c2908547246bc69f74f67cd1876ba573f8af95675a6083a1d89a534bbf17b8641565deeae14474f10b83a68c56291f8f7d2733c6c7ccde8 SHA512 cabe1a62f9deceb944afaa9f7290f536b5edd1f452a556995c0c9524d793c1032327748e9820018ff6048c975af7d90f50981ab57322d717882ab5b9b4b5902d
 EBUILD rubygems-3.0.6.ebuild 2520 BLAKE2B 2c647d1d469e7861046b1d45b5084e2d2187b8611021f349287a34bc15270d15adc394029e2140ce94e9a4d2d71b413ab115ae09b280a590204b04e5184692ee SHA512 ecaf23ec49cadb371f4474b5cf2b9321a2a40efc20f92ff2afb7ad0d282915d70a24acacc4b53bee85d98e0b0aeb6e20c58e082d7d05123caca7f029ee487cf8
 EBUILD rubygems-3.0.8.ebuild 2654 BLAKE2B b60639ca7ebc7f1f2523c59c6431be637599376e3a52798316dfb539f8f2bf53a7077d92e48d82bbb2190c73dc2d24f6113c9aa418e9e9768c00ba108c090c8f SHA512 e44d8b97cfc1d75ebd77f2628649aad2f333e8237ed428b6956e0c6194bd8e8a5549f1767dab1e9193c526f6688c22f25fe00e427a77d325192ce52b7a822244
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
index 6ed9c3617872..e113d2a359a0 100644
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.0.3.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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE="server test"
 RESTRICT="!test? ( test )"
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index 8f80457c6fb2..9e9ccc345919 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -2,6 +2,6 @@ DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb
 DIST sexp_processor-4.15.0.gem 56320 BLAKE2B 8624b7fe28f4aa9447f42cf4f8c5b424088ca2c1628f3e785f746ceb60725449812205dc657ea856c5bead616ac18d689330315fdb44e92447ee3a89740557d1 SHA512 f7877ca59191ab39848c6d3b0cf9625c2e1c180784cd757c00a7cea67aa6eee5549ab5630641f4044c875a1aaadc89b8237f8adadc961ed86c5379cb72db33c3
 DIST sexp_processor-4.15.1.gem 56320 BLAKE2B 1f75dd7dbe39b3684ffcbfb607c961e9406ec16373ad24ccdf37d4bd8369a240b8fdfc16f6e7437dda06605c26b2f4b507a14bcf680b91e12bd7827539f54e53 SHA512 e2ae9f5e8f61c1a703f14c692cd171ceb9acda5839417589051ffcb818584ff65a6a86279f3d6f2b9ad8c97ce842d946b57be810e5887effd4c606b6fdf1d984
 EBUILD sexp_processor-4.12.0.ebuild 789 BLAKE2B 88432cd4143f4c316280c7b2bfad605b18c039a6371ce8604ea91442a3d6b51578d213aadaad315d759d7028fe16c9cc8f7428c7ae064eaf15972985ed2f67b8 SHA512 b92a563f9ebca2c7b6214bb1c8170274f299ead76f41e1fd57939e75de3d79646db6279adecc84da66d5191debe44996dc91314c6e206231aaefdca3becfcfb2
-EBUILD sexp_processor-4.15.0.ebuild 754 BLAKE2B cd27bfa6b69694a31bd53bb91eca78d3ce4936209f43ad2a41ce9cbe38ef798cf65d3ce5dcecfa26121be900ad1e7a3925ce6313f5b64693d73efad5146f8717 SHA512 3161bc6bb013fd69074005ead4f6b70e7b0fe2c47043f048b4ea09f584e37e248027f8d5c8aa2a2a88396a602b80ac375f111a0105b6cbd2a1b968a8f45b52ab
+EBUILD sexp_processor-4.15.0.ebuild 752 BLAKE2B 9e0eb8f279b675614609116ccd53a74bdae4de66cab0b03ecd0df8aa6c4321ad7fd5aeacda535987946afe5177dbee64d425add30977052a77227c82c234b1e8 SHA512 9bd8e6b2ded0bee500c53f68c66bf9aed331a39671337371aaad79e45216cb6e8fe9140ed57d0afefbba3e3b571f6da4ba4b757ccd3826b7e43bd28dc3aa0919
 EBUILD sexp_processor-4.15.1.ebuild 754 BLAKE2B cd27bfa6b69694a31bd53bb91eca78d3ce4936209f43ad2a41ce9cbe38ef798cf65d3ce5dcecfa26121be900ad1e7a3925ce6313f5b64693d73efad5146f8717 SHA512 3161bc6bb013fd69074005ead4f6b70e7b0fe2c47043f048b4ea09f584e37e248027f8d5c8aa2a2a88396a602b80ac375f111a0105b6cbd2a1b968a8f45b52ab
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
index 19ab7bf0b4c2..821f9a8e411a 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.0.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.zenspider.com/projects/sexp_processor.html"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 arm hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sinatra/Manifest b/dev-ruby/sinatra/Manifest
index 5c3e89f16598..64060dadb499 100644
--- a/dev-ruby/sinatra/Manifest
+++ b/dev-ruby/sinatra/Manifest
@@ -1,4 +1,6 @@
 DIST sinatra-2.0.8.1.tar.gz 507102 BLAKE2B 7b88f50b2b2960c17aaa4f0ffbffaf70ece16c1bb29b3ee4706904ebc8e779ad84058ca49ae7cea28f86e635eb9b10ab6f5d94c6eeb4de72637bf5b74d4cac42 SHA512 c6c166e14f2be53cda18263121876ca191c670e12c2c42abb10d0f4a0d8db2916210a6775ef894cf00201c445cd185e5f13c5cd8a1ab0e78e12faa6cb51ee69b
+DIST sinatra-2.1.0.tar.gz 511138 BLAKE2B 05eea600695abf6ee9b2ef0eb2a215c106ac45a343a60017f2cdf8aba8733c1ba5c55235a9c35a4665659797754f78e28d6b8fb1e24391e99a2336ee150bacff SHA512 7127593bd44a5648407631f05d5db04100db30ae862c37e22dc264025fe271336c25df3c47839e41ba200da98be6c7b985852cd53d494a8bbda90fe701a89fe0
 EBUILD sinatra-2.0.8.1-r1.ebuild 965 BLAKE2B 0a64a2f5754ef61d56a2acd3963ef5ffe0eabe5fff57711c90fca4b11fcc0def0ab27ca2c6ff5ba9b7e123764b4e8b37986e129dc2817c9c13eafc45b610de15 SHA512 616fb56643374b0cb9ee63abb60c9de154e86b5028090654770717a6fdd4d0435409a4aec21a334a9619049f2a83e33f42b9971f8718a4a47e332526606599ae
 EBUILD sinatra-2.0.8.1.ebuild 859 BLAKE2B 5d93b3d9572ba4874322b52f35324de551436de0185051b44b7afc161983ac681aa2f5c6b4d3c57c077b93fb37bfb16b732c7c8e6e405b892524786d7530f817 SHA512 340e52ab29f857541ff5f48e1fd66c6cacf40c8d2bc831f9385d6c5df0b149e256bb2ca012cd28b958ee197c8b7c25ab1d1b042e515fa3c6c1dae21644630947
+EBUILD sinatra-2.1.0.ebuild 854 BLAKE2B c1b90704b400fd931f6e5639854d20bc3ba19b0a41487eb7c53eac1227ce9d294df7a74a6d3757207d7f1350079e79a976221c90ad85bd68bf1b4d95d29674ef SHA512 27338b1e5dbcfad54d279d07a54ba4d11c32ac2de21c7bacd2528fa7c10a5fd5bdf8f256920e913d58d410f498b827d7613ee22b6abab4914dd954936f6e19c9
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra/sinatra-2.1.0.ebuild b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
new file mode 100644
index 000000000000..601a0f85a37c
--- /dev/null
+++ b/dev-ruby/sinatra/sinatra-2.1.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_TEST="test:core"
+
+RUBY_FAKEGEM_EXTRADOC="README.md AUTHORS.md CHANGELOG.md"
+
+RUBY_FAKEGEM_GEMSPEC="sinatra.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A DSL for quickly creating web applications in Ruby with minimal effort"
+HOMEPAGE="http://www.sinatrarb.com/"
+SRC_URI="https://github.com/sinatra/sinatra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/mustermann:1
+	dev-ruby/rack:2.2
+	~dev-ruby/rack-protection-${PV}
+	dev-ruby/tilt:2"
+ruby_add_bdepend "test? ( >=dev-ruby/rack-test-0.5.6 dev-ruby/erubis dev-ruby/builder dev-ruby/activesupport )"
+ruby_add_bdepend "doc? ( dev-ruby/yard )"
diff --git a/dev-ruby/warden/Manifest b/dev-ruby/warden/Manifest
index 8c53224e7084..de96405ea568 100644
--- a/dev-ruby/warden/Manifest
+++ b/dev-ruby/warden/Manifest
@@ -1,5 +1,3 @@
-DIST warden-1.2.8.tar.gz 29841 BLAKE2B 657f9d1b5a7fbf3b07ac8cfa514c410561cce853cbc2e6c7bf6d98deab8f625771b20d339613738a979395638b654b066080fad5a7378b15345cb46e273966c9 SHA512 efd7a416f2da3095d6d33c2dca3a7e09d127fb0abec86e959aba56739ae865ea9a11e234ea1f6d557466d9076e3f271481e20982bc159a3f09a4d55148d45734
 DIST warden-1.2.9.tar.gz 29992 BLAKE2B 8a4470c6503c89cb759ebcc155171e86dbb124585d391d6d06c09da0fc0a4095f0235816b9e80895dafe7290584ba49e6699adc9fe8121b2aaee8d1045919b59 SHA512 2ec1129d9afc178c9883a72ffed06f184001147463827f4c5d09475ad65beb084832902a94980e22136400648ad97f2e42a779faf6d49d5a110f545d82a4ddb7
-EBUILD warden-1.2.8.ebuild 783 BLAKE2B 829e0ba93177dda8eddddedf380a9564d1e7edded50938c53602fb4644e68f06a33130ab5eb2f6cadd0ec4406c7d0e97d459f9ca57cad489650b5cd9aea076eb SHA512 dbed443ab5d0af9dcf2f62fc7a1638560b18ad2a068e036aa96527423ca402033cd69fec6dc921c5f511d2a78ca08d50fc9e7d30c35b2d38e3d23d6902e0dc5c
 EBUILD warden-1.2.9.ebuild 678 BLAKE2B 5e60abcb922dc344cc07c5835561560c52578c54389ed2de03cb140beda5440dbc67892a98adca0938eef6b7c8a0b2b73b7dc4624030153d172f1d189007fe41 SHA512 8f3c8f5bf4ffd3dbf86d9c815c29cd2f4be42e3461e2b9e33ce3f20a9ca533578a17e41d4eeab6d7de5c8e7b578bdf0b09173267b0fad5e6936f29d88789c02b
 MISC metadata.xml 339 BLAKE2B 393d527f8c13840cff0d3f73c38e94964fcfb294074767d395ad1e61048d950cc291737406fb0009ef7e7566f175d18a271b35f783dc70e348325e8c0569f6ea SHA512 60503377aabecc35e11148db41d73be583fec27d3776388f7a2f59eeef85d948f13d071fc245555b8d37148147a5c019d094c9cc7ff044b262dbf44bcb3d40e2
diff --git a/dev-ruby/warden/warden-1.2.8.ebuild b/dev-ruby/warden/warden-1.2.8.ebuild
deleted file mode 100644
index 3a84077a9c0b..000000000000
--- a/dev-ruby/warden/warden-1.2.8.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="General Rack Authentication Framework"
-HOMEPAGE="https://github.com/wardencommunity/warden"
-SRC_URI="https://github.com/wardencommunity/warden/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/rack-2.0.6:2.0"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e '5igem "rack", "~>2.0.6"' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index d0352a8fb7b4..aa8df30f5978 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,7 +1,7 @@
 DIST web-console-3.7.0.tar.gz 53714 BLAKE2B d69a7b467e419e87d43c988026f278aea5ca142e336d120e0a50ef85b36186d2f388d551f19820e01d85fdca5a49c471aed69cb2ae0d6f1828a99350dfe86d55 SHA512 d44e4dc3ef12216829b3f522e3645b0fa9b8ae34fa70b5e52a96e345b8b5fc8dad9af6f9918ea23d276cae03445133b15f780041a8cb61584b182ca6934fd71b
 DIST web-console-4.0.1.tar.gz 54076 BLAKE2B d1c93d828f7c0c33edaac664e2f763aff55bd8437c3f8e3b20cc5c065129a0b213234ea372147d5d6df0917d17cc458e63dad1aa64f9cbd67fbf0a02ab631c5e SHA512 7f2d931b94fc2e51edd28ca0f83473c382bd7ade6e425dd9c79770885efcdfbcf6a3a3223d36572d749da15b05126fd287412d2365d9faa33039de4bcb1c9b27
-DIST web-console-4.0.2.tar.gz 54115 BLAKE2B fe1250ee27cb4df4367e6578d8f644be28fc0cc93b4c9df0f130490d57af1cf14e0d98459ea8404bd7633eb9ec88e6723626d69ec9ea8e39c8566d14c0d3eb04 SHA512 471728a66148bca36c2d7130bbb63d3fa427318bcf01a424b0e26781657990fcc836fb8707a53c396ab934003e53bb9282130a7cd36168007c774beb49e15d4d
+DIST web-console-4.0.4.tar.gz 54372 BLAKE2B 5b52c7dbeeeb13ae6cb8bff8982a7a696311e3667ef69b17611cf3ec8ab26b19869ec799e10d4140cc41cfb31a22af1f51134da06d05cca12b488c5470f6ae2a SHA512 66dbfb9d13be57b790053d748c88a9266e673cfcc253df67b4dbb00c874a4bd3601a61b633d5e3e470e010cb764c13846a7038247122140bdb78f40f673cd82b
 EBUILD web-console-3.7.0.ebuild 1074 BLAKE2B fa1096afae3683ea0da7c0b2d61fc8768f434ba81c805266933f6933c9d345137962abd841d3dd2be17746377666891eeefaeb886a8e55daa1ac2e8c2ba73371 SHA512 d9a93f155a46de6c0c4f60913c85ef874e42e69805e7fea050eed92f6e2542e50061a07694482cf609fdd70bcf044ca1ac03ac2bc5f92a190ce2e219b9aaa7e0
 EBUILD web-console-4.0.1.ebuild 1071 BLAKE2B fcba218fabf4ee60a81d088cc159b373212ea4d6effc121ff1c7e8e2f9ea434efe1674d6ce23c886dbb267660291759a7ea6fef3d52de9441091e67f7d0175b5 SHA512 41470af754e173c258fc1571d9537868cc97b22be59c3ead88295eda9ee80e4791d22ac999b86d9a60ca732593a60342cab7c67e138b9b8c73bd1480a16080de
-EBUILD web-console-4.0.2.ebuild 1151 BLAKE2B 9306e8d9be7ff387c65e9205404ceb4cf0dec1f312df2af4c3e62b811c276661ad7c0f62fac3b44ac37123e3631120b31de031aa3133e2bd3da47ff720042e8d SHA512 663decaf9c26ebea424659ce007d47df8b10b4bcd67b780576b8832c0f3ff9b3ff1cab59d5d28e41aa3be01ce515304d951f52cbcf2dd43aac9e4db0e0bf9a35
+EBUILD web-console-4.0.4.ebuild 1107 BLAKE2B 351ba5c63c81d8c51f1f63f291ca57cba3c3277ff5e554842221dc6c3e0a58dc118b9dc5c61f8904ea8103747b0100d660444c8fe609a6c25e28f39050a5d6f7 SHA512 e565b77b46d42fe531aa1a0a9c4f7d367b3e58979194084ec4dfb57e91a483b7760507ef78f320f78821e0c098984bc0854b0d94ad5fb345322c5336690ca92b
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-4.0.2.ebuild b/dev-ruby/web-console/web-console-4.0.4.ebuild
index 4b777aa1bc85..d5cc8c49ccf8 100644
--- a/dev-ruby/web-console/web-console-4.0.2.ebuild
+++ b/dev-ruby/web-console/web-console-4.0.4.ebuild
@@ -31,7 +31,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	>=dev-ruby/rails-6.0
 	dev-ruby/arel
-	<dev-ruby/rack-2.1
+	dev-ruby/rack
 	dev-ruby/sqlite3
 	dev-ruby/mocha
 	www-servers/puma
@@ -40,7 +40,6 @@ ruby_add_bdepend "test? (
 all_ruby_prepare() {
 	# Use an installed rails version rather than live source from github.
 	sed -i -e '/\(rack\|arel\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/rack/ s/rack"/rack", "<2.1"/' \
 		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
 
 	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
author	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-09-23 10:22:15 +0100
commit	8b4ace9c50842c5b83401ea7b179dcab940387e1 (patch)
tree	230f3135ceaace633cf93e9838b185c4a6664c2e /dev-ruby
parent	9ee6d97c2883d42f204a533a8bc1f4562df778fb (diff)