gentoo resync : 20.06.2021

37 files changed, 191 insertions, 395 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 494e4770a974..0ff1a43a9f20 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/arel-helpers/Manifest b/dev-ruby/arel-helpers/Manifest
index fface10d9e64..8388cf1664eb 100644
--- a/dev-ruby/arel-helpers/Manifest
+++ b/dev-ruby/arel-helpers/Manifest
@@ -1,5 +1,3 @@
-DIST arel-helpers-2.11.0.gem 12800 BLAKE2B 7e7008049a87e323e6f7919e6104f8ac2bfe5d7ac096557a72a0baec35890721d83f021c62e431ec441aaa6ce7314f312f0ce8b8889da7691a4ba43f09ebbcc7 SHA512 06426cfa8b77ce875af2daddfa6cfe96339fa462718ba1ab7a0f9f759c16ace03aff4c6f0cc6c3fc165df2f55ff024f67247e652cc3cf4c39d07468ae7080445
 DIST arel-helpers-2.12.0.gem 21504 BLAKE2B f2897b70e679df8a58ace7b88204a3345a2f22bedcaf13ef27f4176a5f02a716e9c7a0b09c3d242c8bef96cc6423a513820d20b15999415d99eb3d61b3b93889 SHA512 6da9d69b49d18f70dd911a5f1cf6edb29055423b6179858ae65f8f826f9c98fae7b9d4a7d6f1365c5efe382adbaeb42f30898c2329b721941428b0a6f58b3aef
-EBUILD arel-helpers-2.11.0.ebuild 609 BLAKE2B 4520091d0dfa84da994a1a251dbbfd8318eae055d79f2072472c338e2017b0675d448d46c894ac25e720dd24b140a892319587ac528ac0f17a31bc934c618463 SHA512 5ba180bb9d6683d30cf41461b93c594fa75877698acb4111ad6491fbb965a2b8f5cace0e2f0746c3e3fd4d17244b9f9bbe6e3d61f8f1edc5001e12b9f4874830
 EBUILD arel-helpers-2.12.0.ebuild 826 BLAKE2B 2888cd55047b4b42a114e80abcd301373fbfeaeeec8b6c05598c7afd273f9138f447944602dc8515d9d240e9c3abd51e5042e45a9020f42739c635d3a2c6a5df SHA512 92964c801c801c379717eca89429524215dea3d1f7a3f555597a189aa2cc5f8f330f9ef5df817dc74369e3b780ff090920092eec8d1d80f17ca5fea93f88a100
 MISC metadata.xml 344 BLAKE2B 3c7611e49af6a5fdfabda583dc91fbe8fc4b7943e774a938e100d91633b3a5c38cefab5973207c25d62a5b8b9e8e7c720b5614c083c8568e532e819bb747855f SHA512 2b4f9f6a7cd7aea5f161da441195d3138810930778d441f0c0d3620fc3de6632088d0d49135e7638553e83db723356184db1abaaf1622999adeec59883087c96
diff --git a/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild b/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild
deleted file mode 100644
index 8b4488aa21f4..000000000000
--- a/dev-ruby/arel-helpers/arel-helpers-2.11.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Tools to help construct database queries"
-HOMEPAGE="https://github.com/camertron/arel-helpers"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "|| (
-			dev-ruby/activerecord:6.0
-			dev-ruby/activerecord:5.2
-			)"
-
-ruby_add_bdepend "test? (
-	dev-ruby/rr
-	dev-ruby/activerecord[sqlite]
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/pry-/ s:^:#:' spec/spec_helper.rb || die
-}
diff --git a/dev-ruby/contracts/Manifest b/dev-ruby/contracts/Manifest
index d2ef135a3209..7d5f83477996 100644
--- a/dev-ruby/contracts/Manifest
+++ b/dev-ruby/contracts/Manifest
@@ -1,5 +1,7 @@
 DIST contracts-0.16.0.gem 55296 BLAKE2B 71b058fd2bcbdf5dfc2ff60631ecfc56cb405dea08fb5b2a67fb23c859a3941ed0aa3963ef639e9cb6670d871a6301a0c8b360fff3912413c10ad44ee8dcde2f SHA512 27d757c3a6d25920ada1b24842a5ed8521bc8902b1840b6060c94dc17e5eecb91501439eb764fa2fec97dedc6591d2c2978630f56d4b38e7b607e9fccfb60ad7
 DIST contracts-0.16.1.gem 57856 BLAKE2B 72978a2a47b75411d2ae74521470d5958ef711351e2ce6776f1331b0d3f4b175d43f991a73fd2332ac0e1f6732b05a65887054a0be4452fd62f058a28ba929be SHA512 bc182431de9efbc6d23603c68a64eddcd3f27ea1ac8c2c9ff00840cf38d2f58ba595304127e6b43e504d3aa387559a5c1429b671dadac175d3a4ad2c02edbf6a
+DIST contracts-0.17.gem 58368 BLAKE2B 2bccd3a552268821b3c34a08fef3d6c0e43e27f8a0e56a2b7b0291d388142a2efb3686230d4daaea6e82c45be8d42f2ab61d1aa3d6a7f682bd7d99a0af7f179d SHA512 bce1417e7b505ec35b43917d53cbdb175995ff877da2a6122e08b3c7e537d557785987a0110006525dd079f09d574be3f5f4793154f99ac91c32f83662fa311b
 EBUILD contracts-0.16.0.ebuild 517 BLAKE2B 072ccdc8151f17161d6a84da566e8bed9808c70f7ec4c29406f2450dd3a9bc8764c6581a92c2ff7f56c12dc4d14ee5b0ac54cdf23f2514d5e237d362bde8f96d SHA512 95269f78676dd3e3a6bcd504a676eeb13da6fc9ff0b259622883cd739167f9850ff73fb05cf416d1604a6b4eeb46d93450523b14e1f67fcaf9d556518f8a3c8a
 EBUILD contracts-0.16.1.ebuild 479 BLAKE2B ae5cfac8a7c5f3fb7e9f930dba900390e8650fa12bc24eea8bfdd9d43b536f8ea4d3f25311fadb55ad970fe76f6b0ee22df318128af789bf8dbce39e102dcf7a SHA512 0aca56bf44e88b17c0b9600cfc52eb7a777fed5298cfc7784831a1d816f742448e801f148a494584707dea25ad3aee7e91a8347e7e70acadb9aa9a0fd367f9b1
+EBUILD contracts-0.17.ebuild 478 BLAKE2B ed95bc5a518d6c60afd52e9438db83ed9dc02cbc3a2d9659e80b74558a1e1eb5c67aa135dbbb07462980bb544a388ecb69563539a44d662bb77f0fce88c3c61a SHA512 fa692ed77a20fae79c8d84781a6e561078ccc5a7f39a397dab3ed2623cdb6745e595e5268bcc7c62df273f7a0208240a4310c4d8da34f4640f8336e64fa226db
 MISC metadata.xml 352 BLAKE2B ceb4318c56fde3712e3855e711f5caab0cec265180dc1505e5a398f38648f35e4fc7af7f9bdd1bdd315b85f4ef81aa0245bcbecb803d4bd82071c43db6b7267c SHA512 34d461bdbbe0e0498653c8036193dcc8e7bcfbdad11db2ef9c5b159b7218eab8fbbe5d91abe3b4242b297625160cd232261f658a5f637d5748dfbc33bb48ff6a
