gentoo resync : 22.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-22 20:28:19 +0000
commit: abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree: eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-ruby
parent: 24fd814c326e282c4321965c31f341dad77e270d (diff)
91 files changed, 1071 insertions, 749 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index edddc179b396..f8164595a0f1 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/backports/Manifest b/dev-ruby/backports/Manifest
index 84b6d88e4641..43ae7ddba95f 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,7 +1,9 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
 DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
 DIST backports-3.18.2{P}.tar.gz 158492 BLAKE2B 7ad924758939fe50b26fb845e96583a57a06e0039780eb96c8df9c535bd5aace261a6b3619ca3bc3a772c0db51162e9d340a6a1515c746acde91d8cb608f83be SHA512 3293430331f217c13f754242848f2541906ce930a8683f0ed65a64f93dc1d2387ef33501b1d8129872d536bf2f59c4e975c67abc2cd966277fd62ffbc68b5522
+DIST backports-3.20.1{P}.tar.gz 178390 BLAKE2B a21ba2035e83ab309582a9ad6b01006079ab38d0990724942ffb591e2ed536dbb6f176c940ccc019bd374c38ca9a0ebd271e32563a41a71e06d1c631084e0445 SHA512 4330c1c8928d914fe85dc5d3797ab0b02b37e5ed3fed1899d6368504dc64c2241fc87357bc5155e708902ae93bf2160276d60a6b1ed5a23fbb234e2598a1b441
 EBUILD backports-3.15.0.ebuild 666 BLAKE2B bd4254e19f91ff02bc0cb3153c0271e5640bb8aa71cafd37f5122759d0e7ceea8d67a8919227bc33d97e162382506fc19377f7ea92303016062749beb964400a SHA512 e1154aa957300f9cd5e7459267dbf2252f20a01fba5de072730b1a20ce1b84489c940faddd0b994974056bce25c67091aaccad5f3bcb8ac3609a07046568b086
 EBUILD backports-3.17.2.ebuild 800 BLAKE2B c6afee4193e95b9dd3d834d8e4fc7e64d6490d02d74303e625ac62caa77171d659bfaf23d73b14109d7a1123b1623d7468ae2c8df1af16c5d44c799fb738c034 SHA512 3548c93050d88b3622456d41bb9196298d62e51e4d618bcaad511d5658b8964345374e68caecf168ede3b290a343ce8571a5125288bf17cecf8b06b7c27d9505
 EBUILD backports-3.18.2.ebuild 793 BLAKE2B c44bf9a13dfbce3d8713b93edeadefc69407bf7f0575ef5629bb9401fccb82dab893ce806daaebe3b4c703a3680aa202a88cca8466ef75a9b55d1f98a0112d33 SHA512 60444bf27bbabc3ea8bf28ae0c54d6dce880933e58d386fee988f5dab15885ad401919a554d103d1577aa938cf58f66ce0d144dec11304301ec382130c56c738
+EBUILD backports-3.20.1.ebuild 800 BLAKE2B a98edb4cf21157da67f6106fe0aa5954c806f6e0a3625a9b8548123b9134a2859e07ffe0de90a451f758f79bfb0090ddc723763373fde81ab925ccb25ee87c98 SHA512 cd575010a83d810f16fe33b421ed7903c2ddb7e5813ff68e95d0ae86cec104fdbdf8b48675b3f8aa19d347d8597ebce360aa4f4370d9cbbc88771990c9820d9a
 MISC metadata.xml 335 BLAKE2B 23e6e33c417bb055592549fdd07fd02a2d97b613095e42248f501ee6ea71e3d4b2a2e25796060d3448900ba0d2fe66d0c44307be97b89834711ed153751126c3 SHA512 2850da756cf7d97e70667e06587ab9a37869e4a77417c12386edff4ab09d380641a4573a7ecaa6eec5809fe85106ca53844b4b25fbeb6cef8e451fef2803ae19
diff --git a/dev-ruby/backports/backports-3.20.1.ebuild b/dev-ruby/backports/backports-3.20.1.ebuild
new file mode 100644
index 000000000000..79bd0df839fb
--- /dev/null
+++ b/dev-ruby/backports/backports-3.20.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+RUBY_FAKEGEM_TASK_TEST="test"
+
+RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Backports of Ruby features for older Ruby"
+HOMEPAGE="https://github.com/marcandre/backports"
+SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	# Avoid activesupport test that no longer works in Rails 5. This also avoids
+	# a dependency on activesupport
+	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
+
+	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/bundler-audit/Manifest b/dev-ruby/bundler-audit/Manifest
index f19363b693a7..27f835d6ccee 100644
--- a/dev-ruby/bundler-audit/Manifest
+++ b/dev-ruby/bundler-audit/Manifest
@@ -1,3 +1,3 @@
 DIST bundler-audit-0.7.0.1.gem 162816 BLAKE2B 2e068531d8edf542ce7bd1d362ac36290c90e87d12a5e861ce269575e7a10f9e8399c256be5f0f9dba145f1c3bdd6e0dfdb78826d4c45f79ae8a280631450564 SHA512 49d0262a03db03eeab95730550c9554453849bb58fcb1d883c85ca021a181b44e7983f21f83d0b14f857d57ea08bfa13b470cd93bcb3695cac31f366a78d8c1a
-EBUILD bundler-audit-0.7.0.1.ebuild 1295 BLAKE2B d798b51f184a92a11f3f12c7eb766588d2ad398e77329870824b2e0f48b2ea8b86ef9b8fdaccd2f15077d493c50872e773b55c8daa1424ceac9e9fcad9f1a253 SHA512 ca8916456d1e0fe76a2589f407b87cc5e03dd11e9b5ae9b3fe9fada36f6abadf1e10e024e8f769c7e5025f67068f64971230bb51805a6c3decd61a3f71856f2b
+EBUILD bundler-audit-0.7.0.1.ebuild 1256 BLAKE2B a2674e230dcc68c8e20a7650afbb44850465156c6d06a28c06252055f6fd35151f0e35f74daa9431bf313cb4879ae216074f7547151cea599c00bb938af5d6d1 SHA512 ae4c92ef869da0a6dded698bb598c9a5cc04925a5c9a9a732b2d5d05cbbe156a3000d7cb9a735989e4c442925174725b125e1bd12e244a3625cd19ae2cb825a7
 MISC metadata.xml 337 BLAKE2B 349e729ee8aa87d72509ae0358c0d7e3ecfa8ec4d792b0140a95a13ea175203d0b0efe879c375ed5c908e06dd6e1ce846c8a60cdd79096cc6397db606da3c92a SHA512 17b5dd74e3bf812111d8c824d10f537c3e1258b6f5a1065c2d850158945883ba158811979f4ea45e21312a2b1bdeb0ac701f0b54a62ffa27699330ea36103eeb
diff --git a/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild b/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
index b24e51497c53..71a834176e6f 100644
--- a/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
+++ b/dev-ruby/bundler-audit/bundler-audit-0.7.0.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -26,7 +26,7 @@ RESTRICT=test
 
 ruby_add_rdepend "
 	>=dev-ruby/thor-0.18:0
