14 files changed, 39 insertions, 211 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 9bcf56ff523f..bbb6b55379da 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 73304fd5b58a..b54bc829ede4 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -1,4 +1,3 @@
 DIST asciidoctor-diagram-2.0.5.tar.gz 12482984 BLAKE2B b0ef8596d2f2dfcf11fcbba876141aee38e8615195159f76e07b45c00b46bd85824dd6e8e9f571b396bbd9d082c5d60d4e05cdeac27719bfca53216c0d1b1816 SHA512 7e3bfbfb08d7389a039b1727bc173fca82e05134bebd89f3ca65d5e7860555034ff5e785c32e55ea2cc9826343456c6ecdfa15fc76f4d94858461356ab3ced71
-EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1024 BLAKE2B acc00fdff7b19a7fd4ab9bb3422e9b83d4fe261e4c7e640aebc88ab895e4e09a7e505e3e40097e37e5dab0d9def209c0d8142d1b44b54e57a15af5d60848d290 SHA512 3299d20354716a34e9ee45cd55581224f26157a7be81d2b6377db468ee2ad263527e3f860a61950971daa5019c2c03f7be16e77330ce44c2a4c1fbea9301f8d0
-EBUILD asciidoctor-diagram-2.0.5.ebuild 1000 BLAKE2B b6acfc52ca81cdf236bbcc6b7712e62ef9e82381f9d05f81cbb26a860c435eb477f8b14cc291939aec9c13ffc197591a45d2a67e8561ec70c2d4307b3c71fb26 SHA512 987dd89d93cd91f3eeae8082490971fb3797a4d3c17628c76952fb85ce2df2b43ba51bd0b7b49bf1661c5f051f731b420dde3bef0f5f62aa8cf98a28ab7ad972
+EBUILD asciidoctor-diagram-2.0.5-r1.ebuild 1164 BLAKE2B adb21009c7520cce9292fefdcf08ca7f6aec75ffebb5d13519c663524ccd0b8481dcd71a509ec21c2653943545c58027907d0b3377f11fdbc84461cef5816afe SHA512 138403bbfcaac082ebc5c7b7e0ab4e2ca2379b42e41d5bb965e837b34ec90d171d78e7e9e8a634221732f59412af7fad4f57ad7f993190f085e6240212b4b2ae
 MISC metadata.xml 358 BLAKE2B 0a7ccfa951823c5c42d8ce280483f15e73abaf453c24b79b68bce29717bb3ae4e4656f40d7bc320479e65d8942bf43cb4abca9b9d916d2c27275880ef2034367 SHA512 4cb3cea3081700e1eb920452d2408fbf7ef730232e2979edc057c10b1ff879d14d97914765c644fc8d055c5705b8bb16b2a9651001733b102b8a05a1e72e1cdb
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
index e19bb7db440a..48a2fdb58f89 100644
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5-r1.ebuild
@@ -23,6 +23,13 @@ KEYWORDS="~amd64"
 IUSE=""
 
 RDEPEND+=" virtual/jre"
+DEPEND+=" test? (
+	dev-texlive/texlive-latex
+	media-gfx/imagemagick
+	media-gfx/graphviz
+	media-sound/lilypond
+	sci-visualization/gnuplot
+)"
 ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