diff --git a/dev-ruby/contracts/contracts-0.17.ebuild b/dev-ruby/contracts/contracts-0.17.ebuild
new file mode 100644
index 000000000000..cdcdf09d1eb8
--- /dev/null
+++ b/dev-ruby/contracts/contracts-0.17.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="ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.md TODO.markdown TUTORIAL.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="provides contracts for Ruby"
+HOMEPAGE="https://github.com/egonSchiele/contracts.ruby"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE=""
diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index 29507f58c09d..2ab7b85a0a0c 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,4 +1,4 @@
-AUX hiredis-0.6.1-unvendor-hiredis.patch 668 BLAKE2B 028700bf24f26e0090fefde677c32c44de57558ce9e334c7d2396e8fd98112ad96fa9502a1aa363ff4843d3b7e9d80a07870a011482d0716b84d22414014d3eb SHA512 c58191682152d26c823c01c689a4cb9becc6dd870034e8ddb7f1aa64a345025f771beb1f72b3dcfebb6948412e1548c9f28fb65c11d60243acad232ecd5e5787
+AUX hiredis-0.6.1-unvendor-hiredis.patch 599 BLAKE2B 941d7f370c1dc85de07334b77e89180285fc57e604ffb904eb03fbb9c810d28c2c2e229f1589b98f58c80f68f3a21fa881ea78805361b67032a3006605428c1f SHA512 34d527c1182bd5bbc17e0a4e08b29bfeb15a55c02d1cfde75e5bb2b1589ee3dec622d87ed00cc3d7db390f4cb0ddc9c60e2344ef28c48b725eb37262cb349c55
 DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
-EBUILD hiredis-0.6.3.ebuild 1126 BLAKE2B 6660c27d5eb3a455cfe18772de74d063e295a57e144a0f5632ae7338d349e09fa7200bf858194eb8d55ae32eb08c52a4055e78a0ed237ad4c5de07b4042e0bf1 SHA512 be300037f287a32a8c99eb1e7a9b8e43f0b187a99591f8d7a162cf68cba3d45127a592a95b0643ff407072bb1867e5f0e077c511ba2c36ed55a5184ad31ad66c
+EBUILD hiredis-0.6.3.ebuild 1177 BLAKE2B 3fa66c7317abd22be66df5ffd3aa7169f9ac62e2f0688a56af77473d247d71787497aa150cffbd580ef89e6675e2e1174594a2f9f1dca25ab653eddf5d3ca010 SHA512 fb0d3dd060e9700696a3eb6e50a23de134134c0bfd3398c65dca871ed2dd73f1e15c4f15e7593bbc8b1ebb04c4cabe6a7a2c7697750e8679d5451becb2a9ef88
 MISC metadata.xml 342 BLAKE2B fd0bfbbf389a657ac98a4bd4da04180258197b8947e4fcff2d0495f99d74795e97c17d90e4f8cd3c37896fe438fb51f61b7c8bf524a546da12f1e1db949275cb SHA512 82e2c1eba3739857ef533105899b3fa50865136d9aa54709b97d46beb8791c3025b78fbd5173db3c5e0981c0d0873f88ceef9b4a1abdeee7d47c860ae6b25c92
diff --git a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
index e8fb1f9ffa62..885d6d15819e 100644
--- a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
+++ b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
@@ -1,5 +1,5 @@
---- a/ext/hiredis_ext/extconf.rb	2015-12-29 15:53:00.000000000 +0100
-+++ b/ext/hiredis_ext/extconf.rb	2018-04-21 07:40:15.973747727 +0200
+--- a/ext/hiredis_ext/extconf.rb
++++ b/ext/hiredis_ext/extconf.rb
 @@ -27,15 +27,8 @@
  end
  
@@ -13,7 +13,7 @@
 -  # Statically link to hiredis (mkmf can't do this for us)
 -  $CFLAGS << " -I#{hiredis_dir}"
 -  $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
-+  $CFLAGS << ' ' << `pkg-config hiredis --cflags-only-I`.chomp
++  $CFLAGS << ' ' << `${PKG_CONFIG} hiredis --cflags-only-I`.chomp
 +  $LDFLAGS << ' -lhiredis'
  
    have_func("rb_thread_fd_select")
diff --git a/dev-ruby/hiredis/hiredis-0.6.3.ebuild b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
index 79371e1ba364..7f495d631948 100644
--- a/dev-ruby/hiredis/hiredis-0.6.3.ebuild
+++ b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ IUSE=""
 
 RDEPEND+=" >=dev-libs/hiredis-0.14:="
 DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )"
+DEPEND+=" virtual/pkgconfig"
 
 RUBY_S="${MY_P}"
 
@@ -33,6 +34,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_configure() {
+	tc-export PKG_CONFIG
 	CC=$(tc-getCC) ${RUBY} -Cext/hiredis_ext extconf.rb || die
 }
 
diff --git a/dev-ruby/instance_storage/Manifest b/dev-ruby/instance_storage/Manifest
index 0dc3a7cae2c6..318094c089db 100644
--- a/dev-ruby/instance_storage/Manifest
+++ b/dev-ruby/instance_storage/Manifest
@@ -1,3 +1,4 @@
 DIST instance_storage-1.0.0.gem 7680 BLAKE2B e8c4f90c90c6efebcbaa577ab17824f4d759782f1b3985679200ca97b89f04245c562f6d9aa96ac894d488417f4e393bb7faf28ab18aa3f3ede1e03365706a29 SHA512 45ff98b3d0ab47d3459d868eb1b0075abb83b23bbc3a9b84f261077bdddc385ed016e81d01c19f93fa6cffd7cb9020ce1e22411636709f18af09a76c7d44598f
+EBUILD instance_storage-1.0.0-r1.ebuild 472 BLAKE2B ab9199a0ccb2447811e2c7d045862b06b26bcd2642fba1bdc2db3ac9d9d5417ac551a078726d880ea8ef4359ef2463c45a8484ebeacd7a9a36038005863675d2 SHA512 b79046c71e6ac7d92c8d75cb379b6dae8dea59f29f98e994a5f594ae45b820e222181e103c5bddc8301af14fb8dc48964c69a3c0d2ed914eebe3afdbd72db103
 EBUILD instance_storage-1.0.0.ebuild 503 BLAKE2B c9a9723be5337606d969c818a4e2dea0f91f2a514b42ca23bee452c560379088662e78d4443c982b0a94e3a82e631a1f3a0da45984138724d6b10b30d74be2a6 SHA512 95e0a649bf5f0df9327ac2122d158d8cbfa98ea4840058bb8dcaef80120ac8873f4a08cfc39cba12d1560680c422638d5e45292c5a7a15a81a6dcae1bd5ebf47
 MISC metadata.xml 411 BLAKE2B 2e1ba3d431fafe85a4b3d22369eaad7de3a2e8f40a2aa7596912dd5a3c7e242731c00714b35bcb29fb641a79daaa3132aa3a4695d6faefcc8150afa38ba4f304 SHA512 2e7c66f01814ab0c9c5d677183d3bac6d67617279c422e29a4f697b328cb461d53b142e9bcf1995f8f0c43c2c7333d666d6fae3a5f30970f4da99e59bb0e1105