-	|| ( dev-ruby/bundler:2 >=dev-ruby/bundler-1.2:0 )
+	dev-ruby/bundler:2
 "
 
 all_ruby_prepare() {
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index df22085f74d8..a3db8ede4b72 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,10 +1,13 @@
-DIST bundler-1.17.3.gem 364032 BLAKE2B 81e097156a593e4ec85a2353aa6c62143d9aad120c22c5f76423c6c5f4e4d33206c8ef41c64e54ea53eb610a0d865beba19d3c033e8f65913564963319bb523f SHA512 658de4228bc12fa5ca6ce335f76fff773f64da9f3d12f5097b4fd28d4c4f4d2a5bf12dce761b3d95432c5ea6a5aafae895df87c26660a4567db8b682aff48c02
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
 DIST bundler-2.2.0.gem 400896 BLAKE2B a9d67d052bc6b7b8c09a6dbc249e348209a6a02bb3a43f9dbef29c3dce651974a4c9bde200085632cc7f4fb0957aae42a7cbaae28c8cab91986dacf1f52f1deb SHA512 bbee12a30362d1dfd8a7de4258d6623d08df91a38ba1e869f9a5878871d8fd145221f8eaa99fcb72e0c1404c9c31df37a5a1dbf4a94610cb3381566cc6c45516
 DIST bundler-2.2.3.gem 401408 BLAKE2B 7162444956c65d6684a299c7ce15f64a178dab40867315241eaa3cfcb51b6973a004980abef359c911de06ce2051e5ca98e68e3df388963f40378a6f5fabda62 SHA512 da1f1dfae51cdf3dd6792fc66c33389c113579b8a723fb204ae3b315dcd1d45aed65524469336934d7276be53b026952c944457e326c97b20d4c423dd44321ef
-EBUILD bundler-1.17.3-r1.ebuild 937 BLAKE2B 8ca548e66814bc848ee7e573a9c42d12a606d9f5e51af8625e2da279153e30f43dd22166be2b82ff75707bef6f38dfc085c5be32f04ec2867321dd9a310d6bf9 SHA512 5e17118352330d5add47e1462245aaaa7a938575aea543f9151ec0964fcb0427788a05d835c13defec53dd41c6111ec86358d677e235069be5b29e222dcb05e3
-EBUILD bundler-1.17.3.ebuild 912 BLAKE2B f0ec5223d9461d85eb381a6a7cab0e8eddad44c8b2f99222bd6301b3f64236a1b64ae14cd60152762080780fca44a863a3b97bd1940365791dfafb3a1d88d306 SHA512 48836a1da9702079dc72c11f8f88c5422b1516f7cd427d4d6619e138a18f70a3ceae84957e724c9ead5240588318731bcdfd8da3135cffe657696b7e04c93263
+DIST bundler-2.2.4.gem 386048 BLAKE2B 7a2cec046b75ff371df9b563a81f48c8a2a3782f75ec4868869b4b2fda5e117b6cd38daf6a566ec1201fe7a5f6b8b2c4dbe0cc552d2a63bcb4e5e9f53c710046 SHA512 f3c988278746896da276e5af5cf046c5910962c2022fc8d37ab00db1a81a69d77a1fd21fabd8a1d086891d18bfb4ac321dbb60f830b139aa7c3192ea879b4cf8
+DIST bundler-2.2.5.gem 386560 BLAKE2B 070f52338e9424e571ae40c01ba559158fd9938910be4d5b1d4c8990cdaac4f6a2cb7d2a554a2e7bbb35b18a31e9d1dba5c4e711556294496ac6978ae63a94f0 SHA512 d985168531ad7415841535a496717faff2cbdcff04c8b701c0e29533f3fe5c87cb5815e6b219ab1d536c29c8c8d80b051f4f05aeb2b6fe279dc12404bf824742
+DIST bundler-2.2.6.gem 386560 BLAKE2B e1e3f50425839bbb13360fc986f98588aa09643b6fb5b8c13911b5680ef0ae2ca0b19f71ffa99234f6f6a39ca6467564f25ac26874c67b493e028f086e89c211 SHA512 58e80bb313c132125e2b601113e6e262d00f768ca75adbacbff2e98cdcd83e40aa68a8f92aa56e477c66cd396687ad6d9f54f4df9366fd6b51424b6ff5429504
 EBUILD bundler-2.1.4.ebuild 929 BLAKE2B a79ad4ac2dd54ceb6163218b366b45bdaaa8e5b927e232ec6a7cfff0aca675b0b994065c837778619ccf27938d5971990fe3e6357adcfad721910b24a0b4a436 SHA512 c1b5d4cb99131409fd72849a5090366c4ab180ebfbfd9c0416304e0eba18fc502ec51c56120a1545369309c9ebc16b2b4b109760aeb3a1123a2851d85357c91c
 EBUILD bundler-2.2.0.ebuild 931 BLAKE2B 45ea33bc46297106a0cf1cbf84426c45e4b7699126bec073a7312c3b4e7a9cc968c9b008ea0635b2c3fdabc57856b4b7e23285e4bbf65305d5752e685f007c1f SHA512 bf4c48c4944bd02dcbe255a8f23a2df6bd24ceb8ccabbb1bcc8ab8bb36fb656ac2672e570261178576e57fdd75a764ef195f67e7bd1c81d91fbb5046d51044f7
 EBUILD bundler-2.2.3.ebuild 938 BLAKE2B be710cc6084c21afe9b6826249b64d8d3f051cf7e23f104e21b6c79204eb5f56eb9ed8f2ef0d39372ff8cdf010f183bdb1698e6956a249a255bff8297076fbb9 SHA512 453daf930f02fe82539a9f9b7277b93ef1def4512743d2bc16ce56ba738dfdf56ad531427b1ed13c85659dcb8560a96f65e5742087ee0a2eef59aff930449f81
+EBUILD bundler-2.2.4.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.5.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.6.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-1.17.3.ebuild b/dev-ruby/bundler/bundler-2.2.4.ebuild
index 41bb44124a03..8256c6960865 100644
--- a/dev-ruby/bundler/bundler-1.17.3.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # The specs require a number of gems to be installed in a temporary
 # directory, but this requires network access. They also don't work
@@ -11,23 +11,20 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
 # No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
 RUBY_FAKEGEM_BINDIR="exe"
 
-RUBY_FAKEGEM_EXTRAINSTALL="man"
-
 inherit ruby-fakegem
 
 DESCRIPTION="An easy way to vendor gem dependencies"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
 
-RDEPEND+=" dev-vcs/git"
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild b/dev-ruby/bundler/bundler-2.2.5.ebuild
index f72fbe8859e8..8256c6960865 100644
--- a/dev-ruby/bundler/bundler-1.17.3-r1.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.5.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # The specs require a number of gems to be installed in a temporary
 # directory, but this requires network access. They also don't work
@@ -11,13 +11,9 @@ USE_RUBY="ruby23 ruby24 ruby25 ruby26"
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
 # No documentation task
-RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
 
 RUBY_FAKEGEM_BINDIR="exe"
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="man"
 
 inherit ruby-fakegem
 
@@ -25,10 +21,10 @@ DESCRIPTION="An easy way to vendor gem dependencies"
 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+doc test"
 
 ruby_add_rdepend virtual/rubygems
 
-RDEPEND+=" dev-vcs/git"
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.6.ebuild b/dev-ruby/bundler/bundler-2.2.6.ebuild
new file mode 100644
index 000000000000..8256c6960865
--- /dev/null
+++ b/dev-ruby/bundler/bundler-2.2.6.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# The specs require a number of gems to be installed in a temporary
+# directory, but this requires network access. They also don't work
+# when run with a path that contains "-".
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+# No documentation task
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An easy way to vendor gem dependencies"
+HOMEPAGE="https://github.com/carlhuda/bundler"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+doc test"
+
+ruby_add_rdepend virtual/rubygems
+
+RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/concurrent-ruby/Manifest b/dev-ruby/concurrent-ruby/Manifest
index ef31f8259054..d3e1698447f0 100644
--- a/dev-ruby/concurrent-ruby/Manifest
+++ b/dev-ruby/concurrent-ruby/Manifest
@@ -1,5 +1,7 @@
 DIST concurrent-ruby-1.0.5.tar.gz 1307802 BLAKE2B 2eee2afdd33e2609608e9389847de380eb895c2193746b1190ea96ca8bb67eaccd8d141bc2071006afbd971f078e5b6452d1e62624892c0fce2c12b8ac9fa28b SHA512 fdf7324b56bb37b4a79dc89882354e452ee838a097f522fb906c20a06856303cfbbae16f2500255cbfb4bba33ee1b3b3ee8facf3d0156e976add64209e349da6
 DIST concurrent-ruby-1.1.7.tar.gz 4370284 BLAKE2B ea9120fa6c0c58d758c71d54a7a1371a2a94987141343be92e5d8150167d774b513003bc945b7a54dbae8ef1f15b371f6ec28e6e84828d653fdad5b6b58c63e1 SHA512 2af2f1236850666ef56f6024db3b094051de88bb0495b902f5be9471ded733e998b2845aacba2ff8b166d5097fccd597203502ce58766017cb67c529c2840d29
+DIST concurrent-ruby-1.1.8.tar.gz 4921836 BLAKE2B 1a58be0790af7708c58f6542b9bcf09b4f853bd180412f44cc6d18f2c058647384f2bc03f9828664c289eeabfd0721c866a143da4e4b4650d11058a2de7fdb16 SHA512 79b326721107abb972124d5e2cac32a348475d8408079747cca6a624df790c3662a8a460a9d1f0d6aceb4b4dc04fadcdc94777b58cec73d82350b3464f70b679
 EBUILD concurrent-ruby-1.0.5.ebuild 1226 BLAKE2B 762a7d9f335a9e60bff70d381d38a6531e7a4b97ad53e7918af5ba4665ffa02150341a4373887e1c8135b74198f7f6b640c3112d110e6be2b6208ea81ac06ed7 SHA512 44c99e6b0ad806b44a876e79a9d6b0fbd65b07fe19458e4449365ae98a0a0263e3dee1dad4da610166760c6175a61a4cc5a419060317e9341356bb84fe234be4
 EBUILD concurrent-ruby-1.1.7.ebuild 1369 BLAKE2B f3d176d753b2541004b005f8d2a81b7631f378c48deace0b20fc0e6896e8fa46e8bdd848c22aaa7d53725098045624adc62a9a775dd38721c82f79b3dc42b320 SHA512 8f2d07eb5b42015759d896cab882fff2967ce98f935317b908fc165e7acc479ff295b61cf37e7031333aceeb5e90f717892cd2139e46a3f829db61baa3598001
+EBUILD concurrent-ruby-1.1.8.ebuild 1369 BLAKE2B f3d176d753b2541004b005f8d2a81b7631f378c48deace0b20fc0e6896e8fa46e8bdd848c22aaa7d53725098045624adc62a9a775dd38721c82f79b3dc42b320 SHA512 8f2d07eb5b42015759d896cab882fff2967ce98f935317b908fc165e7acc479ff295b61cf37e7031333aceeb5e90f717892cd2139e46a3f829db61baa3598001
 MISC metadata.xml 358 BLAKE2B 4af4b67d3a6beab61cb05090b0f0a0a7802af67231fce103d84c2a475f9e65324a511f5a1c8b9df808a929281811de7b5f62a680688dd89c25ad75424bc5f2a8 SHA512 64e69249d1082b41905c309e159ad7eb8045af1c89ecc77cf119ed6014d40e83ca81bfe8938b5eaf5119fe12c02f1b1613ccc885770c897be06769af40dca85f
diff --git a/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild
new file mode 100644
index 000000000000..6b34f2682135
--- /dev/null
+++ b/dev-ruby/concurrent-ruby/concurrent-ruby-1.1.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Modern concurrency tools including agents, futures, promises, thread pools, more"
+HOMEPAGE="https://github.com/ruby-concurrency/concurrent-ruby"
+SRC_URI="https://github.com/ruby-concurrency/concurrent-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.7.4 )"
+
+all_ruby_prepare() {
+	# Remove edge files as defined in support/file_map.rb
+	rm -rf spec/concurrent/{actor,cancellation,channel,edge,lazy_register,promises,throttle}* || die
+	rm -r spec/concurrent/executor/wrapping_executor_spec.rb || die
+	sed -i -e '/concurrent-edge/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e 's:lib-edge:lib/concurrent-ruby:' .rspec || die
+	sed -i -e 's:../../../::' spec/concurrent/executor/executor_quits.rb || die
+
+	# Remove specs for the ext gem
+	rm -rf spec/concurrent/atomic || die
+
+	sed -i 's/git ls-files/find . -print/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/connection_pool/Manifest b/dev-ruby/connection_pool/Manifest
index 578a61f31347..28ac53bbc141 100644
--- a/dev-ruby/connection_pool/Manifest
+++ b/dev-ruby/connection_pool/Manifest
@@ -1,5 +1,5 @@
 DIST connection_pool-2.2.2.gem 13824 BLAKE2B 2f52bb3451dec5916d5797596f7bc3dbf39845321ee83736d679c433e96f154db852469b1f6d0d3b7c7f48262f7840087d89cdd40ece22b67a29c20ff77274dd SHA512 74cb64aa3f183ee4e41f438133f60581e9f99a1d5b5daf61607cff2329bfb1fbd8810d87c35d709418a22ad925049e3e9403a602107452414a67aee1c6eecfe9
 DIST connection_pool-2.2.3.gem 13824 BLAKE2B b74666181790e678793023413eedbd5b68836e6d480d79f6c12d512277a1917db0d400e08be98c098305ca065a12988bcac9d46f89b4c1380d758991490a540b SHA512 a5e54b11073723d5cf5150a47c38b37ef8e58e9adb056eeedc4427207ed1ae5d1844cab925bbbcc8a2a9dd3fe9373593ab735ce4de588b89db97800fb74757ac
 EBUILD connection_pool-2.2.2.ebuild 731 BLAKE2B 37ca896432e4aba932c2ee253636932b0dbf14d7bba7ba1646cb8778469e15254628b31e361d4f4fccd23c564e67fe22fdd5d4fbb1bd15b7de4be907eb8133dd SHA512 a9ad336e9ec89a980b630e499a58a0cf2ca318369c5b52b698202521cbcb09ac0cab2fd06e23ea78169d735a9c07a25e4cf062b268768f4d0acddecac59a61b7
-EBUILD connection_pool-2.2.3.ebuild 753 BLAKE2B 97d6521caf8a157ef90ab6c5b2253d734e9ca681c4ab6b0e45d20f9e41143ab8a3f5ebdf1da304e6261167f8b2cc24eff8cffe8b69d564d504cad546c769e026 SHA512 11606e8a00ede33872b5c8e8c22481e3e8dc93ff511e0ec749ec27ce1864818db7c0d99533a8527e672c95e167832d182bdcfbdc50934670142732f64d416d00
+EBUILD connection_pool-2.2.3.ebuild 753 BLAKE2B 4976ae2a26fb6b4d28cf15a787079f6024ec97c050d648a65b2638ff6b0295448e57b3664556aaa8eef2054ebfbd887c642a02d31592adec8367da04b6f6c4ba SHA512 72e5859af088c87a68bdf93c54804e9c0ceca0e0459cb5083ca7f675ac6b61229ac47b6ceaf0d4552ce20e6669ad8d7adecde70633f8a7269afb0b538f406460
 MISC metadata.xml 349 BLAKE2B 7ffc13174f2f47522a66c48922952798d03fbbb15419d9a52e183c633b56d863e85fab4682420aa9fffeb16d474f52de30799489a99221f25438524dbc569303 SHA512 18245f101f862c5880a42121eac9947a22fac206823d85ba650f5766af334208a64f97e7ea44e298f4f3c1191eb6bbf0e37949974c737060dd66434e1963b41c
diff --git a/dev-ruby/connection_pool/connection_pool-2.2.3.ebuild b/dev-ruby/connection_pool/connection_pool-2.2.3.ebuild
index 194ac6f8667a..ec3d219df836 100644
--- a/dev-ruby/connection_pool/connection_pool-2.2.3.ebuild
+++ b/dev-ruby/connection_pool/connection_pool-2.2.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rake"
 RUBY_FAKEGEM_RECIPE_DOC="none"
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index ae801f1e9d17..3887d29ecea1 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,7 +1,9 @@
 DIST docile-1.3.2.tar.gz 14684 BLAKE2B f24ce3ae857d249ce2fc32bcefa505b272327962755e000e51dd13531ad81a039c1da0e97774752cc03444fc3f44fa12212bbe61ff7886ebf5d44076785db3df SHA512 6bba8e8855e43acc3ad314ca500896b861865e4470618f98e720a11a26e226e30d8748096638027e213eeb54838fd1c3b2c9749701476d26cf8bc55c82c4f3ce
 DIST docile-1.3.3.tar.gz 15752 BLAKE2B 290af9553aba4b8b6ab058a1b1dbc4a36e840b3dc11e97db08408230679ab1095a5f6c03b133d9c02d2c1c9be75cf4d5cfa525bf5bd3c0705993df975ef152f3 SHA512 64e4f45616135f2089ecdb7282b7d1bed61cc5a1c8fa37e5ea70d8141d364760c62e06c650359d9cc107088fcfe4837d6bf35b492bd81c0207b037aa67d1d114
 DIST docile-1.3.4.tar.gz 15726 BLAKE2B 93f37266dc7fe80f8d3863ac7c5293dbd0432a5917f4ab134a1ceea4bdfb40a6af2e045db0b690fa3ef2590f2c781ea003ca482521e271e21ee50aa95aa9a30c SHA512 4e191f0cc374a429a1bb3297c1baf1d337918a475c783a12ac4e4c5de8cc941d440c85d31f2d226736c9fe88c52698b54bd9897be9b497e96eaceef73a6f0f56
+DIST docile-1.3.5.tar.gz 16345 BLAKE2B c06fe60bc6e0fc0dec699271fcdc0b23febeba939aab513a23d5065d33bc7ce5d1cd6391d7b05a5f163c4420c199e12c97a79855d03fb252b61661c2532ac879 SHA512 be193eff58b73e0367a109d459e28097d04e0486b152b084f2fd6bcc795aedbaa12c13dae6d845ec4ef3d52335563ce2b22d5424d689e8b93ff9adf7dbe7b0e9
 EBUILD docile-1.3.2.ebuild 776 BLAKE2B d1166b8e13c3f3c9216b60d767453c11c95201f8ed4b3c55a16060de9e8790430ad273c8fb818c2df8bc9ff9d64dce909a71ac50b33bc4c443702ad8ccf3d4e3 SHA512 7cfc0fc2d24ca5d037c525c28f0e1f7c7253fec41b95309e9fc7198dac323c51b64ae3c1e428f0a5d6d76c88fe4cb860c48f559419552fa5dc1b970d8c50c3f3
 EBUILD docile-1.3.3.ebuild 738 BLAKE2B c9d5f42d5c1f38f15ef7f7193eb11da1524a8fc77749dbbaa8ae9569d9f67e1d7b1807bc240091c1a2e583097f812e3f74536ec796a8811b1e0d49aac412d328 SHA512 eefa4c0445f9e3fd3c338b2e79ec7bbbffb7211cabcf773a834dea2dc02b084dd783f7dac8271864f0e458ee88feec5d5a97c41c794935389f602f133fff1f42
 EBUILD docile-1.3.4.ebuild 738 BLAKE2B c9d5f42d5c1f38f15ef7f7193eb11da1524a8fc77749dbbaa8ae9569d9f67e1d7b1807bc240091c1a2e583097f812e3f74536ec796a8811b1e0d49aac412d328 SHA512 eefa4c0445f9e3fd3c338b2e79ec7bbbffb7211cabcf773a834dea2dc02b084dd783f7dac8271864f0e458ee88feec5d5a97c41c794935389f602f133fff1f42
+EBUILD docile-1.3.5.ebuild 738 BLAKE2B 28f6e9b21c3acba40b0df45b55c93cad359a0e3c29996ff2603b98d6bc6d328e04531ea3f9ed908d6e8d8cce0e1a11cf902809eccc2c03389e6b3da58fa0ab7c SHA512 924a37471398fe680f09502245bbb56bc7695c07b19555f44736ffe791e2f31d5ab5532f455df56a4cfbc604689962aa076b571f1970a1cd2f8331843d4567c6
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/docile/docile-1.3.5.ebuild b/dev-ruby/docile/docile-1.3.5.ebuild
new file mode 100644
index 000000000000..3ea2744eb564
--- /dev/null
+++ b/dev-ruby/docile/docile-1.3.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+RUBY_FAKEGEM_GEMSPEC="docile.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="https://ms-ati.github.io/docile/"
+SRC_URI="https://github.com/ms-ati/docile/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
+
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/facter/Manifest b/dev-ruby/facter/Manifest
index c94cd5e37ed8..1321f94e422b 100644
--- a/dev-ruby/facter/Manifest
+++ b/dev-ruby/facter/Manifest
@@ -1,6 +1,8 @@
 AUX facter-3.14.6-fix-static-libcpp-hocon.patch 488 BLAKE2B 73f28cf30f5dca16f2ea8bc3346ea95df5d6b3d925a6373153460699e9075017fb43640b714f025c5f8a2167e0742bfffc20dcf886b5e0f6bdabab181a07a7fb SHA512 72192b75ae6d084d0e47ec6a7f4d0817dafd0623269d16cebcb5615d8df0efc891176d0cf246f41dd0f2180d54b8cc94ee596295787fbdb3ca83d0cd41380e89
 AUX facter-3.14.8-explicit-rspec-2.patch 578 BLAKE2B 7bd6134235c61e03b2706388ad0c2c21e67582b00c5588b1d0596e3f783eb1df448a92c031862b03c0dffeefa10e0b69fdda4b44d88ac6e09a66f325900cf96f SHA512 a4c219b78b25c2a12e8578c092284fb4bd6d07b8b0d819d5625b1043d2b395413609e21266d3a7bceaf0461ad059e0edfea14a5e48bab85995eadf2d77bff17d
 DIST facter-3.14.14.tar.gz 407276 BLAKE2B 5f911581773ef9a19ee42b5ed64114e2519ff88e024490d74bf9b1e777221d92d3ed502c8e6a0df573a5390fca323fcf0bcfdce6aeed25826c84efb3971307a5 SHA512 22e0ff0a9280be129f7587e24109f76f34660d99086378dd7e9ccc004c08a4fa5dd6f9ba50957c146ea40e26344ee87dbafd45b885f8f576192b6e572b084af7
+DIST facter-3.14.15.tar.gz 407293 BLAKE2B 0f9bfe78314144e920695e678fa7ce8b4656ba424240e7e7621fe048e15e46db6fe507bc859448fa22f31e28caecadc33877ebaee8dab85c8e87238daf140157 SHA512 45deb530991883ecb1235d6a6166c36888c3c2c4a42a694e041f4d0911ab4bed880bee56034871fde08cc723b7270166e7d0dfa626bbc205d3b1f495c8d74691
 EBUILD facter-3.14.14.ebuild 2138 BLAKE2B da159d7ebc68d3587a29befc35742729e938c63fa176ed924daebd564efbc839be7a3e6f7f929d2222da71cd70de684d4f257f4da3d00de9ba3c73d7910d028d SHA512 71012baae5a2c15c3228004cab2202c59343b5b704aad7e37f89285db826c38a2695acd032bb5451a2d46db90779c509acf1df7cf40b8b420dbb4d7f5e793c1b
+EBUILD facter-3.14.15.ebuild 2140 BLAKE2B 230753014d081e4f4960ea8da9bc6f67556f372ea291a8c13136f1ab08bf4ecc52cae9a9f961623f92ecde6e84c232c04c5f830a111ca8e7a385a8fde9453ab5 SHA512 01fe42671b8cead735468a78cc7c9076bff32beba95d1b1bac8188e0cdd2c16a07368f8a26fbd3c9c2d414fec34aa49bb32d7bf5dec9c6642dcea7bcd2e7884c
 EBUILD facter-9999.ebuild 2490 BLAKE2B 9c480e951320b78a43aac1c436d5008d3461de4a62f73f76e7ae6a1eb62d5ac0b4af8f58b2fe25738c892e68d3c014be43f0ac79a8ccfc065c0f1485dbc03428 SHA512 41a5ca3bbbbfb9e5c94271490e7d9a9a1a99ca76b9c3c3ccf5b9ac6b3da005101063ad9b6e3ae8c53e9335c1d55e8b3f8f528f1b759b85a40f6251217b8a7e76
 MISC metadata.xml 539 BLAKE2B 989d6bb49686504b47720be6119802f06f998514c53261bb71cb0082cccbd22361195122c101e319ef985f6d5d39d84bb7a6409d77b4735c26e6b87856770a79 SHA512 92486b6b382d065c39999f271b07a915ac6f80fba225b0c1deee86f73a0143d47e8fd986e2ad6a82ae20a9cdd59ece63b623c6a2ec9d10e178c1fbc54f5381a5
diff --git a/dev-ruby/facter/facter-3.14.15.ebuild b/dev-ruby/facter/facter-3.14.15.ebuild
new file mode 100644
index 000000000000..0feb8baceeec
--- /dev/null
+++ b/dev-ruby/facter/facter-3.14.15.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+# git-r3 goes after ruby-ng so that it overrides src_unpack properly
+inherit cmake-utils eutils ruby-ng
+
+DESCRIPTION="A cross-platform ruby library for retrieving facts from operating systems"
+HOMEPAGE="http://www.puppetlabs.com/puppet/related-projects/facter/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="test"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/puppetlabs/facter.git"
+	EGIT_BRANCH="master"
+else
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+RESTRICT="!test? ( test )"
+
+ruby_add_bdepend "test? ( dev-ruby/rake dev-ruby/rspec:2 dev-ruby/mocha:0.14 )"
+
+RDEPEND="
+	>=dev-cpp/cpp-hocon-0.2.1:=
+	>=dev-libs/leatherman-1.0.0:=
+	dev-libs/openssl:0=
+	sys-apps/util-linux
+	app-emulation/virt-what
+	net-misc/curl
+	dev-libs/boost:=[nls]
+	>=dev-cpp/yaml-cpp-0.5.1
+	!<app-admin/puppet-4.0.0"
+DEPEND="${RDEPEND}"
+
+# restore ${S} and override all phases exported by ruby-ng.eclass
+S="${WORKDIR}/${P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.14.6-fix-static-libcpp-hocon.patch
+	# be explicit about the version of rspec we test with
+	"${FILESDIR}"/${PN}-3.14.8-explicit-rspec-2.patch
+)
+
+pkg_setup() {
+	ruby-ng_pkg_setup
+}
+
+src_unpack() {
+	default
+
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+}
+
+each_ruby_configure() {
+	# hack for correct calculation of relative path from facter.rb to
+	# libfacter.so
+	my_ruby_sitelibdir=$(ruby_rbconfig_value 'sitelibdir')
+}
+
+src_configure() {
+	ruby-ng_src_configure
+
+	local mycmakeargs=(
+		-DRUBY_LIB_INSTALL=${my_ruby_sitelibdir}
+		-DBLKID_LIBRARYDIR="${EPREFIX}/$(get_libdir)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	addpredict /proc/self/oom_score_adj
+	cmake-utils_src_compile
+}
+
+src_test() {
+	cmake-utils_src_test
+}
+
+each_ruby_install() {
+	doruby "${BUILD_DIR}"/lib/facter.rb
+}
+
+src_install() {
+	cmake-utils_src_install
+	ruby-ng_src_install
+}
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 97346a979433..21cfa71a7abb 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,11 +1,5 @@
-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
 DIST faker-2.15.1.tar.gz 1213822 BLAKE2B dd627078ce1edab63a3f16a5e893c29911b9bf8d88b6d490a368ec16a633e7138124ee66d439738c4f2a8e14b6d0815611ed744d5323817873a0e13f2bddfb06 SHA512 de3721290683a86f985c2783c749be530c3306be73d929517fb54dcde2f64b124cedfa6b10c51e390a38a0b5ac81e2feb0b491c165d0bae9f017463596794fbf
-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
 EBUILD faker-2.15.1.ebuild 800 BLAKE2B 2bb2848c765ef5979b3168ccaab019cb9986f21e39a9b24df18d28956380745caaa32965ab6f6099dfb8a1b8c02aa259d03615f52162d9fb6547537dab065651 SHA512 e9b4b50fdabd07315493fb58cc96cdbe038706337ca8ff0107028bc38a20eebd306c945cce884a882cd86892e1926231897029619f3b42d24e7c5f2f6be049d6
 MISC metadata.xml 452 BLAKE2B 70c3af75cc74dd28d3af9df670a4f2f0d898c702a5d5421d46e598ad14c380e288cec076d2a3aaa08e85a198b12daa2d69249feccffe24f07d6d73fea1010fcc SHA512 1c525fb78b733e6301acad7092799dcbba462c471cf3719f5634069a83c67bbb27a705c2ec6a27b8d431842efebef3209d7ca4167f8dda7e6439b1c0cda09eea
diff --git a/dev-ruby/faker/faker-2.11.0.ebuild b/dev-ruby/faker/faker-2.11.0.ebuild
deleted file mode 100644
index e632ed504de9..000000000000
--- a/dev-ruby/faker/faker-2.11.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_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 !!<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/faker/faker-2.12.0.ebuild b/dev-ruby/faker/faker-2.12.0.ebuild
deleted file mode 100644
index 51feba618ce5..000000000000
--- a/dev-ruby/faker/faker-2.12.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_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/faker/faker-2.13.0.ebuild b/dev-ruby/faker/faker-2.13.0.ebuild
deleted file mode 100644
index e02e94be8040..000000000000
--- a/dev-ruby/faker/faker-2.13.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_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/ffi-compiler/Manifest b/dev-ruby/ffi-compiler/Manifest
index 0455a53ca0de..f3bf8e4ca406 100644
--- a/dev-ruby/ffi-compiler/Manifest
+++ b/dev-ruby/ffi-compiler/Manifest
@@ -1,3 +1,3 @@
 DIST ffi-compiler-1.0.1.gem 18432 BLAKE2B 9832d9836a0b55d3099085b53e0c8e15cc5ae79cfadadea942603ef8595b5fa4d781b5f031f0592b2688acb1416acffa9e525e3cbc004c2c51aaaea12a722706 SHA512 7a13625ab1c5748d05ec93d68708dd9435ec92dcd0c823109c44173fdaf8710aec5f5b4fb11966475f10ae91401c7ca3c620f9d36bb9ca665114e1ed70f4edd0
-EBUILD ffi-compiler-1.0.1.ebuild 438 BLAKE2B 80ac8c83be20cb3095dee9e1dbfcdc99a7136fb97fb0e194d0638bf23b3837cc5b45abba19aeeff73a11086c0a10d2ae93796d890876547b8a44bde81abe4750 SHA512 e0a07aed8850a0f94bdd8434806e3f5b5df2c4428b7106d0f46ecef1b895fbd19de1c295d5289a311699abee8fef9b4d6af6d8cfd6a4f6f5368b097ef5f97111
+EBUILD ffi-compiler-1.0.1.ebuild 457 BLAKE2B 1ed99bee0c5e6c8900a493e709ce79bece41e7b1229264262aaea21d991061594b04e1e440c75ea4cd9a4f7c80e1aeae7cc148a24442c8691fa43048dba5c293 SHA512 0878fd25f6e262cb2b36936fa794ef2efb6b2da42692813a926e286705fca44a525bfda186f582e07c115e7677bef98e4bd780154978fc59b3c841f72618f163
 MISC metadata.xml 257 BLAKE2B 6339b8ae3ef779011f34940b5af7faca341317790ee6752ad73cb83db463ddad10b25cacf16f73ce6d0fde976d916e2838e6209bdedfbe5ef6da285be302203d SHA512 d86ea11e509e5d031f82c4bb476a5974b85d812abe415e95799bdf34a308ade95e2f1cf35f6af84ae5acd0f67996b150c02712b75ab4f5a1ff4eef0ffb046d7e
diff --git a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
index e5e861c01ef9..c927d37f8ee2 100644
--- a/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
+++ b/dev-ruby/ffi-compiler/ffi-compiler-1.0.1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/ffi/ffi/wiki"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rake >=dev-ruby/ffi-1.0.0"
diff --git a/dev-ruby/google-protobuf/Manifest b/dev-ruby/google-protobuf/Manifest
index 6dbd031515fd..bc4c491eb28d 100644
--- a/dev-ruby/google-protobuf/Manifest
+++ b/dev-ruby/google-protobuf/Manifest
@@ -1,9 +1,7 @@
-DIST google-protobuf-3.10.1-ruby.tar.gz 4905995 BLAKE2B 1dde3b6260918da8430c2ce69210462f339c492b2a4e53d5d9c1bea3747aead905370507fc4bd703560f6885c0f3f8393a998b875c19744ad94827109ecbb49f SHA512 aba0c4034c0d3b1759904adb6270eee94dd5dc568f433b219e3f1f70c0033993cdfa3bf476ad3f5767c7629edb9fd029c686405abf93731dde808286b336330d
 DIST google-protobuf-3.11.4-ruby.tar.gz 5140799 BLAKE2B 97b450c0623593efe6a42b66582ff183344b8831689e6a5b4d36096dbd57c33da9569bbf26578536aaf73ecd866ac0588b6cb7d55a6a9b9a6e840d4c57099001 SHA512 777bbb0e9e2375eaebe6b8c87abd660bac70ee469c9ad00dd25917b82d7fb5bbe33cf87f0d69c90e19d55c07a7285ec20974ba4768623ce9ccfadf147fd5e261
 DIST google-protobuf-3.12.4-ruby.tar.gz 5310348 BLAKE2B 2630941672963165467221843c10079a0ed966f2fdfcbc970b0b41e1ed3c7f78734496c1fbd3ec509c68999a14f637fff267b309cf82a8acf2bb5a948484f79b SHA512 c5d24502b9a6be0a606a19213186fe462e0de6830547003636f0897781f36d0bd7e4e7d9689d96390a0399ce04b6438cda3a0fe6f97f0feb700a110e90beef0c
-DIST google-protobuf-3.8.0-ruby.tar.gz 4934577 BLAKE2B 4b86ab216e8a8b2c99c3620da9417c0562498e9d4dbf4957db186f51c62b0ed73b1322635a076b2d4054e015bdf6c8c50cc7fd0cb78d24a93b29d2a5b48f66fe SHA512 ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2
-EBUILD google-protobuf-3.10.1.ebuild 888 BLAKE2B ffc528047578e425ab92acb742c77b185e108911ba809faa9882831ca5c1c62d902e06ce4fe84c3389abbb73a272053c06114f02f5116260bf84c8f212e25cd1 SHA512 591ff0ad95313bf23dcef49d6b7fc9a5d55a1f3f89aa8edb66c5095555275a5f5e7c8135b93f5b68acb9cdbdd0afe4fe6cf1139f9a445f7c27aad35efb5fd2bd
+DIST google-protobuf-3.13.0-ruby.tar.gz 5277913 BLAKE2B 168aaa5beef83be675cd2543ca8efeaf5174f5e7fd861a056b04b01c8c781dc7b1fcbd05068ae89f051dfacfdc47c34b19cc33c8d09dd3212d3827746e3408f2 SHA512 514efa65fc8a36bc0791e6d39bdfb07b2689e9c2a4b82536c657859b800e7bc1e1a0ae86a7ee33f30c43a473a49b5c346ce830ac0057b6da104ed37f90b8b0fd
 EBUILD google-protobuf-3.11.4.ebuild 956 BLAKE2B 1e795340a36991275e03f543609698517cf1134f5df4050ca5842b03800bc44344f3d7fb545fb8ef8813f7b71fb9328d4c7e92e2aada725a71c42a6656d57573 SHA512 82d89231f92b7f7d928a666f8e20d5709ce392712876506c8d3771d8fcf96ee870fd47bff6fdd927b06f1f451d869b4e5fe2a1c020d809f5d89bdaf236694851
 EBUILD google-protobuf-3.12.4.ebuild 957 BLAKE2B a23e4806a8ac69f5ae65143214e23632b215b80de65d24ab6c52cb8f54b66aefb0b80acc2274047caccdc14429dd89fe98a17a7bf236fa616448ebaadf33bd49 SHA512 02dcee02c57e781f673e02706e3dfb269ad75a04619082b7759002c18ca10ff54b24282c5ada699eee09706aedb82d0676b825069cb996ecbe155e5d417b36d7
-EBUILD google-protobuf-3.8.0.ebuild 913 BLAKE2B 8e1ea1aad0db1207f3c82e7065f28ee19cfe5cdffff91fb75113bb5963830d67c71c8be1b45e85fed77036d579a203775eabc207ff5ea5dbd9fd28eb638048b4 SHA512 cb217fcb8495f773778fc2e53e56a48828d3390907420c37cb0a711b545a07533ba6145d34ad322a8eb2a2586c94d9f34b32f8bc8624c4b7dca9b5f0b46aad9b
+EBUILD google-protobuf-3.13.0.ebuild 964 BLAKE2B 00217e4f50fe1246dc87d4256d283a00d5ae2c2c261cd82dd4b6a8e7d4eb6eb0b20693f12253139fac62d14bb91dd1af93a74bdd4a692ef7c8f96c12ebcbc44e SHA512 f883eaba02e0cbee13958c3f43d5f780058cadfc2142e9fc2ab93a5cd494ba854d233fd7cd94eddb229c4517aad44dab646ab4120a7ef19e5fe78eeaccf0dfc3
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.13.0.ebuild
index 749ced3b808c..c61f42fc155a 100644
--- a/dev-ruby/google-protobuf/google-protobuf-3.10.1.ebuild
+++ b/dev-ruby/google-protobuf/google-protobuf-3.13.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -20,10 +20,14 @@ SLOT="3"
 KEYWORDS="~amd64"
 IUSE=""
 
-DEPEND+=" test? ( >=dev-libs/protobuf-3.7.0 )"
+DEPEND+=" test? ( >=dev-libs/protobuf-3.12.0 )"
 
-each_ruby_prepare() {
-	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' Rakefile || die
+all_ruby_prepare() {
+	sed -e '/extensiontask/ s:^:#:' \
+		-e '/ExtensionTask/,/^  end/ s:^:#:' \
+		-e 's:../src/protoc:protoc:' \
+		-e 's/:compile,//' \
+		-i Rakefile || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild b/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild
deleted file mode 100644
index 5eefeb1f2412..000000000000
--- a/dev-ruby/google-protobuf/google-protobuf-3.8.0.ebuild
+++ /dev/null
@@ -1,37 +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_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Protocol Buffers are Google's data interchange format"
-HOMEPAGE="https://developers.google.com/protocol-buffers"
-SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV}.tar.gz -> ${P}-ruby.tar.gz"
-RUBY_S="protobuf-${PV}/ruby"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" test? ( >=dev-libs/protobuf-3.7.0 )"
-
-each_ruby_prepare() {
-	sed -i -e 's:../src/protoc:protoc: ; /^task :build/ s/:compile,//' Rakefile || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/google/protobuf_c extconf.rb
-}
-
-each_ruby_compile() {
-	emake -Cext/google/protobuf_c V=1
-	cp ext/google/protobuf_c/protobuf_c.so lib/google/ || die
-}
diff --git a/dev-ruby/http-parser/Manifest b/dev-ruby/http-parser/Manifest
index ddd44223b289..1087776dbe0b 100644
--- a/dev-ruby/http-parser/Manifest
+++ b/dev-ruby/http-parser/Manifest
@@ -1,3 +1,5 @@
 DIST http-parser-1.2.2.gem 32256 BLAKE2B bc1600497db7c0ae9ee9311a6eae6494090b190b49d37809671d0c2fbb3b56ab4709dd16b68c7bfe8fc75609fc6f01d31c21c92681b9adbb4c83e521991d9172 SHA512 cffc1561657b7cb50c446e54da20176870ffe5f1acfe5e9fadfeacbea421fcc89243dd8f4a04d7933e19c155662fcd47db950c3743968d7981c52aa6c0a43ab5
-EBUILD http-parser-1.2.2.ebuild 648 BLAKE2B 342fd0c57f727bef330c3057e0c93b7f36523263ada698d8f44a3ad0fd430819752e2a3dd54bb45a25d13411cebfa4454e04334de6d1d7c3d4447a9d1c2b12be SHA512 c62b17b6c4d3b34567ec8cac2369f410fbb1214c2a7896114c35acdfdf96687d8cfbda7d4f48a3d3b90c73bbf812f66dfc7b8dc0067d1e7d81e84f2587ec2d88
+DIST http-parser-1.2.3.gem 31232 BLAKE2B 055ab9ccb42bb85f87b65eeaa59f645ec390f0751eb379b22b1a2c83920ef1c482a3bed8f5105843c341fe92ba0c8d44272688b929bca13c690945f7e37b282f SHA512 03c34c3e8174d9010440483af34800b74a7bbddd5daa63607e6aa2254d9c91cf36d90854ea65827b32680432de278aeeb7b8878f788f124c150f163409fa5107
+EBUILD http-parser-1.2.2.ebuild 630 BLAKE2B ac881c10e770eb83bf1527965763c052ff56f3eaad578f82d4247a562416a4f3fdbb0e12ee441a2824d6ceba720013b9df6c14d16879cce304d90b387f15d4a0 SHA512 ce4bceeb4f80b58ce5a311453b1559929eafb1a1349f21aac869260a4d8ee8695737251a0d46310833da6719943ef1dbcfc2840bdfc0119562a99b3b411a1a5c
+EBUILD http-parser-1.2.3.ebuild 642 BLAKE2B 122b4676d3b40aef477aab983b0175087859c942123d4ede2c2de9571aba2ecfa8a4977385951c4b3e86ead4c2d0a0bee9e3867463cf730de1b04494164effb0 SHA512 c72e67c6c372a7b614a74ef6b4ba6fa482bf977283bb1ab5f37f06c1bde914a5e2ffde1040bbdc2a091c2975a9f09dfda847d4a19df023a032052f5202b196be
 MISC metadata.xml 343 BLAKE2B 72290387c9fcabd2fc09db5cd44f3676f1b8bd033aeabce6bc0b1a52eb9af14b7908b48c9c5a765af0af4578b3d3c54574f5793acc1869d97ba70b8d82545bda SHA512 efc0c6cc3d88913690573b792e3ee051538034bb5d6b368cefa4d558e91ef6104060007a8d605299ee18bd67727a122752eaf754ecb341d596e1b3bc5e1b1ace
diff --git a/dev-ruby/http-parser/http-parser-1.2.2.ebuild b/dev-ruby/http-parser/http-parser-1.2.2.ebuild
index 796554e18319..e3227ecbebf8 100644
--- a/dev-ruby/http-parser/http-parser-1.2.2.ebuild
+++ b/dev-ruby/http-parser/http-parser-1.2.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
@@ -25,5 +25,5 @@ ruby_add_bdepend "dev-ruby/ffi-compiler"
 
 each_ruby_compile() {
 	${RUBY} -C ext -S rake || die
-	mv ext/x86_64-linux/libhttp-parser-ext.so lib/http-parser/ || die
+	mv ext/*/libhttp-parser-ext.so lib/http-parser/ || die
 }
diff --git a/dev-ruby/http-parser/http-parser-1.2.3.ebuild b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
new file mode 100644
index 000000000000..61c84cda710b
--- /dev/null
+++ b/dev-ruby/http-parser/http-parser-1.2.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A super fast http parser for ruby"
+HOMEPAGE="https://github.com/cotag/http-parser"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~arm64"
+IUSE=""
+
+DEPEND+=" >=net-libs/http-parser-2.8.1"
+RDEPEND+=" >=net-libs/http-parser-2.8.1"
+
+ruby_add_bdepend "dev-ruby/ffi-compiler"
+
+each_ruby_compile() {
+	${RUBY} -C ext -S rake || die
+	mv ext/*/libhttp-parser-ext.so lib/http-parser/ || die
+}
diff --git a/dev-ruby/http/Manifest b/dev-ruby/http/Manifest
index 5d256ac291ef..b16289c89ece 100644
--- a/dev-ruby/http/Manifest
+++ b/dev-ruby/http/Manifest
@@ -3,5 +3,5 @@ DIST http-4.1.1.gem 74240 BLAKE2B 350d4a2eb966f8dae05a206e20a92d8ce0601df36673ca
 DIST http-4.4.1.gem 75776 BLAKE2B ab34a6a567842d52f9b7cbe3fc3fb8e4757f5cf1303deacdf2f2130a44e82fde64f0db561c3f8fc28100faea277a9c4a9352f95e6cb1359730b34e83a7b36d72 SHA512 6e43a8ae379d7c8a807a9a03c87bfb5ad1719f9838e26ac7a695220ee2bc50344accc2db268d30da175328fd5468b87ec8532d17ce42a5b74d6c2c4c281d1bc9
 EBUILD http-3.3.0.ebuild 1239 BLAKE2B 752e544f8c6282d43b6a14e74ccf79fb876f19f5d4036717a0ab9e659343c7dd418ca55239c01543e1e2aad70d24344f396cd8e9a8c438336de39605265b43d1 SHA512 58d13dc6143a19b0cded23a73df365bde42a98c86c400a2d98b03f26ba31f78b9d607b3d6798b81407aee34ecb6a8a00799c4f9613e69c95fc033aa3ba355c79
 EBUILD http-4.1.1.ebuild 1350 BLAKE2B 61fbfd3b70718a979115e66a3078b5cda6ffda0f41dffa7beb9aa1fcc5fcb7cea0a3773979041570e4f421343ddb5b56c96c790fb02bf454b1ab5abf21b833e3 SHA512 a37f1b2813fbca9b378e1ed06c66511ca60f176024630066932c42cb8e217702ae390cc15e6c7dc570ee6f2d345d2d75cdc30574b07fb0b7149b37f493f5a581
-EBUILD http-4.4.1.ebuild 1490 BLAKE2B c976a3c99296ef53a408216d65fc69e423e330b7a8c096ecb2eb89239eb3f931c784abd38a5aafa1383dab5ac8c38d1db83f33901f5782c79a1d0d98ebac9b58 SHA512 02934ebf735b177ccc19dac03ba476245a94db24b2da2e0dc365a6b628ee3ea61c90ae16ce7965fedab202cd8466f3ad7dc3cc51b8aae7a17f885cf2abd5155d
+EBUILD http-4.4.1.ebuild 1502 BLAKE2B 95a50a2b84438db450676bfb981470cf2c670010ecac2d6300049a397ee8ec97c3ac2e66c6e8b249484cca3c2290b0a35833018dbda87c18d379971b833524d5 SHA512 d69d9680b1c9d2ddc374a3603895a8a2ed2de3e64ad8ebe61b44f632ec7294963ab2ae8ee230892d88dc7676a4af6d6eaeb35ac94cd48e2491f2dffe08063a72
 MISC metadata.xml 339 BLAKE2B 2508769568914caafa01e9e8e6517a7cf9c1733c772b3c605c8dbb056efb8dca3be9525e1ba2ac610bd6d5b5dc02b7625f3569dce0597444240bc2ed8d8449c2 SHA512 9b43a2f61eea32941c251429694bcfe432f284527c332efdaf4187c9ad8c6f53cd924421ca9d56cefce75cbaff104d4f7579790fe09b45a4cced06bedc44d1c1
diff --git a/dev-ruby/http/http-4.4.1.ebuild b/dev-ruby/http/http-4.4.1.ebuild
index 1b3a4d077041..2383d9799f22 100644
--- a/dev-ruby/http/http-4.4.1.ebuild
+++ b/dev-ruby/http/http-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/tarcieri/http"
 
 LICENSE="MIT"
 SLOT="4"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index ebec7d6ba66d..43dfb33a6d8c 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -2,8 +2,10 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.2.1.tar.gz 51030 BLAKE2B 1c7df3910c856c472f42417d51449f04d56635f0c77dbc6eb7a30d25042482f4efc7bbfa2d74609aa9f8d4ae134f53dc675b621efe35c2cc6faed8780d7128c8 SHA512 24cd67b926589401123dfce1a344a6d1ab1d0f9435b9646b7f638deebc0f683b77df70064537f84538eaf800beca4c67fd7c02e40d955fac92866b8ce1eeb769
 DIST listen-3.3.3.tar.gz 52994 BLAKE2B 95831a65a75cae28b767696bbe5969cd7115657fa56e01701f3b17d5bd727a053cbac16928d8c7c2a19ad24ea3c99afdadd1e9ebbae0a66d03a511ded7d32734 SHA512 73ad762086e7961e45f1245e5aa32c738824736b7d373c31565832c3acf25f91cbc9c25d7bdffb27cf953cb2b2bb37adfddcc6888f3a1b317f70cba75c2ce67c
 DIST listen-3.4.0.tar.gz 55390 BLAKE2B 44f0319a19cbac9535b585380c95a4c538a19f9b66a837ccb78ede4d2e8d2c49d0c78ff21913a8de959de43dfb62f4e5489ce70b06e0d5c47e19be81e42fa8dc SHA512 b247c6ec907141549943fd1eae4075c18efb653dbb666bd8b71876c4bd96ae637d4634746815ef1f35335414ff833479fbb2a5a997df994d16bb42b21775b5a2
+DIST listen-3.4.1.tar.gz 56014 BLAKE2B 7a44a1ca960d8ae0cedd3b0128c4d8048b6f4f4168fa522c376708ebac1996076b36ce3054d179f5bb2267328473f63ef3ec2cb0c22a1fd56c5aff957a3c77b8 SHA512 fc745b7a825beda526588a5227c81c6f3c686d25968fc67c9c0df3c2beba343fc558453dd5c51b4cd82b072b3834526403ad5c06cda2cb57362bfafd105d54f3
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.2.1.ebuild 1208 BLAKE2B fe6653f617c1f0caf4c4cb39ab27977acd22af42ac1ecbdd03be705918050d4b973eb6410a1eb1e484a2ba90c51c2c9ca6d18e0d259d160c911e41d7916e680e SHA512 6c54b1af911554bd2c91e94ee7b6e005715fffa9b31594a270c7b49f819bd38e427b9fd376c2d027bf97400d67bc49688487166de0597a47185cbafddb1e1549
 EBUILD listen-3.3.3.ebuild 1201 BLAKE2B 5db4e313fc8bc0a67e5ba7a2b8a14330ed78e02ea82989981c64ef3398e30d9f12b555eda9e11cceb242302daff8252b6f2772a843ffb8f3f3147ddc2bdfb1ef SHA512 2715c9493641cff9f1d980cc298b7ce85d8b6e27d776c7461e273e85a8327a57ebfd81ff522bdfac1b8dade7fb47c161a0dd7cead9fc08965bcdcebeb65c4c0d
 EBUILD listen-3.4.0.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
+EBUILD listen-3.4.1.ebuild 1202 BLAKE2B 437f65eb29fee061d5dbb34179cec9e7058d1af8d2963e0ae9a3a9c66a68985402d1559fa0f8c387889f9bdaadf561a3b8d472c00d5ba74e1dc6a76c1d6ac81d SHA512 d50f8bf4946406d636ef0a2432bfe2b6569ccb59c69ec5da132147c4047ce5428672e9089188a70b64745c3765e5c1a516934a9d2b0a447ba75af795e2c2071f
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.4.1.ebuild b/dev-ruby/listen/listen-3.4.1.ebuild
new file mode 100644
index 000000000000..ee04d1c2272e
--- /dev/null
+++ b/dev-ruby/listen/listen-3.4.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index 08290c4f4cd8..d347ec71e9f5 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,7 +1,7 @@
-DIST loofah-2.6.0.tar.gz 68970 BLAKE2B 507e907e9c744734594dbb0aefdfb76f57f57ccb9fde6c52b15b56289d6cbeb8c1a7bc0fff0259d22204c45f55b06a360cb56e8c8731736a0d70ef079e006cbb SHA512 6c3948844b5f66f14a86049fa0527967a120df9a51661bab88449f0a60093493b5b948901b7227995747d253d915ca0176f708b126000036ca3396b794cd49db
 DIST loofah-2.7.0.tar.gz 69272 BLAKE2B 1578cba4b4b12fb35a1095060af8d764ec55d3745a44cf756f1de5bf43bc0bde37276372e7aa53a3a26c2c83a8c3da417140d3addb102cc0429f7d47b8c01806 SHA512 698f7976e6048615643d8875aa4dc09c4bd261234bdc9908589edc08be9073a83f84f04fff7e32b518712d63cefe2611895543733967a8b8de12e6cecdb902c9
 DIST loofah-2.8.0.tar.gz 68844 BLAKE2B 52b5b5c7a70939069d84d0f66c4262e456d2ed81ab4ef2541eceb9068ccdddbb1c7b470ca7504700f6f66d4aa4507b9edfd4720c1302f6026008c10100c1fecb SHA512 a9d7c21be733e1aab8353ab7bfb3db14d47e8da2c3f20eba11d0041b782e4f2cb82865bbd5a2a9321aae7ea04089f6a5fd1bd3119cbfe8a00c2ea71a40cae53b
-EBUILD loofah-2.6.0-r1.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
+DIST loofah-2.9.0.tar.gz 69098 BLAKE2B 097479b8de0f2fdebedfab9b1a0a656811c4650c13cdb73d2594c513a6be7bd9d6e6f81b5594367e7f0d783ff22664d22dcc8e06014cae51493057069831c174 SHA512 9dfcdd1142256b4fee10038ace13e33f5086aac0ab8e449fae878c33d66bc0882e6e032a9251dd16188dcb4549260403768771f2c7f5f38d55686a6a88792b65
 EBUILD loofah-2.7.0.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
 EBUILD loofah-2.8.0.ebuild 1203 BLAKE2B 9fc912673ccae3465c0052ddaaeb3128a48e8ca7adf001c9edb84e1ce6b07e405f85b7a27534f02f878b288768682a85aeeca325e9709cedfa6daa18903a8ad3 SHA512 71d7f379ae47270d7f811a6e7532091d76d2951ae7c3755412c865e0a5f83680e4a9f87929dee382daa4a63db2fb4780dd9925448b7acacd78198d4c22f0bf5c
+EBUILD loofah-2.9.0.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.6.0-r1.ebuild b/dev-ruby/loofah/loofah-2.9.0.ebuild
index 58aad399e56f..000d6ae80a3e 100644
--- a/dev-ruby/loofah/loofah-2.6.0-r1.ebuild
+++ b/dev-ruby/loofah/loofah-2.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/memoist/Manifest b/dev-ruby/memoist/Manifest
index 77eb8323ecfe..c6efa767691c 100644
--- a/dev-ruby/memoist/Manifest
+++ b/dev-ruby/memoist/Manifest
@@ -1,3 +1,3 @@
 DIST memoist-0.16.2.gem 13824 BLAKE2B c3ec292126cd5254a2561317554d4bfebd11155de88138bf82a2a09b4342a0833d87cad33dc149cd40bf962843230161b766fcd5b03c55c1d55fd705a5e768f1 SHA512 8de7c73362e621c420f04e1b37c27a21fdc46c5e341c8cfbfd835f1cb53eb1a763dc43565fcc9723bcbdaa439a7c6921a8541a741646db4ef127cb8f6018fb10
-EBUILD memoist-0.16.2.ebuild 489 BLAKE2B a84df0c56fe51004ff1d45d8a45e2b23bd4590e5416d270ab0ea942d2c2ce33598e24b79263dafb8236c0bb6d097e1cff5cc586c566747af48cf78f3ae76caf0 SHA512 b55935c7974ce2df5ab32a31e96ba3a0d72f2a8bf4728df53981e5ee83ac32e7035ebe7057acb055ea40ebee51f6fd5a38fd93cfef947d9b81dd616668545708
+EBUILD memoist-0.16.2.ebuild 495 BLAKE2B 2dd247fe5a71d972c55e6d8776ff7be4c573ad569e74c2e24345e46e1951abceff5c3b129c4fb7f46560d0fc91599ca34a0164f9c61f40ef424b364e80e2dada SHA512 37789ef0660a4d4e051448b9a55c6240aa26e8e79cb6adc1ead108a0b409151490276307890dd33d47385fd62ab68670f876b2b12448bcc82a6b7d03b394ac56
 MISC metadata.xml 477 BLAKE2B 7054dd9012ce8821d8b86fb26a7a81fd6d48e8a98e5498920b4c95b275f70919e70dde1591364f5e8ac24201c37d8e871d2af14cd4f7505966416f459e5d8dea SHA512 019d2ccf64907ccc3d5be96240e30409602fa2831b5a0b498f06f1e7bf1cd8d433f6e3b1da26c768fe6f2c96c46347b07e9691b0660521ee0103ad1a0b3137cf
diff --git a/dev-ruby/memoist/memoist-0.16.2.ebuild b/dev-ruby/memoist/memoist-0.16.2.ebuild
index e6b628eeacf0..4adc0c7d30da 100644
--- a/dev-ruby/memoist/memoist-0.16.2.ebuild
+++ b/dev-ruby/memoist/memoist-0.16.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/matthewrudy/memoist"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/moneta/Manifest b/dev-ruby/moneta/Manifest
index d3f0a3e80f8b..6e92f9a1554d 100644
--- a/dev-ruby/moneta/Manifest
+++ b/dev-ruby/moneta/Manifest
@@ -1,5 +1,7 @@
 DIST moneta-1.3.0.tar.gz 130195 BLAKE2B c6eabfe31ca39b4b0c91214eb37a6090d21b3ff62943cbbb5e1f1b2dc72e6c4087aed7227fd1ecd0678730ca0b86b82423b25e8dca3c56881f2c0a7a98fc95f3 SHA512 9ea725f095cc7e7faae9621c2f4bfa27c54c81200c16a680fce289e68f79f4a5f66d9bb55b1921578a65d303ff6dd2069f56fbba28cb9e758d898ae03bb1c3dd
 DIST moneta-1.4.0.tar.gz 129069 BLAKE2B 86b3eaa875483acb5931eb5583f56a0484851df57bc0186daf5fe1cca402c209a44226e5dca570b14026f8beb861650506ccbb386ad8d092fb7b5a9277c6f8b5 SHA512 ebcdafd4badaddccf833a43c3561421d82d0941c2340b9bed37b62a94d79e5098a36e7f04b93b1fe26c7dedfe455d6a751be3aa4606263fd2025b7a95fb5a68d
+DIST moneta-1.4.1.tar.gz 129056 BLAKE2B b5a7a9fdb1817c88c942ce8cc3353974d556f14e6362722ae4b44c40311241aa5dd7354054e4edaca84edcc3a76b3d43230dc0a376d48911409721137cbf8d01 SHA512 7ff8fec2047a7df7e110480ff87eadc8e33b776176350279dd933b456cc7def0e92b74eb5dfb7ac2b2233232959acd839ede80d491bba0f134c31414d3f7786b
 EBUILD moneta-1.3.0.ebuild 787 BLAKE2B e82d67649e98c63ec6a1f823f9eb0dd77f6b1bde4aa0b1ddf6b7be6564d79ec9f4ede2123f69e0722b8323edb6e8dc7cc761ba3ed86b9685ab09ea8f71b5e2cc SHA512 26efe595bfbc650b29d27281e19d2e4a5523449b286f82c9f07dfac14aded294228b3abdf9646f38cfeb397ef01669707f3d8eff828da1ca2b62849fdac7ab76
 EBUILD moneta-1.4.0.ebuild 787 BLAKE2B e82d67649e98c63ec6a1f823f9eb0dd77f6b1bde4aa0b1ddf6b7be6564d79ec9f4ede2123f69e0722b8323edb6e8dc7cc761ba3ed86b9685ab09ea8f71b5e2cc SHA512 26efe595bfbc650b29d27281e19d2e4a5523449b286f82c9f07dfac14aded294228b3abdf9646f38cfeb397ef01669707f3d8eff828da1ca2b62849fdac7ab76
+EBUILD moneta-1.4.1.ebuild 787 BLAKE2B 19f7fda4319aa8c6e7b9c76f2aea9cdb857ee2267608f51b6a055f87158547a99c46c54b306cd23ee801db0796344df49a88545a953a499c7b38635648971800 SHA512 a986b62b8efaadeb25198315f7bc90cb48a62431242b480798847fd43e87adc3511e45b5406a8f5e1997e704202ded4c8ad8f2ec62024db327657c7d17704c86
 MISC metadata.xml 338 BLAKE2B f4108feb99f75000aa42b1ce88a4b450234e83f66d275eed92f8ab8743dc8e9844171aae3da12b337533fd8bf4309c28031c845958b7726e09b6e931f55f4642 SHA512 93a165f2020451e5ebd0329021d4e6ad92bbe91f995e6b8a8542177090bdd6c475d71ab8ddc5ba13cc61788cc585ca98066c36d55cd7d6e648c5a0e09ad7b0d5
diff --git a/dev-ruby/moneta/moneta-1.4.1.ebuild b/dev-ruby/moneta/moneta-1.4.1.ebuild
new file mode 100644
index 000000000000..0403894ac099
--- /dev/null
+++ b/dev-ruby/moneta/moneta-1.4.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_RECIPE_TEST="none"
+# test is disabled for now. It requires many packages.  Test suite also
+# takes very long run time and has high memory consumption.
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md SPEC.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="minad"
+
+DESCRIPTION="A unified interface to key/value stores"
+HOMEPAGE="https://github.com/minad/moneta"
+SRC_URI="https://github.com/${GITHUB_USER}/moneta/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/ls-files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/necromancer/Manifest b/dev-ruby/necromancer/Manifest
index 01563d3caddf..5af792e67bc9 100644
--- a/dev-ruby/necromancer/Manifest
+++ b/dev-ruby/necromancer/Manifest
@@ -1,3 +1,5 @@
 DIST necromancer-0.5.1.gem 19968 BLAKE2B 32bf97caea056a1290ad574a32dbd8f9f258d0830694b28c3691d9d39039fcf6fb1d66c909f720350f455399fbbc9e416354de99bdad532d94843a8f8f1fdab5 SHA512 439358288bbdba674de9ebc4e43ddbba2fd8602c25114fff7a4c93fa11eb5d2a21aae7b6a95d82e78216fa19b5254270292e2e609fd08d6954f2b39afb9a3854
+DIST necromancer-0.7.0.tar.gz 22784 BLAKE2B b895677d0293adabd9c30d44c33131c69b9b30c24deca41d257c75d586cf44e34d68a090c8618a3040622be93fca3c4e637bb7510ff5db586c0392c47ee4e389 SHA512 873284964e55a0be0265675860b22345f7d46d8b49ccebb5cbe7a2103bfcb639443c3ad3af5d6d6f07d1bb2bc16dd945dc8c0a39b803640e866b82317d5f67b9
 EBUILD necromancer-0.5.1.ebuild 486 BLAKE2B 850a8526f28c0feaba13873dbe4e1196dffdf6ffcb4ce977fe2a40be293c4e9686ab222c17eb6f820936cf8e22dcb8153210d4152c8c160c77bfad8751071fc7 SHA512 90af7365fa603c02fb8c3f634a5abbb141dd49a5e47aef5c110cc17355843f9e7780b44afa41d26ae1bf83ba7910f6ccd6a81f542e5b8750428e7b38a389dd66
+EBUILD necromancer-0.7.0.ebuild 670 BLAKE2B cb4593ba5acc65af9772e8f2a4e6ca5eb9bdc5e58c1baa1603a41a9272b63f283048054f6f1e62eafa9a42c93bb51b26ba9c23838666642eb138f37227012f4f SHA512 2f8e9859d7b0248dd6d0fbffe33b66abfda637ec2b34f89a2243356fe96855b92ead33bf5a7b0f102a85ecfa8383828791e3d2667fb074d06567ca74f638021c
 MISC metadata.xml 339 BLAKE2B 7223f0fc0ce65869046b29a8d68e967382e4898f681032f0f55e59e8cf1292e5c7e168ef5fdf419f5f265c09ac595d923bff2102e634990243078830341d5036 SHA512 68fb1acd87765c309d044d434d996cf357c13943b11925968a4925f4734f739bf52a4c6ab0a8b2006d5b2f9b640a0aeb5926450a86763bf391dcec806530c313
diff --git a/dev-ruby/necromancer/necromancer-0.7.0.ebuild b/dev-ruby/necromancer/necromancer-0.7.0.ebuild
new file mode 100644
index 000000000000..b1e9e54126db
--- /dev/null
+++ b/dev-ruby/necromancer/necromancer-0.7.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+RUBY_FAKEGEM_GEMSPEC="necromancer.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Conversion from one object type to another with a bit of black magic"
+HOMEPAGE="https://github.com/piotrmurach/necromancer"
+SRC_URI="https://github.com/piotrmurach/necromancer/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e 's:_relative ": "./:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/net-http-persistent/Manifest b/dev-ruby/net-http-persistent/Manifest
index 5031e508e568..3f93e1fcc775 100644
--- a/dev-ruby/net-http-persistent/Manifest
+++ b/dev-ruby/net-http-persistent/Manifest
@@ -1,7 +1,9 @@
 DIST net-http-persistent-3.0.0.gem 30208 BLAKE2B 2bbd87d66e65081c76bc9cddaeb38f3ffd8a92b5b64f7717f77c7a927e2032fa732c2e82e220a75a63ddc10dfaa6a0f24e4fa7e0964e2ebd3d0729127f1fb452 SHA512 a601d3abde43b196406e3cdd6b704796ed70db67dfb67c9b510e0164ce7355cc925cac37fbf4c5889f41b069890ba2e2c15440fb40294ed21891fd08d9f87894
 DIST net-http-persistent-3.1.0.gem 31744 BLAKE2B fdd9c36ab5216c1cd1fe358207a689276e109845ac374ea16011469b6cb2b165115e78e701cce98c280e7f878c23d8016e75cac4508c7e579209012671b64101 SHA512 65b5afc4ad0729ec14b642e0e36363cecfff3dc25b26308d632866e93fed3eccfb83ce85da78f631553c6a1fe3ee834fcbc9d3681c85db6387463abbc30e60fa
 DIST net-http-persistent-4.0.0.gem 30720 BLAKE2B 5955cd60c86ae74c1f9d3415bf0257542718fc83d2b82cbc6ce31b5013edd1c0c3202757ccaf23a33c70d90fcb04e6bdfd2cdddfb82a45733ae3d15a5c526301 SHA512 eccc6cacfdd1dfb99bd0dcb7fe1c13cb1c21eae0104357156888bd0a5b2ee0b0d8ed5687860670c2dc54ccc1cfc7a090592bee160458427f44c255c1b99938d2
+DIST net-http-persistent-4.0.1.gem 27136 BLAKE2B b88151498c401cc20983c86859d7ef7ae3688ee12a5fcc69544d9716c3aeed55f4339d35ec08e9c0a6a16b4b4ab807d7155425c3056b9634185c255472ad93c5 SHA512 d3c86c9c58affac8cde1513dd899527406c0baafd3a620b80011e3babf51a4bfd6fb2bd8998fd9c4696d49aad2d014bdf666b9626e06fe4413cb4010f94e5e91
 EBUILD net-http-persistent-3.0.0.ebuild 874 BLAKE2B a3015ff9e4532090626746a238b180ea045c34fd882edbd8fbcc30d7969d65e78ff1dcd24160ae812531b5851b62f86e3fe9bb3a7650d22614b07016a4828b79 SHA512 9d18e19de760d5a2a3eafcd362f7f5f6fff3768d74b7bedc981f17fd015e3b229d5cb15ba0fe198f898816cd6f2117569f19f0708a00f8b32f53512addfe4213
 EBUILD net-http-persistent-3.1.0.ebuild 869 BLAKE2B cbeffa90d3d6359123326301449f942954e254fa6517588a1ff588a0ef4a54b0faa6c0e40bd516b6f9903e3f2ea94811ed52159fcbe660ae2fd6c80c8acf8eca SHA512 72eab46c783f89be648fe0860ac49c12c32834d6300065335a276f756f3bfa541b7980b34a7e7b704d6d983dfc9b18bd7b93bc1a38a8acea7a5390d41789f315
 EBUILD net-http-persistent-4.0.0.ebuild 855 BLAKE2B 7ffed8c7fe63f3d2018fc69e4c5e3c7b23f1a3a5902d0033352ab9b0b90e205ec1ebbdff050da1a5bc10b17e454ce8436a89d878fec1e75a2241732714d37881 SHA512 47aa38d2cd60879e4beadf084c133c7223a32165316b29da0ec1e893796cd153c90b954ff1b3304d539453107d103ba6df819deb6605bf1a7f59fe6bd9aca355
+EBUILD net-http-persistent-4.0.1.ebuild 848 BLAKE2B 23b7a1aea4003b9514236c08dc22418f4354ad42b8681a93f9cd186dcac749280bc83ba459d50d6a98db314af69cc460dce737ea67525c8b6fecd3896b20cbc6 SHA512 c7bcae97f52934e2ad3d4d800f7695278ce06f4891b7cb397dac4c66b94309f054cb9bcd6b134d6114a3420d36683f0f101956fc1adc7d60be4f8b4fbcb39489
 MISC metadata.xml 353 BLAKE2B 9c2503aa880a368eb25787d0020bba032b96ad047823434e630864c5569985cddc59fb8cfe458ce2ec7a278759f98c677d0413c70d65f20bf2b11df7c1114c0b SHA512 acff0618bb97cf903d61bf4149537876ba57037cf93c033f7a7c2165682d52216229f5d52166e648e313c7066c25bf3cd70925b5791ac8f77f4c43180555d420
diff --git a/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild b/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild
new file mode 100644
index 000000000000..22ef11e58977
--- /dev/null
+++ b/dev-ruby/net-http-persistent/net-http-persistent-4.0.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8"
+HOMEPAGE="https://github.com/drbrain/net-http-persistent"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="doc test"
+
+ruby_add_rdepend ">=dev-ruby/connection_pool-2.2:0"
+
+ruby_add_bdepend "
+	test? ( dev-ruby/hoe dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	# avoid test with implicit dependency on net-http-pipeline which
+	# fails and is not tested upstream
+	sed -i -e '/net-http-pipeline not installed/ s/unless.*$//' test/test_net_http_persistent.rb || die
+}
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index e3570fc087c1..9e13aea6d4a1 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
 DIST nokogiri-1.10.10-git.tgz 5793723 BLAKE2B 13829f6cc31c2b81462fdf306222ff27830d80aeea922ce4c3adceee4ce7486c0571ab76b3f07b14f1767af7b433af9e0eb83d02f8bcea989fa7e96c9cc743f3 SHA512 2d0bf09af417f0f5e7b07b9f2c555ce04e22d69ce73b484906d8a35745f90d6467824d0d56d8dadc53f020c56a7806e7152cd6347e47596e79ddaaadea1ff65a
-DIST nokogiri-1.11.0-git.tgz 5834946 BLAKE2B 3d54b8a998d56c66d97b7376031aebb0951df7f99c684e67537107a5e7fd0cb76b40c5351b8c46831eaf1427724e302d29a0a9b24bf806f64c541f2c30d54f66 SHA512 2cc5642d28e5a83023d0d3e031875dfbcde176995ed458be13bbe560f01552fee0424093bd7bd881c08a698f545874389d92581e987466bbf57f13deefe1e8a4
 DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
 EBUILD nokogiri-1.10.10.ebuild 2713 BLAKE2B 57dedd5488570432b5202d72ea9427ce220fa3303f4899ec04802969cef5e2b151fd0f97f6fdb912f5fb1ad876ebc5c4a66f0b84e7cc2eee573d4ce24da217a6 SHA512 fa8c7d4e2dc79676837763c9b114fa9d4fc53b387dc94293fde7902b3506d99fca95ea7c8699caa284a8eb8b49bb46bc7a8e6e8d6b7eef32caeeac1ced927b2f
-EBUILD nokogiri-1.11.0.ebuild 2822 BLAKE2B a458e3fb58fdf6140e5eb9840209027679df6d46ba6cb88d369c2602674d187cf8b1a77060439625bebdaee1250058b44033a7f985e66cafee265aa12e294096 SHA512 384d3a0a78754158683795631e1a86edb4f43379c9e346d8b059de48deffa7338fe3107b76d787caea79a8fd3db7a65e62c808b706327669ad58b539e994baa4
-EBUILD nokogiri-1.11.1.ebuild 2822 BLAKE2B a458e3fb58fdf6140e5eb9840209027679df6d46ba6cb88d369c2602674d187cf8b1a77060439625bebdaee1250058b44033a7f985e66cafee265aa12e294096 SHA512 384d3a0a78754158683795631e1a86edb4f43379c9e346d8b059de48deffa7338fe3107b76d787caea79a8fd3db7a65e62c808b706327669ad58b539e994baa4
+EBUILD nokogiri-1.11.1-r1.ebuild 2890 BLAKE2B 743f0897e421a45ea046446afd81da14c5c4c939eabefeafab89c9c4eb6f6f1c2407c22cd023237701eafaf31f5198db1c4cb5ab202dc0ba4a3b98fd49c209b2 SHA512 76b0679e7c0a856f47891128e4473a0f0c3d1f3253db88900cdcd2eb03385479530bec1476f072c6173ab6ad531566500867f3c662b7b9acc03d4903116ab7ab
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.0.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
index f0d3e1a26ed3..25405d872c2f 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.0.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
@@ -53,6 +53,8 @@ all_ruby_prepare() {
 	sed -e '/simplecov/,/^end/ s:^:#:' \
 		-e '/reporters/I s:^:#:' \
 		-i test/helper.rb || die
+
+	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild
deleted file mode 100644
index f0d3e1a26ed3..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.1.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.10:=
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.10
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.7
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/oauth/Manifest b/dev-ruby/oauth/Manifest
index 6353db24c7a0..64676428f39b 100644
--- a/dev-ruby/oauth/Manifest
+++ b/dev-ruby/oauth/Manifest
@@ -1,3 +1,5 @@
 DIST oauth-0.5.4.tar.gz 59141 BLAKE2B 1e588d411795b7c5b4ae5b7b3c9928b69aaa005bef858137759757e9f06d6de144408e4dba33d7fbf82a3f2586238a71b85b89c681f5d633453dfe0da954a2fb SHA512 f114f80255944934a276d0f9556ed37e4a0a72b221269cf7792f2c3a5a1504c5ec726fd5b7437b1102c648a6cf451a1c83de4689f53d30ea8c6a1d62662de535
+DIST oauth-0.5.5.tar.gz 60289 BLAKE2B 28a283bdb251b791ab6e0d50e6ed7db09445177bcaf5a99258c465e3783c5535f7d6acee356ec2f7559a942d1146ae8487260f8945f3138de670c20c60d7068c SHA512 9db8d68950b46b469777e320dea88e14506be846233f7c24e7dcdf9b57e761c43a7b715fa70f32a41b15ac7936a586e8b49a33af971fd0e9509d62827c69571f
 EBUILD oauth-0.5.4.ebuild 1054 BLAKE2B 0171f7c346a4aa6a1d71cfdad59223accde4e560d60d185c5e8accc78ab583395a88dcd94f26c0a937ad92d4fd3fc1222c01cd042740b91c99ec9eb6eb9e73b6 SHA512 cbf832f21e6676dfb2a0584bdc2d4e59e1594becb178babb9b4abf866fe348f20b86d9576584404b00f10fbe1943efb10acb80ea11070351700489c406ce94c4
+EBUILD oauth-0.5.5.ebuild 1046 BLAKE2B 77864145c4ddb5687126c8a98899a5ae22e3465725090ea5dbbe56f48fa29cebb65d5b8200e2c55e7e4ac4132ea411ca52ca2f170a722fba5008c84f73b19ee9 SHA512 0080ba443cda38027f086bb01a92daebb7c85577e6d326c927569e5f800dd1106361100ccd362791e0e4521f1f60c4ecfe94b302a11c994b46c14d1f903e899c
 MISC metadata.xml 335 BLAKE2B 57f59b76960a57baa7a46f505fa812b1f3417ea7f026272eb513139014e245cf7f34c286a677b6b91e7bd293c28da283dca118e32f76338758bf4a2247c01a32 SHA512 a740b8de21545f432e6e1d4b72a588bd1332bca643f017d8cffa84ae76f6a3d4514e3734f24f80954b7691034411b46463581291ae405a1026b90d93d991cb96
diff --git a/dev-ruby/oauth/oauth-0.5.5.ebuild b/dev-ruby/oauth/oauth-0.5.5.ebuild
new file mode 100644
index 000000000000..016e9a7ac239
--- /dev/null
+++ b/dev-ruby/oauth/oauth-0.5.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="HISTORY README.rdoc TODO"
+
+RUBY_FAKEGEM_GEMSPEC="oauth.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A RubyGem for implementing both OAuth clients and servers"
+HOMEPAGE="https://github.com/oauth-xx/oauth-ruby"
+SRC_URI="https://github.com/oauth-xx/oauth-ruby/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/test-unit:2
+	dev-ruby/mocha:1.0
+	dev-ruby/webmock
+	dev-ruby/rack
+	dev-ruby/actionpack:6.0
+	dev-ruby/railties:6.0
+)"
+
+all_ruby_prepare() {
+	# Require a compatible version of mocha
+	sed -i -e '1igem "mocha", "~> 1.0"; gem "railties", "~>6.0.0" ; gem "actionpack", "~>6.0.0"' \
+		-e '2i gem "test-unit"; require "test/unit"' \
+		-e '/mocha/ s/mini_test/minitest/' \
+		-e '/\(byebug\|minitest_helpers\|simplecov\)/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/ox/Manifest b/dev-ruby/ox/Manifest
index 2e68e3ee168c..a9ed574f2ca2 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,11 +1,7 @@
-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
 DIST ox-2.14.0.tar.gz 208213 BLAKE2B a5f99c8878efb9f87d8061d57ffb0afe26329b7e987c4de8c084a3453e35404fdfe29805d9a4cf60f3e30c39f47de5721a9d5c52b87660066ee484a30ef0837c SHA512 51bafbef13b1d3e0a5f27f69f9ca21b5774cb32f4b0d55e12ec5b94b1dad3febdfda37b43b84f599d7874f5ed28fa85d094a6f9c0087ca1d9b5d77b969c7de88
-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
+DIST ox-2.14.1.tar.gz 208294 BLAKE2B 588d9171de5db1cec6e24ea64a604ab85074ebb59be0d53afc040c9a47c64e2168abdd86271da8d1dad05803c98a64f8d12ea19297638a2f2a54a52c1c3f4342 SHA512 c82e9ec18a4003ab1e76f03b024b345b77a83a72f9f01d0dea1d9fdbf7c948638269e8331c19715b6b8bd999c2a104cf3660ff1f95cb445f13956ca0f95b723c
 EBUILD ox-2.13.4.ebuild 707 BLAKE2B 1852a031319f51213ada103be5f623496d42bf59af37148be1bcb8f8a8cbc3a31f15a03eec4c94a970e52008f02316becbdcd4fafadaecf9ca9b243f84c9c188 SHA512 80f3d533f0375bbe3847036881365440dcbf7179d2c0a1b892ada22b78720bca1879ecad24695afdc61992c70138fc58094f1f7222b0a10228ddada44a6d4e99
 EBUILD ox-2.14.0.ebuild 708 BLAKE2B b73770ef9835c297afabc649ccd4472a29ff182209a5f9336fbd029c9246dbfdc450d9ce777a1bf5c208b142b19bf20c22df7e3e7d270075f215f0fb07eff3ef SHA512 7bb13132c4b87e254ba69d2e56037aadc14817839690f27d6d834f5e88019d1f2001e363b105b736b84b290d8bd12d329b1be72a877d0929fda9b1cbfa53bce5
+EBUILD ox-2.14.1.ebuild 715 BLAKE2B 23d24c03274ae9c721e1614c987d4b94c13b720ef7b2738a4bad457af4fd2c4e70d5fc8ef6e366b710ab777dfc85649f1dcfe045891641465d8055029943eef9 SHA512 e64448baa14313e4a0aa45e2f3bd1d11143f7bc03b24aacf0d01b11de89806330f9cee29c3f344079b556243380710e54f8da0d71f14d43d221b58199afe0afd
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.12.1.ebuild b/dev-ruby/ox/ox-2.12.1.ebuild
deleted file mode 100644
index 0ca97a996081..000000000000
--- a/dev-ruby/ox/ox-2.12.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_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/ox/ox-2.13.3.ebuild b/dev-ruby/ox/ox-2.13.3.ebuild
deleted file mode 100644
index ca6de7a13bb8..000000000000
--- a/dev-ruby/ox/ox-2.13.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="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/ox/ox-2.13.2.ebuild b/dev-ruby/ox/ox-2.14.1.ebuild
index dfa02327978f..9a9531496c27 100644
--- a/dev-ruby/ox/ox-2.13.2.ebuild
+++ b/dev-ruby/ox/ox-2.14.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index b96f721b0219..22cb187ef8b4 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,3 +1,5 @@
 DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
+DIST paramesan-1.0.1.tgz 4981 BLAKE2B 3447281084a1d79d46f2a8b80c9b6d2ee63d9ef245e07ef07799a2ab2c730a1f99075bfb5c632c409fe412e277cfe354c8e59e99ffd38c2f1d671b7db3ace34a SHA512 6353006a26e8a7d4790d8bee88e4968df6d79ebca1f0855262eee1679789dfe1404fc345f6965377d5eadf03b88b9b8e1764a84065dde312d29fc0bae323b8a0
 EBUILD paramesan-0.1.1.ebuild 694 BLAKE2B 5fef784f26fb8f0d9393e34ab78f10fa350ab68584efb71940509af9b7700e2e6e3f9ea1ad8e43908421a7f905ec438d08477e2c7928eb3966f37db385bf781f SHA512 92df728806b398d36fc3228dc3efc98211a718474f56459e64fb4c610d3759b18da835493e299bb8ae20e7b425c20d803079298eeded6bf95fc832f3ea13ba2b
+EBUILD paramesan-1.0.1.ebuild 676 BLAKE2B 7dfe35bdaec99d04cde204543df7c9f3e801c95d51879ac4b95e32a34472719ed089e8569231349f8fed280c4b8b0376b22fd38e3f297abada1b5ee9c941b462 SHA512 7d17cd8c3440649e52196fa895f03ec7472e95f141d20cb9f70002926676decacb338fc6b64261ce4d278bcf95812f73a53f014b594445d1dc719323856e62ea
 MISC metadata.xml 336 BLAKE2B e2b9e1f7e89c66ec2a9e7a7269b48f0eb15c8ed0997e8287d1ae187d4be2e9a52e420de1a44cd13b92f9ec80748b5b6d9ea1237ccac0fdb4e28728f380f58aa4 SHA512 9ff8be1939525ea473bc5b870130a9bc0ac3bdd8c1ca8578ae476c71f6829f1698f646e5661c10a5fa55f6ed0608f7369acf8de24036ed98f5ae9e55c63eef44
diff --git a/dev-ruby/paramesan/paramesan-1.0.1.ebuild b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
new file mode 100644
index 000000000000..e375f431d298
--- /dev/null
+++ b/dev-ruby/paramesan/paramesan-1.0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+RUBY_FAKEGEM_GEMSPEC="paramesan.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parameterized tests in Ruby"
+HOMEPAGE="https://github.com/jpace/paramesan"
+
+SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~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:^:#:' Rakefile || die
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index e7e53d4bbf13..da6673278958 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,7 +1,5 @@
-DIST puppetdb-termini_6.12.0-1stretch_all.deb 21290 BLAKE2B 11bc0a316517190162e7e4e5a2ce05bc880ef8412bfcf5fb66ec68545bd7779e217d5d5e75ab79f24fc6b2f68e1a962262704efb8833fdce84288d060245b898 SHA512 a742825e9f9bacf5726814474b7812393d1a51c50fd710d771c10a9e23c874a465c6859fc17485b66a2c4114ac170f2f25c5ce1be6684ff18f5da31dc9ef0744
 DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
 DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
-EBUILD puppetdb-termini-6.12.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
 EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
-EBUILD puppetdb-termini-7.0.1.ebuild 665 BLAKE2B 611933cbf3ad90f8e6f11c4b3460d9946519c30ff57b0132d0de9cfab7d243365ab4a3deb10643df19b79cb2bbef878347614e3798544f2494e75f786d8e934b SHA512 613eee0dfa30b09fe2659dd2775d8f1c0f334d5304d153d7965342c0dc610f1402b6e34b60078078d852d031e2b67cc8ef59d952c266caf10bda6dfa5eaa2603
+EBUILD puppetdb-termini-7.0.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
deleted file mode 100644
index 7919b7b236e7..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-6.12.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-inherit unpacker
-
-DESCRIPTION="Library needed to connect puppet to puppetdb"
-HOMEPAGE="http://docs.puppetlabs.com/puppetdb/"
-SRC_URI="http://apt.puppetlabs.com/pool/stretch/puppet/${PN:0:1}/${PN}/${PN}_${PV}-1stretch_all.deb"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-# will need the same keywords as puppet
-KEYWORDS="amd64 ~ppc x86"
-
-RDEPEND+=""
-DEPEND+=""
-
-S=${WORKDIR}
-
-src_install() {
-	insinto opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/
-	doins -r opt/puppetlabs/puppet/lib/ruby/vendor_ruby/puppet/*
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
index a7f2b53b2dde..e88438205f95 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 0ecd3f9cae00..7683f03bf5c3 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -1,9 +1,5 @@
-DIST cairo-1.16.2.gem 100352 BLAKE2B b8b02e949b33c60ebe05852efd1cd775a79dab5ab6837f973ecf1b2c1af653a7c09221892b92210b9e5a0d615732116a91e5e1e9f93229f98987c18b36514dcc SHA512 b711399ddd7afa958e3faee87b2a768f55af9ec0cef486d9edcf082a0c7a5ec90610d9a52784d55608a70befe4571e4cb1abc401a8a5b5357fa0bfff9159d239
-DIST cairo-1.16.4.gem 196608 BLAKE2B f7cc8d9e2dc5e3f6dc5a6e259f5594bd7a6cfb13c3577a870949696c25c5139b69d6809cceda664ccf7b7278536b2d551bbd42e4471154a302eb1710324c2792 SHA512 5af8536cd374255386fdc84b265deebb7ed21ef270538f0c2d6a5cdf3dcf1c913633f1ca813f197460968b20b6e592f24334b872cf822584d4de28c589160da8
 DIST cairo-1.16.5.gem 196608 BLAKE2B df84e6b0b4419471cdaacb7eaecf23b9257b8e0933dba0e3058afefc288cbb2f14acb38d4f5302f095ed37c46469eae61d934c8da2d0b1ef1cc48f06e794179f SHA512 98c10e16a3a2d964dd9b5fd450118068042e721f9655758ca567ed45f418ce1c2b9fe8cfa991a94778eb17d69fef65008d2c21244592f4f1819104bdeb76bdcc
 DIST cairo-1.16.6.gem 197120 BLAKE2B d5c1f1704592afb096d30504f2d74d27e29e6222fd1648895beab786efae071de70f942b31e2f49960ec91bd87f0297a2d3b07013e894951d4ec1e8d376e73dc SHA512 f499daa83e865d58cc29d158ce649cab9f939464a08e5d7711f6cf255fb8dcfbf52457e3d2b81aef2018ad8d0762117776049b3681c9be6abdf4f0b12e43404c
-EBUILD rcairo-1.16.2.ebuild 1793 BLAKE2B c7a07ee26d6e26d19d59ac423ab7b14f9b4df45c19511a36771c3c40edc03e18834c0df8cf4bfd28fbf8b017ae05033fe4bbe266be94dce40bab5e1f6c8c678a SHA512 c6267cc0d698413057a12072368c833ddcd777cc09c9d6ed713fce9670b45bf28a3bb7031d2a59098cdc9fa578de8da1e20e13218bf4baec0ee54029ae5816a5
-EBUILD rcairo-1.16.4.ebuild 1891 BLAKE2B 55ce6d910c377866b51d8ad3d525c56727727bb3fa04ddf28ef6c9a7424a56bde3f06c33eedd5292158ad7161b32344aece891c74503afe798cbc5fa613463cf SHA512 05b7b802b2623cba16d1677d216e35d68c340cb5d962973cfe19068708c8dee57924779b1b62599beae753d543712cf29ab9592ff4059e36a9485906e8ea1de2
 EBUILD rcairo-1.16.5.ebuild 1850 BLAKE2B 9c5512c5bfd2430614351e2d042112571bec231a5948f46711699f56a838ea601b36f24c2f85548722ec49bb9147f817bbfe4d70ca81a99e620960ab374f7b5e SHA512 ab5c12e5d02cdf9bb6ccf4a569c51ea12371250251f29a5864ae23c067ca010f1f03bc5b4513e9db890a3b4fe6389a027be243299a2bf77db0622fc1335bbef9
 EBUILD rcairo-1.16.6.ebuild 1812 BLAKE2B bffb4cbc3a6af87f881a3f84a405094edff6fc6219e498fb3944fe70a3d5c6236f3a2d46d607f7002aa9af6f6b360f3a509a20feb4b5d181202aac0613962637 SHA512 2f2be83f7b2de88d7112d255139518a0b308eaf86e503b4a7540035adbbf5f69ffa91c57b42cff9f3a867b87eb108837e8c423039e8490a3200bfe08b4fd4b43
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rcairo/rcairo-1.16.2.ebuild b/dev-ruby/rcairo/rcairo-1.16.2.ebuild
deleted file mode 100644
index c321ceda4620..000000000000
--- a/dev-ruby/rcairo/rcairo-1.16.2.ebuild
+++ /dev/null
@@ -1,78 +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_NAME="cairo"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby bindings for cairo"
-HOMEPAGE="https://cairographics.org/rcairo/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="amd64 ~ppc ~x86"
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-DEPEND="${DEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.2.2
-	dev-ruby/ruby-glib2
-	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency
-	sed -i -e '/native-package-installer/ s:^:#:' ext/cairo/extconf.rb || die
-	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
-
-	# Avoid test that requires unpackaged fixture
-	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/cairo
-
-	# again, try to make it more standard, to install it more easily.
-	cp ext/cairo/cairo$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	# don't rely on the Rakefile because it's a mess to load with
-	# their hierarchy, do it manually.
-	${RUBY} -Ilib -r ./test/helper \
-		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	insinto $(ruby_get_hdrdir)
-	doins ext/cairo/rb_cairo.h
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/samples
-	doins -r samples/*
-}
diff --git a/dev-ruby/rcairo/rcairo-1.16.4.ebuild b/dev-ruby/rcairo/rcairo-1.16.4.ebuild
deleted file mode 100644
index e11b75bfaf57..000000000000
--- a/dev-ruby/rcairo/rcairo-1.16.4.ebuild
+++ /dev/null
@@ -1,81 +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_NAME="cairo"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST=""
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="AUTHORS NEWS"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="Ruby bindings for cairo"
-HOMEPAGE="https://cairographics.org/rcairo/"
-
-IUSE=""
-
-SLOT="0"
-LICENSE="|| ( Ruby GPL-2 )"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND="${RDEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-DEPEND="${DEPEND}
-	>=x11-libs/cairo-1.2.0[svg]"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.2.2
-	dev-ruby/ruby-glib2
-	test? ( >=dev-ruby/test-unit-2.1.0-r1:2 dev-ruby/ruby-poppler )"
-
-all_ruby_prepare() {
-	# Avoid unneeded dependency
-	sed -e '/native-package-installer/ s:^:#:' \
-		-e '/def required_pkg_config_package/areturn true' \
-		-e '/checking_for/,/^end/ s:^:#:' \
-		-i ext/cairo/extconf.rb || die
-	sed -i -e '/native-package-installer/,/Gem::Dependency/ d' ../metadata || die
-
-	# Avoid test that requires unpackaged fixture
-	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/cairo extconf.rb || die "extconf failed"
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/cairo
-
-	# again, try to make it more standard, to install it more easily.
-	cp ext/cairo/cairo$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	# don't rely on the Rakefile because it's a mess to load with
-	# their hierarchy, do it manually.
-	${RUBY} -Ilib -r ./test/helper \
-		-e 'gem "test-unit"; require "test/unit"; Dir.glob("test/**/test_*.rb") {|f| load f}' || die "tests failed"
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	insinto $(ruby_get_hdrdir)
-	doins ext/cairo/rb_cairo.h
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	insinto /usr/share/doc/${PF}/samples
-	doins -r samples/*
-}
diff --git a/dev-ruby/redcarpet/Manifest b/dev-ruby/redcarpet/Manifest
index c0c95e7a97f6..326bcb2ac62a 100644
--- a/dev-ruby/redcarpet/Manifest
+++ b/dev-ruby/redcarpet/Manifest
@@ -1,7 +1,5 @@
 DIST redcarpet-3.4.0.tar.gz 105525 BLAKE2B 38b28f400b7300ea49cebda9b4739193b54c322c1c20ecba50938893286ad87e44ba9e9da83eab8433af0790d76bc0db4189fc0b70a4438480fe784570809e1a SHA512 25ed1fd35ebf815f396ed819baec69aae366bafab3983a53d364b1ef0d3f18cecaa523953d12cb0e5b896c30ac86e000318f33c633047bd271362474b9b8f877
-DIST redcarpet-3.5.0.tar.gz 106773 BLAKE2B 34c72d21c8ea4d841c9728e3c7e66be02c69943e5e0ee091688992c400748cf0a0900fa15de7bbaf18db8a89bc0309160fd5c2b2ca83ee86f6d46dd5d13d9770 SHA512 8d48f1b437297aa556d7f3c5e69c8dde04c63388e78ffe15ea3c36e4764790b5cb75a8baaf75ad64317bccc63384fa0a42251d05718902096229f9f6a24f06c9
 DIST redcarpet-3.5.1.tar.gz 106950 BLAKE2B 2f84e0dbadaa79827d9d244988b19161996e249e493208b20b6339f0eccf73160fe84d79f11a23419573693bbc9c1faae61e690ffe5ec133f8a0baddb69d92b5 SHA512 348ee8fc56b89bb1b9fe0b004cab08e9542f3806a885fb5fb0ff58c9a0fa704ad37611484e071951ad00d1d337988d5dae6d240cd65df890f8fe0865e242608d
 EBUILD redcarpet-3.4.0.ebuild 1031 BLAKE2B 44ad77ce9fff4057c3eaf59bf83b3f30c3e37c870fe468cb2ff9f667485fcf063db72f436c60c1cd969228173161989c342e2ac26fd53ca90598d72a4df0f810 SHA512 4c01aef2e885a9a6eed7374b27e16b29b442b08677089c4b1520e445102f75512080fa9532a2969abb077b53d232efd649686da59b398efdcb27c693dfc4b73e
-EBUILD redcarpet-3.5.0.ebuild 1080 BLAKE2B c2c95175c69f4ffccccd464746e473987486774e793ceaae24a55d3567f81b74dce7a86890d7dee970d825d7a4ae75984c10a457c798b34ebef63fccb1f66817 SHA512 d1d069562f4bcdc19d215b81264d6e1e75898e0b809067ba7e7e2b97d8187e927ad67c2dc4c6da95e309f23d7fc63b8a3036b18f000230a5930be2f331f6369d
-EBUILD redcarpet-3.5.1.ebuild 1001 BLAKE2B 2c2930bd840e40d75d03d88cf7514696b81691d9898b9ff2e0ad74b5023c6c7bb4795bde68d85dab5596fd7d3bb9849bcdd5acc21dfc1fa8818e098b13868675 SHA512 f7f079a0c97f68d38102ea7302b6cca2857fc527d1e847ba5bfb2a53cf0ed969761fb08e615ed595fef4441d8826e52180c68fcbb601ebb4e6ad25499208b920
+EBUILD redcarpet-3.5.1.ebuild 998 BLAKE2B a0c0facfc4d56f637b2a9a025c13886f0740b2391b76f8b215b19ae811f4ea81caf6ce17184220726b83934621e6af3f3c89f26ef3c6a7091f73518aeff8dc3e SHA512 ce6691134cb4a06aaf297cff5e25ac70b9a5865c852d7a30b4ac7c80235913ce6e5313004b140b12a14d83eeee8c4781468a9c71dedfe766c197a23f49f169aa
 MISC metadata.xml 339 BLAKE2B 3f8aaf2e00581b0e8a62f7a035a0bb80208dd8b4a1541cf77a3550cfaa486e800662c9f251bf02ec3e9a326dfe62d254981f04808b35700130b055488025c79b SHA512 eb85f708675bd9dd3d132e73d14e52689a94279ffc754097a986ddc3224ee21a69e7e81f1bc391725f1d2f1d41f72f8553079a10ffde7c8eb55048b7c6f089d2
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.0.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.0.ebuild
deleted file mode 100644
index a72215a51155..000000000000
--- a/dev-ruby/redcarpet/redcarpet-3.5.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOCS="README.markdown CONTRIBUTING.md CHANGELOG.md doc"
-RUBY_FAKEGEM_TASK_TEST="test:unit"
-
-RUBY_FAKEGEM_GEMSPEC="redcarpet.gemspec"
-
-inherit multilib ruby-fakegem
-
-SRC_URI="https://github.com/vmg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A Ruby wrapper for Upskirt"
-HOMEPAGE="https://github.com/vmg/redcarpet"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/nokogiri )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e 's/=> :compile//'  Rakefile || die
-
-	# Avoid unneeded dependency on rake-compiler
-	sed -i -e '/extensiontask/I s:^:#:' Rakefile || die
-}
-
-each_ruby_prepare() {
-	sed -i -e "s#ruby#${RUBY}#" bin/redcarpet || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/redcarpet extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/${PN}
-	cp ext/${PN}/*$(get_modname) lib || die
-}
diff --git a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
index 42d91fe8cfc9..28b95765d35a 100644
--- a/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
+++ b/dev-ruby/redcarpet/redcarpet-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/vmg/redcarpet"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
 IUSE=""
 
 all_ruby_prepare() {
diff --git a/dev-ruby/ruby-feedparser/Manifest b/dev-ruby/ruby-feedparser/Manifest
index da52b199089a..363d5240e187 100644
--- a/dev-ruby/ruby-feedparser/Manifest
+++ b/dev-ruby/ruby-feedparser/Manifest
@@ -1,3 +1,5 @@
 DIST ruby-feedparser-0.9.4.tar.gz 2705393 BLAKE2B 22d95f817d7cd80c33da804e391dce877eb3947dc249eff82884e0ba747aae9d6949418311a7596f6639470e32ce81e1bcc180737e25ab1bbc910bbfeaabdcca SHA512 0fbecb83837996c1a9483d70275cf869a62dcb53bb42d3fc8d1c7992e37c7d2c8b3194a9d0372566c4907f8ffd893c1f6ee1b2e55fa2417c5f34b71496bfad9d
+DIST ruby-feedparser-0.9.6.tar.gz 2705372 BLAKE2B 4a169fb980a6fc23f2e1aeaaae6a74607d3aebfa0a779ee52d7621196e39363886a88e5fd77ce84abaf52d956881e02f8b4f776b0abcab234cd1a4d26b012b90 SHA512 a35748bd23e87138583aaf04ecb482712a3774e1f97c471f86d97e506edf33f63651d5fd64c680d5250c42277ff3f33248fa65d2fa53d0e468a51b0d745a7a33
 EBUILD ruby-feedparser-0.9.4.ebuild 1009 BLAKE2B a7befe6834cf5072bac6cd8f77772e16ba37e67bc5f2aca58739c0a6268da355b18a2014318d1909ea012e5d016fc9faf880efbde9cacbc3c185648d4aa066b4 SHA512 cbb07ce35e08637a0a6bc88943089d67f3e3fe41a98b3c00e6fdc5c8a0bcddf1c0c19f7dbd3b80f5dc644f1a062535f2136cf2e3d257f05b21e32e4479a0f905
+EBUILD ruby-feedparser-0.9.6.ebuild 971 BLAKE2B 22e922f929c2bc715244131edd11d6be154b0a662cd8483c46502c89d174da86064a5949a877a051c8e2a67460b2662c4f7093cb1aa52651729c75414947fa86 SHA512 a448d0196fc7bd95722ec772bf90e481e74c5cb4abf5e71d1faec4f482936d0808811ffef52b49ae1180c2d7b7694e32f50f6007c34564e6d36ae5b33845d41f
 MISC metadata.xml 351 BLAKE2B 8ed001732ed47da11d190f32cb521b9700142bbdf04e6b486e9889f8df32ae24d9783b70357e653c3df8743d423eee547b5f884f5487f3e789f01792a6fb8551 SHA512 ed6059fdfc72e3f63ade2a463de1202da05bfe1b1b59f30b947e3c8999bc610ebd3729468bfb5ebd0b016dfa99cfd0af410dea3a4f054968fa6f1f201eafcfb6
diff --git a/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.6.ebuild b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.6.ebuild
new file mode 100644
index 000000000000..bcaa2442bb43
--- /dev/null
+++ b/dev-ruby/ruby-feedparser/ruby-feedparser-0.9.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="feed2imap"
+
+DESCRIPTION="Ruby library to parse ATOM/RSS feeds"
+HOMEPAGE="https://github.com/feed2imap/ruby-feedparser"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/magic"
+
+ruby_add_bdepend "dev-ruby/magic
+	test? ( dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	# Extract gemspec source from Rakefile
+	sed -n -e '/Gem::Specification/,/end$/p' Rakefile > ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e 's/PKG_NAME/"'${PN}'"/' \
+		-e 's/PKG_VERSION/"'${PV}'"/' \
+		-e '/s.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_prepare() {
+	sed -i -e '/PKG_VERSION/ s:ruby:'${RUBY}':' Rakefile || die
+}
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 43b05eafb7d0..842d5b7415bd 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,7 +1,9 @@
 DIST gettext-3.2.9.gem 285696 BLAKE2B a7bc40b2102f5b937d5f0e407dbaa23ead1da59eb9284c10a249c59548d0e2ad5fcd56b8855439893d2d31b57e0109bb6a9d5cc2d24075f5e360dc16b9291137 SHA512 21496c38cfc16a2b280f30bb94ff4560007eaa7f02c2341cb26aca2969a663c0863cdb650b4eadfd262d8585111dfb572e2ebc66a7a879045de50bf9da80a501
 DIST gettext-3.3.5.gem 290816 BLAKE2B 74434c3feaedc16a17ee530669dacbc4b32ae0be95eb903ce89131619e862e1c823351653ce3c5f95f0882c183e3b2fe87b423a245aa2d8803688ce7e6afb5f7 SHA512 6777b96dd73b3d454c0a14a40d2ac0eac52894fa58067ba9ec976627c96efc98b294b1498bed965d0426bcaa1b371dcde5745101e05e21e408397b4e8d31894b
 DIST gettext-3.3.6.gem 291840 BLAKE2B 5ca1a48582cb46e96fd672d9dc9e65ef3d5171560cc82fae147669023dafef761b67a68f31eb32fe1e433d918efe2c4c6983c32d8985093a3f090ab718703fe4 SHA512 ed03d370c03fe7502360aeac33f924c7463d7cde6bcde85c66befe8560b221a00f995ba6208ee14d1ca9cbaad6bd37aa7d0085ed75557f5b07724468de4433a8
+DIST gettext-3.3.7.gem 292352 BLAKE2B 76232148ec89720553e7f260c7222b8c5f9eccf0dd0b0b3afa776d9fe6dc6205b21f7853fd1a1edb6e28208ebbd56e327d160af179a4b7c7aaab12965243b806 SHA512 6e7906d68b3e834e1a9d69cea26a61ffed07abd035c9a8ffc3456bc2fdcb9495700c2aaa4d099cf75f88dc6916899510208012e02d1d4f15de3d5148251b4233
 EBUILD ruby-gettext-3.2.9.ebuild 1767 BLAKE2B 851f67ad032cd953e78cccd232b8ad05fc868ce75daa07bc7fc7dabbe3b342e57bc3122ede6e5cab86846f827ae88ebf83601fe4c6d049ba50b6008f694bd5b4 SHA512 b11c4c2de781ff7ac1d39babb5ba99d5ce1e744e8eb9be5d1634a9e15457b01645bf705f2462c26912f0f8ac06bf37ab8d0fbdd3eaee9f3cb609ffe5ab5b33da
 EBUILD ruby-gettext-3.3.5.ebuild 1729 BLAKE2B dcfb65933b92155a73e83c55ffa7bb6cfc0ce05d2ec5b4dbca0fbab50abe4499f44ef8d10d6c4bf22ea39808eb02fed3d43027cf3083a17cf471ef183341733a SHA512 5418d2b91c2ac538a8ea3d4fb089a25f8c354fe193bb46b98aba79e91e034eefcf8e911347153ea55710534292c24591b1df4337c7c2f44984b2d0b5c4c421f3
 EBUILD ruby-gettext-3.3.6.ebuild 1736 BLAKE2B f1b19efb62011446279fcb327179e773ebb2239097b2b2b7a8195c7b2672429f4b58b35cab47995beb815386e5de3a4714f6126361716f68b4eab01549fa0df8 SHA512 5b52cc32f1e21418a9d4d9d84a8d90f65732d6b15f37e9cc5c76ba39f61b8932cf9de62cab5e3b9d9ac3036cafc466ee23410869269ddd70dcd5d7c44d97bea6
+EBUILD ruby-gettext-3.3.7.ebuild 1736 BLAKE2B 30f9ab98b4b1e5e061b7599c848b85509b224562d53f5cc9060dcabdb1a66769f9706c96ef9d181bea6b414ed12ec5ba99a33277adbe5b6b9f7a296b4445ed66 SHA512 7aa10787e7d8a2ee5109c0e0cf4a571c461280488fcefe9ecca34449f7c8e3dac2e3cefe1c22f1278f1f5cae1b0308f563d8e10133abf38a4f2281e3cb12c130
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
new file mode 100644
index 000000000000..fb6b697eafdf
--- /dev/null
+++ b/dev-ruby/ruby-gettext/ruby-gettext-3.3.7.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_NAME="${PN/ruby-/}"
+RUBY_FAKEGEM_VERSION="${PV%_*}"
+
+RUBY_FAKEGEM_RECIPE_DOC="yard"
+RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRAINSTALL="locale po"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Native Language Support Library and Tools modeled after GNU gettext package"
+HOMEPAGE="https://ruby-gettext.github.io/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc test"
+SLOT="0"
+LICENSE="|| ( Ruby LGPL-3+ )"
+
+ruby_add_rdepend ">=dev-ruby/locale-2.0.5 >=dev-ruby/text-1.3.0"
+
+ruby_add_bdepend "doc? ( dev-ruby/yard )
+	dev-ruby/racc"
+ruby_add_bdepend "test? (
+	dev-ruby/test-unit:2
+	dev-ruby/test-unit-rr )"
+
+RDEPEND+=" sys-devel/gettext"
+DEPEND+=" sys-devel/gettext"
+
+all_ruby_prepare() {
+	# Fix broken racc invocation
+	sed -i -e '/command_line/ s/#{racc}/-S racc/' Rakefile || die
+
+	# Avoid bundler dependency
+	sed -i -e '/bundler/,/helper.install/ s:^:#:' \
+		-e 's/helper.gemspec/Gem::Specification.new/' Rakefile || die
+
+	# Avoid dependency on developer-specific tools.
+	sed -i -e '/notify/ s:^:#:' test/run-test.rb || die
+
+	# Avoid tests failing due to a missing test file.
+	#sed -i -e '/test_invalid_charset/,/end/ s:^:#:' test/test_mo.rb || die
+
+	# Avoid SAFE mode test that fails on ruby 2.6
+	sed -i -e '/test_safe_mode/aomit' test/test_gettext.rb || die
+}
+
+each_ruby_test() {
+	# Upstream tries to daisy-chain rake calls but they fail badly
+	# with our setup, so run it manually.
+	${RUBY} test/run-test.rb || die "tests failed"
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	dodoc -r samples
+}
diff --git a/dev-ruby/ruby2_keywords/Manifest b/dev-ruby/ruby2_keywords/Manifest
index b436c5b1ae87..2bb33ff76af6 100644
--- a/dev-ruby/ruby2_keywords/Manifest
+++ b/dev-ruby/ruby2_keywords/Manifest
@@ -1,3 +1,5 @@
 DIST ruby2_keywords-0.0.2.gem 4608 BLAKE2B a13fab6800dafe557ca05a14301ed37afdd0fef22b6c4a8458be758d96099dbad47c49d7b01bd3c7297aec51d971c944005f704fbdfc45d8f50249040c244250 SHA512 a7bc02980e073a899bf3de2e32711ca9820657d43cc44dede44ca31681d8586e7f808a93b6f6778aaaaf8b84da37a48c8062e69ca33477d9469e9634d616ed8d
+DIST ruby2_keywords-0.0.4.gem 5632 BLAKE2B 1d2d4a71823e61a14fdf15edc2ad8ed8df70e3f52f621940d3d3e00c18f58e76d7c18ca2ff409b1c2b5d77216f90e72e1d50bad00093fa1f7740ccf8375c11a2 SHA512 22cc0c9c08f84ee6485e02f1d1fa244219dc96846a638b428970e0876c83056b87939e8a3cddac833d6feb493e34420604e81a3973d7cfa4dc969a6639b13439
 EBUILD ruby2_keywords-0.0.2.ebuild 451 BLAKE2B b8a02855e056567760ccbbbd3c78a127cbf365e7272c9b274d370b2bcf5e1fa8aa39444ed1ccc8b01a188319e4776be9a43b1d2cf40869af9d672b9e664b4f2c SHA512 07b0152d0490fb0ae7c6a4d152faa51fcadb23980a53b6332aeb2c06ad80c5aa594f03c46b15ef57b8709fbdcc72f0fe83b7596b111b140585649b0e3626ad86
+EBUILD ruby2_keywords-0.0.4.ebuild 452 BLAKE2B bf9aa28b14bb2a2bb644ad486691d8d620f5e15118acd4441ed973627726e2de902f368c6abf86680364e555d71ebec8d359307dd0d852e76adf8f78f016aa97 SHA512 12b8b1e79bddbe977c3ceda9afd3248a41048a8956a968b24cf8ad9c3f18841dfffdc20f68eb174e41371a6a9bd6f7254baf66f083b1c532855a667ef0fdcd05
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
new file mode 100644
index 000000000000..da9a11ff613a
--- /dev/null
+++ b/dev-ruby/ruby2_keywords/ruby2_keywords-0.0.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Shim library for Module#ruby2_keywords"
+HOMEPAGE="https://github.com/ruby/ruby2_keywords"
+
+LICENSE="Ruby"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/ruby_parser/Manifest b/dev-ruby/ruby_parser/Manifest
index 6455e610ca36..612bc6092468 100644
--- a/dev-ruby/ruby_parser/Manifest
+++ b/dev-ruby/ruby_parser/Manifest
@@ -1,7 +1,7 @@
-DIST ruby_parser-3.13.1.gem 445952 BLAKE2B 7df7bbfe3f7f700747d32bd5c66d94fdd7c57974e622969958dda39f4dc8656a4211378ba51c4b8e8eefafebf82e550ab73a775530eab06ff6419a3dee7f8f7b SHA512 90c8b68245168c7df4ec8d0e6c62d9723d759945823768645614fe085f375c6811a15c35334c485cb59f32f6adb1aa0a06e7df043b09a48ef4e6102d93562b1b
 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 1131 BLAKE2B 7cad57830383143309aaf2bce365574250b0d30f20b6910b75809f6574c2737b31eae55a48c76c4d3d61466bbce84a9f65a8418389e47213d4950f81bbc27fb2 SHA512 2d091d9513a4c4fe56a533503adb25722c3278fa8df3cd8d403e0a25b872ec5e7c5ed78384ee6c4d1bc91199e24d7607888a4b794db49773a4bc9c7a193fe5b0
+DIST ruby_parser-3.15.1.gem 527360 BLAKE2B bb8c486f5c1e5da82aa6f0c2e0c08a8fa21928cb6fe1468f68d93cf79159848ae9f88f9eaa446d4d2a41b3f49e2cc961048f3bd6341da639aac99755095f5b8c SHA512 221af19b0b3d035af1b57a098076989f93f8237da3a0833aa2dbc85d5840b343215a2e1421d4685f9cb49f1d85af8640623ce387fd5a22af440432f0699097a8
 EBUILD ruby_parser-3.14.2.ebuild 1067 BLAKE2B 75ab55434aef8bf6d53b49948b9050b7cd43f9b1b2f6ec816f28937d17fcdc40742e153b020b03120847f5d6359f251fd9f51ece19ff1f8c6ee7fa75826aeb6e SHA512 f8a847213cc83752ed30bfddccb4d709ce9444591d787901921279a198b4b5c57afbde22527027cb51ac2a13a5c5b50d1731ede3991672b791476aed8636a281
 EBUILD ruby_parser-3.15.0.ebuild 1062 BLAKE2B 3257dc721852aa236a7150fe9e89d7bc00cfad1fc0f5085c79fb47bf6e014440f831505b58786187014b40398d12bb4aa8a63ddb643213986e8a9c75093e95e2 SHA512 98b0f594469af0fa26676ec2db600cbeabc8f7192ea0521351dc22bf27e753558740fe4781e303afc40a96941d641a5bfe17a09e6a2ed2482a9016ee27d16149
+EBUILD ruby_parser-3.15.1.ebuild 1069 BLAKE2B 3ee4919e24ac1fb28865fe6c3d306a9396a9e12c2968034102fba2b2f757c5789cd3a2c67547d6fc214f70a7d8583e07728f92f13fe1710071a07149ae313f0a SHA512 da9f9c9fe8d88ea339757011e3597c13f94fbe4aa4ed30370e6b5891925ac62732ad7e95174de12c11501d547972d29c66cae9c2e0996240338a1c01c68b7b8d
 MISC metadata.xml 347 BLAKE2B 58585950079ff918b98a50b41060c516e4640d3d9e382bdd659ad6b17c1f0e138782cc7e94085cfae35faca53445beef7ce645113a49a47d42e912246ce8dd6b SHA512 ff141bbed5bdb7f610f87c5f8040889784f9a3a1f7a2f5802d0ee52a2a3d660d7ef2e8e3cc37af9c8b549433447f1d523b4864a6175efab755a3009c99c59632
diff --git a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild b/dev-ruby/ruby_parser/ruby_parser-3.15.1.ebuild
index 124977ed9bef..48b33d077855 100644
--- a/dev-ruby/ruby_parser/ruby_parser-3.13.1.ebuild
+++ b/dev-ruby/ruby_parser/ruby_parser-3.15.1.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
 inherit ruby-fakegem
@@ -15,13 +14,12 @@ 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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
-ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4
-	!<dev-ruby/ruby_parser-2.3.1-r1"
+ruby_add_rdepend ">=dev-ruby/sexp_processor-4.9.0:4"
 
-ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.12.0:4 )"
+ruby_add_bdepend "test? ( dev-ruby/racc >=dev-ruby/minitest-4.3 >=dev-ruby/sexp_processor-4.15.1:4 )"
 
 DEPEND+=" test? ( dev-util/unifdef )"
 
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 2aaebbb35c86..9f7c2cc6fe8b 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -15,6 +15,8 @@ DIST rubygems-3.1.5.tgz 995812 BLAKE2B 43471515e4da8a6fe47a419f67f26efc9855334d4
 DIST rubygems-3.2.0.tgz 982282 BLAKE2B 2895cee1d2bc4e59073cc1e3e96a7958d079da5d7a7d2eed392e6bd2fac457a738518f30365d5601511998997f578b3ce9ed65c5e41cdc80138d0ebb07df3548 SHA512 a3d0b9a577a88d8fa27d3bbdfd4bb78e419549c579dc1add4f80e4abd017cc64c441eb7ad260705cbae672937c07fdc0c76f8751bd942fea5a97953f01052f28
 DIST rubygems-3.2.3.tgz 984126 BLAKE2B 3a1447738333cc27be3bbc30080b2e39be7557d9dbd9949fea21b0e6ca7c4ef3f062b5a2cd4c8004150f9dc548fe3c8e2cb174854c2d4ed7115f377662673398 SHA512 2910739e3bf3fbfdb98e71bfe97d5761ff6a6910e72004af4c3c3c050df80160c704318c62501b7283086ca3c2342cc9c8bb2ed406d5c582cb0f9d989c841c32
 DIST rubygems-3.2.4.tgz 982062 BLAKE2B d74479b4798ccaf03a8940a6f76dc8f5fa28226ce29062b48e725ea47033a4f0a8d5e36df96aec97cff0b0a4eef8beb8ff14e6ac4df4596f170111e89c26841d SHA512 18f4cc79eb3ed5a48b760a6b7a1b4283d8ff7c929f712152eab6a7a389dcc9a969ec77891ee518c033546cef6584865beef4f8f33ea06172eea3ce4e172c1531
+DIST rubygems-3.2.5.tgz 982720 BLAKE2B 027343c37a9be7bc3ef1f12a2851ed1605ed5c0a55e9c23c5f42ebf92f101e2693da725ccc749ec7f48c507eb57e39d3ca91201e5f447779e373ff70d8a5273a SHA512 a12dcad3d1698fea790a4669a3183fb81958c97c702988e1ddda1f33ab953517950a38e382b366c6ecaaed3d7954190339a87c8dab77c5285ce74a858da55a39
+DIST rubygems-3.2.6.tgz 984320 BLAKE2B 846202460722a9212df0958fca9bc8df9e3b0fb9aec3fbd0887f166ee5d25226d5325918ada816b5b166544e654d501a8db80ca2d9d7f1de42decddfb39f13d6 SHA512 b9303994bc2ef8a4e66f14f745f8ae493ee2725737cea6caf557f8943ac165a4934c865542c7080bf2d7b0c0be441d4e818ee8d42fdd9ae4419540943ed695ec
 EBUILD rubygems-2.7.10.ebuild 4512 BLAKE2B bce66fda261d27daa57b853de1b1605003c6557de15e3471ae9d426f16990da292e19cd48f0dc29bc09c2652adf521b93fa6a059dd1a6967fac692bde4d084d2 SHA512 9cf064646d60eee8037ffde0a059af6d408cfec13cde5715f8f172012e3f9c402a46139781f7e99c18a80d1fc9f81fd7519b3f7c19bbade22adf7c277b11b949
 EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
 EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
@@ -25,4 +27,6 @@ EBUILD rubygems-3.1.5.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af535
 EBUILD rubygems-3.2.0.ebuild 2862 BLAKE2B 596b1e5deeabbc17e332a4bae8fbfaab3aa8b9b305ed7b35f832deb1ffcff7d75730f3f62de7d7f8fe71eb4e1e8e24e934263d6dea15337456589769193805d3 SHA512 134ed46a51cd42e8b1ffd9a24ec82ce3770696294242a772e034bf5cbc0085a346aeaf619582f802caac893a5e1a76cb7eb82776d09c82eab022323a4ce690de
 EBUILD rubygems-3.2.3.ebuild 2991 BLAKE2B edeeff882bab641104a4084de04be99c8452de8f003268501cacc9db5a414d2ccef08265d9dc6a3d6600dd0a4a7d71da2b8fd26e41ccaeafe1b135e8b70c2298 SHA512 bbfddc97de271cb9fb950d8fb28cda6ff183f91a2cde3af220781bb22b2aa5ab5111314aa96970f9f7d995451f54da4a6b0f892036ca28e38b30bc9665d73982
 EBUILD rubygems-3.2.4.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
+EBUILD rubygems-3.2.5.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
+EBUILD rubygems-3.2.6.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.2.5.ebuild b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
new file mode 100644
index 000000000000..7b3fb4d23fdc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.5.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(25|26|...)"
+	ewarn
+}
diff --git a/dev-ruby/rubygems/rubygems-3.2.6.ebuild b/dev-ruby/rubygems/rubygems-3.2.6.ebuild
new file mode 100644
index 000000000000..7b3fb4d23fdc
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.2.6.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_depend "virtual/ruby-ssl"
+
+ruby_add_bdepend "
+	test? (
+		dev-ruby/json
+		dev-ruby/minitest:5
+		dev-ruby/rake
+		dev-ruby/rdoc
+		dev-ruby/webrick
+	)"
+
+all_ruby_prepare() {
+
+	mkdir -p lib/rubygems/defaults || die
+	cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+	eprefixify lib/rubygems/defaults/operating_system.rb
+
+	# Disable broken tests when changing default values:
+	sed -i -e '/test_default_path/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
+	# Avoid test that won't work as json is also installed as plain ruby code
+	sed -i -e '/test_realworld_\(\|upgraded_\)default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+	# Avoid test that requires additional utility scripts
+	rm -f test/test_changelog_generator.rb || die
+
+	# Update manifest after changing files to avoid a test failure
+	if use test; then
+		rake update_manifest || die
+	fi
+}
+
+each_ruby_compile() {
+	# Not really a build but...
+	sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	#unset RUBYOPT
+
+	if [[ "${EUID}" -ne "0" ]]; then
+		RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+			-e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+	else
+		ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+		eerror "Testsuite will not be run."
+	fi
+}
+
+each_ruby_install() {
+	# Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+	unset RUBYOPT
+	export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+	pushd lib &>/dev/null
+	doruby -r *
+	popd &>/dev/null
+
+	local sld=$(ruby_rbconfig_value 'sitelibdir')
+	insinto "${sld#${EPREFIX}}"  # bug #320813
+	newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+	newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+	dodoc CHANGELOG.md README.md
+
+	if use server; then
+		newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+		newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+		eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+	fi
+
+	ewarn
+	ewarn "To switch between available Ruby profiles, execute as root:"
+	ewarn "\teselect ruby set ruby(25|26|...)"
+	ewarn
+}
diff --git a/dev-ruby/sanitize/Manifest b/dev-ruby/sanitize/Manifest
index ce38f2d761d3..65979932face 100644
--- a/dev-ruby/sanitize/Manifest
+++ b/dev-ruby/sanitize/Manifest
@@ -1,5 +1,7 @@
 DIST sanitize-5.2.1.tar.gz 1352785 BLAKE2B 2742085ac296869b8be36cf803f999475032c147d94aa0fba77fb83b8305470baf144f4c68fc5711871779f327c9bf1ba8b3b817f3777a04fb0b9c726318ee1d SHA512 3384d01db244f9f7feeb67bf2fae5773a85f512411bd761db6a71ab3fb690fac33c0caae848e5a4df6f202be7dd7cc52f8bac4c82bef447d20dbc70a586ed82f
 DIST sanitize-5.2.2.tar.gz 1352903 BLAKE2B 8ebe57b6de733556015e38ddca0a2ed69e4bb8a22d5f3e812f7e346f4822df15e0554b4a74d195fd812c45397ecc03543ce7024e9052b4d0045d56fc3c02f64d SHA512 9a2e7d265799fdb7e02256bd9050ede7ae73c6088064bc79fec6c94f3d35871ff427c2b59f0e3ed122e091ae36b996413080f7fdcefe85f740c1825a70abedcf
+DIST sanitize-5.2.3.tar.gz 1353257 BLAKE2B 8b74376e2c184e6219d089f5404cce0f0ec2acb2002d49eead0045b5771331960b6c1c47ff876aad155d822d04b282c2be6881b25d9864f68e617c2be45e6ac2 SHA512 0cb30811251fbb60a7f37307010ccdc8917ca4a5bc8c9c702767e3c00d9e68fb79d5f0fe2afed3ce74646d9195eff8060e11e0fae1ee1e9c3f5c9e05af14f111
 EBUILD sanitize-5.2.1.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 EBUILD sanitize-5.2.2.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
+EBUILD sanitize-5.2.3.ebuild 837 BLAKE2B 8fca5c6e6760f10ba5e5d5bb54d15657123b9ac946a214bb560bdca089bd1ed48650df2285dbd7b4f7270a416ecfd69dd81d9cbdb1cc2d0015623657cefa5346 SHA512 61c6cc7f500c39b528fffd9cf5ad011d34a21bf08ab2a3401823d22045c8f828aa5d66483f9b187b6eb49b12829b0ac0363fe1ca0364e974d22d501eaad69f28
 MISC metadata.xml 341 BLAKE2B 8081029c35d5a56ed5a3399ecb63510e737a664e97a4eb363108b85fe75860cb8b171e8da497d669cb0491199bdbe94408570cb811a8c86d6d38541a0f65cbe4 SHA512 870423593eeb0219f2fa0b6bbb55a4a19063f5cf3d19d9c0bb352aec5632b3e5f5e717e7c6004413497a981091042d54bc092e2c029a511aa0c37e95d435996a
diff --git a/dev-ruby/sanitize/sanitize-5.2.3.ebuild b/dev-ruby/sanitize/sanitize-5.2.3.ebuild
new file mode 100644
index 000000000000..71a7a8914abf
--- /dev/null
+++ b/dev-ruby/sanitize/sanitize-5.2.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Sanitize is a whitelist-based HTML sanitizer"
+HOMEPAGE="https://github.com/rgrove/sanitize"
+SRC_URI="https://github.com/rgrove/sanitize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="5"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/crass-1.0.2 =dev-ruby/crass-1.0*
+	>=dev-ruby/nokogiri-1.8.0
+	dev-ruby/nokogumbo:2"
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+each_ruby_test() {
+	${RUBY} -Ilib test/test_sanitize.rb || die
+}
diff --git a/dev-ruby/semantic_puppet/Manifest b/dev-ruby/semantic_puppet/Manifest
index 2e52ee3725df..fa1feacd3c62 100644
--- a/dev-ruby/semantic_puppet/Manifest
+++ b/dev-ruby/semantic_puppet/Manifest
@@ -1,3 +1,5 @@
 DIST semantic_puppet-1.0.2.gem 31744 BLAKE2B fd80225f799f55fe668c712cec20ad57163c3829ce70f49a30e7b73037883ea1960be0ea8f510e147c30254b7527e64f323fd7f9edb30f934762088ed997a241 SHA512 b059d8c7b13ae96dfe012318e7c6ee483cc09986d5d065c8422167a27a14d8e99433229c90388a7ff9ee425a0f5b6a6a6d5bc55f8b81901490afd8039ea86480
+DIST semantic_puppet-1.0.3.gem 32256 BLAKE2B bbde7e40e2d7361b09906974b451a33a2698dcc33db1ab3c790968318b21f4c72d2ce775eb56c331b0509666972cde2e5a1db64580eb6e558d604ff025e389d0 SHA512 bdca6793a064d37d15010551c579f61837b1095025d84469ed8893d4bbed4372cde005ed452460a8d771c8e4bf842283628f2c613295bab0af3834cdc163f7ba
 EBUILD semantic_puppet-1.0.2.ebuild 516 BLAKE2B 82ded36da2a07bb20348ed9cb670f7a8bd50cdd62f8497059725748dcc4e7b189e203c8263244f0815d04a790253d9ec3182fffbbea6eee3e2fb8dc2655d800d SHA512 7d098d0348cc26239bee23bd761f2dffcd586b21dac5e3bd63a39c47fcccb77a80c813d7e7920bc0b2856a19177934866a435838c0f565b4066dd39d7d776a37
+EBUILD semantic_puppet-1.0.3.ebuild 482 BLAKE2B f22e33abd253f07d0c2e1baabe1256640ce4f9c0620201f8474eef412b014baaca5c6628686aa85acf7405ea55dca63a3fa2e0777d66ea3979aed8624c073a98 SHA512 9cf20a9c8b6310f00e604d89e74ccd2d3b86012f9d454c241822071bb782007d67ed239aed049300b0dff6ea375311440ae253f6d4d95282aaf07a9328b77446
 MISC metadata.xml 453 BLAKE2B 04500569e8aa9cf4f1e775f0a963db272a82ea8cb4bc33cac1e8c12a6199542e40bb379e3036d8e18e0ac040e78ccc1379d96b6d25f84f52062268d291693bbf SHA512 18ff722caef29f1aae91072feec01611995b7d3c6c4bb30c262007cd8e6731ddf7e94a9bc767f3a1910f28eb4d4d02fc82a531e2434c442757da77bf3e6cfffc
diff --git a/dev-ruby/semantic_puppet/semantic_puppet-1.0.3.ebuild b/dev-ruby/semantic_puppet/semantic_puppet-1.0.3.ebuild
new file mode 100644
index 000000000000..ce1be8b94a38
--- /dev/null
+++ b/dev-ruby/semantic_puppet/semantic_puppet-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library of tools for working with Semantic Versions and module dependencies"
+HOMEPAGE="https://github.com/puppetlabs/semantic_puppet"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
diff --git a/dev-ruby/sexp_processor/Manifest b/dev-ruby/sexp_processor/Manifest
index de19d70dab19..b6d3aa034bf8 100644
--- a/dev-ruby/sexp_processor/Manifest
+++ b/dev-ruby/sexp_processor/Manifest
@@ -1,7 +1,7 @@
-DIST sexp_processor-4.12.0.gem 54784 BLAKE2B bdbb349a85fbd1c7750db3dcd22d9b792eb17605d5157c969d083a8fca404b1af3db1e2bfdcf76a6b7f392043996d246686dfa73117b9efacec529896d5a8e35 SHA512 d1e1ae7cf13b0b8c2e6786aad1bdeda25697d88abec86fc9415bb76d4e9e98097d2fecf16ceddbc80d1d447064bfa73beec5eaa5270ef38ce224c4bdbcdede3a
 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 779 BLAKE2B bf9f65a16c5a2491a413b28c701928409c9f93f2b34752e39a234940367a15eba51ebb1af4b974bebef7f0b65bf0b93119efafad87b74a9cbf92891a1dee2442 SHA512 1849c262148893fca744ff8c8874735b2dcc421a577b572b9d83493a6bee7b8db4c09ea2cf8d8c32bd2226435de206ed88307141d6a5f8950b2387ca5a313b2a
+DIST sexp_processor-4.15.2.gem 56320 BLAKE2B 673b10f1f9e5e4a0784a00e507a47046235cc00c8815292ed57abf0d6d11f0af2d559eadb85aaf28d060bd5b2917ee08b42c48ef4a3ed10e21b8af06ab989177 SHA512 6eecdb247ad3e0d78c666d98c7515824d22a38bbeb191c8ea783b53fa7cbd71483dee670f65ce8abc11a176ddc9db19d80ba71ebe1b6cb8120a07ce3af6d0df2
 EBUILD sexp_processor-4.15.0.ebuild 741 BLAKE2B ec8d3e01c498991cf2b2f3c40d5563df1604382daf0005ebeb627ab909a47f23f61a32c31a4e4c1dfa29e492d82044dbe99a3189ce3c43a81c4c1fb337e34ddf SHA512 e5278d94c67cf8a6c8a8188ca423076492abf59c0629d9bbccb85a6662924f800877f88ae85bf4027e96f22adbc9bd818880a0159355bcd45da99d8ee60202f3
 EBUILD sexp_processor-4.15.1.ebuild 743 BLAKE2B cb9fe8637c72871ddc0ec565ffbbb141c9418024335b2fc3ee2f7a67fff395e618c4583033973b986af796063c09b90309acc0e0805ea662e90be18ed1fc6314 SHA512 66d650a6d3be101fb1b5523c0d65b3484bc3388a9a968cfb9c287d6f0e55ef2a006df93c1ccfcbf76f94c996963ee92e43d121049a218eab503b1c790626e57d
+EBUILD sexp_processor-4.15.2.ebuild 750 BLAKE2B a01f7e29c28decb5e4513b8ce0a0e2fc7112d3cd4e58595c0e70c0a8fbda675cd18065d7d156e9a7013ccf3ab1fd716529cfedb3f0d40cdda939e3e7bf466b4d SHA512 2121a359ba4d400616459e53712de388ac89d93ece207167efe1616d657ea70a3dc92c6b785f144313b880388bb68856bb94273ff99538da2a3a6a7a3a463df7
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild b/dev-ruby/sexp_processor/sexp_processor-4.15.2.ebuild
index 444ab14c3dca..34e019ecd2fc 100644
--- a/dev-ruby/sexp_processor/sexp_processor-4.12.0.ebuild
+++ b/dev-ruby/sexp_processor/sexp_processor-4.15.2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_DOCDIR="doc"
 RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
 
@@ -16,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 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 7e31bf6dbb07..68ce447c0d65 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,5 +1,7 @@
 DIST sshkit-1.21.0.gem 144384 BLAKE2B f4f77d9cf00db4bc0ab6ac092dc859af31fd50976fc9425c0e5ba1b5c1607bd9b50fff44f65f0207b9d9d604c5ace153ba05ec062fb064c44673572769416a22 SHA512 981fdaa19d633e92d4e3ef5fc9255a89d992813c400af4a468e6cf12ca52cbe612b771a87afe6392c4098d07b42162d5981025b8b214aafa197a68222b5e234e
 DIST sshkit-1.21.1.gem 144384 BLAKE2B 961a3646b4401b1e4548b484143f12a9bc21644f710e19539c5831bbdb2f8a70449992c23858d31ce965a2139343d6e33eaa09650a753813191d655d0e73f83b SHA512 794ff492b737190470acdf8238ae4203ce1e66916ee2caba110eee7c92026897f89ee25d30971f9244359c51cc449f954ecabfd2f6a90b068cedf5ed253f8ba2
+DIST sshkit-1.21.2.gem 144896 BLAKE2B ea72b1d0df7252f9c4ffe010721a957b5a86cc43697acf4dfd065a74cca5317deeb15692449d573a2e5590ef3a23ee666196b7b661d6986a2f270d16e2dc8d89 SHA512 37515726b67ae0e2ac9dff42cf7b71a32832ebe144aa192332780e4d9aead1a9e4c3cf7f6f0b994804175a5befd896b32908a82ba2e4f4a1d4e4b0f5bf01c3b3
 EBUILD sshkit-1.21.0.ebuild 1167 BLAKE2B b79a936b31ae0f50cf33806253ad81e1dffe2931cc93d0a0a8b0f5512d76f68c1e455512f308d9708ec153cd43324bff591a02118d1f5d4e7684dc983e6cd1cb SHA512 927d673fb96100b59387fd45e65c1f91781a947f1a6aa4dcca1d485304c995c9dbae1c48008ebf3f8b26a38aa02b08493a53d95348ce75b0fcf0b9fe2690b8dc
 EBUILD sshkit-1.21.1.ebuild 1161 BLAKE2B 416b0ee8d20b4d8f162bdac3e3dcc683a8b2763f4ee7c57347b0191e63d4de384b7acbcb2865ddb06ba62bd97a3a52fbcaabdf7edc62f6310529247747aec052 SHA512 e485b70ba01292fd1e54a9a6c32f68b5734e7f6f5416e638986d315a8c9fffc1d73e9a16645c3b703430b6fcc0c5e2afa0b145df0d89fa9f7542f607c825cc47
+EBUILD sshkit-1.21.2.ebuild 1161 BLAKE2B 31b1b239dc398a2ea7f7b74d1a5531d240b1b0805dbc3af03999da8e45ccf6dbf2ac9fb709dcc5ed88c7a7305b0c70b3b3456560aa27b5b425664042645867b0 SHA512 ece47cde0972fbda3f7fdab4bff478050a13e3508484aae013e9d87656afee4325c1649282cd3837f8e50075cf9e17cb939f1bdb21ef3173eee41b3fc916fcde
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.21.2.ebuild b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
new file mode 100644
index 000000000000..37bf47f7d5d8
--- /dev/null
+++ b/dev-ruby/sshkit/sshkit-1.21.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+# There are functional tests that require vagrant boxes to be set up.
+RUBY_FAKEGEM_TASK_TEST="test:units"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md FAQ.md README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="SSHKit makes it easy to write structured, testable SSH commands in Ruby"
+HOMEPAGE="https://github.com/capistrano/sshkit"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/net-ssh-2.8.0:*
+	>=dev-ruby/net-scp-1.1.2
+"
+
+ruby_add_bdepend "test? ( dev-ruby/minitest dev-ruby/mocha )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e '/\(turn\|unindent\|reporters\)/I s:^:#:' \
+		-e '1irequire "set"; require "pathname"' test/helper.rb || die
+
+	# Fix assumption about parent directory name
+	sed -i -e '/assert_match/ s/sshkit/sshkit.*/' test/unit/test_deprecation_logger.rb || die
+}
+
+each_ruby_test() {
+	# Run tests directly to avoid dependencies in the Rakefile
+	${RUBY} -Ilib:test:. -e "Dir['test/unit/**/test*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/sync/Manifest b/dev-ruby/sync/Manifest
index cceb9eb43817..d925cfc573be 100644
--- a/dev-ruby/sync/Manifest
+++ b/dev-ruby/sync/Manifest
@@ -1,3 +1,3 @@
 DIST sync-0.5.0.tar.gz 4957 BLAKE2B 9b4b1710d2468068387d782109199dd45c783b6d7bb0357851f800df2ac4961a72143cfc2b42f522524cf7148694545ae8eab47ee6629062d8ea1505d9095ba0 SHA512 5f887d9169e0be834c7fa17ae42b71078f25ce3d83e695490cd136adc1799d6b92e4aed41ce3f3d57b3ad193a1ac4de940b37212c2864bbf6331ba3582128166
-EBUILD sync-0.5.0.ebuild 657 BLAKE2B 45bb66b1cd230957e2a2751a46d79e1302358b6b2361238d5870a7fad3816c2a5d93e015f5afd83ebccaad6d38c37f2f53e7242b6b05d29bfd034b061e6392f4 SHA512 9d025aab459eaa702e108e6e7b4b4e3cb660dd02cfb9e1a52c754519d70a5ce396284df860c726850de11a226ad4cbce822d46806be420b385d203572734a222
+EBUILD sync-0.5.0.ebuild 664 BLAKE2B f0984db22da0ed326616fcd99187487a482efe1110c171ea4a388a708e483a21ba56c4512be02e1c5a2079520b92eda13aa28ef22b56f3dc80d3b39862518dd2 SHA512 4bbfde2127889d50da5ec5fb8e774e5205525ac1eeed1acd69871706a7f11726bfd6155f7bf6822a79cbe8fab15171d763c1caf806bbdecc4a974ddcec7ec836
 MISC metadata.xml 335 BLAKE2B e15054bacdcbb1fe1281f62eea70a756942481756161ad2b8e2c413aeca4e2504b40e2678df5cc71b096c747abdb21c9bd55b91e1749072755606b1f6c30ec08 SHA512 f5af55577ea0c1166f825588742d04f5dae93d797e19e257743a21f6d06aca1acb9b28e357b5dae0e86ff3a2c526d8713728944a1336933c4b6cdd6a299c425a
diff --git a/dev-ruby/sync/sync-0.5.0.ebuild b/dev-ruby/sync/sync-0.5.0.ebuild
index c134212a381a..ddc891dd0aca 100644
--- a/dev-ruby/sync/sync-0.5.0.ebuild
+++ b/dev-ruby/sync/sync-0.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby26 ruby27"
+USE_RUBY="ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 86e738b10272..b92d8412879a 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -3,9 +3,11 @@ DIST tins-1.22.2.gem 306688 BLAKE2B c5b0aed29b763d37707de47a57419d9af934a0949417
 DIST tins-1.24.1.gem 306688 BLAKE2B 64020840eca05dc90402310d2f66a8af2a029954ae8f7b37275c257fc402cc7a6c4f75d8a8f506edf49531b6e1d16112db63094f76736e2e3ee213fb88c92b98 SHA512 3df7a43e63f42d48033410affc5b5990864c563c294678b9070bb4dc9c9d47d3783d4e8fc9c4280f6e00304781dae40585df73a8deaac1f228bfc5dadb961b38
 DIST tins-1.25.0.gem 306688 BLAKE2B 1dfbcfeea4fa88d1a227c5b15dce5f8fbf2bdd8b526d6ec6aae14a309bb8267c89e02b861e0f89c6b0f22638cfce5fde53b07f4bc61838530672b6c9dda2b95a SHA512 e8afd89f39647f0722db3128fdb4e826f8beac5f4c081a4fc95c6e8c9a59129f523af81f953dcffd513172c17173c6ffdc0ce2c215b6073c3b94659c998dc3d0
 DIST tins-1.26.0.gem 306688 BLAKE2B 0e3dc0a2493d95d4d32fd0f37c462cf37ad736b186ae5ee421570a9be7b8155b9d7b10d66ec748b22df99eefc31ccd8d1d7c22f8552d1e62a82f94991ee85149 SHA512 adb5e29420d13a0c147262bb4eaf5289c793795ea929a0e4e9e611658bf97e76edfdb008cff657719f497b0b146a23c497c8adb128014fba390389483e533cfd
+DIST tins-1.28.0.gem 306688 BLAKE2B ddb7706ac0a24d913d6bd9256b819218e4d31c0c614f0c9b59758b60b5f7d3670c9bec89c55317a00bb6b4c6d381b236c86cf049489f899e1186d21fe04c2912 SHA512 5b24d1f68226755b1e35e6af5d7c234d0126be5f2638ff50aea61877dca2f640bf5cfca73d39268bbe5624cdc420d256e128dfe0faf59129228826fab36defa9
 EBUILD tins-1.20.2.ebuild 625 BLAKE2B eed2203644e3a0212d6cd17e69b854ee6cd226bb90da0c094e0f5b19a91447a24b7bdad65e3ab4127ccd2692ba0c949406e0c5b1be7f069b82b6fc8cd157d302 SHA512 21f2ad099da1d276ca7df14d4941b39fbfd0e65e4130cea31cd8492b8d20401e1353deecbb29977ac25f15950b558384216bc9a02fe0dca46bf35ee10faa589e
 EBUILD tins-1.22.2.ebuild 598 BLAKE2B e07a09b9a60ff60d623ca8ed3ee86c0053566aff02610271b776aa0c90e78e1d5252e6bcc502cea6b989ec691d50b34fe68d8eb8e12d525a41c60abd6ef95f18 SHA512 1957b049fdef634bb43bdc3b197e5445cf70608dddac80190d1270e991de8eedcb949da4ab209658c96fd5b11b022c198ff37a1a5eed3d183c5f6508c9ead330
 EBUILD tins-1.24.1.ebuild 842 BLAKE2B 8d7a0334cbca086b1c1ffebd2f6ed0db3f302b6a670c6eaf12b21472b91ba4e02b32e9bff0e85f9c10483bdd2429e8e77ce615d572fb45e2309d8c1d6e53ff19 SHA512 8a404b386187e2ac21abb936c31f8d91dfaa282b0bf79fdb7ac7f8999e246fa5e58f46d0111f8c5285b8a983a1757731cf922b515eba34bbf52d586f1a09f8c7
 EBUILD tins-1.25.0.ebuild 849 BLAKE2B 8e2a3dadda4cda9331901acb3483ced17b1c17eaa3d5e46a98aea07203d218d7c0247617f13f1feb6936bb29f02deac44cefe641fa78dc661f3d2b45a86db605 SHA512 ca2cc4214b8c8a4f214c893af129aed0334aa5510bbc34cd3b49adfa31aa862e4f648af7da8eb76253a3c3739dc7760b2317abac53d6316fc07588124e36a114
 EBUILD tins-1.26.0.ebuild 842 BLAKE2B d52c83625b5dd10d7bfe866c252f1ec68254c170a50760f389008239171336e7ac8f5bf525067bba025d40765ac99fdf71726f691b78c88b81b3175d2af262d5 SHA512 db5fa43ec2f62233406e94b821b948d168e5d1ecea5253358adefab192f972577a231a923bdcfc8ddf7ca245b45e1733dcda7adc9f2436d01f555dbe14d4593e
+EBUILD tins-1.28.0.ebuild 848 BLAKE2B 6997f7521890f4432b7230965ff8825423c62bcd7d1a173da6df0ebd8797e20f0070983d4b1c8e1928530d5b504b3ebdf7587e126800a98d53efef2904d35062 SHA512 8a8a644845eb3a59848375642d871a6066d9e15788597c426e696ad57094321f1404ba38858f7283d4686a36070cde3925db5efb99e000bca1a828288d8db799
 MISC metadata.xml 336 BLAKE2B 00b8e1ea737e7431865357c6f52ec454afa14e9e22e130b6ae286a4bbddc2813c2f34ddbe492897c19683ce329bb146be74b994955efab2799d23f81fbca4eca SHA512 fe0912b4e761404c8d0d5860e663270bb47610ce4bee99569588e2c2300b80bd8e5df2bbdbb91afcdec1df178d605acd61635695eff0e7696e04b673a3e14c46
diff --git a/dev-ruby/tins/tins-1.28.0.ebuild b/dev-ruby/tins/tins-1.28.0.ebuild
new file mode 100644
index 000000000000..3f51213ee411
--- /dev/null
+++ b/dev-ruby/tins/tins-1.28.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="All the stuff that isn't good enough for a real library"
+HOMEPAGE="https://github.com/flori/tins"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+# Earlier versions of ruby bundled this dependency
+USE_RUBY="ruby26 ruby27 ruby30" ruby_add_rdepend "dev-ruby/sync"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+
+each_ruby_prepare() {
+	case ${RUBY} in
+		*ruby25)
+			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
+			;;
+	esac
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib tests/*_test.rb
+}
diff --git a/dev-ruby/ttfunk/Manifest b/dev-ruby/ttfunk/Manifest
index 66691c724e87..40aafae9dd5e 100644
--- a/dev-ruby/ttfunk/Manifest
+++ b/dev-ruby/ttfunk/Manifest
@@ -1,5 +1,7 @@
 DIST ttfunk-1.5.1.tar.gz 1454516 BLAKE2B 08bb349f4289977b7391013a6686a05f27b4faea9f4b005a5056e525ce02fba2de43712e4538ccf17d967d9cc2c29cbb95e6fc39fc11b6c17291ceac54f63849 SHA512 6f2ffb30200b5b5d36150fe8e81e376e8f4ceec3ac4b1bfe9363191f37616f7a22849a826c19a87458ea5ca70c381e6f976311964bac113bfe5aa767d9e459d4
 DIST ttfunk-1.6.2.1.tar.gz 13625405 BLAKE2B c80fd7f534f7c22cce9ce3e87afe8b23870f46ac6a3a3dc860c07ef95e4e1a73998baa284797e704482fbc57ccd53997eb85f410244f4b4c548590643c62de49 SHA512 31dbcde0e7ca8325b7d88b1c5265ef054a04793b9da93e3c8973d0d84e6865bc93d8431247974ed372330a0a9b73df595ef4bea3736583cef2a23fcd4e1ecd29
+DIST ttfunk-1.7.0.tar.gz 13625349 BLAKE2B 1d401d181eb9cffea9bbb31b631b6a5d1a9c268af41baa1d976ab589111413ad02e3c32ca9c7a0493d9399dc169effa7a06e22bc9b2443afabb297cc7bb0ec03 SHA512 5b026feae0b2a32e141edc6bccd926292ddbff1569f1c11f075647e8a0e6c0fdd4d7e4ecca023bf71f08438a4782556c5f5106d067310937124ad154c7225d78
 EBUILD ttfunk-1.5.1.ebuild 719 BLAKE2B c82014e6197e6eec40acf0d36454b26202980571e738ed21ec06665896a6680df93387a729707cf6d24a303b83b39471d7acdbdf3f7a02f27edbc1853d62dc92 SHA512 385dabea898aff801c531ee6fe8c8fcf24c75e4a7f29170b647883c82cc974746c9a98ebf9578c62c4130101bd5132c99a44bb8ee8e901ade89e156cfe8df961
 EBUILD ttfunk-1.6.2.1.ebuild 695 BLAKE2B 3f815c8929c855fe621336fd2f64cc97094e15a08231d54a46e43ca2da303ab6312b7c3ef8b2e5a5a4d1702df7eb95d0a383c8ebeea8928f6740a2c9551bc95b SHA512 8bd4950d1e1676ad5083634301ac381d059bc178a35eda475f1368691918d22ff84aa101f0d97e0d48ea6446e8c19680580717ca027185a55a5b8cb756b7efe7
+EBUILD ttfunk-1.7.0.ebuild 688 BLAKE2B c94754836d0a09cf36723eb114a0c90bfe76c02231efdc5a799c876dd8d0d97f791679dde076aae0acad61acc758f4d78bedce83b4a18892dfdaec59ef815005 SHA512 435c8dab53473930b4fa1f9d5afd883687653477bc71056cdb348ed86f108c85e696ab1dfe045e90bc3b7be17296ed81a39d5856090cde57da45b124decb4b65
 MISC metadata.xml 341 BLAKE2B f2ba4efe120d15cdc09a481265fa0e6bade218338cdaf5115d4c4ae6dc833326bdc2fc380e2c8ae366351c829119410f884a75a1d00cdc606d80e761748f5dc5 SHA512 971e696df378c8fa1447ce18eeaab4e9ada79d046764818c3f764aca29f127f8f704258690c3dd63b60ec7cc3424ca7a4b9d10858248cbd2688b3ce76b1f9aa0
diff --git a/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild b/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild
new file mode 100644
index 000000000000..b45a8db23a4b
--- /dev/null
+++ b/dev-ruby/ttfunk/ttfunk-1.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ttfunk.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A TrueType font parser written in pure ruby"
+HOMEPAGE="https://github.com/prawnpdf/ttfunk/"
+SRC_URI="https://github.com/prawnpdf/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 Ruby )"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/webmock/Manifest b/dev-ruby/webmock/Manifest
index ed7b5c991fc6..b484abea1860 100644
--- a/dev-ruby/webmock/Manifest
+++ b/dev-ruby/webmock/Manifest
@@ -1,11 +1,7 @@
 DIST webmock-3.11.0.gem 125440 BLAKE2B 8c57ca5b49922a61590595cdeeb5d3306edb3be616fd8e5c68617838831537f2106664201580f645de58322f11e684dfc8404d91139eaead5810c0cb40d5dc1f SHA512 dda7318d32dd88dcd4bc1fee9d1f4644f272348b532cbb59afde2e6a1fc42f359125b28d605ff1a18edac4ed71c00aceb1c67a364c15cfa56092e226588b449c
 DIST webmock-3.7.6.gem 122368 BLAKE2B 9bc40971f1eec96d88217544acc67b7abfe6c0815a0696119e12fc5629b4f51e1164ecc982525d2c02fa50c7b1b09548c4831c1d597f06acde04a83227ba0dc9 SHA512 85455495476b22d94b23e34a92db3f0f8cf1aa5bb52ea6a8eb71f5f0bcbdad1edc13dff778c62806ec27850320e9f4e17f12525bbac552e5e105ee1ecd771efd
-DIST webmock-3.8.1.gem 122368 BLAKE2B ba956c72f20e2c21cea90b107ef445e42a6995fdb31f9af65c3b561e9e1fbb9fbd299db009a1d83ddfdb473ce030d40aadf6633e23afbd072ee3b4debf7e0be2 SHA512 b1137fabb000469ee88fdd5521756f368463ee49988d5d89b51fa8352362ff249a4849159504834933e5e1248ed9b6791d254528b3cdea461fc9e8e5d92a334c
-DIST webmock-3.8.2.gem 122880 BLAKE2B 0cd10f391377749c6420d08434c8e66230612c50bdff86b4dfd098690c006426e241c32bf716e2f8b9ee6c0ce6488d1975b54f3e4cd85cc14d6c7f0880f65701 SHA512 ae6bdda341bea804257d9f9b57d17a65a25d030ee2f5a9b7fff125a5f7881a34584c6b5d26a1e6dd5a49bba56ad5b6e731defecd109e19a5144df4caf90561d4
 DIST webmock-3.8.3.gem 122880 BLAKE2B 66371028294f3b15172d718e0fa9402ad6ed1bf7beedb0c62621ad31758d25e401af9cd982a6f29cd1161a7e4d7954f6f9df22ab2e0c44c970a0edca3c0f1304 SHA512 6c845c4ed0c82ba4bb1f32d0d87a87eb945c54e159317aa14e2238b497d38282b7e81542e78c0d68d4b8d4a08e46137de84503829b7381e6d945e45474ebb507
 EBUILD webmock-3.11.0.ebuild 2065 BLAKE2B 4e57a1a85b7d559719b0d21d72c7971e30765b7bb289f93991a6a5c6b87b8a03f6004099395ccf1b3b1cf19096f76bcb5f0a3edb417b057b874aa870beba60e1 SHA512 3fd8316bea269e5898db3beb2a57bcf5b15c6647f60ca448e5f5da91b511224118c9ba2c7bf83b9fdd60dba34db1a121d7a63b8cf0694bf53e3ea1484403fbe8
 EBUILD webmock-3.7.6.ebuild 2059 BLAKE2B 21417ac451a0b70df72a05a8848c8ddf7a2f0f939eb498a5d71f91dd3f2bcd065f15d3ea8ed047c64b70c421562b337054a5388d96d497f52a1b684b58417ca9 SHA512 6b94a52934ada134df94b263fd8fdc9a3ea1388c742a11c2eee24e011fce9f99e86436745d56a646a0e3fb925006f7048a889e2cf82b47ebe39b2d505763b897
-EBUILD webmock-3.8.1.ebuild 2060 BLAKE2B 4faf298c68b96ae1e2eea9389a7af6133af3eee570e001cf7c0e9a36225a023d02769770ca39b827adfec687138ea3c478ac59d50f2ba29566bef89be11fb37f SHA512 f0bccdf423fe1ffe0dafff3d1c418b477e36ee1cdc2094238b5e2b5ff098c171c52c31d92fbf5300dc878da62b8b465cfc00a1f8300c7b8a787f2e4639a52ca0
-EBUILD webmock-3.8.2.ebuild 2060 BLAKE2B 4faf298c68b96ae1e2eea9389a7af6133af3eee570e001cf7c0e9a36225a023d02769770ca39b827adfec687138ea3c478ac59d50f2ba29566bef89be11fb37f SHA512 f0bccdf423fe1ffe0dafff3d1c418b477e36ee1cdc2094238b5e2b5ff098c171c52c31d92fbf5300dc878da62b8b465cfc00a1f8300c7b8a787f2e4639a52ca0
 EBUILD webmock-3.8.3.ebuild 2066 BLAKE2B 032b384a4dafd98a1925c0a1582b4698f51f3ed15c0480ac3f6e683492571f869896cdddb8f4f536f84f5cb2b6f0cea89bdcdf1602d9bd40044c60c69a8629ca SHA512 b4f4055fc24416151b55fdd9ee07701ee3562ff03c6dc4f49080417a66539db1b66386721ca7601bc2eae0a30a666a3e52167a3f8d093f9c24a255a94d0c7199
 MISC metadata.xml 341 BLAKE2B 75a7b957f0aa060ff3c632620c1b8eac9344b37566c9205bdfaff70fdcbc8cd391dc7296317bde0e8ce1e1ea3cb7540446267112eac00571beda686f5a592130 SHA512 66c55ee845168bbdd2b792d90cfbe116a09ff3bc00861164e82b68355ed585e87b58b7c0ab21da37dd984b680ea4841e7a2cd0c8bea1a081b1adb4c5b9885b73
diff --git a/dev-ruby/webmock/webmock-3.8.1.ebuild b/dev-ruby/webmock/webmock-3.8.1.ebuild
deleted file mode 100644
index 7b97e611140d..000000000000
--- a/dev-ruby/webmock/webmock-3.8.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
diff --git a/dev-ruby/webmock/webmock-3.8.2.ebuild b/dev-ruby/webmock/webmock-3.8.2.ebuild
deleted file mode 100644
index 7b97e611140d..000000000000
--- a/dev-ruby/webmock/webmock-3.8.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_TEST="test spec NO_CONNECTION=true"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Allows stubbing HTTP requests and setting expectations on HTTP requests"
-HOMEPAGE="https://github.com/bblimke/webmock"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/addressable-2.3.6 >=dev-ruby/crack-0.3.2 >=dev-ruby/hashdiff-0.4.0:0"
-
-ruby_add_bdepend "test? (
-	dev-ruby/minitest:5
-	dev-ruby/rspec:3
-	>=dev-ruby/test-unit-3.0.0
-	dev-ruby/rack
-	>=dev-ruby/httpclient-2.8.0
-	|| ( dev-ruby/http:4 dev-ruby/http:3 ) )"
-
-all_ruby_prepare() {
-	# Remove bundler support
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -i -e '/simplecov/I s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '1igem "test-unit"' test/test_helper.rb || die
-
-	# There is now optional support for curb and typhoeus which we don't
-	# have in Gentoo yet. em_http_request is available in Gentoo but its
-	# version is too old. patron's latest version is not compatible.
-	sed -i -e '/\(curb\|typhoeus\|em-http\|patron\)/d' spec/spec_helper.rb || die
-	rm spec/acceptance/{typhoeus,curb,excon,em_http_request,patron,async_http_client}/* || die
-
-	# Avoid httpclient specs that require network access, most likely
-	# because mocking does not fully work.
-	sed -i -e '/httpclient streams response/,/^  end/ s:^:#:' \
-		-e '/are detected when manually specifying Authorization header/,/^    end/ s:^:#:' \
-		spec/acceptance/httpclient/httpclient_spec.rb
-
-	# Avoid specs that require network access
-	sed -i -e '/when request is not stubbed/,/^      end/ s:^:#:' spec/acceptance/shared/callbacks.rb
-}
-
-each_ruby_test() {
-	${RUBY} -S rake test NO_CONNECTION=true || die
-	${RUBY} -S rspec-3 spec || die
-
-	einfo "Delay to allow the test server to stop"
-	sleep 10
-}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-22 20:28:19 +0000
commit	abaa75b10f899ada8dd05b23cc03205064394bc6 (patch)
tree	eca3dd248b73b92013cba00a0fcc1edf2696e19a /dev-ruby
parent	24fd814c326e282c4321965c31f341dad77e270d (diff)