deleted file mode 100644
index 48579c8ab99e..000000000000
--- a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-2.0.5.ebuild
+++ /dev/null
@@ -1,37 +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_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
-HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
-SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/asciidoctor-1.5.7 <dev-ruby/asciidoctor-3"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/c.formatter/ s:^:#:' spec/test_helper.rb || die
-
-	# Avoid specs for unpackaged tools
-	rm -f spec/{a2s,blockdiag,bpmn,bytefield,dpic,erd,mermaid,msc,nomnoml,pikchr,shaape,smcat,svgbob,symbolator,syntrax,umlet,vega,wavedrom}_spec.rb || die
-}
-
-all_ruby_install() {
-	all_fakegem_install
-}
diff --git a/dev-ruby/hashie/Manifest b/dev-ruby/hashie/Manifest
index 5da1e53dbb6f..48a0ab2f451b 100644
--- a/dev-ruby/hashie/Manifest
+++ b/dev-ruby/hashie/Manifest
@@ -1,7 +1,5 @@
-DIST hashie-3.6.0.gem 74752 BLAKE2B b689843d30001dd7eaa09d62ab908d60e76128df66055283ccf0770830e5901b4e792c4bebd2cad8bb6d5e97a23016aee0d0114f2fb0f7ace8ebd722b8941020 SHA512 7b5355a2b93267d6b7c63608aeac4bb7d21f32a982e2c59771d5a791f9a0c921d11e1b4a185067447917315ce98f8cc5f2b48a31efec3068fb1f1ec0e4386e15
 DIST hashie-4.1.0.tar.gz 86972 BLAKE2B 33979037db67f8a7f20ae85e3db6e8b5415b9b2659a5961e2c2a97e3197fef1500cedd8557af314baf8395a9790e8a457633ecade944c198c295f7f13847afa5 SHA512 f2a36ee812e39d679390647514ff894d4170b61ece6d37ef42f1203212d80d2dee63b4af162d81ded451a53c058746f26fc16810db4c748cce9ca6635a300a4b
 DIST hashie-5.0.0.tar.gz 105224 BLAKE2B f15fd3ecd5dcdf88ea97d4aa5e13d984bbfb4dc54a687b4f166d9d84f07ddc0037f4fe251a4ec4950a5b89aaf4f0e43d11467018d63e3a89ae980ec06caf3dd6 SHA512 fc1f9399895f67af77af7b2d1d993eebd221d2b779781625bf1bbee579547580add7d7d0dbf1791564c8df6764c19617721ae5139ca949c81a316beacfe8c806
-EBUILD hashie-3.6.0.ebuild 1266 BLAKE2B 5003bc6dff9dee766277c1399fffcc0b7beef0cf006fe2dcac444fdb0c21548f3287c37f92756ca9fb46a570ee9ea6747756088e3d4a8ea39c59c87ea3a7dcb2 SHA512 fa6d6a28b708aeb94c791a3925bb8f52d80f0fd8b31192a1a6a83bd2cddbbe4391f5126ecec9ca17517fa96cd213c132feb7c4bb554a1130b69fc0bbfe360253
 EBUILD hashie-4.1.0-r1.ebuild 1414 BLAKE2B 07ca818d318de830c4ba163819145aba59b8d1c42c24c20ebcc3c2060651f061aa36662de518e430adb46f9b17c60251591b734fc622d49518b722fed401f686 SHA512 7378a17821af6259921424a29b94c7ce06554ee3d5a38f669904cc362d057782aacc6445c0ee97c9a6d8e9df6d07bba9c629e52818b67191692779033a13abd0
 EBUILD hashie-5.0.0.ebuild 1423 BLAKE2B 2c961e13d1e820c7f1b6c006025baee06a469888ad72f3961a1bbe67770f09aeb1084a64842dd31c1bc5644cb88507f58ab988823fe11963bbec58712260958f SHA512 a218c916fafcf5d3806135f5efdf0a39da06cffba2fbfb3190730f3db79e186311c5c375824bdefa0c0920d3526b6d5e77732c9f0ac31b43c9fca863a6dc9b3b
 MISC metadata.xml 248 BLAKE2B 0c876bde3c72e61d28284a95a837103e6d594c9f6fccbd6d7d1039f9c5a604347c20c334c9a57d80b152888fed536196f2807b477e8d0336c80affb0e28c9dc9 SHA512 b2b64178cf6cbbaa5fb4671ffe1ab88b83c920de363ae099ef74fa3e5eb8c8f0285c749cabc0cebf344951503d1b7309ae294afe9e7cf5172700182d8843fa14