diff --git a/dev-ruby/instance_storage/instance_storage-1.0.0-r1.ebuild b/dev-ruby/instance_storage/instance_storage-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..e9930274df9b
--- /dev/null
+++ b/dev-ruby/instance_storage/instance_storage-1.0.0-r1.ebuild
@@ -0,0 +1,21 @@
+# 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"
+
+inherit ruby-fakegem
+DESCRIPTION="Manage class instances with dictionary"
+HOMEPAGE="https://rubygems.org/gems/instance_storage/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/instance_storage_test.rb || die
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index eb1e0653801b..72016a1036e5 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,9 +1,7 @@
 DIST loofah-2.10.0.tar.gz 70379 BLAKE2B 1de980e181bfb0c6fc8c98713b01aaedbd5d7bc7cffb30a0b8f477ee0e475c255a8e14d9b54254d318b569ca4327e78a6b42c73f765c7bafd8a265f083cc4449 SHA512 c51e3981b4f4f2d93a1e8817c86df57c50818b0a0589e260fb4208b34c69f08b270ea399999e3354c4c15b670bbd3eaba6b3274e4f4d67a8c97fc99b28bc8ef2
-DIST loofah-2.7.0.tar.gz 69272 BLAKE2B 1578cba4b4b12fb35a1095060af8d764ec55d3745a44cf756f1de5bf43bc0bde37276372e7aa53a3a26c2c83a8c3da417140d3addb102cc0429f7d47b8c01806 SHA512 698f7976e6048615643d8875aa4dc09c4bd261234bdc9908589edc08be9073a83f84f04fff7e32b518712d63cefe2611895543733967a8b8de12e6cecdb902c9
 DIST loofah-2.8.0.tar.gz 68844 BLAKE2B 52b5b5c7a70939069d84d0f66c4262e456d2ed81ab4ef2541eceb9068ccdddbb1c7b470ca7504700f6f66d4aa4507b9edfd4720c1302f6026008c10100c1fecb SHA512 a9d7c21be733e1aab8353ab7bfb3db14d47e8da2c3f20eba11d0041b782e4f2cb82865bbd5a2a9321aae7ea04089f6a5fd1bd3119cbfe8a00c2ea71a40cae53b
 DIST loofah-2.9.1.tar.gz 69652 BLAKE2B 76bdd6c1ffda325314eb28c4bea6e5c8b8a69c3a7e9a661f328507a523ca086c2caf14f58b2e83cc2213c072342176bbb2de7be5a68d68e54675f30e81657b92 SHA512 625c38de7fe5fcbd8e3fb01aa7aa28560e7f3bb4e5354912bed072bd83cf35e824cf84e491155fa44b50ae418c46a187f02d4f605062abbfde05653d022bb663
-EBUILD loofah-2.10.0.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
-EBUILD loofah-2.7.0.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
+EBUILD loofah-2.10.0.ebuild 1210 BLAKE2B 00d5047a436e60e1002f0713bc37cd12fdc5ef80732db380f04ba38cc1e781187c163bfe367b837eca626baa7a504e58067093724e9de6ee1d56c00426dead93 SHA512 5739470fb231ac6ed1bc81de8f4f5881cabd1843cc0412bd86b7467d9995ca71e4d7cc7f0528133b7c73bc95b1b7bb2ea4c332103346f0574f0090c169ace863
 EBUILD loofah-2.8.0.ebuild 1202 BLAKE2B 9de000a066c830aaa8b960a1b79735a824c651a7a2d5f200463f30b362b69c14d18b9dc9d9dc62d30d4e9a05e69e44ec14b7203bc71ef00a14396a3adf885c37 SHA512 0cd53bb6da0b4d83abf2c9d83469c8da6f2d31190e549efbd42a0069499037fd858b6bca161595f25585b380e0ff0c308101e311b8a1804f076be34608b7109c
-EBUILD loofah-2.9.1.ebuild 1203 BLAKE2B 45ce7519d3a888a461e9a10abb2d30638c2a3f72ddff38e721aff86642c72bd49c846f01655cf1757620bab6051aa67d7753e536ca24a362bbaa822289e04d58 SHA512 98fbd18280301fe2c454914d6d70b2eb272c4da649755e483f828ed5ebb8b1c9e086f6c81e895a5ceab5e5e320bf405df20a02dfd9c02119402696edc52b2ca0
+EBUILD loofah-2.9.1.ebuild 1202 BLAKE2B 9de000a066c830aaa8b960a1b79735a824c651a7a2d5f200463f30b362b69c14d18b9dc9d9dc62d30d4e9a05e69e44ec14b7203bc71ef00a14396a3adf885c37 SHA512 0cd53bb6da0b4d83abf2c9d83469c8da6f2d31190e549efbd42a0069499037fd858b6bca161595f25585b380e0ff0c308101e311b8a1804f076be34608b7109c
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.10.0.ebuild b/dev-ruby/loofah/loofah-2.10.0.ebuild
index 000d6ae80a3e..a9bcd9d282cc 100644
--- a/dev-ruby/loofah/loofah-2.10.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.10.0.ebuild
@@ -2,7 +2,7 @@
 # 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="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/loofah/loofah-2.7.0.ebuild b/dev-ruby/loofah/loofah-2.7.0.ebuild
deleted file mode 100644
index 58aad399e56f..000000000000
--- a/dev-ruby/loofah/loofah-2.7.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="loofah.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-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"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Fix version in gemspec
-	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/loofah/loofah-2.9.1.ebuild b/dev-ruby/loofah/loofah-2.9.1.ebuild
index 000d6ae80a3e..50570d6e95ff 100644
--- a/dev-ruby/loofah/loofah-2.9.1.ebuild
+++ b/dev-ruby/loofah/loofah-2.9.1.ebuild
@@ -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/ox/Manifest b/dev-ruby/ox/Manifest
index 884e4b61162c..82aaa5d33873 100644
--- a/dev-ruby/ox/Manifest
+++ b/dev-ruby/ox/Manifest
@@ -1,9 +1,7 @@
 DIST ox-2.14.1.tar.gz 208294 BLAKE2B 588d9171de5db1cec6e24ea64a604ab85074ebb59be0d53afc040c9a47c64e2168abdd86271da8d1dad05803c98a64f8d12ea19297638a2f2a54a52c1c3f4342 SHA512 c82e9ec18a4003ab1e76f03b024b345b77a83a72f9f01d0dea1d9fdbf7c948638269e8331c19715b6b8bd999c2a104cf3660ff1f95cb445f13956ca0f95b723c
