gentoo resync : 03.07.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-07-03 22:39:47 +0100
commit: 7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree: 8c6793f68896b341e22f33d7e6cef88e481f4a8b /dev-ruby
parent: 9aa80713372911cec499b3adb2cd746790920916 (diff)
86 files changed, 518 insertions, 1013 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index a1caae91bc7b..83872105b6c4 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/bcrypt-ruby/Manifest b/dev-ruby/bcrypt-ruby/Manifest
index 9b743c9f4579..5bb035a2e1f8 100644
--- a/dev-ruby/bcrypt-ruby/Manifest
+++ b/dev-ruby/bcrypt-ruby/Manifest
@@ -3,5 +3,6 @@ DIST bcrypt-3.1.15.gem 54272 BLAKE2B d830131971ffb8a26efd4d7afa8cf6f4a93026fbff3
 DIST bcrypt-3.1.16.gem 54272 BLAKE2B df8e1169df3a67f3eedd90b4fe04224266cd41d1a0dd2866b06372805b5b00aa028c3bb077078ffde3c89a9052497016dc3fe812075d8b6f57d6dd951a6aa806 SHA512 655483d73347c20f3b04a24d625cde05fd8e1da6f022363fbb2df828aea0623cb5b4981d97791301dcd83edc2719a2238d8d377af1558ca2ce4b3c8ade9bd343
 EBUILD bcrypt-ruby-3.1.13.ebuild 1622 BLAKE2B 2d8bea12834b90c7c72305e7a8be86bf017678cfd54ca0d361f9b4199317b5fa98b1122048a6b0551a4ed9f752c754465006f1f5178309adccaefd6745c1acfc SHA512 9fe9ba2bd7cb56cb9665b43987779dd3e715f0c0ac1e29416bc9556cc7f10aa1559372640680bdb9c2779feb99866632d7cb44632d4df616040014fa67f5bd64
 EBUILD bcrypt-ruby-3.1.15.ebuild 1616 BLAKE2B ffe6304ed15fdf20c5d89d3144f9f585c0288337f0e3c114b32daaecfc981a8c0c453add8056213c604831f60f8b21b5bc32e73891cfa36d65e0957984c7a34a SHA512 317d139330ebe8be64d0c28f1137e581446fb862b7684abd71134e70fadcf27be91f15b985d0837c28591eee2d0010f92b8e1c4246a152ccb4a5bc06a08a3ed2
-EBUILD bcrypt-ruby-3.1.16.ebuild 1616 BLAKE2B ffe6304ed15fdf20c5d89d3144f9f585c0288337f0e3c114b32daaecfc981a8c0c453add8056213c604831f60f8b21b5bc32e73891cfa36d65e0957984c7a34a SHA512 317d139330ebe8be64d0c28f1137e581446fb862b7684abd71134e70fadcf27be91f15b985d0837c28591eee2d0010f92b8e1c4246a152ccb4a5bc06a08a3ed2
+EBUILD bcrypt-ruby-3.1.16-r1.ebuild 1512 BLAKE2B da39d357f52fe6e3bbed0964c0e78c9f44798358902d62eb613fac45a0009f2483b59d04013fdff054ef35139af59019c2656fa4848a5919b3baa43d5b89eaf9 SHA512 84f16968513746a85c1da9e8d890d5445260ffc285a715c59e879b3b36d28b2401eaccf3246b5ef88e716c7cb686d3e5fb3d950d8ed42f38a30decfd6cdcb9e2
+EBUILD bcrypt-ruby-3.1.16.ebuild 1615 BLAKE2B 4534b33b84d784b5afb0a86da52bd8c3cac4c8e9c03620b2091644eb88e308d0a7e70d3b9fe5d8f6845861af79b5fceaf022b9136d68fe9bedd066f509b6d436 SHA512 870b244082f21c1241b2dedfc8ef904e35260683c0ea2e164043e69078d0f28f800082cf8ce1a59c53dfcbf080b1f20e788ea582bc956929f1bf9bb8ee752026
 MISC metadata.xml 346 BLAKE2B 635b8241d82a243f102d3ee6ce24c6cb183a9decd70cb02ee8734c85c9796b3dad0206b4e18da86df0e68fdc72a782b0494d682e757631718d0d60ee27b3d67f SHA512 ade206e8719923e0e758268c757100148580fd817bf477beee8df9b9b9f99a50b82b898e555bb6b0fd91239af22b1d7aa320caa1fed5c093a8799e82fac97608
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild
new file mode 100644
index 000000000000..6a7644514384
--- /dev/null
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16-r1.ebuild
@@ -0,0 +1,52 @@
+# 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_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_NAME="bcrypt"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="An easy way to keep your users' passwords secure"
+HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/git ls-files/d' bcrypt.gemspec || die
+}
+
+each_ruby_install() {
+		each_fakegem_install
+
+		# bcrypt was called bcrypt-ruby before, so add a spec file that
+		# simply loads bcrypt to make sure that old projects load correctly
+		# we don't even need to create a file to load this: the `require
+		# bcrypt` was already part of bcrypt-ruby requirements.
+		cat - <<EOF > "${T}/bcrypt-ruby.gemspec"
+Gem::Specification.new do |s|
+	s.name = "bcrypt-ruby"
+	s.version = "${RUBY_FAKEGEM_VERSION}"
+	s.summary = "Fake gem to load bcrypt"
+	s.homepage = "${HOMEPAGE}"
+	s.specification_version = 3
+	s.add_runtime_dependency("${RUBY_FAKEGEM_NAME}", ["= ${RUBY_FAKEGEM_VERSION}"])
+end
+EOF
+		RUBY_FAKEGEM_NAME=bcrypt-ruby \
+				RUBY_FAKEGEM_GEMSPEC="${T}/bcrypt-ruby.gemspec" \
+				ruby_fakegem_install_gemspec
+}
diff --git a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
index ef3162f1c053..17bacd6c56df 100644
--- a/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
+++ b/dev-ruby/bcrypt-ruby/bcrypt-ruby-3.1.16.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="An easy way to keep your users' passwords secure"
 HOMEPAGE="https://github.com/codahale/bcrypt-ruby"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/bcrypt_pbkdf/Manifest b/dev-ruby/bcrypt_pbkdf/Manifest
index 4ba440228f5b..de675f6bdad1 100644
--- a/dev-ruby/bcrypt_pbkdf/Manifest
+++ b/dev-ruby/bcrypt_pbkdf/Manifest
@@ -3,5 +3,6 @@ DIST bcrypt_pbkdf-1.0.1.gem 24576 BLAKE2B 7ccade2b5eeabcdcffe5c53bf8ed2e41635362
 DIST bcrypt_pbkdf-1.1.0.gem 24576 BLAKE2B 4fb9449c23c1a1caefbe7acae630eff9c6ee22b77d1eaed6475400ab2b37186d3f15b867cdad364daaaf27d6b817d6a2a49cfbf567a889264fdd64903f06cf89 SHA512 a7b9f123274a2f93e183be7339149b1df3b185331fdc63af58e342ae4bb734fdcf709214a50922218b837481349948e10ec879f9b8e1a6928b1b7b5617f83be5
 EBUILD bcrypt_pbkdf-1.0.0.ebuild 1091 BLAKE2B 87453b2647c98479ff54e8fc45ed48ae875682134feb4751bc6094d39a452d539e7a1d176818523392d174c00502b559ef625e2a740bba06b841ef55f2c54da7 SHA512 0cdf6de34b390231c2933b2257577c69a18fde6511b8e73ad9e114abda76d596ab6959d018a63829f5944a576291f9907058a5ff4bf51b2fa930438cc9e6dbc4
 EBUILD bcrypt_pbkdf-1.0.1.ebuild 1126 BLAKE2B 1de9596c2f022351f904f89d04a42f6aff409e115360dc8cb7c1890ecf67536d37ca5665de6fc1f89e6020b7f6f8f54da5f3b515f029277a289aa519d47af379 SHA512 b5be2902e3fd7f47e1dc40ef0220e1ecd2c4910d411ecd1e28c318ccfe14f4d95da6248b81a48b68b5ebd942773e71838d885f0045be671b26a8df65796e38d0
+EBUILD bcrypt_pbkdf-1.1.0-r1.ebuild 1110 BLAKE2B c686e78906f7187b109b8937e498607dc16fb3e364d0f15b1e35280f7e0d0bcade08c2f39bf0aab69133caee061ac72d5ca8df19566caf0985db62406ac5cd6b SHA512 e333371574905c879a9bbebd3607a7cd3405232bd48ed3d7c76c14944f17cb518f1f7e58fc6c2909340665256d72a86f73521f5a1ffc3023e520fcc53050aa67
 EBUILD bcrypt_pbkdf-1.1.0.ebuild 1095 BLAKE2B 760d16c8ae96e77ec9e1ce10e6920c17d5e7ecb9ab48a880bc1196ced94c6c14d743437da08596ec04b7311116aea09eed80ecc622c4bd39df6c2f79656391dd SHA512 0b4eee7403c01d0ef287906c3373730bcdd2b7a7c7a1920ee5a7c799f151c5d2e3db5aab8d948b1f32825d188900bbb2b4317ba34fa3c95ce445ba3fd4c3433e
 MISC metadata.xml 351 BLAKE2B c94f203ff5c3e7f1b17922c986b5559eefafba479f71868c675bff11099cba93a4d1102f65f5bdff1d1f8cf6ec58d43dfdea33bf9b1301dd22deded3b8e1c758 SHA512 03184605cef97c6fe2390bbf0b4d33d83faf6c05798bea8af352b96f844be84cec02f1845a77f841cc06645ae791cf5c16beeaa1da4967de6ba0c8e1caab04fe
diff --git a/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..020dc3d821f9
--- /dev/null
+++ b/dev-ruby/bcrypt_pbkdf/bcrypt_pbkdf-1.1.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/mri/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Implements bcrypt_pdkfd (a variant of PBKDF2 with bcrypt-based PRF)"
+HOMEPAGE="https://github.com/net-ssh/bcrypt_pbkdf-ruby"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( virtual/ruby-ssl )"
+
+all_ruby_prepare() {
+	# Don't use a ruby-bundled version of libsodium
+	sed -i -e '/rbnacl\/libsodium/ s:^:#:' test/bcrypt_pnkdf/engine_test.rb || die
+
+	# Avoid unneeded rake-compiler dependency
+	sed -e '/extensiontask/ s:^:#:' -e '/ExtensionTask/,/^end/ s:^:#:' \
+		-e '/bundler/ s:^:#:' \
+		-i Rakefile || die
+
+	sed -i -e 's/git ls-files/find * -print/' bcrypt_pbkdf.gemspec || die
+}
+
+each_ruby_configure() {
+	each_fakegem_configure
+	# Some methods may not be inlined on x86 but they are not defined either, bug 629164
+
+	sed -i -e 's:-Wl,--no-undefined::' ext/mri/Makefile || die
+}
diff --git a/dev-ruby/bindex/Manifest b/dev-ruby/bindex/Manifest
index 12775a37c69f..6e5e663cd7a8 100644
--- a/dev-ruby/bindex/Manifest
+++ b/dev-ruby/bindex/Manifest
@@ -1,3 +1,4 @@
 DIST bindex-0.8.1.gem 19968 BLAKE2B dccbee6954c530f64ac13e7ed0108fe81978327c216ad2e60b675eed92419494cd32ba0e09ff2fa5371f3fff61e05661bdf704644cce49310dc6ce10888cc4e5 SHA512 18729825e329c24e483f1e181315d373d5095c18918088d915a8307e2775e5d0163dae50440f5c58609bf32806fa567ece8bfbbd69a061a8c30e367605bc3444
+EBUILD bindex-0.8.1-r1.ebuild 563 BLAKE2B b020fa89e74976097c18dcabc85cf9915c9b87966448e28b1aabf4e64253d9e363b2f33c767ebdde964ab891dba27d7c9cb3f3d78a76e52a420cc48642e858b3 SHA512 f58d679e7e439e20f60d9cc456553cba7a8ff0346385a4e392cab6ae12ef7a51e140aea6f8ee3c1ca7ebb553f015dd979b9305e22992f41aa0f604afe792285e
 EBUILD bindex-0.8.1.ebuild 674 BLAKE2B 1a864343f038f528ba7c778e2d209dc08aff062f90ea0f39134dc8ec2df1a62b92e02c5352df5a5aa289a682090aeda24104d4fe50539b58a5808b827096686b SHA512 3f807c348d8311397d56fd0f73547b7db2a05ef1f52c6b14dff20e5dd76821473a6790515ec0aaa1f226c35bd6772e51045c975abb80a27971c08f5419ee34f5
 MISC metadata.xml 345 BLAKE2B b455b8848600aedf59b1dcc087ced4cfe1178b0f197655178e6f32f4ed3658c30327559f13d99e183e182391c2a8aad574f6218e579323e95ae9355f2a3a7eab SHA512 9215248edc7892068bb24ffd616fdd640169513cdea04d77ff5e59aef9a61c763988ef2d1e0eb095a1250b38f71027d72bf2fa76b39996910fd8daad6647f317
diff --git a/dev-ruby/bindex/bindex-0.8.1-r1.ebuild b/dev-ruby/bindex/bindex-0.8.1-r1.ebuild
new file mode 100644
index 000000000000..7cd3b64f3f28
--- /dev/null
+++ b/dev-ruby/bindex/bindex-0.8.1-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"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/skiptrace/extconf.rb)
+RUBY_FAKEGEM_EXTENSION_LIBDIR="lib/skiptrace/internal"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Bindings for your Ruby exceptions"
+HOMEPAGE="https://github.com/gsamokovarov/bindex"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -e '/bundler/I s:^:#:' \
+		-e '/when/ s/ruby/rubyx/' \
+		-i Rakefile || die
+}
diff --git a/dev-ruby/binding_of_caller/Manifest b/dev-ruby/binding_of_caller/Manifest
index 6019bb47b705..ca93c3efdd8f 100644
--- a/dev-ruby/binding_of_caller/Manifest
+++ b/dev-ruby/binding_of_caller/Manifest
@@ -1,5 +1,6 @@
 DIST binding_of_caller-0.8.0.gem 87552 BLAKE2B 9097fe2dbf1e5ea2361bee94cb83ce8152f7e1357caecf1217b1643be225e21e5aa793e7fccbef5c983d5c204b95e633ded490158dfdd1d4e99fca81c51cb910 SHA512 d6ea4e893415eaf3614b109f8f36c3fa2378da9997d013fccbd0fc1e598886d11f7843023ceed2468184d5b8df01e2329ef16c7af57bc60bbd47304a53b43974
 DIST binding_of_caller-1.0.0.tar.gz 7473 BLAKE2B 2a8f3cee555e11c9eeb56935d0ee51deb037ea5fc631b4ef5eb50a831e48ba47c6a94e9104456bd8e6c4910bc76c5bc7e268db7de8c5ed283886b80c3feffd62 SHA512 89c58fec180b7bc25c5124035ed69692961148a3ddcb561643e7b8b1a78c3b103795408b52e70264db7c4b62080991219af977c5b981a135d573ecd56cebebba
 EBUILD binding_of_caller-0.8.0.ebuild 576 BLAKE2B e78491de6adb0de769ebce72fbabab41b4a26ba3410e26452ee177e60fcd770369c44969a6358398de130c373c90981d9c5b6400b549a9039a2594bebb523959 SHA512 4f832eb9a856fb0d6377786a6d0e2d6d16270bfdf1d9d60a40f66fcee6d1e2906fea0c8eed63c64b3dff2a29bd80ca3f65611df7b95a87abebdf5e6085bcf9e5
+EBUILD binding_of_caller-1.0.0-r1.ebuild 815 BLAKE2B eb77b9d4599af8b5d7b501b01abd0dcc987add41320532c59c09891b8f1f05ad8065f9639fe36d65b38ecf67c290c95ff9212696cd5374e9c157070316051498 SHA512 682e5774094b0d5a480ed462291aaacab43f89cd7d2f987d26d912c9c3ec2c68bd63662ea0099c06bef2b0fbb45d9d7621381f9e1a29f186455299948545ccfb
 EBUILD binding_of_caller-1.0.0.ebuild 808 BLAKE2B 58e4df4996d67fe3b9d850c7b9be3ba598c5baac264e9771dc51947240c37d1aa3703c1b5b2246f6c6a246fa068fd916de6deaea3cb50335c258655926ea043b SHA512 12ce0383563bdffc384a93d5d4c019e31ba4c3f75b14671f9784f14053ff9509af3492d55303ff7c858b0562cd5325a0597e20d1ce8281757028bd87bf832b40
 MISC metadata.xml 352 BLAKE2B 1ff945eb6a72367cd1901603d59de20bc43ac45a07bcb525d7cb8641dc9cbab8493a19919a3600356d49082bc5563471926fe632cd0ccf5c0ba34d2445e31cdb SHA512 3774a75d46642d38c562d1a2cfe3c432cf3857801fb44b3da21ba2bbe9bd046b60d1bf4b5712efe66b9d875d407717a53f0a00a3516b631d05335f045f87fa23