diff --git a/dev-ruby/hashie/hashie-3.6.0.ebuild b/dev-ruby/hashie/hashie-3.6.0.ebuild
deleted file mode 100644
index 1d6ac814ed5c..000000000000
--- a/dev-ruby/hashie/hashie-3.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Hashie is a small collection of tools that make hashes more powerful"
-HOMEPAGE="https://www.mobomo.com/2009/11/hashie-the-hash-toolkit/"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/activesupport )"
-
-all_ruby_prepare() {
-	# Remove bundler and fix one spec that depends on its requires
-	#rm Gemfile || die
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-	sed -e '/pry/ s:^:#:' \
-		-e '1irequire "pathname"; require "tempfile"' -i spec/spec_helper.rb || die
-
-	# Avoid dependency on rspec-pending_for and its dependencies
-	sed -i -e '/pending_for/ s:^:#:' \
-		spec/spec_helper.rb \
-		spec/hashie/mash_spec.rb \
-		spec/hashie/extensions/strict_key_access_spec.rb || die
-
-	# Avoid integration specs to avoid complicated dependencies
-	rm spec/integration/{elasticsearch,omniauth*,rails}/integration_spec.rb || die
-}
diff --git a/dev-ruby/marcel/Manifest b/dev-ruby/marcel/Manifest
index 27090efa950d..a8b95c6bf5c8 100644
--- a/dev-ruby/marcel/Manifest
+++ b/dev-ruby/marcel/Manifest
@@ -1,5 +1,3 @@
-DIST marcel-0.3.3.tar.gz 7845456 BLAKE2B e27d851119f434144a790cd1bfb1ca21662357b1875ae9193273e00c5abc6156c217efeb961356d4967d984b4c8fb4b4047620fa5d0448cc20651aa1ce05bb69 SHA512 d9be185fd6f5185fc67f3eed931ecf3084da671840b6e464bf341f51c9dec4ab1b4650abd1916e640b7caced230d6cb90370bffb559151e0047a8b03211dc751
 DIST marcel-1.0.2.tar.gz 8305198 BLAKE2B 264737cdb29852a186bf0e719748caca6c63626528f486dbefc3eedc7df6d7fe6f34e5cf68eb8b04f8b2b75c52bed59222d5f7bbcf60047cd5db7c4c935802ff SHA512 cd159545b246dcbd26ca07ac69e36ff13a965ac0e99ebd040c53b6a92f8ec8fd65786783c9a173d669fe6b32340a23d72c83c483011eec2e1097bdea73810ed6
-EBUILD marcel-0.3.3-r1.ebuild 1061 BLAKE2B 21993da1a5ec3020f53b2371311e8d2a8cbfff0857e89574e0adaf458179a3b0cf5e3d5a0cd18920e741e230658d9b366ba1e1d66318672d4b9eabab6e65e336 SHA512 b40d11abedb93fb38e355e10540e0a15928f9b879c734010fafbd3340f25a9f2d5ad0e3d3a86f830d3a10b6f4d4fb9c84007feed0632116d5c7f2181542642be
 EBUILD marcel-1.0.2.ebuild 762 BLAKE2B bad955681b97b944aee792302b9deb75e5e536e0a0406cd2984f38b19a44fa7e41cd7c4b7c6d1059557c38b98cb408377c442bc314a462c124e5d7440edcedc8 SHA512 f60e644a9614a86cd98a9a3df2f418a4c4d017b3de64a92a80c28e5919c38e8cfa76ab1f0b503547580dc40836d3fbb489d25de7b71100fae8aee0c891f1d8f7
 MISC metadata.xml 342 BLAKE2B 44cc52444c7ccbf38932c88133d066cd0740c8eb8538fca85665e6d7d17aa75e92ddfa941b37226a61c577c520e7240c6754ce5d94086f426cafb9b2483ccedd SHA512 59eb5165fb820bd9a0484522c5a73942d7679a2eb2e7324a4b5050c4dc3cc28089fee755de0f1e117ee31c5d6fd3488e0b5c009de884431205febace1046a8ad