-DIST ox-2.14.2.tar.gz 209260 BLAKE2B b1893aca7f49d98b402f071feedf8b7d903692654620a9cab37024b9bc2f8e710c46862b8155113ad3618fcb24b1baf55d69c8c9aeec1528b477afc6d1ac2d1d SHA512 f7e34a702d7be5001f09bd919108e0da30183f4c4bbc6c8b533fc3d4892770300c76075af28d21227cf840e43ec868c7f623028a329d0e49997bd1bfeffb35af
-DIST ox-2.14.3.tar.gz 209300 BLAKE2B 3101d41491b11262e012bfd807396af12c4bb05d626432bdf4e539d90f3ffcf17c09a42c883d64e21e7f02431ca49acb00d0808593b822afc499fa4fe99935b7 SHA512 a6b9ef9b6f3fe7c73ccd1c69cecf9187c586ffeb22eb3aebb542cc22231ab929b1c76c81d3ea065c073e732d4cd12d74c7bc35f3b406b8bb1ca20edb1f5050e9
 DIST ox-2.14.4.tar.gz 209459 BLAKE2B e5e029ac5050cd44d0b80c313afb7415495203562bd08b34d4028310e853654b287920531f59f11c149715145e5aa44d3a9b1b2c8eb1c13a1095dc78a5fab95a SHA512 885aee65ae4a833dc9fc1847201f1d922e0d615831674abaa2d8169a22913202e49d677ce792bfe2d71cc9990d5a7652684f0d55606daf5f4a538d24078b4496
+DIST ox-2.14.5.tar.gz 209521 BLAKE2B 36695eceb2965f34b22c8809f493a5b8f8dee5f189cb68fbd06a9143c6970cb357b03e977f2bff3cd3867873e935a9475543ea79a1cb6a476469d667c74b6de8 SHA512 e91436f75e0868128f818d4f93c33e663c2ae6683f834c61ad7c14b2ebf680d622e81d71392bc24907313713be8463ab42c8badfcf4d0327ccca4abbcd1fbb0c
 EBUILD ox-2.14.1.ebuild 714 BLAKE2B bced0d68b0e355f590b3b972287b31af82d0e810b1864079d2e7444d9199cf7fc3dcc5c78bc18e8d396390dd0b290089a3ce876b98f787e12f79ecddb07a9c2a SHA512 42764a17622d54d7cbf74553ec7253712a857ea4788dce7e6735349db03896eca324ada0dafa4f29edd62a515fbcdf7bb867729ea75087d36838569b3593e080
-EBUILD ox-2.14.2.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
-EBUILD ox-2.14.3.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
-EBUILD ox-2.14.4.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
+EBUILD ox-2.14.4.ebuild 645 BLAKE2B cc22181a2e74f99ee712c57450b52f2f381da9ce6f0fed272d0c4fac9fcd188831502a4e43d73520076ec4a2dbf616d7a2093306550a5da7a1bc62698308e70d SHA512 3e8567de6d9af0319a70847b6bfb810e1bf68de5f34fb0d1c0c8a049087911cf9a1bb45713ab62cf4199870772450bcf3c02dc4080dc9a55d128ebe693375a76
+EBUILD ox-2.14.5.ebuild 646 BLAKE2B 0c6710ec158d41c628e382838fcdd5a43f4fa2e2c91ce5a274bf217951a1c6e5bbf64be9661932c38812c08758cd6d11891d0e219e4fec97f461c24ca5b8c3f4 SHA512 4fd7e1fd1fe3a53c49b18247e373f1bba7c484be9e7bba1b253fc43632c06f33d29255fd445eec45e3ef43d3215076bbd0f377b99edb035bad0c709a5ed7542e
 MISC metadata.xml 336 BLAKE2B 7371e572c7bce86e0d3c2ac19ff7555b4bdf793d96377dcdbb810f8fc09feb597f4cc883a03e888c0c38c1a1d9ceb7ef150ac228db7300aea01238f497f0473d SHA512 43b8b42cb09fe73a49e0db49671effd91859d2b9001fc3e51761a1b51b245e83a719ddddd100ecfeb92910baa06690b2cc0bd52db0afc872e007c4be9616908e
diff --git a/dev-ruby/ox/ox-2.14.3.ebuild b/dev-ruby/ox/ox-2.14.3.ebuild
deleted file mode 100644
index 43ef944b9a38..000000000000
--- a/dev-ruby/ox/ox-2.14.3.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="ox.gemspec"
-
-RUBY_FAKEGEM_EXTENSIONS=(ext/ox/extconf.rb)
-RUBY_FAKEGEM_EXTENSION_LIBDIR=lib/ox
-
-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_test() {
-	${RUBY} test/tests.rb || die
-}
diff --git a/dev-ruby/ox/ox-2.14.4.ebuild b/dev-ruby/ox/ox-2.14.4.ebuild
index 43ef944b9a38..e722008b945e 100644
--- a/dev-ruby/ox/ox-2.14.4.ebuild
+++ b/dev-ruby/ox/ox-2.14.4.ebuild
@@ -18,7 +18,7 @@ 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"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/ox/ox-2.14.2.ebuild b/dev-ruby/ox/ox-2.14.5.ebuild
index 43ef944b9a38..43ef944b9a38 100644
--- a/dev-ruby/ox/ox-2.14.2.ebuild
+++ b/dev-ruby/ox/ox-2.14.5.ebuild
diff --git a/dev-ruby/pluggaloid/Manifest b/dev-ruby/pluggaloid/Manifest
index 9cd9efb15c43..fb81687e991b 100644
--- a/dev-ruby/pluggaloid/Manifest
+++ b/dev-ruby/pluggaloid/Manifest
@@ -1,11 +1,7 @@
 DIST pluggaloid-1.2.0.gem 14848 BLAKE2B ee092768b9aac2c64a0ded18f328f0f1a5d67d073da28a3029c9be13554f77565ed2338fe9630115067ecc1d0d712273642e0679a43f822995faaff48cdd7849 SHA512 b17bd264c2e8027ae1a9288b5b9a12f5c0e4c91bebf9cee5328bfe61aaa32662f55901d5ece030702780756474d54028272c7cef18fc79982d9d7c48f04b5acb