diff --git a/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..51161fe0e1f7
--- /dev/null
+++ b/dev-ruby/binding_of_caller/binding_of_caller-1.0.0-r1.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"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="binding_of_caller.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Retrieve the binding of a method's caller"
+HOMEPAGE="https://github.com/banister/binding_of_caller"
+SRC_URI="https://github.com/banister/binding_of_caller/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/debug_inspector-0.0.1"
+
+all_ruby_prepare() {
+	sed -i -e "s:_relative ': './:" -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/certified/Manifest b/dev-ruby/certified/Manifest
new file mode 100644
index 000000000000..be509a8eaac8
--- /dev/null
+++ b/dev-ruby/certified/Manifest
@@ -0,0 +1,3 @@
+DIST certified-1.0.0.gem 143360 BLAKE2B a7fcc8b2439dbf8926f45dd6fdca93acc67c22fc7dd27099e9f626f6cf065303ec5c3c0084a243699be583f7f244aff180a36ce487622d023b1fc4ae860844af SHA512 8a331bb88f68f32c765136fad3f5b130843c8d1d0f3f5988b7ac7e3258a2ae57fe203ffc74996114dd708d017594a033faefc8e6928e24f07cac176aecbbca68
+EBUILD certified-1.0.0.ebuild 422 BLAKE2B 6a4524f670bc45a446f2fd6533d964efecdc4c279f4d1d10696865126f78f07f18d475839d969e1e771c928254717b3b4b20857dc0cc36b2d2747455b600bd7a SHA512 4657d9173a98f134d1e8a8dd9e9ec0a8d6edae50fe61a6f13ebe2e9fcdee73abfe00cae0ec765b911a63273cc29911bd243456005fea4112bfefbaf07027a7ff
+MISC metadata.xml 246 BLAKE2B ddf176ab07cd3f2a14f81f4df1a54fb58418eb8e1a916899898d00c87d175f881add29c9d5f7992b1c5fe7626afcfc3489bb04ef446a67c204e55d377e88d5be SHA512 a7bcfa33f9a281be74f28c1982f204eabbd847bd314872fcc2a546f1358d84376517812e0740480aef662534d4ce6c2da9b38d767d682421dee801f5b7e89724
diff --git a/dev-ruby/certified/certified-1.0.0.ebuild b/dev-ruby/certified/certified-1.0.0.ebuild
new file mode 100644
index 000000000000..54d83dad114e
--- /dev/null
+++ b/dev-ruby/certified/certified-1.0.0.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="ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ensure using OpenSSL::SSL::VERIFY_PEER and provide certificate bundle if needed"
+HOMEPAGE="https://github.com/stevegraham/certified"
+
+LICENSE="MIT"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-ruby/certified/metadata.xml b/dev-ruby/certified/metadata.xml
new file mode 100644
index 000000000000..109b200cf8d7
--- /dev/null
+++ b/dev-ruby/certified/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type='person'>
+		<name>Florian Schmaus</name>
+		<email>flow@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 0336f88bfa4b..868d56389725 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -2,7 +2,7 @@ DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d3
 DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
 DIST diff-lcs-1.4.4.gem 50688 BLAKE2B 0b72890b147696425120f2dc71f8d741d993411bd8e76d130d3c12e3b4f451b0812a3cd34b09e653ec7024c616d7ffb4bd1c40303b66ca4a13e26c397d5913b6 SHA512 fcc6c86f392697c4b3690827f7c20d50fe68e367626b85a56446356d7bb21b4020bdb2bc5c2faf4e82807cd9f3049d71c94d166c85a1a4231f0fd9fc032f41c7
 DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
-EBUILD diff-lcs-1.3.ebuild 630 BLAKE2B 8fb5f22d409c807f4fc8784a9869a1f651248da43ba2b3acea1a7cb32db8c71f68b0c153a502a9d67440408cdd9c70d6a91855991cc315a8e430499c47b427c7 SHA512 99367b4e2baca6e2609e694f20423ad3b56043478cb565dd9f705fd77591188215267687c86fb049374051c0220de88f19d4d6557f1ecf0ff997655bf81e2018
+EBUILD diff-lcs-1.3.ebuild 630 BLAKE2B bff2b7dcb83f1d84b500dbabd9e797929e86d97af751a7e074d024db67f9561cb6a6b332b051f6965c16d96164e656994100eadde194399ac46d52c962dd5b81 SHA512 ef3ccaae4f96c61063b251eaa688193b49361003ba2ed2490b157049593bf87cf88969cf04eb02de8ff7732b1d47f9b6d9d8ad19c5b55f11feb7f4dda685fb56
 EBUILD diff-lcs-1.4.1.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
 EBUILD diff-lcs-1.4.4.ebuild 748 BLAKE2B 2700f20d633295a15b936b96fd7fbacd5fba76238661ac463a825766e61ae32c0779a476a5919069984deaa0bde76517185091f37d4d2aa4423a4e4ce89696f7 SHA512 7a443d9e67a447a9a15d9c68025c78da6c36b3e43b20689f6460c05514ebbe4935e4c247a29282eb58d52c0b514dff17926aa7400668de4cbbb56b3aa16a3855
 EBUILD diff-lcs-1.4.ebuild 599 BLAKE2B dc7bb6ac8d252e4b7bdf7f131043041453b9e646ce046ff222fdf013477449e2ad48ac8b8ca6e21f7560f66ff484c365ba60eb9540ca059720bf3d8bfedba911 SHA512 73b53e115fe37da479352dc3a55ec15c569866b518d735f23e8341703c47bc97b0e5436800fb7713d51ce34bdd0684a8f29f11737e1747a00e08cadd5259682a
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
index f2e950fee8a4..8997dcb23097 100644
--- a/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
+++ b/dev-ruby/diff-lcs/diff-lcs-1.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/fast-stemmer/Manifest b/dev-ruby/fast-stemmer/Manifest
index 356dbc5f9af5..799841ea3cf8 100644
--- a/dev-ruby/fast-stemmer/Manifest
+++ b/dev-ruby/fast-stemmer/Manifest
@@ -1,3 +1,4 @@
 DIST fast-stemmer-1.0.2.gem 11776 BLAKE2B 090f7a9bd63fbef2c9ef84a7089c7a4881f69f9d77fb8f90377424f1417e97a636d956c4ed646b1f45c25abc1ac16a7836ca70ec1591659e77242f11b6368e60 SHA512 7a7a17c62ecc9ce6eaaed9d0783f161c53c5c6faa07b7b0577da5a46d4539bf3880f71e4e9097a489c045222738d0441c322fb5cef5e02a1483405f815a81b29
 EBUILD fast-stemmer-1.0.2-r2.ebuild 703 BLAKE2B 6b715c58c0b7595a16b885c29724b66b254917641dbbd6eb8fbcd7fd15da27e074aeb429f3053aa4aede0971a460958983fb663b5cf1122612ca918be4d1a9d8 SHA512 3a7b5ada71f7e84098cfb7df1d567b2755e2ee01eff661ea59f58e76f7879ce0486f1e7205c8e312edcbf07941eea351a4b7cdfc901dcb0abcdf37ac57854106
+EBUILD fast-stemmer-1.0.2-r3.ebuild 572 BLAKE2B 0c32b0ac21f283a34bca544c311d26c76649137c9ae72c74954e39628199eeed9cd5a5b790da94e7d99a5a032f954d069f53b7e77ae6bcef81fae8f9a7e4ebac SHA512 9f7a42d7d15b12794b60eb8aa3eaf6ce5748d3f51e6cf3d51a7c8465da073753da471fd68d4a140e13df6c5972a56209d5bc69bbb35bc22f8776bc23f3925530
 MISC metadata.xml 347 BLAKE2B c8b2b78f8daa0e489cb2c2e644c2bdc7056ba7b3719f270307b0df16a6aa684c99d15d48c1a9eeb1edb30c51d446db0afcfd0f7cf8ea1617e21b7b1c1ac66b31 SHA512 a2863465c22556e4b96e34ce8f1db86e25ee2049a24feda43ee5925406ef1f356c071faf99b71a83be56084587db9a0ba8eaf49d23652f5fcd16b5c22fe77439
diff --git a/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r3.ebuild b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r3.ebuild
new file mode 100644
index 000000000000..03fbee88251d
--- /dev/null
+++ b/dev-ruby/fast-stemmer/fast-stemmer-1.0.2-r3.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_EXTRADOC="README"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="Simple wrapper around multithreaded Porter stemming algorithm"
+HOMEPAGE="https://github.com/romanbsd/fast-stemmer"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+all_ruby_prepare() {
+	rm ext/Makefile || die
+}
+
+each_ruby_test() {
+	${RUBY} -Ilib -S testrb-2 test/fast_stemmer_test.rb || die
+}
diff --git a/dev-ruby/fast_xs/Manifest b/dev-ruby/fast_xs/Manifest
index 2f3c4c2e2e4e..f52f35a96dc3 100644
--- a/dev-ruby/fast_xs/Manifest
+++ b/dev-ruby/fast_xs/Manifest
@@ -1,4 +1,5 @@
 AUX fast_xs-0.8.0+ruby-1.9.patch 1090 BLAKE2B b5b0b2db3e19adc57e85141b893cdfbed8844def9ad39cd7ba5ade46a5ae73201498782c0093e25e075bd6c2577a895715ba82a87cc14327492410558442d194 SHA512 0c4f4b03db6ed70381b9aa7e671038206648a2c88211bb7d015f552e2114015a7cb749678670ee876aa568505ac3df42535f839367cfd1fc52ba6674429940a5
 DIST fast_xs-0.8.0.gem 22016 BLAKE2B b24e65c31623e86ac8ab8b5a442565083bd047e5740aeae74d74e82c09770a8149853ad021ea6c6c036d411e8f299f4a531d78b0b3314ed5bf32d7f8b9fcf697 SHA512 55fc2704fab020f03b1ce138d1631dd5ad73a8601dcd95989a59c7cccb490c70b4e1af59fb8b009bfa0899f2c23feb42cc3068e243cd539ba1cb01a9f7bc573b
 EBUILD fast_xs-0.8.0-r2.ebuild 1310 BLAKE2B d0721f5167efc4dae52de306286e0995c0d7bf91c4bfe5ec208519f780a8a5e769e3e52594a7240e94c3a5b0d46fff7095b2f6f11cd817dc59a719d87e0bc24f SHA512 af29ea28cef2a70fa3dc6f57e0fa71b01d9d207b53be25af6b2507bb12df772f52a3f8635d605da5b37b0e6dc93f4a8febed67a106fdd3bfcb0fcf81f0961287
+EBUILD fast_xs-0.8.0-r3.ebuild 929 BLAKE2B 47e5aceb99870b6b8815f64825760d1c5834058a6662c4c297d09a85480c057551f17a9830ab4a0d59fb0419129a76df608270909aa28f4bc817b27d6d88dbf9 SHA512 be4202e6e8a9333eba9449c690b5d88c03eb9273d3dc4846ca4a18c6fdd02b1cb268f9c0a334a02227a4c4048a18930b86da258a656483e35fff3a35f12a42cb
 MISC metadata.xml 344 BLAKE2B 606e2ea9e00823abb5e87d45ac41c0ebfe100de30901b120d74b90966d50c525b068796591c3aa7be7a8767f98b2e9d93c2a1b556efc861fa5d6b29b8955c36e SHA512 4c84dc383d13d166f199d39a7a9cea86063392034a467b0aeec29a06c2b70949785662c0bd9b0dc60884cab74455d92f113613519708889f64e11a6d4bbc53fc
diff --git a/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild b/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..1d561300495a
--- /dev/null
+++ b/dev-ruby/fast_xs/fast_xs-0.8.0-r3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+
+RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/fast_xs/extconf.rb ext/fast_xs_extra/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="fast_xs text escaping library ruby bindings"
+HOMEPAGE="https://github.com/brianmario/fast_xs"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/rack )"
+
+PATCHES=( "${FILESDIR}/${P}+ruby-1.9.patch" )
+
+each_ruby_test() {
+	# the Rakefile tries to run all the tests in a single process, but
+	# this breaks the monkey-patchers, we're forced to run them one by
+	# one.
+	for tu in test/test_*.rb; do
+		${RUBY} -Ilib $tu || die "test $tu failed"
+	done
+}
diff --git a/dev-ruby/hpricot/Manifest b/dev-ruby/hpricot/Manifest
index 9ec5baaca3b2..bc9bf58aeb40 100644
--- a/dev-ruby/hpricot/Manifest
+++ b/dev-ruby/hpricot/Manifest
@@ -1,4 +1,5 @@
 AUX hpricot-0.8.6-fast_xs.patch 650 BLAKE2B 5ad93195325fa1e26c2d207fefec83c8e01bbcbfdf933e6925a10bcf74a56c94b8517c7000a3c1aecff091b4d5d1cb3c29c9c899af7a5a5f5f0a17b1967118da SHA512 cbb1aa6138ec98e2eac9bcad8d06ed7c435a8ca503e062776576cfdddb944b294b270dd30e2c2924441ea527445df149e7ce34d085652ca6f184c4e66d209b8d
 DIST hpricot-0.8.6.gem 293888 BLAKE2B 5c054c6fcd5c3365dbf44f3c502bc4c1c3885f4aa43fd1fd15365aea19600ef0ef48157c39ef1709386bda0bc3fb6bba6d98862e8e28bdb5c173429969ef5ab9 SHA512 f0ea9168ae79d099cdb751dd5a205e0896dfb229759e499fff833e94209d1497aa97becb285176dcbcc1fee19bc11913ca3ac0d7a467067e5d837c1eb6e310ad
 EBUILD hpricot-0.8.6-r5.ebuild 1657 BLAKE2B cc952f3491113ec1bb392cca66fc3c42dec0d6cb83ddd52fc9101b1ece2e8c4a68b7c57d13487400c68ed466f3dea663d210be40d03e28781819891827c7c37b SHA512 7ce07fa04e050fb247833c2dfd3cb25298475c1bddf93ae86cf4fdd0087cd7c090e22f1d6d3dddfdd5f34a58be99577a2451ccafbe869312f1ca9491fdce6a69
+EBUILD hpricot-0.8.6-r6.ebuild 1464 BLAKE2B ab680367186182620438c5b97d8663a11acf9ce0c4de950fc158a72174d1689403a8484774dbfb2e5d6662b82618a17c1695c7c7ed02808c56a831b117c9d6b6 SHA512 f071de018cb8c094d0c7a142a35365fdfd9ab86406956e1f617442eacde5a051109448ec240c0cc0e302bf4ecc89033eac854d5849b77aea14b6c8c8a7f6185f
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild b/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
new file mode 100644
index 000000000000..4af8d4a90b3c
--- /dev/null
+++ b/dev-ruby/hpricot/hpricot-0.8.6-r6.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/hpricot_scan/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A fast and liberal HTML parser for Ruby"
+HOMEPAGE="https://wiki.github.com/hpricot/hpricot"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "dev-ruby/rake
+	dev-ruby/rdoc
+	dev-ruby/rake-compiler"
+
+ruby_add_rdepend "dev-ruby/fast_xs"
+
+# Probably needs the same jdk as JRuby but I'm not sure how to express
+# that just yet.
+DEPEND+=" dev-util/ragel"
+
+all_ruby_prepare() {
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+
+	# Fix encoding assumption of environment for Ruby 1.9.
+	# https://github.com/hpricot/hpricot/issues/52
+	# sed -i -e '1 iEncoding.default_external=Encoding::UTF_8 if RUBY_VERSION =~ /1.9/' test/load_files.rb || die
+
+	# Avoid unneeded dependency on git.
+	sed -i -e '/^REV/ s/.*/REV = "6"/' Rakefile || die
+
+	# Fix int size warning
+	sed -i -e 's/te - ts/(int)(te - ts)/' ext/hpricot_scan/hpricot_css.rl || die
+}
+
+each_ruby_prepare() {
+	pushd .. &>/dev/null
+	eapply "${FILESDIR}"/${P}-fast_xs.patch
+	popd .. &>/dev/null
+}
+
+each_ruby_compile() {
+	${RUBY} -S rake ragel || die
+
+	each_fakegem_compile
+}
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 88148c7a6058..3f3409b76725 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,5 +1,3 @@
-DIST puppetdb-termini_7.3.1-1stretch_all.deb 21144 BLAKE2B 34e925a93b9f0c882e051ca0ff4368c06ef2467211e645a976453e60008e1a02ccf76ba8b53270ceba830e43be5d8ababf601c6a5ecad5f9d603dcf56c78e19f SHA512 745cb5fe4eb6e4bb720028f794a767fd7eeb936f310c18f153a94bab28a36e35fc1bd5559b1be20a3ef5573227cbc4f013673eca3d85ff15e8a29d238ffd0370
 DIST puppetdb-termini_7.4.1-1stretch_all.deb 21552 BLAKE2B df93159a7dc9f6a6735f44531306a2b1c7a1bf9d8b88dbd4c9784367e949a83b0cb42dd8172880df9e7f4cbc1d3bcf9da570cdf2fa0437e525452d1f2468551d SHA512 4ffdf5e2019400dbaa5bb1fee22fd66fa430ab395a42d25cca2c61feaf68168b44eb1d29c0a9984a2cb669eff4ffadd9f9c64c6c19ea21bd3ceead392ad6d26b
-EBUILD puppetdb-termini-7.3.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
-EBUILD puppetdb-termini-7.4.1.ebuild 665 BLAKE2B 493069cdb3bb7b80150656a5e4791b8c8e5906a5b3b3470efb8196903e404caef5d9319fd1018939a86ad4a4156434a0b52c9b931a424ccfbb5c1008b5222e50 SHA512 281d8569336911f65b13b2d16730d2dc17c8476723746d249919add79f103c45185dabd9f98165d0ce7780e218265791584da14703e69eadc65a660cb9d526db
+EBUILD puppetdb-termini-7.4.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
 MISC metadata.xml 366 BLAKE2B f03ce821e0baae11d699365e190751fd1c9d233935e46d31ed9f19105ce6b66b1c4ef56697f5e5581022261e4b45bacd4f04368c3e6f74a12b15ee4dabecf869 SHA512 96ba26c725e5fd36269acc3556a7ad6b89d26010e376ff76cffd2a99481b2d3c9c76595f5ee4cba585c3dd7ac76e121aa4f7fbc0efa80d760748e9f81c998655
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild
deleted file mode 100644
index e88438205f95..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 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.4.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild
index 57a8294eabe9..e88438205f95 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.4.1.ebuild
@@ -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/rr/Manifest b/dev-ruby/rr/Manifest
index e7b6067c943d..9d3d7fd86681 100644
--- a/dev-ruby/rr/Manifest
+++ b/dev-ruby/rr/Manifest
@@ -1,7 +1,9 @@
 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
+DIST rr-3.0.5.tar.gz 139168 BLAKE2B bab1274fde8362e591702d94b9faeb136360e707b41e2c3d95a1bd12da451540a5f9cb8d9f808b80fa5b842f0d407f9f47ff15448fc3b0d0cdd9bef72131183f SHA512 6bfa6426a0675c9dba88c10cd50a70cc480bf88d3b485164baf5db53ffbd312a32fe9e1ea73ac209c4cae61689ae3f5f1959f23320625d37d457c3f53c320ed0
 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