diff --git a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild b/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
deleted file mode 100644
index 10ac4471b7ec..000000000000
--- a/dev-ruby/marcel/marcel-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,36 +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_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Simple mime type detection using magic numbers, filenames, and extensions"
-HOMEPAGE="https://github.com/basecamp/marcel"
-SRC_URI="https://github.com/basecamp/marcel/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_rdepend ">=dev-ruby/mimemagic-0.3.2:0"
-
-ruby_add_bdepend "test? ( dev-ruby/rack )"
-
-all_ruby_prepare() {
-	sed -i -e '2irequire "pathname"' test/test_helper.rb || die
-
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-
-	# Account for changes in shared-mime-info 1.10
-	mkdir test/fixtures/{magic,name}/font || die
-	mv test/fixtures/magic/application/x-font-ttf.ttf test/fixtures/magic/font/ttf.ttf || die
-	mv test/fixtures/name/application/x-font-ttf.ttf test/fixtures/name/font/ttf.ttf || die
-}
diff --git a/dev-ruby/paramesan/Manifest b/dev-ruby/paramesan/Manifest
index 73700f34c4f3..521435b153ee 100644
--- a/dev-ruby/paramesan/Manifest
+++ b/dev-ruby/paramesan/Manifest
@@ -1,6 +1,4 @@
-DIST paramesan-0.1.1.tgz 4064 BLAKE2B f6c0e8b0df885e9dda4d5c2a3f0226703a94237707b877a7b82d5b8b0fdc812fcf289019a1ed550640a7f99a59a0b0389407857bc0e21987c7dd734734d32c0d SHA512 927595ed9686fb8833beaabf4421cb2c4908bf6e2e1c656034a79c839c292b503ca0ae211f8bdd3916501a281eb2f0b374fc5f4c90615629170e1ba767f0e7fc
 DIST paramesan-1.0.1.tgz 4981 BLAKE2B 3447281084a1d79d46f2a8b80c9b6d2ee63d9ef245e07ef07799a2ab2c730a1f99075bfb5c632c409fe412e277cfe354c8e59e99ffd38c2f1d671b7db3ace34a SHA512 6353006a26e8a7d4790d8bee88e4968df6d79ebca1f0855262eee1679789dfe1404fc345f6965377d5eadf03b88b9b8e1764a84065dde312d29fc0bae323b8a0
-EBUILD paramesan-0.1.1.ebuild 694 BLAKE2B 5fef784f26fb8f0d9393e34ab78f10fa350ab68584efb71940509af9b7700e2e6e3f9ea1ad8e43908421a7f905ec438d08477e2c7928eb3966f37db385bf781f SHA512 92df728806b398d36fc3228dc3efc98211a718474f56459e64fb4c610d3759b18da835493e299bb8ae20e7b425c20d803079298eeded6bf95fc832f3ea13ba2b
 EBUILD paramesan-1.0.1-r1.ebuild 676 BLAKE2B b50b27d26e52cebfca12a13b9ec79a297a59164f515095b2d92b779fb1d50d0f604c97df4d69a90a1e7a9ce0e06329d73b3e699a10b6714ec6c85bbe622ed8e0 SHA512 f2aa37b0b110003060a18c1bb054dc1dd9ada5510066a3151b8adcbc12399238599251a1c41c6d42d21ef8b97f5b3dee44fc13f8888b6d25ffea682a30b0604d
 EBUILD paramesan-1.0.1.ebuild 674 BLAKE2B a2fb0e409fd5b26f49177ef7bf07de3c4d65c6f9333afdfbb3963f7eaddc66b185309099e8dfaf5a0aba250ac042b12e1c966721a814bd08f6c52dbdc65f6fd3 SHA512 441ddb428ce9cc4f88b42bdc4bc6e1b94d3bbd825f47fc2764d3f73de09f281e5065ad87002e9f89b823ece6be2d97226eb64053b772179ce3970f7586ab153a
 MISC metadata.xml 337 BLAKE2B 83425721733f8a7f3dfc35d3e482a06f9b750a7abff07af5a8862ccf29b6fa361c5f8c9cfbd6cfd0e18c4ed8cf5f225f2f7cdf7274cb84518da85a1db03d2847 SHA512 c007c6bf891c952f44b0c74f7d049917f9a2e15e4e413641ca6cc705b3ce5318827d562c3d9ccbd8cbc065b9a076e24062352bb6780615524fdf8f97b9e0693c