-DIST pluggaloid-1.3.1.gem 16384 BLAKE2B cea02ddee3d0edc48b5a43de7737e1ee85d3bb00fa29367e1e540e9824d0433a4973b30214f5b0a01b981d6983d9d783753565598fa9b3815fb31d0a02cbe1ea SHA512 4db3a26d940d55487614e67aeb135121f19261e6d63e77d623f89b2b4eef275c035abb83e1d2d5197a27248c944110a26196f5ff1915fd14bac7d3b39827a020
-DIST pluggaloid-1.4.0.gem 18432 BLAKE2B 4df2180a2facb3d0d82f891bfcf888629fe211cb69ef3e5934619136df7b72f28c0f56e7dd76dde7667eca079beb9c9e5f716662185c565b7252713217fdde8a SHA512 75ce56c1831d79fed9216f0b217ec1a0962db2ba98cb690debeb8edca8a4c27f4f40f498440b35595d756d5a3790fe422fdd63cdf39cd8c157f8bc200879c018
-DIST pluggaloid-1.4.1.gem 18432 BLAKE2B 7f7fde7074547f27248874fa3ec0e7e9a671d8aaaac31dfd5a53e0f377ab28034ed5a3322131bae8d178a32b3d8ad874f329670ac5899527927627d358d60d26 SHA512 fc800576bed6a99d42f43baff482d4242584a4a301d22dd243e58c43800e72e2fd35f997fcfd92a443edf3c99e489d52fd14e6413c8c6e66809fca90cdbbde06
 DIST pluggaloid-1.5.0.gem 19968 BLAKE2B 39fce1d3077a0d2b2b969c8a6b48850b0451e8ff50e76ceca8a094f866c5de8be3a4a26458b86cae82ecba881203e1b9546464e80a482b287457c24fff3eb751 SHA512 ec5196d2ec7c61b0979693fbe603ab52451a0c66ef74b9b1486f2f9a3fbd41ffafbdc25acfb8e4f815eabf7e1829c5eb6792a71b6a7e1dfcda6a64ef21b034fb
+DIST pluggaloid-1.7.0.gem 20992 BLAKE2B 8e5dca33d4e724ce264cf94d3494d452dfa6aaa3dc373c50ac7a5e1931358484e984bb0f3e170243d7e3daf10ba6a7e15b1e7b0cc77b6394c2349e6e36e7a77d SHA512 f4ebf9fa60bf29366cafeeab09cd1cddd3c46903757f55a6b0a1326499c1b5e917258eb07a7f95934ab2ff32626dfffc2738c847eb6090725f90dce7ac90c550
 EBUILD pluggaloid-1.2.0.ebuild 558 BLAKE2B 3503584a6126ecdd56f0715c57d6bb3d9902c5fc201cc1e883dd94e11219e5502b802b75f40ed92f1e9cb5ddac834c4a3bee1847aff5f29193604125dd9552a9 SHA512 5fd51185815ebad86f3c4b312c5e7c383ba99f166aba9ee65e98e5ea4cc84bfac45beb31db12b832f797ba896c0712ad4141676c0868b10d5fc9091dfffe5a84
-EBUILD pluggaloid-1.3.1.ebuild 529 BLAKE2B 1785d1e03356c7562e72230a1d9f0d8c569475bca5b0947f011f60930c606ca0944f3a392ec028ea95066f66d83ca4818230b78219946434ca5b60615d014003 SHA512 68c72da7ecdf91054e76b6647b01063aa4913fdea6d54fb81e726c2459c98672b2168a7df1f4d516d13a73d72e69fe8999a58e7919ca842fa0d916daa2a0016f
-EBUILD pluggaloid-1.4.0.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
-EBUILD pluggaloid-1.4.1.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
 EBUILD pluggaloid-1.5.0.ebuild 536 BLAKE2B 5938d6b08fdb81537219c1d135e79a61832923701072e6b6473b6b6f7d170ec4954fe34883a84becf9147051628b042f76446dae683ad4157a40a50cf3c26f08 SHA512 63688f45ecbc61abf85787fe5563f2d98ac4078511faa87a0bee5b029913dd27c59d24412a03d51167a875e9f6579d0ac170aef33e8b6f3b69611483adff3724
+EBUILD pluggaloid-1.7.0.ebuild 536 BLAKE2B d9c8fb99412f232ec91cf15e9ceaf1b477e28e5d9a132a63d61ac1b7385c6b2ed503183adbe10b649aa54ceab307393fbd55c26f4c9490a0369f165477ded59c SHA512 fd7163ee4e872f58067dcd652daacf4d1103e7a29a1893d4d840c24c1ce63a4ef4853230e789d27889b708b5f27a850ed3cfb6dc4efea4cc1f3702a0aa8ff936
 MISC metadata.xml 411 BLAKE2B c4607d99d68dd5f206741e4021f2c8c2495468085c941aa66fb26aa356029b47ae33d1cdc16b07e256bc1bee58a92f5ca4599432a1b6e7e882275638fd02ecc1 SHA512 24dd8c687efe2f4b36b890912e583b7800151d1209b74b0676ec9c863e263e8858a9a9e465523680890e14243c8a2d67e7a999a1973bc5bb797cebdf886ae546
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.3.1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.3.1.ebuild
deleted file mode 100644
index 5929c9c70901..000000000000
--- a/dev-ruby/pluggaloid/pluggaloid-1.3.1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
-HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/delayer-1.1.0:1
-	dev-ruby/instance_storage:0
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
-}
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild
deleted file mode 100644
index 493b5e874163..000000000000
--- a/dev-ruby/pluggaloid/pluggaloid-1.4.1.ebuild
+++ /dev/null
@@ -1,26 +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"
-
-inherit ruby-fakegem
-DESCRIPTION="Pluggaloid is extensible plugin system for mikutter"
-HOMEPAGE="https://rubygems.org/gems/pluggaloid/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/delayer-1.1.0:1
-	dev-ruby/instance_storage:0
-"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile test/*_test.rb || die
-}
diff --git a/dev-ruby/pluggaloid/pluggaloid-1.4.0.ebuild b/dev-ruby/pluggaloid/pluggaloid-1.7.0.ebuild
index 493b5e874163..56af59272b30 100644
--- a/dev-ruby/pluggaloid/pluggaloid-1.4.0.ebuild
+++ b/dev-ruby/pluggaloid/pluggaloid-1.7.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
diff --git a/dev-ruby/recog/Manifest b/dev-ruby/recog/Manifest
index 47749fdbf695..93293f9b665b 100644
--- a/dev-ruby/recog/Manifest
+++ b/dev-ruby/recog/Manifest
@@ -1,9 +1,5 @@
-DIST recog-2.3.14.gem 331776 BLAKE2B 62aad2cf8252c24cd7adc456a022555f05924e501fd5f2fafeb87c2587e049ee41a501602bc1b5d97370a69a6b98f1ae77df22bfb7ae2c9e80b38b5e0a1518df SHA512 1154ca3d610fe8f554a15846b49f978d3798c9a43893c40d58c8421e8012c0823368d374ecadd351fc1479037c898966dc2dba9debb4c46ce6b743c7782a848f
-DIST recog-2.3.15.gem 332800 BLAKE2B 4a6360f72d5ee48e066a30abf875fba18e8dcdcba6d36bf8d8de28b36405870819a1b91edee1a5877b1ddda99a25918419bf42bdd4851c7d814a2acf558439d3 SHA512 a26f722da886be22332330a9b0407ec28431ca900b43d6cb7c6fe65938a026a51d54f90cb264652fb8a70352f5e548a7ed013a4b136a7a21df4a9987b36faf0e
-DIST recog-2.3.18.gem 331776 BLAKE2B 8a44b13c73e4487fc41c00b34d907fc91b6c3b9bfcf29a7366e3462a946db51e9ae8cefb09d47890c8bb71fed6b6277f117f96b5a6f7e611c8583873049ec4ad SHA512 023486b1812c7e90f1eab6f6b49733c77207b725f82adc71d0d79eafad07a13cb368b5d02c23d8f00341cbe94d77ac1b590430f0c891ab7095643af1a1772ba0
 DIST recog-2.3.19.gem 343552 BLAKE2B bf5aa0e2c5e8d7a27b23f03250a3fa952dfa0ed5a2844596b00940fce2e1080ada009a46b5eeb2418845ea12f803580040fc3a3aa6871675efff1a8f4d5a4ade SHA512 f09a0ee2b4a7ecb7ca6b587a70e115e162fbca8a7a1736017305346ed03207de66f71711e78593ed242c63c3c8be9af2b341c2d06c08a6592fd3d8ecbdc60147