+EBUILD rr-3.0.5.ebuild 824 BLAKE2B 9ead7ed073a5a9ffcb0ac0214b3691d33985aaa7581682d20f8c0c272b19a55935841c16e3ed89fad0f60b1ae6adbe88a1f53a9ff08de4a4a407bfdf5c52515b SHA512 d9ae19e08292e48f49dd15bb264262849f5f27f07accbd8aed11bcb827187fbc4385d01f6e8abe5f497cc3ec457ecb6704838066809fdcae4803d62da553cbde
 MISC metadata.xml 331 BLAKE2B bb2b9b8afc411541f4cbc3f3ae7034761b8424dc81bcfce4c47d945a974a13c1519c2b46968dee270bc76beeca6902fc42cb0f8ac1ba3d944d96e4146993094c SHA512 3a7b57e7e43fad3270e91950256d20839fa2a4a2d7e7c8a9b82ca9e5bb72bd465427925b7994ece2f882c37b8ba5984bf8949ebe28c3bb0875c8af6cba3cec39
diff --git a/dev-ruby/rr/rr-3.0.5.ebuild b/dev-ruby/rr/rr-3.0.5.ebuild
new file mode 100644
index 000000000000..5cec9bb3a296
--- /dev/null
+++ b/dev-ruby/rr/rr-3.0.5.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-sdl/Manifest b/dev-ruby/ruby-sdl/Manifest
index 2fc4c5c0fcbd..6b92fb354164 100644
--- a/dev-ruby/ruby-sdl/Manifest
+++ b/dev-ruby/ruby-sdl/Manifest
@@ -1,4 +1,4 @@
 DIST ruby-sdl-2.1.2.tar.gz 178105 BLAKE2B 84870279edcf2616159861267ffc8666b482786f43a30c8729cd4c59f25219956648270452bf38b72115e05235786ec8c0f0e7913469cc8573d9eda813d25726 SHA512 1ddae367fb4145cc8142edbf3c61acaf56604054f710ac37cadb8d04f93db24fc3595c1bc8e0fb5f330aabc815884f31b5f2a39c0108026fca442fc0b3bc2807
 EBUILD ruby-sdl-2.1.2-r2.ebuild 1904 BLAKE2B 087a42255287aac196d9f9bbf57afd667bb1fed656f0c448ab2c45987f749bc7840d786560a8cc0b90ddc57c70c943541ebdbdb0df54d5ad9b8205938452ea8e SHA512 68e3aae400697b6cb2f6d3b52c19bf6eb0a93db5d0ac1aca6d30b937b001392a3746bf24fcfec904c1af70da828411e9db98cc75c977d0eeeb06a7f72559d2f6
-EBUILD ruby-sdl-2.1.2-r3.ebuild 1924 BLAKE2B 7257ed13367eaa07529ac04d6e5a883d71914624c735d1ce77568b2c777a98e8e8a4be2e5a317286196c1c2c541bea52cbde9f84c413142505110738708a9b3e SHA512 e783ec468ce3c60e72bd24c516339c6b477d84518eef3cba88ac66282029f7907cfe3b85e6e222b286b36bc27acecf039fbc3fa4f306515a65c01afdacf304ce
+EBUILD ruby-sdl-2.1.2-r3.ebuild 1922 BLAKE2B 5ae628cfc682b57e13e8c2a0700c643d6185ef03c76794993539fa31955ec37202e2ac1719a4ba346c7bf13a625590991f0c4e909fde4a604cca5330ebaecd3b SHA512 0542028ecb6d0c453ca568fda66cbb5802e571d7af2261ebc3e38abf2fedd1f37e8a686156fa0f44e1f7ea50e15a95b029f7df2662ef82e3f0e704282975ec34
 MISC metadata.xml 560 BLAKE2B 44c2c964436b58f2f3d088cc598db576b71e5f42a490e1ae616400686addaf188c82b0f5a4dfab56a61712d5858720007fb31df3f6b71d0e37e5b617dde67984 SHA512 a9eaf9e6a1cf02821fec770e3499796993aebfdf0a7f251773a12950cd42770beb1d5bbc34fad694e74522eeeea619cd659509c31f914f4ddd257a9ce1c17fbb
diff --git a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
index 39b94a9ed94b..c377c03af5da 100644
--- a/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.ebuild
+++ b/dev-ruby/ruby-sdl/ruby-sdl-2.1.2-r3.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
@@ -14,7 +14,7 @@ HOMEPAGE="https://www.kmc.gr.jp/~ohai/rubysdl.en.html"
 SRC_URI="https://github.com/ohai/rubysdl/archive/${RELEASE}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 IUSE="image mixer truetype mpeg sge"
 
diff --git a/dev-ruby/ruby-shout/Manifest b/dev-ruby/ruby-shout/Manifest
index 2f9a5550e80a..47585a169dcb 100644
--- a/dev-ruby/ruby-shout/Manifest
+++ b/dev-ruby/ruby-shout/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-shout-2.2.2.gem 13312 BLAKE2B da84e8ca777e5c5e60f4319f030467cbbb0709f8e94c08d3b7c8bb30c4db2861d27852930a01f4a0625ca8cf71ed849fd39f0398708b838c3b6bdcf85c12609d SHA512 2553518d3cef655e9cd59a734860d290928171600676dd0fa4b65d84421286eb9d79cc897cfa5544570e3731c4f761e97e8cd1dd3488d9b62246af840a1d126d
+EBUILD ruby-shout-2.2.2-r1.ebuild 520 BLAKE2B 25583ca4c690e8aa60fe40f58d0b4cfb8edfbd2288fac670a7ab78dc2fc044c47db021d1e85a9d34958b1f4c700cad26dad7a81fa270654cfe445ce91775d3d1 SHA512 e0b52454520b02a9b3c9c65f1275a4fe781759cbf718ffaf355b2e8c3b34686be86f582400ae80b1f9ef0a1a063909a91495cdcdb90045ae20329f83c1e7b710
 EBUILD ruby-shout-2.2.2.ebuild 759 BLAKE2B b398c1001db4a4fb12a5a9874d88febc32e388240c0b71803cbdea8927d1eadc75a56f100f0506a5fa77f5f28671c920ab27eeca57f8c7aa0fb481e238b605b5 SHA512 ca863f2c5e3cef05f7630c5b0482cad4f2ec2a1fce0cf1e006aa0099a56e3fb4c4197ff128c455349ffa3b9276780f0e5213be3155e94038f510c49b00ed1ee9
 MISC metadata.xml 331 BLAKE2B 0e79e6f0495cc496f53e48253657ec9678a6da31c49d09abc81f3c2e910d4528f6be7867b51cca2f01c8ec4df6f3771bcf91262f53b1eabdd421dc3c00085d47 SHA512 b5cf8ff6f45ac3f59dc4412a280a5057e3e1f30f2cf82db54db8f281894d753e9fc11aab699e766f2a532cd6ced1a1b784d6f5a8607c0ab5ee1a720b0d0d62a7
diff --git a/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
new file mode 100644
index 000000000000..c3b5c5f07cbc
--- /dev/null
+++ b/dev-ruby/ruby-shout/ruby-shout-2.2.2-r1.ebuild
@@ -0,0 +1,25 @@
+# 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_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/extconf.rb)
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A Ruby interface to libshout2"
+HOMEPAGE="https://github.com/niko/ruby-shout"
+
+LICENSE="Ruby"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND+=" >=media-libs/libshout-2.0"
+DEPEND+=" >=media-libs/libshout-2.0"
diff --git a/dev-ruby/ruby2ruby/Manifest b/dev-ruby/ruby2ruby/Manifest
index 882e103b50b1..2cb364fc70d3 100644
--- a/dev-ruby/ruby2ruby/Manifest
+++ b/dev-ruby/ruby2ruby/Manifest
@@ -1,5 +1,3 @@
-DIST ruby2ruby-2.4.2.gem 26624 BLAKE2B c7ad5c63829bf03cc166d42f2ae67b47790b4652b1973367881a4c242866acffabf6783cc3296ca7ea91ff3e9967f703852be6c4bcb53dfaaff0f822b50747db SHA512 ae8a34a77d48a97d29bd0ea9e2653e6189666564e971b985e7a459a562f8f03fdff4ec8775a2184cef578249aebbc8a050b57613b63d3c09b7a84aec5f727a7c
 DIST ruby2ruby-2.4.4.gem 26624 BLAKE2B d330cd65513218a96c9e35fe2b69d859fa103ad6dd1b8e8a671bddb9732f99cd65540b404632e671ababbe5842ed2be34a29c2b1fb3bc4c43935f5a7a0735d9e SHA512 51728d702d2142e9a7599fe53c2b58906cd386be429fe97590f850df8cf461c046c67a99fc7b7e277551013b78e35d21609c8125fb568ef90270d146a685c04d
-EBUILD ruby2ruby-2.4.2.ebuild 905 BLAKE2B 6aa8c2bd67e98b8a4a79c6f69b6bf8f1c74ef2621f47cda31c866f2eec78000fdfabfa7cf0b6d3af4f0f0dc7626a21c2fb7604f09a7d5663b171f9d604266e8d SHA512 9dcbe595914611ef49a3c314c7e588022993875ed9683da4c81ae8c8939b9ee7624b044efba232c3a7e8a76afc01b06cf527a3042796c4bc15f989cde0f0593e
 EBUILD ruby2ruby-2.4.4.ebuild 844 BLAKE2B 0a1bad818c3d0e9c81d1646cc9f3aa93b1ad3093c00a88849ede63f72a580faecc999cbb87048244c63d9de627ca6c493f51ec9631f6502d120c602d2f02c5eb SHA512 4b8ff0973d0999ecc2b4df3fe4e15747cd68f1800c1752a666ea27d691eaf1d03f168870c3dd2f250bc7168f7c035ed1bc2d1d76cebf8e410086496ff2718f11
 MISC metadata.xml 345 BLAKE2B ad97abb4ce420cd1a798b019724f408bf5e8f04116ea72d8de35cb220b028d1e31d9b1380b625dd478e110edbc5100d38fa7ca10ee336d131338f2ba148ed284 SHA512 160d20c5eca00fc8d0cf3145e26d1a89ac158d5d7b826cf1161255c2b895986e7629215d330277d2e3bd8b08c106c4e8725f8d1d8aa3566cdc9e66a3e8cf37c1