diff --git a/dev-ruby/paramesan/paramesan-0.1.1.ebuild b/dev-ruby/paramesan/paramesan-0.1.1.ebuild
deleted file mode 100644
index 2339e07e4fdc..000000000000
--- a/dev-ruby/paramesan/paramesan-0.1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="paramesan.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Parameterized tests in Ruby"
-HOMEPAGE="https://github.com/jpace/paramesan"
-
-SRC_URI="https://github.com/jpace/paramesan/archive/v${PV}.tar.gz -> ${P}.tgz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~hppa ~ppc ~sparc x86"
-IUSE=""
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-	sed -i -e '/bundler/ s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/public_suffix/Manifest b/dev-ruby/public_suffix/Manifest
index 330fd2b5295e..65d5867eabdf 100644
--- a/dev-ruby/public_suffix/Manifest
+++ b/dev-ruby/public_suffix/Manifest
@@ -1,7 +1,9 @@
 DIST public_suffix-3.1.1.gem 99840 BLAKE2B ef86b7ecb834a855dbb44b8a0f934de3715edb6d67faefd20f99054898b35bfedffd490b60fbe80236905826868611aa96e13766577bb98ab997321cf9c49b39 SHA512 1e266ed7fa224fa94a49a51dae2868bdadb80ca2de660d2cda9a1e146ccad5aaba2cf68d75272e333a4b1a80e47863d388d85d3a86bddf8f649a320e5e700078
 DIST public_suffix-4.0.6.gem 108032 BLAKE2B 4cbb10ddd924daf11d97a54d18550961f46c0951dd3dc1f23740ee7500fd8e796e78fd6421a7418a49350a69eca7d6456a09810be317ad4619ef3d3e7f71ff69 SHA512 a756c0f8f9cee2d12bd1730280108b72befa362defda12e5f6d7af6d68c40e31478c337b3eb7e7407feff9531082051d18928861003c7ba29679b4048da3b4b1
 DIST public_suffix-4.0.7.gem 113664 BLAKE2B 5da86713da01f59e7f311985a36b835e02807ca5f186ffc5e41e42cae7781cc10d96a4aca77dafb77050c78e6fb03e10f7ac55dace776c5cca68bca9f4bd7d75 SHA512 acdfe135684277a669ceaa61ea78fc70b979614f63daf27d145e78e4013221eac106651838a27b6694844f4fc33521ecc9f81102582ca1f1232fa80ce8191207
+DIST public_suffix-5.0.0.gem 114176 BLAKE2B dc7a7dcf3d84130420d6243aa0a9391c141061fbe0fa70d85ce120938f3e31d617cf022a853dc9839cf49b997c1eb85f49a8759f357820ca32f88a26730fa473 SHA512 89dc076e6c55790b1459ceb0b0587d20b80d8a681bab6db2dd213e06f9bf9e55200e86cf891c92b310e691e7b0e1bb5ae95e28e3a3307541c2f020e5f69abeb5
 EBUILD public_suffix-3.1.1.ebuild 874 BLAKE2B fd5a479bd94cf040749c6933a6bd012763dcbc11fc200897544c85e1a7ac83839c3f37a3f75dbb34ca4a3e050b6c1c68716ee18cc137e84c0955b67ba731997f SHA512 4a019c94279f7befa531d27969399080e2b6873c24468c4d7eee36c5acba71f0110c53e2fe7505f24e28b153a6a72516d4cac40e0c9e61a4c2f156c8b1078fa3
 EBUILD public_suffix-4.0.6.ebuild 814 BLAKE2B 03948fd4c736861e92035ef694c0ad24e1b31e62f98cd1a777d62d2c802260722713c3db6d1eb480f691c98ce6fa577c6afc2584bc08f5e581c342c4ff7bdc38 SHA512 0d7ec35b03cd96d3ea1a451ba02812ebbe37f998bfdb978a0297e2125731860be401d085999a87d2a33fb5d5c836ff8d03d4ff44edc62d884666d59a2afd8a6e
 EBUILD public_suffix-4.0.7.ebuild 831 BLAKE2B 97e6de0503f2db469240e3b6e968911dd57acbbd4cbb5a2f24e949b9fe614dde6d3074460051142150c3d4234f9a94328c0d25437a9b2e29cd1c9ef4e001a258 SHA512 9d5f1c764445c8a2cc8b821adeba402b1c8607aa9ebe4584c0e8f7753f69fdb98b4bb185c46a3796dc3ef2e351065cad1ddf2f816e81a4d72d95750e1637e627