-EBUILD recog-2.3.14.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
-EBUILD recog-2.3.15.ebuild 781 BLAKE2B 491ff32a9898c4e49a9538f6b748276391d57a050cda369386d1b890afcbce515044a4dea8d276a36c4f6e31923fa5aaef2fa8503b735df92d4a4ae5f79565be SHA512 3b600044289bd0523684974660fd072e304df6aa4e3de777b62172da4dc4b0c737ddd707e89286879bda83fa6cdd62e238cc28c49cf371fcbd13c5396349d40b
-EBUILD recog-2.3.18.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
+DIST recog-2.3.20.gem 355328 BLAKE2B 0da5bc28ef7afa9f6e6e64911c6cc423b1667a06b9ce1cb234a89d05e3680c562796ed4701015b5621f6319c1516d5ff7c0e67bd1343bbe6464ce5982ebfdeb7 SHA512 ae247adc9dc342fb3277f4f231f5f827e470a74fea5e609ca53cd1dc9b48c5742a16433536271f4e686c1af31619cc1afd4255a41285ff18518f81f21433cef1
 EBUILD recog-2.3.19.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
+EBUILD recog-2.3.20.ebuild 743 BLAKE2B bf211180aa7a2651db6f923e41c91dd0ee8bdd4eabd9c2485fa06f694c3bc2b4d01a13bbb44d8f4e565f46e504480de6f5a566e8b89cb21cbb57744cebf05a28 SHA512 fbf11002303a746fd65b14375441804cc5b87f9c4c30f1e53ee7c1c62ff0fe6b44c4365b7824bdb713d31e1e25d8260495f5661f5b2bbef3779271e5a6e7f94f
 MISC metadata.xml 334 BLAKE2B bccb589153c4961a76c8bbd83ace97d4295b5c6a3b66ede325156940c8d0a1119bfaa838caa5d1e7ffb1363e4a3cbe8d2899fc2430b051dab63b11709f16d190 SHA512 cb416ad148d55b439a260d17b6f014075031a7b60cbf686b75e2b34f4d7bf82a8f0001c84f0dcbd9506a855a64dd20902965a0744cdd9fa06f6391929d5245fa
diff --git a/dev-ruby/recog/recog-2.3.14.ebuild b/dev-ruby/recog/recog-2.3.14.ebuild
deleted file mode 100644
index e7b78df0cb67..000000000000
--- a/dev-ruby/recog/recog-2.3.14.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser:0
-	dev-ruby/rspec:3
-	dev-util/aruba:1
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.3.15.ebuild b/dev-ruby/recog/recog-2.3.15.ebuild
deleted file mode 100644
index e7b78df0cb67..000000000000
--- a/dev-ruby/recog/recog-2.3.15.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-RUBY_FAKEGEM_BINWRAP=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="xml"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pattern recognition for hosts, services, and content"
-HOMEPAGE="https://github.com/rapid7/recog"
-
-LICENSE="BSD-2"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/nokogiri"
-
-ruby_add_bdepend "test? (
-	dev-ruby/regexp_parser:0
-	dev-ruby/rspec:3
-	dev-util/aruba:1
-	dev-util/cucumber
-)"
-
-all_ruby_prepare() {
-	sed -i -e '/simplecov/I s:^:#:' -e '1igem "regexp_parser", "~>0.2"' spec/spec_helper.rb || die
-}
-
-each_ruby_test() {
-	RSPEC_VERSION=3 ruby-ng_rspec
-	ruby-ng_cucumber
-}
diff --git a/dev-ruby/recog/recog-2.3.18.ebuild b/dev-ruby/recog/recog-2.3.20.ebuild
index 18077246bb19..18077246bb19 100644
--- a/dev-ruby/recog/recog-2.3.18.ebuild
+++ b/dev-ruby/recog/recog-2.3.20.ebuild
diff --git a/dev-ruby/rr/Manifest b/dev-ruby/rr/Manifest
index f59eb560eab8..e7b6067c943d 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,5 +1,7 @@
 DIST rr-1.2.1.tar.gz 137497 BLAKE2B 3db6751d15e54da6ee6777fb7d383c1bfea2e68482dda03ceda9a70f66382cf9aa7c39f27fca9f0ce92b19858b5324bdbb5811809b3ae146e213bb03ddca0772 SHA512 df2d05ff732908da55878cb89cb7d1c4442a18c19f71940244f5bd7dc55632467a1824f55d7fade4b5122486a61277090d7ad05df9f99098030c21aa45b36dd2
 DIST rr-3.0.0.tar.gz 137978 BLAKE2B 707678362370173c3cb088db9003a5acb54f42b579955239317738027ede63d19217c9e76dd693d09226bac85b41cf9422ac7a580f502c1cbc338b0d4ccb34c9 SHA512 4d162a88868dde9a300a0783869d7c7edae840960c26697e20db3858cc3cc9db942a52c22e79584d3e7371da59156ff4f026ca9052d9d4b203159223f78b1030
+DIST rr-3.0.2.tar.gz 138641 BLAKE2B 5b28722a4fab8fa83fac349e1f57fa968adfef3f007b55ccf0fe673a538a3992334c373b52c0e219b0a8bb43eae2105957c3e7569909b6f85bdc5933e97f7358 SHA512 d421d652b388c9ae533dc6d26f59c6327c9438a9318e17473133e4acbdd378bb38c676e08fefb221227e3aeb6f3a469d03ece5ae5102d3f04f800922b533d5f0
 EBUILD rr-1.2.1.ebuild 1094 BLAKE2B 49caf7ccb853a9545414c8bd7dc82a7fa0ac3124b5f3e9029cc8b7428df9a53b278495fb0ea2458df358853881ed010ad0826e1c76230c46891aa93057670241 SHA512 26d86571134dfe9e89746f3f65907d6ffff218d6790e6aa1205c705765098ec6b8f22e8b6d6b1196ade5d955b30a715be901bf5abae5bba451db99ebfc986358
 EBUILD rr-3.0.0.ebuild 1127 BLAKE2B b8d68170ee3930b4c2376f3e2d6678636aeb42e6f902687740626ae96daa0638f76305384a8ec42dce01fe46016dbb258fb8c28b57273a213587b8b03759a214 SHA512 cbb783f8dc81e92d45ae3eafda05b743fc9af1a28824b87b0fce0b97c606718e837edfbf3dd991c50f4c038a3aaa546c314aaf05da2cb107897474479bfea9fa