diff --git a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild b/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
deleted file mode 100644
index a3ed54e91309..000000000000
--- a/dev-ruby/ruby2ruby/ruby2ruby-2.4.2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc History.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Generates readable ruby from ParseTree"
-HOMEPAGE="https://github.com/seattlerb/ruby2ruby"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/sexp_processor-4.6.0:4
-	>=dev-ruby/ruby_parser-3.1:3
-	!<dev-ruby/ruby2ruby-1.3.1-r1"
-ruby_add_bdepend "test? ( >=dev-ruby/minitest-5.3:5 >=dev-ruby/sexp_processor-4.10.0:4 )"
-
-all_ruby_prepare() {
-	sed -i -e '/plugin :isolate/ s:^:#:' Rakefile || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 10bcc1dbc844..04b2c46f29ca 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -7,22 +7,16 @@ AUX gentoo-defaults.rb 972 BLAKE2B 4353b782296ad04f400fbdbd67dcc2f26b23a9bc4a716
 AUX init.d-gem_server2 505 BLAKE2B ea5807a1c8ffdaa61bf37315c71d910bbf2bf4b0b4c62e3cef3b76176e9cc1fc39272f59bd46e55e17427f730315e2c691fa3f471c1cbf697073c45c0c7589a2 SHA512 fc2c57f4deebf479a36e69c3507f109abeda9f73b22bb2e617f56e6be0069af075fa6d66708d7324922f3d8bfaa96bd8c71292d9e388e27217cc7687ab4004e1
 DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed0c7584935a0ad5fc722d7fbdf9f442261f96fdca4b6975b62608965d2f0053d3046da59771be373bed21154a SHA512 48a18c0f202f463c38cf5dafecfbc7cc39245e63c7a059ef2cefadda478483794a929ea6b7e0ef062dd4423230746f1f09d7bec06a97fe3ceccc3325397a3e71
 DIST rubygems-2.7.11.tgz 861642 BLAKE2B 6632296d8bcd47d52d92db3c09a0d95118c72877c712a9bfa01f4d4c8aff1bc62ee7e663f763a73b2c2e3dfd2d261ea965ff932a77b84f70e63fab1445d19d8a SHA512 83592f4089a768f6d58be975995855ad3aa6b481de5e2d31789d1c8d96a33f5347a914e5d7450819bb2e8e434ee65c4d3f5c978965ccaefad6c167a29801b7bd
-DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
 DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5a9481c406e51ab125fa9da0e4e1ebde79c6a663e8847125c1ed8657f6af69000cf0d7191360e7aab99ba508 SHA512 1a6d7b3b08024d95988e033c772bfb6b5ed8f94ff4ddb194280bd3a7530cc384cb90fd56d44b6d56760cffbb23c5a6ab5917737ca46ec85fe61e1ae79d7ba4ca
 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
 DIST rubygems-3.2.11.tgz 987152 BLAKE2B 589c862ed4ae14d66437587adfbe9c57e4b95b8911115425098463f7be77a597cb9df3e3962da58da3a12139799afca34ea002983cbd4406947278c7db9e8e41 SHA512 686d35175891cb098c1efffc957296af6526622882560c8ecdc19eff19f50a5769fc7df122c2a863cfd17b09c375a70f8e554345cb50075693219d68ae81edfa
 DIST rubygems-3.2.13.tgz 987809 BLAKE2B 20243f6b81592d62f033ec96485f8b6af6693c283d278e2a7bd89873deaf7e22440e85de274f806e44acad0db2a1966b265aca768c43a5758fc4eb57f661cee8 SHA512 8eb54c4ad2fb4d022517c73fb6951ee9853a50f1191a0c9af7d62dcf415aef15caeab60327ef28f74fbf98b24f29cf1f7a3971a9ee9172bb1601d836fadd3f46
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
-DIST rubygems-3.2.6.tgz 984320 BLAKE2B 846202460722a9212df0958fca9bc8df9e3b0fb9aec3fbd0887f166ee5d25226d5325918ada816b5b166544e654d501a8db80ca2d9d7f1de42decddfb39f13d6 SHA512 b9303994bc2ef8a4e66f14f745f8ae493ee2725737cea6caf557f8943ac165a4934c865542c7080bf2d7b0c0be441d4e818ee8d42fdd9ae4419540943ed695ec
-DIST rubygems-3.2.7.tgz 985071 BLAKE2B f8075429c42a53b648ddd11128c91789b214f04f048261fbb071c0ee1250241a06c0dc2ab4e608f2282a0fc9690a35df371c02f5d7f0b6397a631e4a2af36b2e SHA512 b01c9d78ac172981650aa94e26d9b07fb97e63a2d1cfbcb55462d6333c45ce16635491dcfa95a177ead429f22a5ec450ab049a7024e14e20466f5f60cf4c53b7
 EBUILD rubygems-2.7.10.ebuild 4513 BLAKE2B 324e63a6f09a1b3deed3b0911fb4838ca7369f26750da327548bbda070877deea4f4428f22fddf524480c21dd1eaca29c6f8d3cf392c5fd87a5608d59dad1115 SHA512 e9a51c8772490a9bced46b0279fdb7b35d1204297e4fcdab700414495fbb0ebadb583dfc15e0c3a68a3a8897f72863c958e1476597b0707591c5371ae29b1560
 EBUILD rubygems-2.7.11.ebuild 4521 BLAKE2B 8b28842aed8ac1c6387fe52b2639b5afc42c70c9f2222d9567068f173140ffcc51534899e0e0d0ac132e6a1e395126838e0a7b82a17c8ff5c09829a2fc02a017 SHA512 e9dc2072951259dfe568eead50b32aa6bd28515e66926a18568f85d330b05d2d900399ac3a506254fbca9f4dea49064a5d517e4e4de9e7c60929477ffb953d42
-EBUILD rubygems-3.0.3.ebuild 4646 BLAKE2B 42f400a5286dea3ff7aa5f3739f7d259ba56bb147d8fdcc5644ec583d0ea98fc7337bc3e9def844a293d09a8bb9745184822b09f7d7c6dc71ec0689e3bf44166 SHA512 4d86e443da752f2422437e9426cbdd32cf32db2ddc7bc36a20f382c4756c9251c96e79e581b93ba2764bece593c95a0c79b7a1063c2c202aec4afd58f0840752
 EBUILD rubygems-3.0.9.ebuild 2635 BLAKE2B 45c6fa75ffd962eebe61fa8fca8a7867dd0cacd5a0503d3ba946cb1f13b0f00f54a90adaf0d069c2550d510e912fa2619cbcbb6b1f65421075062270fc7bb367 SHA512 e2c67911e5a521cb630bdd071d0dadab5a775e965918cf73fa3f3f8cfabfaa81a64d2f189c063d72689d9f6a1453f61a95044c52d9f3f4e36d3b91f3e97225b0
 EBUILD rubygems-3.1.6.ebuild 2847 BLAKE2B 661f1e1035c989668cb24642cab1cc444af53595b77ace9e9977a502316deb71b5f5d61521b4480390d8fed1066ca3d0ccd920b21c98251020d50645235ee1b0 SHA512 30aeb16df265eb4e627600071b5057d1e831fa2af1a005db6da2c741385bc6646f4eeea809c0c879f068b7d48b61642f3e4abd50812cf170dbc787fa5c1da328
 EBUILD rubygems-3.2.11.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.13.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
 EBUILD rubygems-3.2.14.ebuild 3147 BLAKE2B 665c7552d0999b82d851b3c1a38ccf582c3d981e6dc28b19c04f1035d48b771454610772cec750b675f6ed0e0dcb728a7f0f07fe637efb158fa8951847774d28 SHA512 6facf0eb322be5de42e30aea3a32f4d9e0b94b5cec0646c6f8108b991d92212045dd711804b70b7d050f4bb001e134f6afc525d40b7ff83ad8e0b826f9de0358
-EBUILD rubygems-3.2.6.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
-EBUILD rubygems-3.2.7.ebuild 2992 BLAKE2B 798fa78b7d11faa943e9ee03c6d1c832355e06774e3ff94f3e99c902719b865b0d19f74fe021b93de032dc72fe6e9667c2b83c64af70555b9ea1723f00011e2e SHA512 b70c68ecdb8a12bf49631b97fc5decc31a57b8de1fb1685f0dd9892ffdadc769cf4bad93b67678af106e5b2132ba18421d955c9302576c4b58e2324770e298b9
 MISC metadata.xml 335 BLAKE2B c86eaf3d37fad025b8f6ca0b03e65b1b472716b4fda4ca4d08b415b29a63405d8e7b2684d309091c90411c5fe809e5129c6e0c0c4e7a982b4aa062ffdd0ca7fb SHA512 fd7bf880ad68fe5f1fe8eb79f9662af87831ed499517d5a97e22f18a4ddafc69d53118f020e15c3b8b171fe144bf6cb0ce799beaa6e4e4bdc01c984ab582388e
diff --git a/dev-ruby/rubygems/rubygems-3.0.3.ebuild b/dev-ruby/rubygems/rubygems-3.0.3.ebuild
deleted file mode 100644
index ab3a8fd1f2eb..000000000000
--- a/dev-ruby/rubygems/rubygems-3.0.3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-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_bdepend "
-	test? (
-		dev-ruby/json
-		dev-ruby/minitest:5
-		dev-ruby/rdoc
-	)"
-
-all_ruby_prepare() {
-
-	mkdir -p lib/rubygems/defaults || die
-	cp "${FILESDIR}/gentoo-defaults.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
-	sed -i -e '/assert_self_install_permissions/,/^  end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
-
-	# Skip tests for default gems that all fail
-	sed -i -e '/test_default_gems_use_full_paths/,/^  end/ s:^:#:' test/rubygems/test_gem.rb || die
-	sed -i -e '/test_execute_ignore_default_gem_verbose/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-	sed -i -e '/test_execute_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-	sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-	sed -i -e '/test_execute_all/,/^  end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-	sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^  end/ s:^:#:' \
-		test/rubygems/test_{gem_installer,require}.rb || die
-	sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^  end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-	sed -i -e '/test_uninstall_default_gem/,/^  end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-	rm -f test/rubygems/test_gem_indexer.rb || die
-	sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^  end/ s:^:#:' test/rubygems/test_require.rb || die
-	rm -f test/rubygems/test_gem_commands_setup_command.rb || die
-
-	# Avoid tests playing tricks with ruby engine that don't seem to
-	# work for us.
-	rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
-	# Avoid test requiring network access
-	sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-
-	# Avoid test requiring file system permission changes
-	sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^  end/ s:^:#:' test/rubygems/test_gem_util.rb || die
-
-	# Avoid uninvestigated test failure in favor of security release
-	sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
-}
-
-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 History.txt 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(23|24|...)"
-	ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.2.6.ebuild b/dev-ruby/rubygems/rubygems-3.2.6.ebuild
deleted file mode 100644
index 7b3fb4d23fdc..000000000000
--- a/dev-ruby/rubygems/rubygems-3.2.6.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-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.7.ebuild b/dev-ruby/rubygems/rubygems-3.2.7.ebuild
deleted file mode 100644
index 7b3fb4d23fdc..000000000000
--- a/dev-ruby/rubygems/rubygems-3.2.7.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27 ruby30"
-
-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/rubytter/Manifest b/dev-ruby/rubytter/Manifest
index 49dee8688d91..799b7329bf3a 100644
--- a/dev-ruby/rubytter/Manifest
+++ b/dev-ruby/rubytter/Manifest
@@ -1,4 +1,3 @@
 DIST rubytter-1.5.1.gem 15872 BLAKE2B fd4f3be2570f12a900fa031a74fa6b4e053bc966e8c086d099fb0716c80515ccf1df63d0634af676a95541329029b932911262db5f377a1bc32a41bfbed5fdeb SHA512 79be7b7803a53db654a14ff83da657e3e5016d5bda61e8c127dbf6d85231a8c115d38041aba99fdabd50825135b801cc444cca84c13d174004cda8cc4760bd2e
-EBUILD rubytter-1.5.1-r1.ebuild 614 BLAKE2B f84063e9e06a12b3285e4a87c3b0d34356ac6dce74162d7cee413f4e8f75ea31cfb3144a44406aa46aa9071ae7c330351492fc8a76d738aeef3507732fafc400 SHA512 bce3903f3e3b501fb01b29513abd8ed6f889736e0cb9e9446d4da5543ca68b3da1dac57f52062b2f5f2c427a7bc4cf83ca6879e4f3b0e0c0627e347212235aa9
 EBUILD rubytter-1.5.1-r2.ebuild 576 BLAKE2B be94918dfe8d1f12ee42580a5beb72a043f4f29a956cbf3bf1195f20f907356fed36d1183e68b9d02ef0dbeee9c0b2ab1556722298cbf4fee609091bc7a4ef34 SHA512 5ae10cd157db730c61c0da985a8de557b87e19183b0dc64d29a2914246020076aca2797e1103af4e1d9e165ce3f06a4a6ecff713da55272772b05d57150f7335
 MISC metadata.xml 328 BLAKE2B f7f4a4e8fa97a0a60701f738021614a0c13a43e5aae2729a11bc18995261f9c0b94017b09799b143a09a52a0317b13c90a0bbb33b8a3fb43a3468c93f5522ba9 SHA512 68f720f1fd2cddf40585e919813999d69c73485e00f3d877f8d0daf5bb600b0d8c526a419fde64ead64db9d2d9ad35188edc31bdbcd031f3ae17347f2cf4640c
diff --git a/dev-ruby/rubytter/rubytter-1.5.1-r1.ebuild b/dev-ruby/rubytter/rubytter-1.5.1-r1.ebuild
deleted file mode 100644
index 8986caea688a..000000000000
--- a/dev-ruby/rubytter/rubytter-1.5.1-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="History.txt README.rdoc examples/*"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Rubytter is a simple twitter library"
-HOMEPAGE="https://wiki.github.com/jugyo/rubytter"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/json-1.1.3:* >=dev-ruby/oauth-0.3.6"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/check_dependencies/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/safe_yaml/Manifest b/dev-ruby/safe_yaml/Manifest
index 3cbfa0c6823c..9fe5c0fe3aff 100644
--- a/dev-ruby/safe_yaml/Manifest
+++ b/dev-ruby/safe_yaml/Manifest
@@ -1,4 +1,4 @@
 DIST safe_yaml-1.0.5.gem 30720 BLAKE2B affbf5331cf290c3e7932f53da9b0f488730ae9138f0b28eb1e8e0323c7056635ed73bcadebd52f725895030a153dab13e243d997e84004f5bfac82e82dcebe2 SHA512 d9c8d9c28c3c8708f97cb0545f58152af81056f5e79147424dd7bf625f8e533440d1ed41d6abe2faf84578754823a1215ba28772c2e8593bfcfc397d647187b9
-EBUILD safe_yaml-1.0.5-r1.ebuild 914 BLAKE2B 4cb1f223d6efba3876da098db8806085392bcb0c6cab1aba9f71908fdbf2069da3c3d3507c37f2e6b8d0f77175eb4abb287a1409aac7798e18d3ac3b4d780b58 SHA512 43d3f7e2931fcd36b285b1829f687eda1c31a7273db3204caf5cb801e073445f10dd5be0d2fe75bdb200d81d8074666936eec5ad246b75ca6645075940078309
+EBUILD safe_yaml-1.0.5-r1.ebuild 912 BLAKE2B 022ebcb9254456e24cc2caf938e501fa9daf1996ecc120cf37369d10d72eccd2589a0949a58df0c90e6384190e7125bdfa79c4585a8b8d164093b47ae30b9433 SHA512 225bdca6680502f7c4f27155890c6045f10a402d9c52a012b5a0c99183f54b596431ee16fb200354cbca0634eda8fe7cd746bba6a3b3a52f187cd121428b72f8
 EBUILD safe_yaml-1.0.5.ebuild 962 BLAKE2B 2c567ca3e55e46f8a378f25948a7f7282451193545310835ef4c648851528d622a1cbf8f3f1ce9958575a35799fdf09f4b69cb0bd12ef060ae09e2c61f0adbc4 SHA512 d5d5405de7ddb5e1d7b76040e207ab7865d5ddbbf629023a549d7c5839322a17d194376ed91bd4386a71ebabc80d9dbd03a9a8ceb9a69f744a2f05dbb286b991
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
index 46e1bd32dd31..00eda3df6685 100644
--- a/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
+++ b/dev-ruby/safe_yaml/safe_yaml-1.0.5-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://dtao.github.com/safe_yaml"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 ruby_add_bdepend "test? ( dev-ruby/hashie
diff --git a/dev-ruby/sfl/Manifest b/dev-ruby/sfl/Manifest
index 4ebf282ea789..1dee5a1f8f36 100644
--- a/dev-ruby/sfl/Manifest
+++ b/dev-ruby/sfl/Manifest
@@ -1,3 +1,4 @@
 DIST sfl-2.2.gem 8192 BLAKE2B 631712748d0f58a9d76087a194cd889c4cc95696df2ac755a13357e7055f0277a146f6f3df58e678f95134ec9fa1d5ecf720c702b2bf2c7e4385d443381b3cdb SHA512 9b64a966ec4125ae39d273e9ea1529f422dd17bfe2c4696574ab7725c0aad42f974febe7359dafa073c2291b47c6e351e1d549e145d247ed7c2ea6ebc5c73932
 EBUILD sfl-2.2-r1.ebuild 612 BLAKE2B 22e09dd4f853fb61cd1a9ad515a0b987077a8358e1abd4c87324caddfb884f6eea49452e6d32b4cf57c59974a284c18ce0d0584eda830a6564da0b1f9ee419e1 SHA512 97c8bddb14c06b8859df5a878e4c654fb3a8d0264698f93602e79e4aaf3a79abdfb94e64bd009acc5720815554cc4c4d43d425a1be71cd63a59191812e1b367e
+EBUILD sfl-2.2-r2.ebuild 605 BLAKE2B 8e9a10ccb7c89daaeb7fe08a1acd2273a0dff544d7fcc01c940082ad6399242636bcbd353501b89ea4b331dd2fb1660abaf37f8ac1fa8ddca7b26796f12b25a9 SHA512 e7318884b0586d47c59099c3015cb2bdba32689522e61630c3a99d3d6209f1d909e5f5c449b920be0190cf25e40df34f45dd68e7f516b64e87d473945eb14ec6
 MISC metadata.xml 350 BLAKE2B 1e4b5ed1332607b056a79f85f6929b2f5a7705055127e0d0de3cbdccb851cde6f9f4f4462285e4c22847dc6ac807a5a9269b8dc9d8af840ad4f1e59391e5c055 SHA512 91539030961ec4d6d9b70ac65fc3b8236521dec596bc06f865e07f2aab3b0ba80584a2a49d07d4b008a7c5ae41e9c17017a1a309bb08af5d72df15509cff8dbc
diff --git a/dev-ruby/sfl/sfl-2.2-r2.ebuild b/dev-ruby/sfl/sfl-2.2-r2.ebuild
new file mode 100644
index 000000000000..bf0d43ccff3a
--- /dev/null
+++ b/dev-ruby/sfl/sfl-2.2-r2.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_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Library providing spawn() which is almost perfectly compatible with ruby 1.9's"
+HOMEPAGE="https://github.com/ujihisa/spawn-for-legacy"
+
+LICENSE="|| ( Ruby BSD-2 )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+
+IUSE=""
+
+all_ruby_prepare() {
+	rm -f Gemfile* || die
+	sed -i -e "s:/tmp:${TMPDIR}:" spec/sfl_spec.rb || die
+}
diff --git a/dev-ruby/shoulda-context/Manifest b/dev-ruby/shoulda-context/Manifest
index 24c9ed719af4..c9e9305b5913 100644
--- a/dev-ruby/shoulda-context/Manifest
+++ b/dev-ruby/shoulda-context/Manifest
@@ -1,4 +1,3 @@
 DIST shoulda-context-1.2.2.gem 24064 BLAKE2B a6068da369c00a36e6056a8ebba96eca90efddf94613dfc90c9f2a47bec2c054a41fa61b861b2f3ec1195e417bdc54ab60d53f91bc5e0f167eac07b84880892b SHA512 b09f5ce2db59bbb26d5678b17b6641b79df7983d25e81a31bc10c42b702bdba09795b692d711d59c103beb2f691b503567e37c46668f77e600416551ef2c5e05
 EBUILD shoulda-context-1.2.2-r1.ebuild 846 BLAKE2B d7d57110ac1d8b2429f2c368b81715d273acf77a89a8d0be562aa8710bfe4e99749abfe28ecc478f79f8636b164e7d130b9ba2386fb13468d546a8e7e9feb81d SHA512 ae180c0fab01122172d583d3a1d663063d21ad80869ae103264540f761d86ff2c234c399f7bfbf8317ba71bb5519d2ffede15286b3fda7eaa0606fc48de7f7b4
-EBUILD shoulda-context-1.2.2.ebuild 877 BLAKE2B b7eebe0e276b814ad80bb7445d7ee7696a294f5c40e73974bf9d4f3ad0645c9e190a4bae9ce6e5eac4027eb2ca295cfcc5e154b460d8f69151c23e72961a9f04 SHA512 4d18f7b13d3544f09586250060b595efc6ed32f90d3d8a5092800be53118d42ca7e509786d57e2ac06c27c9f936ed580cddc62a227604d705e9a2a338caaa1a5
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/shoulda-context/shoulda-context-1.2.2.ebuild b/dev-ruby/shoulda-context/shoulda-context-1.2.2.ebuild
deleted file mode 100644
index ac9582b4fd6c..000000000000
--- a/dev-ruby/shoulda-context/shoulda-context-1.2.2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CONTRIBUTING.md README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb rails tasks"
-
-# Don't install the conversion script to avoid collisions with older
-# shoulda.
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Context framework extracted from Shoulda"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-context"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="doc test"
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit:2
-	<dev-ruby/mocha-1 )"
-
-all_ruby_prepare() {
-	sed -i -e "1igem 'mocha', '~>0.10'\n" test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	BUNDLE_GEMFILE=x ruby-ng_testrb-2 -Itest test/shoulda/*_test.rb || die
-}
diff --git a/dev-ruby/shoulda-matchers/Manifest b/dev-ruby/shoulda-matchers/Manifest
index 1fee75097c0e..1730d13d0eac 100644
--- a/dev-ruby/shoulda-matchers/Manifest
+++ b/dev-ruby/shoulda-matchers/Manifest
@@ -3,9 +3,7 @@ DIST shoulda-matchers-4.3.0.tar.gz 235212 BLAKE2B 03d634a851d5b79baac7fb3c5017be
 DIST shoulda-matchers-4.4.1.tar.gz 240423 BLAKE2B 5fca9389601f35c536fa8a37adc6a14282fdb4aba21453223d739e503fc226c74473791880d2fc0b4f308bf9deccc1bd640c320e86f586f075b5d1add69e33f2 SHA512 3103bbad862848d00f9ab8c71c20fef1fdc131c6ed13a5d6ae9e11c3da8ecd2aa09e5996f8b28ad08a5588b02ab5783dcc37d04357d13357ea3fa8ca28a02e3d
 DIST shoulda-matchers-4.5.1.tar.gz 243634 BLAKE2B 32d846d0dc3c8725a9bd0d60e858eb9fe4106a20222503ac908d1a9c9c310d8e1477aa6264f06961812151b9bd1a1a33488707d9c96524cd3431ed7b3246e534 SHA512 8c240fe7699094a63db824145ca28c245526e95d489fac82e1a28a2418ae40524ba0a184a7f9b269b7c31ad7ae2cbc24b453547cab0845639fdea442bada483a
 EBUILD shoulda-matchers-3.1.3-r1.ebuild 535 BLAKE2B 1d70372e32dffd151239cf5b9b6b4b9baa93a24710efaaf00dac928702d33d64e9f19933a839a5d532fc37c6f2d11b3bd4daba08e377692c642876b42f250797 SHA512 a57717479260da7b69335404c7100b9c36929815b8c1e18ac9a3dff332a856b91de4b350450f74388886701af03af5843e66e00ff333ddad660b9bda5d73b131
-EBUILD shoulda-matchers-3.1.3.ebuild 529 BLAKE2B 8e86c34cb17d6cee8e2a6f139eb4337671ce57f38c0132568874c7f79d0784f4609d30684df3e4a0bed5eba750684f6de31f86be44f9369769c9a9d515cf01ed SHA512 2bac2b7f6d1bbc17aa01a98bb244212af4b90905b7a1516ae5f0e4a3a6b33f67cceb17de2064675e4711565ed6b24e1f7fca5679402723d8f795c72000c58a33
 EBUILD shoulda-matchers-4.3.0-r1.ebuild 816 BLAKE2B e1d68caae2340c23b4abaf0691a3aedbae59bb29357417616d998e724d83f07fff075a2aee58954924d3c7449b096cf499290dd00d1e6e5ba87815e4f415545b SHA512 d1e6b7955f15d523c19a135d5de795b384cf5f81de2045354936a86506aca541017fcad00cb28fb1e825275d3deb3ae3f6be4a4fd81769767edba61eea6aeaf3
-EBUILD shoulda-matchers-4.3.0.ebuild 815 BLAKE2B b0659e19572024e2db6db9a4620756f856c110526c5d1e2d8a398322b71fb38cd43453ab40214279ba5cd0d55007b73e8fe195656911515c17ea1fde2e1768d1 SHA512 3eede673c7b40c5f0a245e8c3d5d45bff86c050e430d4df0ae36c0aac252f49fd69939542406d4d6a1212832e58da315fc270a8f0369858e740aeb22946105d1
-EBUILD shoulda-matchers-4.4.1.ebuild 827 BLAKE2B 11bee72906fd00ea2d2a27ceb0de995f0da58525a1d05d7a11a3207974d4c69c4d4ef99e051f2b789756900975a4ba97a986d0ad1b5103507e6a351966be62b5 SHA512 393f70eed0992172d26da975fa7eb06c47552d3bdff86af1cecdf29a714cd58106c9d17f456332469c3d09af0d4e4cee0f88b035f77d0ed0b8c1486858ff0fd4
+EBUILD shoulda-matchers-4.4.1.ebuild 826 BLAKE2B b21f3c8ee48db9c51d002a1fa99be0777b0343f4ad2ad371b47591cbfd46e3de2b20045c6274baa98b8a08519f07d7cb4faf2bb891130031005cd56a21885930 SHA512 62f4c3f846eb2f45d1019648af158ec821e752af03ea5298808755768b3216af43d2b6a0705f506700d3bef904a654cb85be0b45d8d6202124a37dc467d757d9
 EBUILD shoulda-matchers-4.5.1.ebuild 828 BLAKE2B 5534da966d45c768a72aa432c0c2d52fb732334b307ca1f420a7d37d556233d237d2eeb4f2c60123ae2b907750c18d52c8ba6553a0c9f2d13eec29f181cd9cb9 SHA512 7489212005c817def938f140d3360d60ad12be148370c3944a492ebea73bcc062a22b8859e58ba0c5c748dda20d5ec6a009591a8f16642d64593d9c26ea8ace2
 MISC metadata.xml 467 BLAKE2B b4a8138623dc83ab8a5fa10d6242f3d04d20ce4e15b0abb00f678600212063ce8653f3644c3a98d0186d4bdf53d042ba7f7bc1d1bdb699501d8a7e1aa7fb36b7 SHA512 d3ba695c8bfd835a472f35442b16057a73219d9b320276823843b65f00f18d8cfd7fe7f814abf458bdaa945751883a5f490d0f7a02a1c200d99fcfb51a57a400
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild
deleted file mode 100644
index 32252b23022e..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-3.1.3.ebuild
+++ /dev/null
@@ -1,24 +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_TASK_DOC=""
-
-RUBY_FAKEGEM_RECIPE_TEST=""
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.0.0:*"
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild
deleted file mode 100644
index 60349fce2fb2..000000000000
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.3.0.ebuild
+++ /dev/null
@@ -1,32 +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="none"
-
-RUBY_FAKEGEM_EXTRAINSTALL="NEWS.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="https://github.com/thoughtbot/shoulda-matchers"
-SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
-
-all_ruby_prepare() {
-	sed -i -e '/pry/ s:^:#:' spec/spec_helper.rb || die
-	sed -i -e '/s.files/,/^  end/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild b/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
index 93c08dbdac1e..d0c989b52cd9 100644
--- a/dev-ruby/shoulda-matchers/shoulda-matchers-4.4.1.ebuild
+++ b/dev-ruby/shoulda-matchers/shoulda-matchers-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
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/thoughtbot/shoulda-matchers/archive/v${PV}.tar.gz ->
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/activesupport-4.2.0:*"
diff --git a/dev-ruby/shoulda/Manifest b/dev-ruby/shoulda/Manifest
index b66fc931b877..874e2ca55537 100644
--- a/dev-ruby/shoulda/Manifest
+++ b/dev-ruby/shoulda/Manifest
@@ -1,7 +1,6 @@
 DIST shoulda-2.11.3.tar.gz 145068 BLAKE2B 5e6d9b78b255612ec18c78076f9c4d45265a3e02a8fd56a127ea8f235e3b344005942c4b6e53014e6328206501c178ce76e1554a9d995ba0de04f5afefe4a0f7 SHA512 0b347c4a8be177b5806364114c25dc786ca2ac95a11c93a723dbc9ea1f6d8ae62df7fb420a52d477cd1e10e8d894074072a040eef36ee8a43440e5256c8427e4
 DIST shoulda-3.6.0.tar.gz 22691 BLAKE2B 798b88e208355b0325b9e8b48f66687ad2702e1b5fc058d45504648fe7c7760b018eaf3d1c7bd45c68656c7bbba8fccc9b74d72003ee0b78ac53a277567609bb SHA512 10f7c6801eaabafa08eb2bc9c4d2a96237d4494aee7d40e5db8cf9c1abd8cccfe86aa21b0e68e2ec42cf222d285cdbec11ed2fdd804ffb8bd65ffd2efa3e72ac
 EBUILD shoulda-2.11.3-r2.ebuild 874 BLAKE2B 2441a2b6a261de6de5fa10a17f92dd22bead3ffaf6b75204b6607821dfdfbff876dee36dcf40c89bffbfe84194ba5525698ef533856d433f0d1c17165b25fc1e SHA512 afe6e330b0e5deb1453e64891fc42243cd9f0285adf300f588d1936b4a991757190d9a03c4b02cb7b5fc5b914495689cf7c3061ffee7dec543b2e7d5670d4426
-EBUILD shoulda-2.11.3-r3.ebuild 841 BLAKE2B c41232118979ff733e191582e086a306a4d3608c44c2835dc44e296cad2e27ff748707618e944d027e998cdc8f8b86a57e610d92d6de4a0399da561b3b3a4ac1 SHA512 9223ba175f0874f868a64177f43005567f7a7616951899aeff02f60a0db8209d88e9a17e0c0ad35a1541d1c73ddef6860afde4518da8a9ded3328510d777cec6
+EBUILD shoulda-2.11.3-r3.ebuild 836 BLAKE2B a16178f1c34220fb8c01bb68468d10229439de2c101a8e9511a227286e4c38e29bffe0262916c74274de12d8dd2ae2e0d90db5ece4cb9b39f01e1ead5fb0da1d SHA512 a2e1fab8c023c84e90cb985e71ceba1f9aba2141f0820344bee7c085075dc130d46eaff25ef6b77dc558022774fe851a0766d053139a45b9b79b3d4cb32d736c
 EBUILD shoulda-3.6.0-r1.ebuild 924 BLAKE2B b0e4344f4255760b5ce637eb53e58af37d08e772218c77fceaafcf4f81195467cc1733ff9380f36b86d2d900378d54da046f0e1196ae6237ea5ea6fee4901fee SHA512 1a14864d13555c3631653bbf87fb5d77195e8b7c7532c889ff916a0f187c05a28f2e35ad13ab3c794bf8005a42b96e7f900195ee001b59284698f26370e8f7b4
-EBUILD shoulda-3.6.0.ebuild 931 BLAKE2B 02504a8fbb249eb1899083362eec53048d6b1a994da86cb5cd215480c3c663277db56eb0e37db4b41c74f7729d1037675869c4e4756e4728027734bdcfafd6f2 SHA512 7e6bddcfaa0eb3228022d1025f133fd04f14040286108d6db25447f206fd1376ed713c2a5529550dc7bf785795d9d95a34cc8e47380d2fddd845df6c91198f89
 MISC metadata.xml 344 BLAKE2B 4f4a9e5d5bc1e6a6a10552ef0285ca16024cdd9bc838a25397b23de1f873a3ca87194d0912f8d0a0c24158d4f10fdb92fcecb15f246e96dc12a95e56604770fd SHA512 b4fa8d5ce8421c5541cdaf288da9a8589ea6f4682470b376921e987d5a5344352afc2f20edbdf1f54ac46fe658f46c4863ec4dc5dc8eebe1c3223a15c72f450d
diff --git a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
index 905694b9e654..b472d2d5c371 100644
--- a/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
+++ b/dev-ruby/shoulda/shoulda-2.11.3-r3.ebuild
@@ -18,7 +18,7 @@ RUBY_S="thoughtbot-${PN}-*"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # tests seem to be quite broken :( They require working version of
diff --git a/dev-ruby/shoulda/shoulda-3.6.0.ebuild b/dev-ruby/shoulda/shoulda-3.6.0.ebuild
deleted file mode 100644
index b7232eb371d1..000000000000
--- a/dev-ruby/shoulda/shoulda-3.6.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Making tests easy on the fingers and eyes"
-HOMEPAGE="http://thoughtbot.com/projects/shoulda"
-SRC_URI="https://github.com/thoughtbot/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# This now more or less a meta-gem and it only contains features for
-# integration tests using Appraisals, which we don't currently package.
-RESTRICT=test
-
-ruby_add_rdepend ">=dev-ruby/shoulda-context-1.0.1
-	dev-ruby/shoulda-matchers:3"
-
-all_ruby_prepare() {
-	sed -e '/executables/,/^  end/d ; /test_files/d; s/git ls-files/find . -print/' -i ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/sinatra-partial/Manifest b/dev-ruby/sinatra-partial/Manifest
index 78f87fc3b91d..32343a05ef5d 100644
--- a/dev-ruby/sinatra-partial/Manifest
+++ b/dev-ruby/sinatra-partial/Manifest
@@ -1,3 +1,3 @@
 DIST sinatra-partial-1.0.1.gem 16384 BLAKE2B d129940c425a7e1b079860ab5c9f6459c39fc04d4256a0c1a5f25bcb9f3198133c897bd4b447429cd1e5ef11fdbaffa8d8b9384898d80d2564cbadb08e2131cd SHA512 04fb0826cdc9f6d8ce6ae8d80a9eafb3b0b37136fcecfb3f5e45a1bac101dac0486168473ff66de75979a5153d4efbdce17b63d774f5ddcd0e7fa251df0da1bd
-EBUILD sinatra-partial-1.0.1.ebuild 683 BLAKE2B bbd3e75663bddea7e78fb655a6633215a5a69308234175ba108b2e6f6f199f3ddb3182d2779835021d8012e1daa80972707fdc742c49df9791760e751f646ae2 SHA512 2fc228489c8b72eaa4e8b1cd85493e19366a68c2af149ae46ff4218247fb679f875082ca8aa11df9210c6d02f450490b8696ad27c9d67925dacd7ce1e002526d
+EBUILD sinatra-partial-1.0.1.ebuild 676 BLAKE2B ce95f4dca3f734d58a6eb88fe7b778ae90e1c2b792c9be6d57399a62c614c4c2f3f7ffe29de24a8aa20296cd3ab16111a806be3a9d48bf4e3ff835dda12108f3 SHA512 35088573f68b88b518d9afbade3e3dbaa8bad334f2586c22e3c5e37709b8a085daefa28c272c7f9085d058899a44475d3c069ffc5328aa9bfbf94cce13029f0c
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
index 3f07b0c8b6d8..a3e7200db87f 100644
--- a/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.ebuild
+++ b/dev-ruby/sinatra-partial/sinatra-partial-1.0.1.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=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/spork/Manifest b/dev-ruby/spork/Manifest
index 2cc83fcbdf7b..7fe11fd50fc7 100644
--- a/dev-ruby/spork/Manifest
+++ b/dev-ruby/spork/Manifest
@@ -1,3 +1,4 @@
 DIST spork-0.9.2.gem 33280 BLAKE2B 0c06cad1d6fc7264aee25fa400ddf1890685f87bbcb3fa8f5cb31f45f9c99845ff650b1d8e9738b04d87bb35fa4bc4466c24ddfb0d35a27377b9f42ba46eddfb SHA512 04acbdb00cb23c74ab5e3737d85f6b353dd50555e01e13aa4e0289bc7716eaed144800127840d9eae8d580f020ab646351411f5c1cbf299cf17ed5a73d24d81a
 EBUILD spork-0.9.2-r2.ebuild 502 BLAKE2B def688bcd31b6e712482d9f6538cf16cb08e8b19ca0d6ca908dbbe1ff40990c073dfa9988be43764b5df8b5b0aa0b9d219081f42c112c56f1c501cad762ac3cd SHA512 0202ed966b09b4fb15b19b66abeeb0dbb3f99661a11ba2bb6bbe0811e860f9d647584d72b0bc649eef52c184052341b8d7f5536940c0339c34f3e4d8891193b4
+EBUILD spork-0.9.2-r3.ebuild 500 BLAKE2B e37dcd66eeca45b14229eacde25f01bc7635912393e02556ff437fbaec3f876d4dc3f809625ddeb9b93e703536358c9dbaac6683783f555182e84b9f01246af3 SHA512 71f298f15d54282af52fdc7b6a0b329863a902706df8f748e19f7dc9516f1d6809d83d073a6b8d9c9e300900a276553eebd43d4edd44b59d92b467a209381174
 MISC metadata.xml 339 BLAKE2B 0c874f7cd4273f669acd83ec67b0a84797bfeabdd71ed53597fcc6263578a3ab2480d24c161b4b17669456c2415fcca3f1d4110bc7047907491944e88fa64976 SHA512 e70684bf4dda9def0a09a12a67a94741cea52601c298e76fdb2b1d628f311fa043cbb2d6c8b1d1a3c5cd1a6139ff753f6d264350f53496847c77bf26a62685ef
diff --git a/dev-ruby/spork/spork-0.9.2-r3.ebuild b/dev-ruby/spork/spork-0.9.2-r3.ebuild
new file mode 100644
index 000000000000..e6622feb750d
--- /dev/null
+++ b/dev-ruby/spork/spork-0.9.2-r3.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"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.rdoc"
+RUBY_FAKEGEM_EXTRAINSTALL="assets"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Spork is Tim Harper's implementation of test server"
+HOMEPAGE="https://github.com/sporkrb/spork"
+LICENSE="MIT"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE=""
diff --git a/dev-ruby/sprockets-rails/Manifest b/dev-ruby/sprockets-rails/Manifest
index 373c6d093016..d447119ab093 100644
--- a/dev-ruby/sprockets-rails/Manifest
+++ b/dev-ruby/sprockets-rails/Manifest
@@ -1,5 +1,3 @@
-DIST sprockets-rails-3.2.1.tar.gz 108682 BLAKE2B 842ce4560c7537f12c3aa2c068da89d99b410c4ad27f44b69abeead90518a4d9bad92fe6a70406c2f52d1124857419e845e3a1468cddcdce8a534c5f1210c3a8 SHA512 2c108370dfbf945e912505e854cdaf799f08d4374aac57a33bfc298d6e9bbf136877978458f7a8f48e5d120f578d3c7a88d91c058c12f520dd10b8271f82c49b
 DIST sprockets-rails-3.2.2.tar.gz 109408 BLAKE2B ce589e18daa4f664ed56d909a0eff082a69d756ca57e6e7569723b5da0b1dcfbe02f4a00e42b3d9d34b1cac37b663830ede046715c04c8bbfd48be7407e13431 SHA512 048f48930325316ac28d721a2c33ba60767dfec9456b0705e90363a1c81c8876ec6f99d65ce533d5a0704e1f67a33fcac5cd675aec5cc3c3f1cd896d518865a9
-EBUILD sprockets-rails-3.2.1.ebuild 1005 BLAKE2B 0eacd0cdc317b93ed582ce7cb3365ff0dbb78c36184b3b2b78cb837e299d26c5c9563e1370c119553dc15ffba80b87a61b952eae97ef5b3067f20beca8dc81ed SHA512 05feac0068e6b4d2c9dd4ace8f0bfabe8ecae9721fc597cbb2aa6a060ca2dad93a2b9facc318fa520f4e4541106c400fa90d3a092e7c29a58c8bedcef376120e
 EBUILD sprockets-rails-3.2.2.ebuild 937 BLAKE2B 0c630e39659651cde1125acf3ffdfb86d26f8389ef68d2400a63f1ace0034bfb228b4a3ee9d4c24270f69841bfbc1102bb1d3d662a3dc95ca1e5e133d6fad198 SHA512 cd1bc4ceaf3cd0cf0f119724864496a6f2ef0cf0baba90d1fb51ef570769de7ecbdc9e036cd06c2f33f6428fd09e79580e23a546934099a37f90ee0d945f6929
 MISC metadata.xml 347 BLAKE2B 762b3943d802321b3eba7cb5bc4f47093dce9890fa79d7c8ec25aea5c352dfc4509718465d6791d7c194975b3a4c4653ed0d9be06e69b0cdef5aac1713d44412 SHA512 3eb588d32f48bb0f9e497c1d219314b2edfa33b48f245e35816fb34c46f0796b437d2064fed4c32315ee93fa6ed904be0a46fd136e820a3965a4240bd9db3c81
diff --git a/dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild b/dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
deleted file mode 100644
index 9f10fcd57896..000000000000
--- a/dev-ruby/sprockets-rails/sprockets-rails-3.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Sprockets implementation for Rails 4.x (and beyond) Asset Pipeline"
-HOMEPAGE="https://github.com/rails/sprockets-rails"
-SRC_URI="https://github.com/rails/sprockets-rails/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-
-IUSE="test"
-
-ruby_add_rdepend "
-	>=dev-ruby/actionpack-4.0:*
-	>=dev-ruby/activesupport-4.0:*
-	>=dev-ruby/sprockets-3.0.0:*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/actionpack-4
-		>=dev-ruby/railties-4
-		dev-ruby/test-unit:2
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Help load correct rack version consistently
-	sed -i -e "3irequire 'action_controller'" test/test_helper.rb || die
-}
diff --git a/dev-ruby/subexec/Manifest b/dev-ruby/subexec/Manifest
index f87a969ebc69..68df4f931fe8 100644
--- a/dev-ruby/subexec/Manifest
+++ b/dev-ruby/subexec/Manifest
@@ -1,3 +1,4 @@
 DIST subexec-0.2.3.tgz 4384 BLAKE2B 27dc40377f7b2fee33553543723b9e15cd02a1171bd24b5d213b3546b7b20267cb8cbf987c1a1f6c0285f594b194f1dc20c41314266587be30d961e4b514f8b9 SHA512 b6fc5ee802906a690a1d1542ada44aba1df5e6861a66f4df58623e366d8d3ab2349d2963817bf07089e1dc15932ca03f0020d16777012ec4b92879280868bb75
 EBUILD subexec-0.2.3-r1.ebuild 745 BLAKE2B 3ceec00621225756507737444ffc641b224c2e796cb8d83bb0ab6e186336fff8615cdcef587f4218ad05e3f343b3e991afddda624e0c13fc64566d0483bd2e57 SHA512 1e37a5f662a6c043464d6e91576ea3a5dcb2302b7db5dde5842ae04d24d98fb1402901a264a2b390722b32230455492098f8cb917f9835dce29fea5e70ff448e
+EBUILD subexec-0.2.3-r2.ebuild 778 BLAKE2B e445ee06e62edd9bd2e3c5e85556c18029383caf9b9e8df916f2c800504ed70a832c65ad6d88e0275ca2fc6cbe8d32c90dc16acf4d0cf6dd71998756e5b47b32 SHA512 dad2366e9ab0e5ae01541a43eae6189c46e41ae20e16794fe5d4cb6d6b0f77c636421e5bc0579dc94789a1535970031f276c10b4a121ef88309d4d0a66029e94
 MISC metadata.xml 341 BLAKE2B aa5ca57e8f90589a330fcec539b522d24e13584b305e4c89ccc0a1efd3e62b50887da931ec7fd2321810b165e6ac09c8ee0dfbe78447a0341a8a749526261b7b SHA512 3bfec664d4436ca5e76c8d73872f7bc23ccfd6fe676725d96c96a64651a33660d4f0ec6f3aaaa6c231594684904078a848622332d9729a4fee1ffbfc60e29972
diff --git a/dev-ruby/subexec/subexec-0.2.3-r2.ebuild b/dev-ruby/subexec/subexec-0.2.3-r2.ebuild
new file mode 100644
index 000000000000..f689733762be
--- /dev/null
+++ b/dev-ruby/subexec/subexec-0.2.3-r2.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"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="subexec.gemspec"
+
+inherit ruby-fakegem
+
+GITHUB_USER="nulayer"
+
+DESCRIPTION="Subexec spawns an external command with a timeout"
+HOMEPAGE="https://github.com/nulayer/subexec"
+SRC_URI="https://github.com/${GITHUB_USER}/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/shoulda )"
+
+all_ruby_prepare() {
+	rm Gemfile* || die
+	sed -i -e '/[Bb]undler/ s:^:#:' Rakefile || die
+	sed -i -e '/begin/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 296093882b4f..029faa52e5e1 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -1,16 +1,12 @@
 AUX testrb 177 BLAKE2B 7f0192ddcadda449bc4766d5910c76ef21ff8cadce1372a46db4fc236374eaa3cb57e145b1b7b09896b3a866ddd9fa1f910f40b751a773bac1104d705902bc0f SHA512 9de97bde52a1e5770a8dae8da3adcbde3b1dfa7cabc6d131159c8a688a7ad5b59dbb528ce9eef3346da12264c0d30415addd907bc66c1d7d90b1dbc4c605730b
 AUX testrb-3 183 BLAKE2B 5bd4712b7a73cc480669facf537b5bbeaf16eeae2782e21d5fe88cf92c9945845803d3f1611d465a3fc16f76838b5aba964e9b96eae35d9cef1b0b269bb94e2d SHA512 cff9584c54bb682f03a0253df953ea930053642e249a3c4573e34cc78f4b77ef943ca5a2c7d1869d926b4a8d9e173ebece69169d845724b03c03f00608bdbdfb
 DIST test-unit-3.3.3.gem 133120 BLAKE2B 37fc200b121e84046d1ee483277fc1274dc3bbcdce95ecb5c88a71a77ca9c164faa8364f68d777896bceb3dd1857fc7146ca464f039c0f30ce5baa466f38ede5 SHA512 ddb40e2ec1f15405cc396a9008912fd41ecdf67a0c02bc7ad4bf7725ee68cdaeec6f171f1786469ed55c1154ce094c5f0dd75103c1989a694bff412c9cc86934
-DIST test-unit-3.3.7.gem 121856 BLAKE2B 507c9c538e89156d620b229e0144258def17975d41fa569178bb0c47761d5afdfd6cc8a99e3255e72df7a3eeeb65358faf1ed81571c12242559990762a09f69c SHA512 42419c947433330f06d68a26dc2c5e8309658d75aac44f6e391e02085eae1819937fa3ba86e86231dfca91e8de86252b7bc79dc5ffa1e1fb8b0f0ec9074a0056
-DIST test-unit-3.3.8.gem 121856 BLAKE2B f47ef205c566fc404d7ffb9380502ae18224c395f65e3ab663472ec4874d0e77b0cb13a5ba80525965ff340c3941168773d6ceca6891036a8ec57bfcaa4ffbd8 SHA512 fba6a7ab4c87c07950498a372a21f888d87f1e1b0e5b49deb97aab4e2815fb85b979aa8afc6e8a6c4a9ad648371f1d9de968958350d0ecab10dfdd2bc0a2c112
 DIST test-unit-3.3.9.gem 121856 BLAKE2B f8ac1568aabc7d53c79715c6b141d3f2be0782e35dda36fc6184e7b7bbae419e883b94f163333e4e1a186c07f55cef181a2d86d4531e3968667e8c5fcfe8e36c SHA512 8e2a1516d33811793aacbf0b31b9609b43437ea6800cfe6c97b1c96395a8eea7c42f2788dd86b6decfda184a27e5818646bbe313d39ce3799a0869f62a0c4c32
 DIST test-unit-3.4.0.gem 121856 BLAKE2B ff975888027ba6122146f074926074ad7eb94e7fd442ab3d9f5d4f2eba83695e7f7ff2d17bd4578fa81caed5971170d0d8d287d8c87426dca63bf7ace1c7a850 SHA512 b7fd84165c956975f758b09c13d6d8f3a613e5d72c381cc3ee7522b5c6e1ad2751d8709bf1d45169823260769909ddaad487f51cdf68312b1e29c1d861f8107f
 DIST test-unit-3.4.1.gem 122368 BLAKE2B cb1677c83d11c0edbb6ad2eedda63f777832993d262ad0b1b5022fcc049d82d8eaf9284bad22f9a49f3d43febed6f72291eeb30d8844f3ef4703f93b9f556f7d SHA512 08c5877cf6ae80e6ef5de7c806dac74405329cd08a97431d174b756ad173e727a536fe315a624c5e1d5b071d5b887cb4b8498675f5f54073bdffe9d5ec4eb745
 DIST test-unit-3.4.2.gem 122368 BLAKE2B 3b308eb539915573762aeffb96b02bca3194b5c4e70d00ba4711e2ebf57215e5865f79e5246e5872f2ba813b81256deae289872b8f550ce630249dcf6ff5069a SHA512 ccf04ffbea05334f2d4ffed48db6d236c5eb85cc3d0bd79b5a195c43d218bc03b3b310835d7c23f78d2548dcfc8c4be5d1f3bf92d1aff6fd56ff3f483b2f1b0a
 DIST test-unit-3.4.4.gem 123392 BLAKE2B 7fe5fd5d17712e0b18e5757a22ca60d0504857c46d311874bb2528d6e6eedffdf4f468899cd08c3dddc4808bd41cb21d254d1467f4ccc259eba8bc2405e9cb57 SHA512 3387cc32fca94c2554fa5ed691eec1e0bdddc119ad26f19860c5533764041d17b0ae0515d0a3703f7427558e1eb0f0817c106f2de46b2ad5299ca08c2922de33
 EBUILD test-unit-3.3.3.ebuild 904 BLAKE2B 7c4251d9e4113cc1a3f90eca98cea78f8f288d107a4e6e37c567cf614fd8e21f8f20d46bde4332aa48ba33d0c401ebeeb154cda9ee657ca2ec5de9f2f9daa81b SHA512 ccb513f456f01217a88927a8532c4f0d8bf9630dabed5b0321b4b3d068902cc756dee598d5cdcb1823ee508a2a4d2e2eee028725a74b833de87ec98038f08c16
-EBUILD test-unit-3.3.7.ebuild 874 BLAKE2B 15fee01d1015bae7196d2e0d022520337845b4f4f6fa001ed5bb7cc2ac2c74f5c187447f0ecea8bc139f8a020f9605bbd28cf80f0d6970eae7dbfd982de6df15 SHA512 272febdcb0cf394379e5b7062ea7bc24a51933574a18a47f1c83d9bbcf7c1d9438a5f47a61f3e7c87baa4dc7eb6364e1ec49b0da322b5be348110ff2010eec37
-EBUILD test-unit-3.3.8.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.3.9.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.0.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 EBUILD test-unit-3.4.1.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
diff --git a/dev-ruby/test-unit/test-unit-3.3.7.ebuild b/dev-ruby/test-unit/test-unit-3.3.7.ebuild
deleted file mode 100644
index 53b7f9bf38ce..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.7.ebuild
+++ /dev/null
@@ -1,33 +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="README.md doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/test-unit/test-unit-3.3.8.ebuild b/dev-ruby/test-unit/test-unit-3.3.8.ebuild
deleted file mode 100644
index 805bffe784ad..000000000000
--- a/dev-ruby/test-unit/test-unit-3.3.8.ebuild
+++ /dev/null
@@ -1,33 +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 doc-install/text/*.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An xUnit family unit testing framework for Ruby"
-HOMEPAGE="https://rubygems.org/gems/test-unit"
-
-LICENSE="|| ( Ruby GPL-2 ) PSF-2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_rdepend "dev-ruby/power_assert"
-
-all_ruby_prepare() {
-	mv doc doc-install || die "moving doc directory out of the way failed"
-}
-
-each_ruby_test() {
-	${RUBY} test/run-test.rb || die "testsuite failed"
-}
-
-all_ruby_install() {
-	all_fakegem_install
-
-	newbin "${FILESDIR}"/testrb-3 testrb-2
-}
diff --git a/dev-ruby/tins/Manifest b/dev-ruby/tins/Manifest
index 3901163395f0..60565e0aa795 100644
--- a/dev-ruby/tins/Manifest
+++ b/dev-ruby/tins/Manifest
@@ -1,14 +1,8 @@
 DIST tins-1.20.2.gem 305664 BLAKE2B 37d206664077aa1ba8bac395e076b448797c9d73f46950ff339834b55cb1eaa36e1cdd47a9795d783671a8ef393f6059578ed684240de377ec8824c2468f5014 SHA512 c6c7694ddadf0cf46176a1fabda8ffc2d6b098ca6ed4d568f30c66100a2f55c25ce83c09e8ba379ee6c49dd68d6f1572f17f70f9666628c1fe5225fcc9d7b788
-DIST tins-1.22.2.gem 306688 BLAKE2B c5b0aed29b763d37707de47a57419d9af934a0949417003707fd13a7e9e4a0d82fb905843ceac75a384c6ca9592471c15bc28ea63af4890ce54076f5c2f67d7c SHA512 6b93242d9c63a84de690c381086fd454714cdb0e82ce6eda4deb5d66a8b9ca4bbc5e2c502c258045b06aecb76487eddd019ca267b872717df36cdaf840ae97e7
-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
 DIST tins-1.29.1.gem 307200 BLAKE2B b7e95094662df021d81ea7b580cee5c4ce8f9fa6a09ecf63afa2c84f42ffab62f96f37ae734392021506da373ccabbf68c2dbf55f5ff09224168e24031b1fa99 SHA512 043a49d0755bb158cfd60554b530cd315cfe869520ab02ee819addc0fea39f441960a6c416753c0e69dc0dbf122523842f940ff89dcb43e64f5825a2c0c5a53e
 EBUILD tins-1.20.2.ebuild 625 BLAKE2B eed2203644e3a0212d6cd17e69b854ee6cd226bb90da0c094e0f5b19a91447a24b7bdad65e3ab4127ccd2692ba0c949406e0c5b1be7f069b82b6fc8cd157d302 SHA512 21f2ad099da1d276ca7df14d4941b39fbfd0e65e4130cea31cd8492b8d20401e1353deecbb29977ac25f15950b558384216bc9a02fe0dca46bf35ee10faa589e
-EBUILD tins-1.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
 EBUILD tins-1.29.1.ebuild 848 BLAKE2B 6997f7521890f4432b7230965ff8825423c62bcd7d1a173da6df0ebd8797e20f0070983d4b1c8e1928530d5b504b3ebdf7587e126800a98d53efef2904d35062 SHA512 8a8a644845eb3a59848375642d871a6066d9e15788597c426e696ad57094321f1404ba38858f7283d4686a36070cde3925db5efb99e000bca1a828288d8db799
diff --git a/dev-ruby/tins/tins-1.22.2.ebuild b/dev-ruby/tins/tins-1.22.2.ebuild
deleted file mode 100644
index c896f1ce894a..000000000000
--- a/dev-ruby/tins/tins-1.22.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_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 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.24.1.ebuild b/dev-ruby/tins/tins-1.24.1.ebuild
deleted file mode 100644
index cde93a82c4cc..000000000000
--- a/dev-ruby/tins/tins-1.24.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Earlier versions of ruby bundled this dependency
-USE_RUBY="ruby26 ruby27" ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby24|*ruby25)
-			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/tins/tins-1.25.0.ebuild b/dev-ruby/tins/tins-1.25.0.ebuild
deleted file mode 100644
index bddd0546ca8c..000000000000
--- a/dev-ruby/tins/tins-1.25.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="All the stuff that isn't good enough for a real library"
-HOMEPAGE="https://github.com/flori/tins"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
-
-# Earlier versions of ruby bundled this dependency
-USE_RUBY="ruby26 ruby27" ruby_add_rdepend "dev-ruby/sync"
-
-ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-each_ruby_prepare() {
-	case ${RUBY} in
-		*ruby24|*ruby25)
-			sed -i -e '/sync/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-			;;
-	esac
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib tests/*_test.rb
-}
diff --git a/dev-ruby/trollop/Manifest b/dev-ruby/trollop/Manifest
index 97209e1056f9..22587ade51f2 100644
--- a/dev-ruby/trollop/Manifest
+++ b/dev-ruby/trollop/Manifest
@@ -1,5 +1,5 @@
 DIST trollop-2.1.3.gem 30208 BLAKE2B a5fd19679821c55459cf7792f3ec26b8580732e84107f7a3519dcbcf1729ce48567ca2d35346b3e27d3083a3b6cae160ded8c18a118cb04a7a6e60c82bd91e78 SHA512 4d172c6d75f40edb36c353d2e32afce10b012f02927772fa201256126f88c62adce39400225434a80fd678e1cad703e3d3f32cdeddd150287a44ff81a2fca819
 DIST trollop-2.9.10.gem 29696 BLAKE2B f69b1ab8ce166f9fe6198e177266ee86e38f3bed4c3a55529705aedc4518cc04a48b9bee4463887fc4ac1cd04cad98d35c298265ad1433ced11e0ff5bc1f50ce SHA512 21a0db09d480353ff846a1311b118e0b0db4ca13a559dd1749c1478eff7080dd04e5308dbf1807215eadb68e276c991970b23357e9a3497acb9f705f7f77253c
 EBUILD trollop-2.1.3.ebuild 724 BLAKE2B 86f630a652aa6cfbac5cd5e0369802fef91f4a0b2796b0c087857a8468c8bf82a8171c45043c1b6ce8ac75f03605296b611289eed1541b04b13b163e198ac379 SHA512 468deeb6528d1e5dbb3e0a53c97dfd07c51a119ce554c9fbae55c88c3437f808397fc316c49d2a3df1b313dd8d3a79c2ce863dc593815fe5fd7d6ba9f5467a42
-EBUILD trollop-2.9.10.ebuild 694 BLAKE2B f3346382e526dca7a74d12e0988aa8d8d17ee07bdd6ae792e666d82abdb26614e3a3c5b5e599c786db04c5fe8cf0b89f5f21f03f4e9695e081a38b98266595a3 SHA512 7d4311d92d9c933ef1612f5519b4acec5b3d5d40df80dff9db24eaaf20e723c728883e035edcef7fa1192023ca1a5a6212b7021f569e3d950ab6483c72e33641
+EBUILD trollop-2.9.10.ebuild 693 BLAKE2B e504cb2f85e6ee3fe1cf0ad7c6a97a471d9a35debbb05844b576ed44ef3c14760e796aea6e5503c957ded5e36bee227e9763b74026dd9f92a55d51e60b9cfca9 SHA512 a7f6e6c14a9127f07bca16c1cbb4ec7c4248c12cf76d5239e79985fd92e41dd139b858e5dcf98582ff1a7ef591ca3ad03d81add7042a9fea261ca6e5da8992fd
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/trollop/trollop-2.9.10.ebuild b/dev-ruby/trollop/trollop-2.9.10.ebuild
index c822e14eb510..03b9b2720f92 100644
--- a/dev-ruby/trollop/trollop-2.9.10.ebuild
+++ b/dev-ruby/trollop/trollop-2.9.10.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Trollop is a commandline option parser for Ruby"
 HOMEPAGE="https://manageiq.github.io/trollop/"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/tzinfo/Manifest b/dev-ruby/tzinfo/Manifest
index 4deb7bbe442c..5308fa12c2fa 100644
--- a/dev-ruby/tzinfo/Manifest
+++ b/dev-ruby/tzinfo/Manifest
@@ -1,9 +1,7 @@
 DIST tzinfo-1.2.5.gem 153600 BLAKE2B 3df5625c61eabf94bb457381ac7d0cdebd5b55da3bb043fe58063cccccb623b502e026a71faef4f7d7efe75eae2fdfd0bf3e0b97a3763fec9a1018f0c6c2ae0f SHA512 87f7cd66d6e80d51d216cb993cc76fe7758db03ffd39dde96eb24a9d208699766a8dbff048485fb732ce125ee9f971e38ed9ee1197f3ee3fc3ee8a8da840dd45
-DIST tzinfo-1.2.7.gem 156672 BLAKE2B c1b52d2ac03fa9d11b68579931991887f566e3cb269bb5eb8b66c3a636decedc99b1729504c6941b260af9415815f5098fb3bba29ac7585da1497eb0fa7efba7 SHA512 dc8d45b09e4f77e5b6f17c9f707932554fc8be8029a9641d82cb8229d764c35522b2d20cc34d50a52835d148135e39a0dc91a7c2bac3eb5077057ac06d67f3bd
 DIST tzinfo-1.2.8.gem 166400 BLAKE2B 67f116171a6cfd2680c5eeac3cf7a034b446e973f2658052a70fff8d0571bfae03ee212b26d277c6b5050943f6117b5d8ce7c2ce5c5ab6891a1b8e9212bf7ded SHA512 5573b252d91a77b1e1ace2d2ccf48f7dd9bfb79b8b0b15ba2e8757e5fdcb9cbc044abdcf82beacffa284fc57ded2b579feccc393331f0f5a680e5f5c6275b62a
 DIST tzinfo-2.0.4.tar.gz 224673 BLAKE2B 0c7ef231767b6fc00cf95b3e1c2037894b14dfe832eaedb3f4b7c60a884ab6f7121243af5b62acf47d02da28395e7390f968421a3a3a2d731deb079e9fc51bfa SHA512 5b2ec73f737009ba21dac7dbb9504235fdef14dc45a6450e1218ba9e53dd29735ab4fa6c2854271916cc5c0244e09ae7ab19467408b72b9b82ca238e14d3fa4f
 EBUILD tzinfo-1.2.5.ebuild 1051 BLAKE2B 1aebe08a8a828f4a2de3ef3d3d8fd96d0427741207659219a8fbb0e630629fc377ef25c12cfd54a8975946003fc260160773cfe7c999334e68aa725e1f5a7d2a SHA512 89c21fc54b9ca7b12a7f8e7d4e3a1a9285a44666b621231194296693288ef2f9cad72bcf7b13a617c85bdcac2f45d14c1a382698ea8e61a7b3f840d0989c6d39
-EBUILD tzinfo-1.2.7.ebuild 1030 BLAKE2B d90b21887564c14bb95c3367ab374299ad167119b58796a0504a1ca5cd075d1cce46847e7bf366cba03e066604f07d93a30642cacebe36fa669146c94b6df7dd SHA512 3747929ed565c22083cf75fc82cb1f5df58136f342df05d7bca0f13ffaaaf9c63cc3fe5e43bafefbf6d0138ac8c611961b96250ad1f30621535ac3a8766a1727
 EBUILD tzinfo-1.2.8.ebuild 1023 BLAKE2B 3c7a9d1b003d817659cd17e32d6ccfab73b576369606b7e786eabbdf41df3c59c61db766d6a5ca2e790bd6779678b06543994b3488d994ed047153480ca108a2 SHA512 2cf403232ec92ca991e6440e1f9b110d20e7ec354d0a4ac93e535b091d8cb2efaaaa18483942c8c1c06f0fcaaae026201887508a6ea64b8c08e932fd6be6fa4f
 EBUILD tzinfo-2.0.4.ebuild 1425 BLAKE2B 08b1cc9420c12a6ce87caa0db3a186da7e2faa91c9bc6fd1097ed4072a87622e21b8225a400bdd5b4d909fc866d79e4679f624b2fc3fa19a0589fef1a4126d1c SHA512 0df2d8e0f1286dd3b2335a233827cf98c66d092fc86db08058e4ca51d931ef475d61278b82f2bc1ab24293f7d1c581c94059042c31aa313ae49ebe5bc7acf156
 MISC metadata.xml 251 BLAKE2B e8bf2b70161d425791d65052583fd8be03b19ef3bb2a2cde34605bc93224fea9d8c6a91f0f2d630a00094ef54c0871e210da0e0134f52401bc80cb6b2358c13d SHA512 17d4dbd64468a524311a24ca065537a5b21560388efd282f3fa873e6722f70db6f83e3e5615556450905c29d5df2cf0a0855f9c0b38bf23f0f8112501456d4ea
diff --git a/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild b/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
deleted file mode 100644
index fa4dfc2dd0ad..000000000000
--- a/dev-ruby/tzinfo/tzinfo-1.2.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_TEST="test_zoneinfo"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Daylight-savings aware timezone library"
-HOMEPAGE="https://tzinfo.github.io/"
-
-LICENSE="MIT"
-SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND="sys-libs/timezone-data"
-DEPEND="test? ( sys-libs/timezone-data )"
-
-ruby_add_rdepend ">=dev-ruby/thread_safe-0.1:0"
-ruby_add_bdepend "test? ( dev-ruby/minitest:5 )"
-
-all_ruby_prepare() {
-	# Set the secure permissions that tests expect.
-	chmod 0755 "${HOME}" || die "Failed to fix permissions on home"
-
-	# Avoid taint tests that throw SecurityErrors on newer ruby versions.
-	sed -i -e '/_info_tainted/askip"SecurityError"' test/tc_ruby_data_source.rb || die
-}
diff --git a/dev-ruby/ultraviolet/Manifest b/dev-ruby/ultraviolet/Manifest
index dfd195eb81b9..e8a09f8a6ec2 100644
--- a/dev-ruby/ultraviolet/Manifest
+++ b/dev-ruby/ultraviolet/Manifest
@@ -1,3 +1,4 @@
 DIST ultraviolet-1.0.1.gem 46592 BLAKE2B 2dd9b69bafdb83c321eee2c4fed9a39782959893993bdd27d3c1ab8337ac1f9a68d8cf7cddbef12404041d541d183f0bd205a4c36ee4978a2c0a631d0df3fbce SHA512 f974f95743b56d7424c8ac96867c56f4d849247ba552bd09ba8893ca6520758ff2132ac46a42f22b8547732bd148531d177a7d38522fad1dfb86d54ffbb29861
+EBUILD ultraviolet-1.0.1-r1.ebuild 657 BLAKE2B bc83e22798f9e9a94d20506823d7da13b41f4bfe1c72f691c0e2055b08e0545c46ead88c66311b2d9f9cc2f0184dd4967b243cddba8f9585f78aec3060c89a3a SHA512 a1f2b3dfcc88ac225c902d0686be4536713db156f8514d52b639c9a723f9015610bf408bd66325ac397eb6f45af95c7ff088fd44165bcfa26a699ae9fd266b8a
 EBUILD ultraviolet-1.0.1.ebuild 695 BLAKE2B 44b745ee8a8355ce7c6a7a925f664d863fd0b93bdb959fb967f39d929a66c34eda33e937a9b6d86ed258e616ffdb83e2977b7ede14e034ee994daa611fbb57b3 SHA512 b4312d8add4fa39e4250cef979e10afa1130c6acf79a8e57a36d28f61661ad4761b432d8b9a51f46499b389257e1b43c5ec92d7579bf621bae61fbc4f4ea663d
 MISC metadata.xml 345 BLAKE2B 72aef81c1274db29f1898e20cf4a298d017000f8cc2842be7066fad3600feb955faaa0a0f8361fefd931395a252ffaf43bcfc0761074a1a8ddc6ce150ca26c36 SHA512 3cf569bd61e3369a5b1ebfe5c45d01df67316bdf5aaf429514f68f89e2aa526a6bb7460a970b906c8845c3f04d25d35151d986ee72e3f9509791340576539391
diff --git a/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild b/dev-ruby/ultraviolet/ultraviolet-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..1b0344cdae18
--- /dev/null
+++ b/dev-ruby/ultraviolet/ultraviolet-1.0.1-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"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_EXTRADOC="Readme.md"
+RUBY_FAKEGEM_EXTRAINSTALL="render"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A syntax highlighting engine based on Textpow"
+HOMEPAGE="https://github.com/grosser/ultraviolet"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/textpow-1.3.0"
+
+all_ruby_prepare() {
+	sed -i -e '/rdoc_patter/d' Rakefile || die
+	sed -i -e '/git ls-files/d' ultraviolet.gemspec || die
+}
diff --git a/dev-ruby/unf_ext/Manifest b/dev-ruby/unf_ext/Manifest
index e16aa4d093de..4352ffcca540 100644
--- a/dev-ruby/unf_ext/Manifest
+++ b/dev-ruby/unf_ext/Manifest
@@ -1,8 +1,5 @@
 DIST unf_ext-0.0.7.5.gem 398848 BLAKE2B 3c7b2a6765360f59b7b921155bb6532981c8b31fd1fcebf1adc1e113da2404fa752ef95bb385155de1a6025d51f4564e52b497c5396624a0a5e99357fff88662 SHA512 5d60740172034253fec9659bec49e60f639e93d8f147582e26a012712ec2e5fca30674efc52695def0c3cd145c5ddd93a56a6d0f854ab04e7fc81544e6aede16
-DIST unf_ext-0.0.7.6.gem 399360 BLAKE2B a805d991580ced26400194bb45d4e4ab395e4936e8416a9469443c12015ca231c6277fd5d2112c346085a5fe9756786cc18626578f0d5ed0d68544043699fa41 SHA512 c6b6bc797015875b0a3422dc1e9656eae6c42d2263fd6e73ba41a1789ac1ffe927f81d5d9874973fd8d9bd9486494efa725b081e553954121588818d454db7f2
 DIST unf_ext-0.0.7.7.gem 399360 BLAKE2B 040800c9598fb544d434e8d3336a7aa8aac2440a3386a520220252aa970c715462fcf242985527b23618dabb291db346d23afd02282f735df1fdb657e021be9d SHA512 7dc75f071be4d4f3cd44f64a26c5f63f01494f79f3585eea3b307c3e8133b17b1007c4b36915f7254e516ae7a62268be8f3e4b250dcec7a9a083b5a66582887d
 EBUILD unf_ext-0.0.7.5.ebuild 994 BLAKE2B b658df9d3ec2768561b36cee351c6b95a5e3d517d42d0ff602710b92eb47020bfcfa07523e2da3554deb98a258955f9ef9f246730446fc229b58243968357173 SHA512 cb4bbae8d085346b975f23924d91ca5f09c644234db1a30ccb34e06dd76dc9dc03d2827ea73663a5d8150eadf701a63986b95bd7fd9262c0a4f2cd81b7d14be3
-EBUILD unf_ext-0.0.7.6.ebuild 999 BLAKE2B 835e36429a40f5e131ed360a132f806803af67c2d5adb9e129b5f4b58fbc0ebae19c160c7be8a48c1b9b8205bf4d2d273464b0cfc2b50464e8d4e828b487820c SHA512 1495e04859d8397aed54c2d850554064dc8df694da4991965beabaca980fbaae60232bed7227b241e6aca1b2db7295bd68433d408bca9534329845ebfca5d1c6
 EBUILD unf_ext-0.0.7.7-r1.ebuild 809 BLAKE2B bb21b550a306ae8a195be8b6e7d100140ff0925dbb8e87534dc2aabfbd39a8dc4b71eba5458148d17882d853d76c629d2249c1f84470f76bd4a8b64b5832c3b9 SHA512 3dd6775f3acbbdfdb5aa7ae926f094d7c72b6656c644ec87e09d5b9711b105ae035d3d56661e9ec9b0010b26d7132f8b76985ddf68d513152f5ed3c4c87e8713
-EBUILD unf_ext-0.0.7.7.ebuild 968 BLAKE2B 15367ac6659abe67a95ef1c3389f85b94efabbc158a6aadf10635499bd3cf8377c152051bb97ae9ff226016e657d77dcff19a5f1c8edae3cb6852cd9e8a70c7e SHA512 a040a56b4e13c991052974381ab016ed0df071304f0888b1ae2fb3a3ccdd86d26dc4193b646d89327a2183a95da011c02cc98ec8f7a72e9fb9ef73bf305ae42a
 MISC metadata.xml 383 BLAKE2B 96615ab1e6b21672cd9b121a3d70bb20630897823e9cf901575c9d646d01d98826c7813fd5d468874574596a4b56479b37e8331f98c51aab496765da2a4213e5 SHA512 c37dfb0021af1d08192825188761b1c1266a8fe85b0d81700fb769d49ec75b01dc0160a6498fa9e2a0cc392d910a86613f7585af7f143c2dc5ba020580c42399
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.6.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.6.ebuild
deleted file mode 100644
index 6b28b0fb2283..000000000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf_ext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/unf_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/unf_ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/unf_ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.7.7.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.7.7.ebuild
deleted file mode 100644
index b4a6960da79a..000000000000
--- a/dev-ruby/unf_ext/unf_ext-0.0.7.7.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Unicode Normalization Form support library for CRuby"
-HOMEPAGE="https://github.com/knu/ruby-unf_ext"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE="doc test"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/test-unit-2.5.1-r1
-	)"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/ s:^:#:' Rakefile test/helper.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/unf_ext extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake -Cext/unf_ext CFLAGS="${CFLAGS} -fPIC" archflag="${LDFLAGS}" V=1
-	cp ext/unf_ext/*$(get_modname) lib/ || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/test_*.rb
-}
diff --git a/dev-ruby/vlad/Manifest b/dev-ruby/vlad/Manifest
index fe1e6cfe226d..5dfbcec799ed 100644
--- a/dev-ruby/vlad/Manifest
+++ b/dev-ruby/vlad/Manifest
@@ -1,5 +1,3 @@
-DIST vlad-2.7.0.gem 29184 BLAKE2B 5eda039d0d618950089ce743cde95c011edd476573058064d3c20b55bca9ce598ddafb352902fc48d9f4d7dbd0cf3a26b6c39acdf5d592a35654aeb8d62fcfb4 SHA512 088739f975e7b9b218b76518a690a7a1fbc534dbc169a704b769a8e99bc5efe0c915012d65a35590fb8f1a27caff4d7c7eaae325431a28ffa973afb25d5890fb
 DIST vlad-2.7.1.gem 29184 BLAKE2B eb35f357d87daaf2903ca880139ac41c1725419fb6f0e3d00e1a31fd24697373c8d4869e31d17e6dc88ce31ecad1a0747ee2ec08a31871b4c44b32dce28424bc SHA512 520ef393fdf63daa348015306003cdd3bd9b8f162b44b31d78c170d1ece466b804226b030640a180a8538c6908c77d80dcfc13078ce295a6c59f1f5b9df9ef13
-EBUILD vlad-2.7.0.ebuild 713 BLAKE2B 3f8c3675bdec38a18a637ad4c3593524230abf7ffd889bab54d57cfa70dfbe010a33eecb9caf28c7209ee33728a784729bbce89d521676f59d90eb446fe4858a SHA512 69f35eb8a6d8b57e2fab20ccfc02bf099bae19ba5ae9b67b00cdb729d2b871752ce7ed24735bbe298fa2209e710fd9c3898278fc505a13a479ab409926da2f7d
 EBUILD vlad-2.7.1.ebuild 675 BLAKE2B d1e46f2d90d31b5b650cd2b9b0d430c7d9fa6a45802d4937ed2b454f29840decc78361130ff752233932bf487f21cdc17d37af7f969f4d4a7030923318a0d923 SHA512 a42e70003ce2d8408451388dcb128eeca6746c320556a0ff4b50732be9babc05246acb32e05291b6c55d3a206b5c188c2a41152ec9a5d4134d5efc3f6c6876ce
 MISC metadata.xml 330 BLAKE2B ed4b057fad3c762800d51a14c41b21f86dc3c657e6383a2d5d39254d1c91fa34ffeb2b5c3d3082e384d8aeaadd0752d0b7e2f3f9536e30d4d975c5518e1d61e5 SHA512 c58958e39430a9a983e0daf195de0236884fb1f4f2fd8ee022cdedb1373fdea1976d71f343032b4244b85554b5edca87443c77b7a40eda1666d26b242977f8b4
diff --git a/dev-ruby/vlad/vlad-2.7.0.ebuild b/dev-ruby/vlad/vlad-2.7.0.ebuild
deleted file mode 100644
index a4e74ebefc07..000000000000
--- a/dev-ruby/vlad/vlad-2.7.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="considerations.txt History.txt README.txt"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Pragmatic application deployment automation, without mercy"
-HOMEPAGE="https://github.com/seattlerb/vlad"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend ">=dev-ruby/hoe-3.13
-	test? ( >=dev-ruby/minitest-5.7 )"
-ruby_add_rdepend ">=dev-ruby/rake-remote_task-2.3"
-
-all_ruby_prepare() {
-	# Keep Isolate from managing the dependencies.
-	sed -i -e '/isolate/ s:^:#:' -e '/rubyforge/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/web-console/Manifest b/dev-ruby/web-console/Manifest
index aa8df30f5978..6f85ec29c3f7 100644
--- a/dev-ruby/web-console/Manifest
+++ b/dev-ruby/web-console/Manifest
@@ -1,7 +1,7 @@
 DIST web-console-3.7.0.tar.gz 53714 BLAKE2B d69a7b467e419e87d43c988026f278aea5ca142e336d120e0a50ef85b36186d2f388d551f19820e01d85fdca5a49c471aed69cb2ae0d6f1828a99350dfe86d55 SHA512 d44e4dc3ef12216829b3f522e3645b0fa9b8ae34fa70b5e52a96e345b8b5fc8dad9af6f9918ea23d276cae03445133b15f780041a8cb61584b182ca6934fd71b
-DIST web-console-4.0.1.tar.gz 54076 BLAKE2B d1c93d828f7c0c33edaac664e2f763aff55bd8437c3f8e3b20cc5c065129a0b213234ea372147d5d6df0917d17cc458e63dad1aa64f9cbd67fbf0a02ab631c5e SHA512 7f2d931b94fc2e51edd28ca0f83473c382bd7ade6e425dd9c79770885efcdfbcf6a3a3223d36572d749da15b05126fd287412d2365d9faa33039de4bcb1c9b27
 DIST web-console-4.0.4.tar.gz 54372 BLAKE2B 5b52c7dbeeeb13ae6cb8bff8982a7a696311e3667ef69b17611cf3ec8ab26b19869ec799e10d4140cc41cfb31a22af1f51134da06d05cca12b488c5470f6ae2a SHA512 66dbfb9d13be57b790053d748c88a9266e673cfcc253df67b4dbb00c874a4bd3601a61b633d5e3e470e010cb764c13846a7038247122140bdb78f40f673cd82b
+DIST web-console-4.1.0.tar.gz 54722 BLAKE2B 242e588843e713b77c0689b17906bb0dad8784ad9b5fd255a174364afa83014d3cb022f1fb52a759aaa9f2453a1a944796c1a84edff65de6a5e1adaebccc4071 SHA512 c295dac733094a4ee4ce9dffa0d65001aa179cd17cc5b9a2a0a418e1e1a4ca3d40fab8bc3f8e099d55a0b7b07295e40d40dd1b3335ac98e9b0cd51590b130e10
 EBUILD web-console-3.7.0.ebuild 1074 BLAKE2B fa1096afae3683ea0da7c0b2d61fc8768f434ba81c805266933f6933c9d345137962abd841d3dd2be17746377666891eeefaeb886a8e55daa1ac2e8c2ba73371 SHA512 d9a93f155a46de6c0c4f60913c85ef874e42e69805e7fea050eed92f6e2542e50061a07694482cf609fdd70bcf044ca1ac03ac2bc5f92a190ce2e219b9aaa7e0
-EBUILD web-console-4.0.1.ebuild 1071 BLAKE2B fcba218fabf4ee60a81d088cc159b373212ea4d6effc121ff1c7e8e2f9ea434efe1674d6ce23c886dbb267660291759a7ea6fef3d52de9441091e67f7d0175b5 SHA512 41470af754e173c258fc1571d9537868cc97b22be59c3ead88295eda9ee80e4791d22ac999b86d9a60ca732593a60342cab7c67e138b9b8c73bd1480a16080de
 EBUILD web-console-4.0.4.ebuild 1107 BLAKE2B 351ba5c63c81d8c51f1f63f291ca57cba3c3277ff5e554842221dc6c3e0a58dc118b9dc5c61f8904ea8103747b0100d660444c8fe609a6c25e28f39050a5d6f7 SHA512 e565b77b46d42fe531aa1a0a9c4f7d367b3e58979194084ec4dfb57e91a483b7760507ef78f320f78821e0c098984bc0854b0d94ad5fb345322c5336690ca92b
+EBUILD web-console-4.1.0.ebuild 1129 BLAKE2B 34f019c9d74aeb6fc17de1248ff1fe9c551f02b485bfebf4e11ff12e7e8f25cae5dae09fddec771de11693f4f900c1c44b23bd0c43d5015d62a8a3d1751ae0b2 SHA512 89f61695bf38b3e453181373e00b8d41ab301440b0afd6a1b5b0ac46031691de404c45305e697b6126884ad9579f644aea4a982b462554d9a6bb92d00ec031dc
 MISC metadata.xml 343 BLAKE2B 8883d76dc0b31bd49361ba715fc9546328ba5a3fc734e8a2607547cfde3d8b48914231839f0ea3d4a59f005a5074770e1dcdccc6b5d629197c8f7f859453f178 SHA512 9116cd6bba4d0030e6f8cdf055fd66afed68c52d9f5382a8a9cd2cb28f84c3f397a3e793dfef3b5ee0fc9e1a4dcd1c2d6e6b285fd7fbb027e339e2d15a0381ad
diff --git a/dev-ruby/web-console/web-console-4.0.1.ebuild b/dev-ruby/web-console/web-console-4.1.0.ebuild
index fc404eb434cc..de91b3bf817b 100644
--- a/dev-ruby/web-console/web-console-4.0.1.ebuild
+++ b/dev-ruby/web-console/web-console-4.1.0.ebuild
@@ -1,10 +1,9 @@
-# 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="ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.markdown README.markdown"
 
 RUBY_FAKEGEM_GEMSPEC="web-console.gemspec"
@@ -30,15 +29,19 @@ ruby_add_rdepend "
 ruby_add_bdepend "test? (
 	dev-ruby/bundler
 	>=dev-ruby/rails-6.0
+	dev-ruby/rack
 	dev-ruby/sqlite3
 	dev-ruby/mocha
 	www-servers/puma
 )"
 
 all_ruby_prepare() {
-	# Use an installed rails version rather than live source from github.
-	sed -i -e '/\(rack\|rails\|simplecov\)/ s/,/#/'  \
-		-e '/\(byebug\|simplecov\)/ s:^:#:' Gemfile || die
+	# Use an installed rails version rather than live source from github, and
+	# rack is now part of rails.
+	sed -e '/\(rack\|arel\|rails\|simplecov\)/ s/,/#/'  \
+		-e '/\(byebug\|simplecov\)/ s:^:#:' \
+		-e '/arel/ s:^:#:' \
+		-i Gemfile || die
 
 	sed -i -e '/simplecov/I s:^:#:' test/test_helper.rb || die
 }
diff --git a/dev-ruby/webrobots/Manifest b/dev-ruby/webrobots/Manifest
index 927eae95b0c3..185af7aad8f3 100644
--- a/dev-ruby/webrobots/Manifest
+++ b/dev-ruby/webrobots/Manifest
@@ -1,4 +1,3 @@
 DIST webrobots-0.1.2.gem 24064 BLAKE2B e77c7b83b16faa7c6d65f6133a5e2231a4e270d8463251c2e6a91a5bd1f11af431d4bca4f11bf40e2e84829c1b8256a39d048a371ce4a062af6bba9dafe25c49 SHA512 8b2a27a1758e613bced16b59a2b1708f468921388882d7ea483c7b6cbb5173fa24032f4db271734820225c5e90d3f30d07c5fb682d0d807c637f535ef7256097
-EBUILD webrobots-0.1.2-r1.ebuild 947 BLAKE2B c250be6eeb9011cfb3c3d51f1bb441b5cb68da78e414d1501cbab79a08ede2a320223a17162e37ced814118030d750354e366554675064d61a4b05196db50952 SHA512 c31c9bae02cf589bb86e205967dd2cb84526ff880ac596668d68ca289ca8a30df206172ac8941e025b27949b7b1f025248c2c168269a496299a06bb348eacb2b
-EBUILD webrobots-0.1.2-r2.ebuild 910 BLAKE2B fe4399837756c04d4d637967dc49fee807d08d3aa124b654efed54be71cdabb2df49baa7a6a37565ad3608e9fdc80843daa3b47d13b5694b63e559e77b51d10d SHA512 500148101f51d6a5bd1b536894772b7aa0b3e0108400d6ad3a8349c9307fc41c935014d6a9d5e2e4e919220809c53b1d3dbbfcdce168d5bde83fc490c8518136
+EBUILD webrobots-0.1.2-r2.ebuild 909 BLAKE2B f5026e59812bcae42fbc2d0d160e9fcb7f60b5bbccda9182182a03c5f8c2b7e1a867d62afd3be4a588c40817827915944593d0fd8778abef881e220fb8b83824 SHA512 7aa2a1f1b3b0dadd2f6ca2a273f7eb4aae233140f9f2bc00002c42071c246b206db7a60d8450ca2914622a869fe460a2786e788449964eed2249e227a83ecfa4
 MISC metadata.xml 380 BLAKE2B c77a2f322b5faa478336339140597c1fa4d8a11dd2110211a3cf2e5f8cc50bdc64f44deaa8f9d3d3d8370ba0c5aaf4867053a87fe264cd6a6a4b9737c6b8da1d SHA512 7970e062ed7ac4b9f4bd12988d5ebfe34c211e7e0344dc1d1f4d7713b9d20482c60f9a17954db1a9ed41f72712f5488f8164ddf9439e372c72ed7f95e9dd0da3
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
deleted file mode 100644
index 251bfeabb860..000000000000
--- a/dev-ruby/webrobots/webrobots-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A library to help write robots.txt compliant web robots"
-HOMEPAGE="https://github.com/knu/webrobots"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
-
-ruby_add_bdepend "test? ( dev-ruby/shoulda dev-ruby/test-unit:2 dev-ruby/webmock dev-ruby/vcr )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/,/end/d' Rakefile test/helper.rb || die
-
-	# Avoid tests for live websites requirering a network connection.
-	sed -i -e '/robots.txt in the real world/,/^  end/ s:^:#:' test/test_webrobots.rb || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 -Ilib test/test_*.rb
-}
diff --git a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild b/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
index 0a5a75709837..6a826db3523c 100644
--- a/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
+++ b/dev-ruby/webrobots/webrobots-0.1.2-r2.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/knu/webrobots"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/nokogiri-1.4.4"
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index ffcd1ae1341d..9862c2f78ee5 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,9 +1,8 @@
 DIST websocket-driver-0.6.5.tar.gz 24737 BLAKE2B 137c16a69309a1aad07fff663ff95a888a151f0fa20e78e754ae62ddfc8c2bdbfda926d7f4c53549e92646d018df7f374721e95246eb2985012e6b219970c4c6 SHA512 6915fdefac26a24e1f7d3d9a7e6bc6afc84b491150290a75a14243c233f5029d7d6e90a803b34bd6a8e8717322c6ae6fd4d3f3dad7a50c8eb18f17c3f2e9bbd0
-DIST websocket-driver-0.7.3.tar.gz 26035 BLAKE2B 508c5acb8e2aa1851ce04671b2bb68ce7e692b26b7b30c3115198d08606dbeb110067537337b75b90e7b3e33bd8dd1938eaa871bf41fd1b222ae71fa723e5ef2 SHA512 1ba113abbed068d1afa34a23ef29691a42f39f3980122c654c72902229f87acf87802c83ea79399b61f5749166bf5927a5d1ea0ba1840e3b9dceccaaa5196b55
 DIST websocket-driver-0.7.4.tar.gz 26184 BLAKE2B d28b078653fd86714a8546479c2a581cdf3d14c601b66f933da13d44d8622b88589008e1e691498d698d559b52ca920f6ece6e236836e6f401ea79d67b8b497d SHA512 a23b199d320f76ec49230932426b9e6bd2e21eccb76fa2a6ee6ae65cd954ae86b8274151a892ffe50c5d934b1f13553f733efcc497f73de65efce270f5959d03
 DIST websocket-driver-0.7.5.tar.gz 26179 BLAKE2B 8e7739d6cf48de5a2ef443f476652af74b269c075aa1e6bc13b2ac3ac17ede1699594a9380a137b307eaaed19ac2868b6a1362a66f835262f18e82f81c8e445f SHA512 538c78cd39507fb6cddeaa6196f0e2bbb89d7293f062d9b0231b6c6988a46b718c91b69a50b4cbf5b227067e6ed4ee89c61759bf340fc3e483c4af97052d42f9
+EBUILD websocket-driver-0.6.5-r1.ebuild 831 BLAKE2B 70f301dbf5789c5fb4a0ccdd5f2186a96a267a4a0b8cbfdf14d94adb51ed20e276f3a21e0f35e412111e7c766a4040ecdbbe8f97fb81abde36f033b762b1cf02 SHA512 642f7ef178dfdc5c0aa843ab669e5f083b7f5489461ea47c3d519b7f9f48bbd6a3e848a36869bfe8ebb439d58db0cc0997b3bf0a6c29880eb3dd4608d93d7d75
 EBUILD websocket-driver-0.6.5.ebuild 963 BLAKE2B 3ef1c98fee0e175e302a46841bee7b371b2e3430ea57565ae781128d2c654d64d5b08f61c4601cf5491c293efabdb4b437c89a2b09002eec7e04663c9e1bfc23 SHA512 419ee174c8e39baf21159308e94e2bce1f81772cf37c82ddedc65e12e2baee99b009911bda70719bbbc2da0ae1d58be449a3c362da50adfeff40a21355e28eeb
-EBUILD websocket-driver-0.7.3-r1.ebuild 808 BLAKE2B c6fb6477a787cb43b4b7994449deb5aff4dce829e865fca738ad3ec7bedce99fab29a3923b5ca05064b1701b40adabb3a0e840f67c063f9b4747162e0c7a75e2 SHA512 3b05437086870eed96f46c72d680c81e570a1f0dc8d9bde4500c25385176c1f79e9ab4fc8e04fc29327e70fbfd0490392aa11b3709ae9025c21d95bda0355e7d
 EBUILD websocket-driver-0.7.4.ebuild 815 BLAKE2B a99e19ee71c87e1f3128a06887d6bf617abc4597ee1e0b68facf91a17ef32c6c3c27fb7e1439469d7d7164265a3ca7faa994514062f208ea2b180e27105b24f3 SHA512 ee4ddba5831e0f310a6f39b86ca705468984a16ef2e1a0707d5952721fb9603becc11aca1a5870a715d21d2d497165be721e774116bb4299f1f31cbba765f13d
 EBUILD websocket-driver-0.7.5.ebuild 815 BLAKE2B a99e19ee71c87e1f3128a06887d6bf617abc4597ee1e0b68facf91a17ef32c6c3c27fb7e1439469d7d7164265a3ca7faa994514062f208ea2b180e27105b24f3 SHA512 ee4ddba5831e0f310a6f39b86ca705468984a16ef2e1a0707d5952721fb9603becc11aca1a5870a715d21d2d497165be721e774116bb4299f1f31cbba765f13d
 MISC metadata.xml 352 BLAKE2B 97504816fa7ecfb7afa7a4cdc75e592d5c31b7bf46e6e7813ac374eb7ac64e34c95a6dc46f6effebce6e712fbd5e66b561cd5d74af2c000603dc4583d9eebbb7 SHA512 22d85a04b0817950a9da710f66781f849f9fbdf4f4cf0af3728abfbbff745c2040bdf0ff0362634954502f0bee00fc2107f9186928adc7936497902bd865ee21
diff --git a/dev-ruby/websocket-driver/websocket-driver-0.7.3-r1.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.6.5-r1.ebuild
index 4c0c845df057..6d1d0117d699 100644
--- a/dev-ruby/websocket-driver/websocket-driver-0.7.3-r1.ebuild
+++ b/dev-ruby/websocket-driver/websocket-driver-0.6.5-r1.ebuild
@@ -2,9 +2,10 @@
 # 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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
 RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
@@ -18,8 +19,8 @@ HOMEPAGE="https://github.com/faye/websocket-driver-ruby"
 SRC_URI="https://github.com/faye/websocket-driver-ruby/archive/${PV}.tar.gz -> ${P}.tar.gz"
 RUBY_S="${PN}-ruby-${PV}"
 
-LICENSE="Apache-2.0"
-SLOT="0.7"
+LICENSE="MIT"
+SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 IUSE=""
 
diff --git a/dev-ruby/yard/Manifest b/dev-ruby/yard/Manifest
index b2fd9c9e873a..0bd7098cfbf8 100644
--- a/dev-ruby/yard/Manifest
+++ b/dev-ruby/yard/Manifest
@@ -3,5 +3,5 @@ DIST yard-0.9.25-git.tgz 930253 BLAKE2B 35531a7e90ab99bad8d236ea4774a8aebc50eff5
 DIST yard-0.9.26-git.tgz 930901 BLAKE2B 19baaefc54269bbc7eee053b42f2be85644a062cbf55b0fafb63748876aad3a3143767855f4ee7b10a1ae814110a6cf63c01e4055e054aeb31bf8512e793d80d SHA512 0f70a089d5e5ba33e326b0ae0cc84a2cacfc5a3f3080545d5fc5bb324dedbbbf65116cc9412b3496c09b2b6c15514e854a741a1fd7e2ae782804d6e4ac28fcd9
 EBUILD yard-0.9.20.ebuild 1766 BLAKE2B c8b561e62e689e9dd828cbbd4674a317ce50dddbfd63a82766eabd315ed4a1c8c7ab80f6a84ef77dd2181c164c9419d62ec491a94dedb7eaa6a4a66bc0a25e8b SHA512 9554cd54d05877dd5e3197127e463c01dd01f578a5d92249d2adaf27bba34a8627075a7ed3af229ab28c473b5144959b519d2006dfc034318d00d2e28e73b37e
 EBUILD yard-0.9.25.ebuild 2058 BLAKE2B 7eb00d3fd28282d032dc9ce57b2fe9e27d0ddafb348a6a0d8e1d42e68187aac69943c4e1a4a8892e7a47cff0ac7a10bf3d71ad71d1cbb8ccfa0a009f4d44c6a9 SHA512 a8f2500b60dcbca8af237e84c29f230cbaeaf59a60d47b0a342a35a595618cab64c8656db7fe5ec7b9bfc9225b97dd8d8ba6bb23af83383a0111b241766749f4
-EBUILD yard-0.9.26.ebuild 2058 BLAKE2B cc8c241a51a252e4fedaee56714e514a8148418774b529078a9102082c2e61a1d27d292d1456c657a5de51c5fab2f094bc011196ccf486ee81ecf576c7a6afb3 SHA512 bf4ddab410103a31df845c3e00b3f1c25d3ffa221e77d19bd13230f209e3696b381bb7c2b4a722ae99e0e37a091e97d18607fc71e2c0f0f8a8aee0b879049277
+EBUILD yard-0.9.26.ebuild 2053 BLAKE2B 5e0ff76cf08b10fdc85b735ebbcf3508c0ee948db891e3869f66d367d9a2cb68e57f4fd7d0126f7599c50c9c1fe6faabe8eeb2e51f836db6798a18b04b6643d9 SHA512 915cdf0d5d80aa400e54d7eab56c985a51a13aa415699560dba9524acf9b4a2dd9d0edb8b2f0af2ca6442a6bd405b4c681e03b2bb28150d27900138323444dbd
 MISC metadata.xml 337 BLAKE2B 1aedede1271d1f9a566743dd25b1fd9961e429b78bb5f9f36bd6ea66f631f376a273d7a094fba7121d099f3a4a3f0e7738753078e2a1a554cfe6cf32acc6e2b6 SHA512 0de30cc9c4a9d08649f141cb6df0ee9c05703831603c77a0605f0bf8e2f49b8324a782d092aaa690581e23d6d948fda9781b98770a3ba89ed6bfc0de351c11bb
diff --git a/dev-ruby/yard/yard-0.9.26.ebuild b/dev-ruby/yard/yard-0.9.26.ebuild
index 82a76216fbd3..b3a0d0931abe 100644
--- a/dev-ruby/yard/yard-0.9.26.ebuild
+++ b/dev-ruby/yard/yard-0.9.26.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/lsegal/yard/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 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"
+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 "doc? ( || ( dev-ruby/maruku dev-ruby/rdiscount dev-ruby/kramdown ) )"
author	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-07-03 22:39:47 +0100
commit	7f0ccc917c7abe6223784c703d86cd14755691fb (patch)
tree	8c6793f68896b341e22f33d7e6cef88e481f4a8b /dev-ruby
parent	9aa80713372911cec499b3adb2cd746790920916 (diff)