+EBUILD public_suffix-5.0.0.ebuild 824 BLAKE2B 37c71816b1a0c0e32a4a71165d25c7afe29cf8bcb334b1b19fe851be61b551fe71c90d841804d09faff0fa8e7c1d843dbadefa0e3a289051336331959650f3ab SHA512 85521eda75932f4e2bc77f412ed3ab2eac11ca02226ca044723d9d5f0b204a0338424a5857dd0d9f45f8c6f32723cb94134423d7c4aaef3a7dfeb3d8be08fa25
 MISC metadata.xml 341 BLAKE2B b3cca7169b9fbc96674afb8199385f169236045a393efea2c899cb2ef6ba3f2887225b7f543fe4bfc7a48d67405cf88a58c2d076cd3ab8ad24a36997e836e8fe SHA512 d70ea0d3d7bcede6344839ab591ca4bb86da938f57fa8ffa1e2fc8498b0867fd9a5859a7b96b372453f577620c26250df8c20b9687aea96234a01d249251ad27
diff --git a/dev-ruby/public_suffix/public_suffix-5.0.0.ebuild b/dev-ruby/public_suffix/public_suffix-5.0.0.ebuild
new file mode 100644
index 000000000000..0e54e7908148
--- /dev/null
+++ b/dev-ruby/public_suffix/public_suffix-5.0.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_EXTRAINSTALL="data"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Parse and decompose a domain name into top level domain, domain and subdomains"
+HOMEPAGE="https://simonecarletti.com/code/publicsuffix-ruby/"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/mocha:1.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/rubocop/I s:^:#:' \
+		-e '/yard/,/CLOBBER.include/ s:^:#:' \
+		-e '/bundler/ s:^:#:' Rakefile || die
+	sed -i -e '/reporters/I s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/rspec-rails/Manifest b/dev-ruby/rspec-rails/Manifest
index e9452d1cc476..399b12fc0a4b 100644
--- a/dev-ruby/rspec-rails/Manifest
+++ b/dev-ruby/rspec-rails/Manifest
@@ -1,8 +1,6 @@
-DIST rspec-rails-3.9.1.tar.gz 143459 BLAKE2B 87a691df63a438b15b5726a802632c16373c784cc66216c1b099ed7e36e0916fdfe7ca1fb964904678b779b8fa90f0659971c4af00f9ca3a1071adf2216466bd SHA512 247acda67672ea3fa0641ea36d6209c8876597c63180979713db257e02cb4282b122af4cc0aa540dae984acdb16afdc4359012360b951f0599710fe422cdccac
 DIST rspec-rails-4.1.2.tar.gz 156296 BLAKE2B ca454065c8fb318148e745162514b9f21aaf6050ae72981d12a23b838bc7d985350c8abd60a36c07cb5c8c8bd80dd7b97b0dcb9ab6f5fb30ec4a6d99aaf189d4 SHA512 c0555d3b0d1ea91c9460981216cb0e4d1999e712daf18e5270aa20daee9667e3e669c918204e863bea0b6a97a63a79cdb1cd261d396743fdfbcc41109211ce89
 DIST rspec-rails-5.1.1.tar.gz 157454 BLAKE2B 580a3443cfe088d4056815e3fc344f9b91e5df9ff52099942f8e74c062e6ffb8ff528e5bcb17b33684be0e6b4ce7791a1df38a7fbead0ca348567cbbf3f6a863 SHA512 68ba2af02619bcf304237e744f728772e9de889d7aba5ab5fef236d40e1c047b03bf0c199bb28074f2d4cf47e1811f241e67b56d8c362dbc8ad69e066bd3d7f0
 DIST rspec-rails-5.1.2.tar.gz 157523 BLAKE2B b500aa53f8bd965f7b95e90403d46096073780fa4e318295bffba44211cfb9d5eab36549e6fc3afc144700a8224ebe808489959a172f1d9e76c43320b7022979 SHA512 f9ef3a3812590a7cd50bd34e9e6cd9669fab24736ac7693b3fffe3f8be9b8313e31b0c7b7571a735f20bc5d9194a94c2f447e69f6491190536b6534211e1b070