+EBUILD rr-3.0.2.ebuild 824 BLAKE2B 9ead7ed073a5a9ffcb0ac0214b3691d33985aaa7581682d20f8c0c272b19a55935841c16e3ed89fad0f60b1ae6adbe88a1f53a9ff08de4a4a407bfdf5c52515b SHA512 d9ae19e08292e48f49dd15bb264262849f5f27f07accbd8aed11bcb827187fbc4385d01f6e8abe5f497cc3ec457ecb6704838066809fdcae4803d62da553cbde
 MISC metadata.xml 331 BLAKE2B bb2b9b8afc411541f4cbc3f3ae7034761b8424dc81bcfce4c47d945a974a13c1519c2b46968dee270bc76beeca6902fc42cb0f8ac1ba3d944d96e4146993094c SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39
diff --git a/dev-ruby/rr/rr-3.0.2.ebuild b/dev-ruby/rr/rr-3.0.2.ebuild
new file mode 100644
index 000000000000..5cec9bb3a296
--- /dev/null
+++ b/dev-ruby/rr/rr-3.0.2.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 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC=rr.gemspec
+
+inherit ruby-fakegem
+
+DESCRIPTION="A double framework featuring a selection of double techniques and a terse syntax"
+HOMEPAGE="https://rr.github.io/rr"
+SRC_URI="https://github.com/rr/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+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/minitest
+		dev-ruby/diff-lcs
+		dev-ruby/test-unit-rr )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+}
diff --git a/dev-ruby/ruby-gettext/Manifest b/dev-ruby/ruby-gettext/Manifest
index 842d5b7415bd..ed3408f642cf 100644
--- a/dev-ruby/ruby-gettext/Manifest
+++ b/dev-ruby/ruby-gettext/Manifest
@@ -1,9 +1,5 @@
-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.2.9.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
deleted file mode 100644
index 6c3286676959..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.2.9.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_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
-
-	insinto /usr/share/doc/${PF}
-	doins -r samples
-}
diff --git a/dev-ruby/ruby-gettext/ruby-gettext-3.3.6.ebuild b/dev-ruby/ruby-gettext/ruby-gettext-3.3.6.ebuild
deleted file mode 100644
index 7ce7349633f1..000000000000
--- a/dev-ruby/ruby-gettext/ruby-gettext-3.3.6.ebuild
+++ /dev/null
@@ -1,67 +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_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/slop/Manifest b/dev-ruby/slop/Manifest
index 2b38776636ed..5f221ec904ee 100644
--- a/dev-ruby/slop/Manifest
+++ b/dev-ruby/slop/Manifest
@@ -1,5 +1,7 @@
 DIST slop-4.8.1.tgz 16805 BLAKE2B 875b9a1895d99147f6d597b976831fcb406170d6172ad4c888f53cb18e35439f9fc6bcf785864a3209de5169166b2760d196e1f2f102308db3aec07950fe5e88 SHA512 4edace1693081ab7f9d1efaeb9c894f34c0012ae827ee13bd1c8014c222e88db20b082be3d6b0a97e664135b2ba09bec9e7ecb0d20c22b32a859ac574fd2b71e
 DIST slop-4.8.2.tgz 16102 BLAKE2B c43af7350346961db1b19db2fbded24dc8a5483cf487f6dd6f6c486f9539984048f43eef7c3152da42b4c833eb9ec75d7ebfd89c7e759e5e5279bd5f69992f6a SHA512 1747981d5723b935f4d2a89787cf090645e43793b7430d43687dde6dc7e0bc8b52c30497f656e360e0cb95d62f3abb19d9dc4aebb617da57de1211104217bdc4
+DIST slop-4.9.1.tgz 16455 BLAKE2B 5d66e1a03b69ac9bbc272c20adbe0daa1a086abf8651838a59c74bde6ff4e136c6b1e10c2266a96508ed333a0f752ace98f95a223464efef2ecea7eeededb024 SHA512 3211b876b910b76413d9109ea7ab400429fb350089a3d89a56b85894a556d0c278daea258551c355a96d9ec592bc7426d9461b7a3fed935c9917e9c18069e89f
 EBUILD slop-4.8.1.ebuild 672 BLAKE2B a05f5fb795e3f6808c10a3c50533c484cfbf465b75b75ff546d72a7a5b911296d67a784ea20305f8c609880373ac396713075cd7a0d32d4cbddb7cc21d1062cd SHA512 cd5f02db3c2d40b7b5e08e2e60858283c49b8779d190775627eb6dd502ed16ad72d0fe597640886b276b6699a4a6ef54acc18d449837520f008391884ca0a8db
 EBUILD slop-4.8.2.ebuild 665 BLAKE2B 3cb6288596c2cf8974327aa93fede7b97aab61978044fb5942a6b1c4fd0616e2dfa903059429d33a8ad27a8a881f7463d34096fd547c45b211525d75b075885d SHA512 d18192b49e02c227c13012ffdb9bacbc5cd044b1955d9d38b90b119bea17d9559e7259f85d4daff21d8ec289c07fce82f988d0ae4527704f520d080d6a50f561
+EBUILD slop-4.9.1.ebuild 672 BLAKE2B d3d147bcecb988f73ef4562af762f1285d49cc4aec2f3438fb8e0a67789e58f0657706069307b9061c5037c2f22ace2919327a57a1e0958e50c4b86a8fd7f04d SHA512 fadcb2109a886b31a7be4e44571c19831a3dc79ef57f5d9b403e6e8a0046c0ea78a86afa1ec17aeb1e143057996cd2604c3a52d512fff5a991ccec88bda8cfe8
 MISC metadata.xml 337 BLAKE2B 257bf07d00a3f336c737c4135fae690b12a7b383de865d09fca95667efdfc4d66adcb55343b064c1fefa190f1f7c21c7b3f18ecde8d73e9d7632209ee8adc720 SHA512 2036c518a80c08e41ddec04f397959241a28fdbec0071c98120bbe2fade6e69ef67b1aa46191099520dced091d5aa0d16ae1484d831061c0681315cb0fa3b35a
diff --git a/dev-ruby/slop/slop-4.9.1.ebuild b/dev-ruby/slop/slop-4.9.1.ebuild
new file mode 100644
index 000000000000..794f18211550
--- /dev/null
+++ b/dev-ruby/slop/slop-4.9.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_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="slop.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple option parser with an easy to remember syntax and friendly API"
+HOMEPAGE="https://github.com/injekt/slop"
+SRC_URI="https://github.com/injekt/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="4"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/minitest )"
+
+all_ruby_prepare() {
+	sed -i -e '/git ls-files/d' slop.gemspec || die
+}
diff --git a/dev-ruby/spreadsheet/Manifest b/dev-ruby/spreadsheet/Manifest
index 61326df12cef..b10e11cf8ca6 100644
--- a/dev-ruby/spreadsheet/Manifest
+++ b/dev-ruby/spreadsheet/Manifest
@@ -1,3 +1,5 @@
 DIST spreadsheet-1.2.6.tar.gz 4656515 BLAKE2B a3b94804db9f4aceb8f6db66da7319082c86f625fc1c6bee5b1c1dc65b121970876cf5adfcc7d6d6800cadab38b017d67c7d0ecd1d708759a6ccd9726666c50e SHA512 4e05dd759f56de97979823864b4f4bed17c7b9c35cb2cc76e817d309ee2b0db38ae5efedba401b1259f3b80b7c954d95c6d26e928ebf03f329bc07d53f8013af
+DIST spreadsheet-1.2.9.tar.gz 4657114 BLAKE2B 6fda8b63688b21ff393402f15cda6685aee540528690ce3aec8a1d3edbf2f68f4145da8edb35706a506506b72ef8b8a32c31fa737863096349a3f2d871b728a4 SHA512 82beea72426aaf92fff16fa80d9a6d0ea4c465aaff6ea311a70fd20abf8824bf384adbe101ebb84b676157b4436bfb0d5c1ce6e11ed087c42a1a4b0538f26598
 EBUILD spreadsheet-1.2.6.ebuild 809 BLAKE2B ee66e6ca63ea682b0763ca7ee47eacca45175245b37a945ef9597a6d9bd41920754e5bbfac2a4028a0f6a9cad4bce636349fcdfa03346fa252962ad52a22d79b SHA512 e6a91908eea76853568fabac846145ed2f8ecf269ed560c6a0beb50c9e2e45fdda921e85bfc08a6b861ce56915cf240cfdc115eb3c6ac02dc5b4bd28b0deb39e
+EBUILD spreadsheet-1.2.9.ebuild 897 BLAKE2B 3e0a22ccef700781f425a8ad3aa7930a45549f88c6ecf8710aac031fa2e8b32277b184b4c06e6b96b592f98fbf3c3cd01fa58d5784e945543dc738a7c712a0d9 SHA512 1c83a65e4edd3c1ca0a55623bff9a66c3e7e1cec041a66cbcf6337222700a80cbf2370340877ca225166bc4f52a38fa67c202a210b13f7d734776e45a438b607
 MISC metadata.xml 452 BLAKE2B acebaf37b6e910c08eda195fab8eb473c2516d5a22d30b64cbb564d25e9c162d3f2a5918fe5ed208533fd847de10ba374c5647f18d33f2045ced2c0fc6158af8 SHA512 a0677ee7cb739f0108436f4021f487e59ad4d24af2d3e08c463b0042cc3016f02a025cbb558a68c04cb13fac2b099530fa3c17b29b473c9371b2243810664416
diff --git a/dev-ruby/spreadsheet/spreadsheet-1.2.9.ebuild b/dev-ruby/spreadsheet/spreadsheet-1.2.9.ebuild
new file mode 100644
index 000000000000..b618329c8fbd
--- /dev/null
+++ b/dev-ruby/spreadsheet/spreadsheet-1.2.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+# Avoid the complexity of the "rake" recipe and run testrb-2 manually.
+RUBY_FAKEGEM_RECIPE_TEST=none
+
+RUBY_FAKEGEM_EXTRADOC="GUIDE.md History.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="spreadsheet.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby library to read and write spreadsheet documents"
+HOMEPAGE="https://github.com/zdavatz/spreadsheet"
+SRC_URI="https://github.com/zdavatz/spreadsheet/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )"
+ruby_add_rdepend ">=dev-ruby/ruby-ole-1.0"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 --pattern='.+.rb' --exclude='suite\.rb' test/
+}
diff --git a/dev-ruby/test-unit-rr/Manifest b/dev-ruby/test-unit-rr/Manifest
index 68e689eccc33..5e73a797f2f0 100644
--- a/dev-ruby/test-unit-rr/Manifest
+++ b/dev-ruby/test-unit-rr/Manifest
@@ -1,3 +1,4 @@
 DIST test-unit-rr-1.0.5.gem 16896 BLAKE2B e9424a29e5f23d11fc9daebe431e49945262633b5c4729a70b59b054e7a9d2373cc86d69dee86a82a39526ce506e21ff63dc0878313c72859cdd5ac28476aa2f SHA512 120c0c6d0b203a40062d61f3b9c915460660d1222b60878eb4bc30111d7aa51ec271d9dba138ba0b91eaa116ab07051323e1de365c6cd21f84c372748f89d36e
+EBUILD test-unit-rr-1.0.5-r1.ebuild 582 BLAKE2B f328e5db0037487281b0f7e7ab73522229d1200091c421c81894c21b7511d6b7037ea57989f154e54ba60366ff4ea513f4f77811b897a6298b31d2f104d4945c SHA512 f8f1d4c7f7f6e52a4aa126bcffd3e5a779ad136dd8c2b913f3f486d072e0708af21731a4d3ac7127ba5e0105c1b12e58f717dda69ada430722292447fc8dae7e
 EBUILD test-unit-rr-1.0.5.ebuild 575 BLAKE2B 46286c0559285322b081be66a43823b3eec7a544bd2ac2f27b950e9b19f26c32a2bf05b6fc3d57254c32828a79cf537f4c8c3b6d8a43f0139aaba700988d593a SHA512 7e8f2e9f9a1d69fd465159d4f18628431bcf6760e200debfb04c30d08a27b34c677444299970338a9e99ac53e7f500cf657294cf5c1cfa011f2360523789a8bf
 MISC metadata.xml 338 BLAKE2B 27f664f9d84efb5173632672773cacd3e695ddf8451b96eb953b2b37f468492f344f12b76876f7f772dddd4d59b1d17d567ec87f22044425c809eaade8cb20b6 SHA512 ebd55294301383173e6b722212d90ee9c1a339c3a02ec77e434cfd8a7260360759daf4dac8bc69d3f419069c69b92a49e85dcc7f0c1927a3f2f997f9c93af9ef
diff --git a/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..2a394a67d202
--- /dev/null
+++ b/dev-ruby/test-unit-rr/test-unit-rr-1.0.5-r1.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 ruby30"
+
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="RR adapter for Test::Unit"
+HOMEPAGE="https://github.com/test-unit/test-unit-rr"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/rr-1.1.1 >=dev-ruby/test-unit-2.5.2"
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}