-EBUILD rspec-rails-3.9.1.ebuild 1511 BLAKE2B c7b77b6d1e9ec550b58e829db92d7746a45709c07a39c5af021188f0ac39ecfdcdd4425125f4f41b2da4d93622beaaaad2133e49a5457a4b46f9d287e4de4d97 SHA512 1a8f965898cf9a073b18d456834dd4c02bb25f68b53f7d818a354be2ae531b1b5d1f3c5cff1a044fa9b6953648d6907014f0ba5b2fcd81082c36a4dbe78d8421
 EBUILD rspec-rails-4.1.2.ebuild 1555 BLAKE2B d97b1683244bf2bf54c19148dd5aae18eb673a79f5b3e95d33adf0636758c92200a2034b6ff070785d129ff7b5537d190321308577713c0521d4475bbd95ba01 SHA512 d7e405df0f5949eecfbd5f3c67bc440b7cbe446c11ddc2db0b93d7c7c29d0e8baf49de69052c134e47bebc2b4affaf6a9c6a6c4668491397f9f1b4177810cd5d
 EBUILD rspec-rails-5.1.1.ebuild 1623 BLAKE2B 52ef145ad123a4ab263d8a1509261a8b856e572ca4413bff111628acb2c9eefdd022d274d2b0b00ff35aaaa5cd19de2e9cbf944bde8547676fa05c51ed83c7ae SHA512 75ca634e6209b7480ca9343920b1340e02e95d8ad9a5fed06172d6bef5321f5b6af4cfdfac569e6ccce1e981c931dde9fea5aeefa6aa2a91865958cb087174ee
 EBUILD rspec-rails-5.1.2.ebuild 1630 BLAKE2B 4085ca18959ec2c8ead80b2fef8bb46c114808ac68582973d080be8880c0e587ea1c7e89802fbc2ad311c5c9391b5ccfcf8bbb59584f788ed870569a246bb675 SHA512 d0858f55d48055077fe89ccb518a461bb70f73c9416471ddbdd3ceb338d4bbf5cca59d9f20bdc2d7249cd7131ad03ca48632a8b34e61942a09441bc5ef33bdd9
diff --git a/dev-ruby/rspec-rails/rspec-rails-3.9.1.ebuild b/dev-ruby/rspec-rails/rspec-rails-3.9.1.ebuild
deleted file mode 100644
index 186d3b997e1d..000000000000
--- a/dev-ruby/rspec-rails/rspec-rails-3.9.1.ebuild
+++ /dev/null
@@ -1,59 +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="rspec3"
-
-#RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="rspec-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="RSpec's official Ruby on Rails plugin"
-HOMEPAGE="https://rspec.info/"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-SUBVERSION="$(ver_cut 1-2)"
-
-ruby_add_rdepend ">=dev-ruby/activesupport-3.0:*
-	>=dev-ruby/actionpack-3.0:*
-	>=dev-ruby/railties-3.0:*
-	=dev-ruby/rspec-${SUBVERSION}*"
-
-# Depend on the package being already installed for tests, because
-# requiring ammeter will load it, and we need a consistent set of rspec
-# and rspec-rails for that to work.
-ruby_add_bdepend "test? (
-	>=dev-ruby/capybara-2.2.0
-	>=dev-ruby/ammeter-1.1.2
-	<dev-ruby/rails-6
-	~dev-ruby/rspec-rails-${PV}
-)"
-
-all_ruby_prepare() {
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm -f .rspec || die
-
-	# Avoid bundler-specific specs.
-	rm -f spec/sanity_check_spec.rb || die
-
-	# Avoid broken controller generator specs for now.
-	rm -fr spec/generators/rspec || die
-
-	# Avoid loading rspec/rails explicitly since ammeter/init will also
-	# do this and loading it twice causes an error
-	sed -e '/rspec\/rails/ s:^:#:' \
-		-e '1igem "rails", "<6"' \
-		-i spec/spec_helper.rb || die
-}