gentoo resync : 31.05.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-05-31 20:59:14 +0100
commit: e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree: 23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-ruby
parent: 908778078736bd36f7a60a2d576d415cb8e000fa (diff)
49 files changed, 505 insertions, 293 deletions
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 493747d2fd82..5161ec074ac0 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activemodel-serializers-xml/Manifest b/dev-ruby/activemodel-serializers-xml/Manifest
index 39a3a16785b0..a02e4d8ce255 100644
--- a/dev-ruby/activemodel-serializers-xml/Manifest
+++ b/dev-ruby/activemodel-serializers-xml/Manifest
@@ -1,3 +1,4 @@
 DIST activemodel-serializers-xml-1.0.2.tgz 23321 BLAKE2B ad626402acbf3a10a9b14a19713b3855e7eab69cd02ceb63386cb11b147c4c9dbc68dd849b9421b518bc70be29009f54f5effbe734e9c8bb1c59a7d2c3286ac7 SHA512 888db4822f9ed4fd17ba93f2e03e4edc204bc14f62e3622949140a3497f56ad7cd7d49cd7f38fbf557098ceed9f2f1334093fd8493ccc82e56be15f6bf138af9
+EBUILD activemodel-serializers-xml-1.0.2-r1.ebuild 980 BLAKE2B 6dca15e488973e7b5ca94a4c9b69895e68ce9a11b256c88e7680f70c8fa3093973461575994e766dc3452360202beb5bc4b3820bf529506ad54cdc740de80869 SHA512 cdcf0667a0a92909e0334de2568e7aa06bbfba4e1294024350ab1d0113e66a8dd441889a574674058c527aaa18fce13e7927ed3f4acac8beb5bc608f4275cf62
 EBUILD activemodel-serializers-xml-1.0.2.ebuild 908 BLAKE2B 1712ced62304a54a8535a0f4d479aba39d4030bf439eabdb65537ae5e8d58122fac6593a6f98f413af679830137fcd739f4e04febaa9a524ba75a9d4fff0ff0d SHA512 b27eb7d6c2dd47c55181ad11eb67a4cecb1b2f120714ae2839c7d7be3b06434c313f5f596b726c7c7a9107fa526ae700dfd20560ffc2b339eb7a6ee1fb308195
 MISC metadata.xml 359 BLAKE2B bd42be542034857259bf880395f36437fe922d69129d5d9bd42304d91a5c7d4b4abdf14172f107f65145e1d84a357df91a1863ba27769d71cf27ed3b23665441 SHA512 6c897585918895b39efa6695aeb5d21fde017b48de50232067658edaab18b90374996f2e5b10a485373ea5316e2fa7f57f0583a02478d64761e2daf2417c9633
diff --git a/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..dd52b160933d
--- /dev/null
+++ b/dev-ruby/activemodel-serializers-xml/activemodel-serializers-xml-1.0.2-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"
+
+RUBY_FAKEGEM_TASK_TEST="MT_NO_PLUGINS=true"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="XML serialization for your Active Model objects and Active Record models"
+HOMEPAGE="https://github.com/rails/activemodel-serializers-xml"
+SRC_URI="https://github.com/rails/${PN}/archive/v${PV}.tar.gz -> ${P}.tgz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	>=dev-ruby/activesupport-5:*
+	>=dev-ruby/activemodel-5:*
+	=dev-ruby/builder-3*:* >=dev-ruby/builder-3.1:*
+"
+
+ruby_add_bdepend "test? (
+	>=dev-ruby/activerecord-5:*
+	dev-ruby/sqlite3
+)"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	sed -i -e '/datetime.*created_at/ s:^:#:' test/helper.rb || die
+}
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 32f739401da5..7d9073191f6e 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -1,9 +1,7 @@
-DIST autoprefixer-rails-10.0.1.1.tar.gz 684843 BLAKE2B 06cbfe473f29acc24544f7fff23adb5d7419b2bfc7b06a809f04e656fd1b5c961a9fb1379da63ae76c8b2626044ce6f91a5a378ed2569f1631fd2d0e23c021f1 SHA512 1b22fa901e7d54fa465ce04cadb81e6391a75b6f6719b075a33ec3b7183c07c008420baa5ffdccf6880472af3fa75fac5b9c03769dd04e748e4e8cdb644b45b7
-DIST autoprefixer-rails-10.2.4.0.tar.gz 720604 BLAKE2B 1f1546f1917ef7dd98aa1f699906865ceb78e6092e1a867569deb1b4a68d66d32d7e5cabae1f1acb2f80220f6c3e55601b7e9d33d6a3a4cea281da1e121fb0d9 SHA512 fbf65914af2962ffa8092405a82f18dc483516d3ba53f062dc17df70b1ed7b41996294a7f419aa24a0cf66d5ea9f273e5cc8e98138b65cd856758eb448a67c9f
 DIST autoprefixer-rails-10.2.5.0.tar.gz 705265 BLAKE2B e6619cb2498eed46af1e92855e960e74f443c364d5d9c11b839e114bbd97797b90c2f6c6180ae68ba291b0035c1ef24f85d7dadfe07f236c6a611e0fe602bcca SHA512 8b3e80c61735d509e4448887272f2b9304ad1431ad4728a524fc87f096822bd10b6855bd1184943037ba2d10920a0fb1b16d09c8124d023b4edb7e9d1b9fb269
+DIST autoprefixer-rails-10.2.5.1.tar.gz 705267 BLAKE2B 089e4bbd8a2acadd7f07a2b3ea5bfdf77b6e83a35a1fdaf55deadf26a8a2e6ca0777c834c300d75877a38cdb10542dab4661dfcb0008c0cbe54c14741a6390be SHA512 97388b55fa0d3df72525c82c105307cd1bd9009e6bcfe161b218f40e1a6508f9c470b990164cbdb2b3c2cac13dc88628c24c3620f814eccbc5de0407536c84f6
 DIST autoprefixer-rails-9.8.6.5.gem 231936 BLAKE2B 7c702f5484f9aa2318408fb8c5c8866ccf9d3565d3282e43279b9bea875ac3610b26c0ec302b2bed0779dcd46eca12badaa16faba1046585cddcfa3e8b22b51c SHA512 6b7281661fcaf0c17ee258a321f8d18664f2f305172719f76fe1f3ef6b04fa1460c7102946e95153df7ecf5c3ade3bfc8c22d302927f2e2183ef3b0f3ef8d623
-EBUILD autoprefixer-rails-10.0.1.1.ebuild 1022 BLAKE2B 53d195a7519b0dc8b5d70ed92f7f53c939d36d27272e639957b00a8f0f9f6d792ed812fd7511fedeeadfd7684a87f9182bdb33aa2082a28b701e90e471fef5d8 SHA512 bb322f730d707c081483efe71263551c824d34bee5cd4958905ae4ac374ef6656a92c49456393bc21686f3cc561ca69ddd5e615b2813bc4926453e0a2e3b3ac8
-EBUILD autoprefixer-rails-10.2.4.0.ebuild 958 BLAKE2B 881faff328d11768a8abb03ad75fa87f3d7bf24e05d4c5b53a87c01a8f0a1c47a20160b2a8eb17fe9fd39eca61c8be2ee5006c0d0782e059fdac6122ccdbbc5e SHA512 7553d515aea72929fef1d6ca75b387d432f15d9038b74f7ba6ec27b343814e594993b69b1c81fdef57cf76832a8b1fb1c98f8c6facb9985d858168cfd8f39529
 EBUILD autoprefixer-rails-10.2.5.0.ebuild 965 BLAKE2B 1ee9621734150b62a10e40aea20505b164354b87890559d80d15ed0c79eba1239b315b963b4085d36b96f3b881fca9e879626fc1bb1a45e1cc1747b42a14c693 SHA512 c0aae0ed51f6c44dd5f90621ba12214d4215816d782e2697c96b7180108e495bf3193a79d148e341aef8cc28af52797c55820adb526a2e079cc46a6ff76ba8f5
+EBUILD autoprefixer-rails-10.2.5.1.ebuild 956 BLAKE2B 9876fe2c5dd2d4b64a9207ce2002b5c3bfb826ff8548fda7551e3a6570179a24136eaadaf9b4849dff444b4d8bc7f5719bd51e3db7fe4d85c39c406a2e891900 SHA512 0860d680534b0a93a6dfdc456cad9e31f3b9abe2994bc3058dd8cfaae63f3b3c2350eb607a454c06a6c58c0e8beae7079a4f3e133f499a9c23d33dbf79aa0724
 EBUILD autoprefixer-rails-9.8.6.5.ebuild 884 BLAKE2B 9cab1081148382ce4444ffcf206d53028180b2562f02e913459ec7ee4710592a0c0360532251884e1e7a0d702cb4dfdf46f097acb9ef4bac9345b92f5318180a SHA512 8e3ec03aeddfced88c758094c3d45f83c2f4e76f12e3e3883e7edcf7933d3ee8219753305a6c46cdba608b4bbbff004905fc41c6c68aa43d1d2ef0f400182491
 MISC metadata.xml 347 BLAKE2B 71b067345809944df1e70cdcaa44e44ae416d0c4ff80975aa796b8217170825e6be32a15d2549f464d9a65e8aa9ff1b2e9496989e66bce29d3dad672742495ec SHA512 b0985f41e9463a6c5bdbda0d5a84cc76cb6090614fa07395705b3207e0cd4fadbe9b1bb18fb7382f3c8bd00663db1232fd7107f6757bd20cfca0a0df99928426
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.1.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.1.ebuild
deleted file mode 100644
index 8fb38afae29a..000000000000
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.0.1.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=7
-
-USE_RUBY="ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="vendor"
-
-RUBY_FAKEGEM_GEMSPEC="autoprefixer-rails.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Add vendor prefixes to CSS rules using values from the Can I Use website"
-HOMEPAGE="https://github.com/ai/autoprefixer-rails"
-SRC_URI="https://github.com/ai/autoprefixer-rails/archive/${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="$(ver_cut 1)"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/execjs:*"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/rails-5.0.0
-	dev-ruby/rake
-	dev-ruby/rspec-rails
-)"
-
-all_ruby_prepare() {
-	sed -i -e "/bundler/d" -e "/BUNDLE/d" spec/app/config/boot.rb || die
-	sed -i -e "/Bundler/ s:^:#:" \
-		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
-	sed -i -e '1igem "tzinfo", "~>1.0"' spec/spec_helper.rb || die
-	rm -f spec/rails_spec.rb || die
-}
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.4.0.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.1.ebuild
index 664833352cf5..57f69c642664 100644
--- a/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.4.0.ebuild
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-10.2.5.1.ebuild
@@ -23,7 +23,7 @@ KEYWORDS="~amd64"
 SLOT="$(ver_cut 1)"
 IUSE=""
 
-ruby_add_rdepend "dev-ruby/execjs:*"
+ruby_add_rdepend "dev-ruby/execjs"
 
 ruby_add_bdepend "test? (
 	>=dev-ruby/rails-5.0.0
diff --git a/dev-ruby/bundler/Manifest b/dev-ruby/bundler/Manifest
index 31bf39de0529..cad807055a8b 100644
--- a/dev-ruby/bundler/Manifest
+++ b/dev-ruby/bundler/Manifest
@@ -1,19 +1,13 @@
 DIST bundler-2.1.4.gem 396800 BLAKE2B f770bd63255df09a20160369dc64e8923e996fb5ea4c11ee763d9a88e5fba142277ccd677861e3c0494b99a36261d5e7bdfb9c40c2abb76322061542f95b8505 SHA512 6c870061a78e17d97a9219433c7ef8fbf1112de17d0e0f3d8b6db1a518318528e3803184278412aabe65008e93f451ffa59465062856918ef488f9438399eff6
-DIST bundler-2.2.10.gem 388096 BLAKE2B 373142f7e40c2c8a0df6acf9c4c85df70e86b5737b641efc2a5201310226e81cb441bbcfbbec48068d386f23fc62c218f1650a5187d2f71f811eeb554a5819e7 SHA512 8f46fe4fd9e04df35bce82e3238b5d9137ad86949ce3fa7ebf6c30871d927dbc09d0e610efb8e68cd60fcbae4719fa4c43429c9d76d1b7dfedd5e19119254d9a
-DIST bundler-2.2.11.gem 388096 BLAKE2B 15f8bc7a0091859c4a52ea11a95efaf2ec2941aa9ae765df761e0027e1951c4bdb9a699bacddd843173d9ca8d70f6a4b1aca567364abc29eef169184bb8aff59 SHA512 a67668a9b82fbd468f84c6a6523dec0504349e4289e31f3c8e12f3b10a60b6fac523e3eba59296f890bc466b6688c655e0a3cfbe9876bde5b58e55d519c27dd0
-DIST bundler-2.2.12.gem 388608 BLAKE2B c9ab5f710dd1f240e651501c85dfbdb436f784326f203352c1eed6d442192fd191483933d58a1d185826035939ce59aaf3522d94d8359e510743bc3257c4eaec SHA512 538dc4eb6f342843045f6b0b8123814f8fef25b5fe56ae3b5e43639b292e674fe3a647613707a7f7f9067207a7a8c0729d2bdd9eb33ab1fdb3ff6f5d5f88d03d
-DIST bundler-2.2.13.gem 388608 BLAKE2B 1d500b18abd7dce33b4780ff6ceef05e51faf465b88908d2a85d4498e8f0fe661e6479af561118d83f0eee7e957831306fe9634698026534db8849113d5abb21 SHA512 321b5110a6c5efca245794b2999e87ef8ecd054df0afae0b6d6840ebc4c9ed428bcc31f5ec06e4c2d7415d5785e780beeb5abcff7270cf6ec11fc415cd232bf6
 DIST bundler-2.2.14.gem 389120 BLAKE2B 6e1a04b82fe2acb68a1525fcc5237cffde8a1f7fc2c3f522932b8819c55fc5aa9b8e532cdf71a8439b6d54a6b9b4bb488ffd498dbdaf92945129981518ab8aab SHA512 0edc95756cac080c7ceb5a435012618727b15893ce6fa6eb4fe1150a21894e0228cc841f4ea59825a430ee72c33247b6915708e3bd0f2729cf446c57421cfcc7
 DIST bundler-2.2.15.gem 389120 BLAKE2B 1f5b9d56dc6613626492321b478607db4a936fa70bb70369c924b721d0a8389542f0c3ec68b4abfe5c3471428240f56bd14b263c66f4146591d8b3ccfd5050bb SHA512 c6fddb5e96887d446efaf5571a1fae47a994a7d8b50332a6b7702af8c99a9c3899b97353041d7393541803a02604d61803cde4623fbb260484f6f17b9d1d65e2
 DIST bundler-2.2.16.gem 390144 BLAKE2B 02e9c0a7a67ce80e31ad111e7dc8a08387ca615773e6ca7e998cbff882518dfc0da898fc42916749280e4b9726075491b1dbd53ab5ebf93d4aee8ba6e80100ac SHA512 3a147677cc026df2f10bdd5d73c6c4c483637c4cd507a521ce604fe385146254c653b29618c774545b1c038f08b7101315110ce7f891d83bff4c79412c6e3c64
 DIST bundler-2.2.17.gem 391168 BLAKE2B df62cde58408482330c3e59a78a70dbed059ee822e7bf54ef218a5df75d25896a87bc07e8e3672d79bd63c5ac41a8607fcee89055f3839dacebaa31e5eefbf51 SHA512 f07158a4de687bd384bdf8e62ccc43dfde4f4454357a7532a248e5fef27ccdaa761b89b77964d21c46930f6eb75ca8ef7f87d8c6386132d2a239233022a8f335
+DIST bundler-2.2.18.gem 390656 BLAKE2B f06d2e08134fa4e3fcee15de648121aa39742fceed004746fd42718062247a95de9ae231093ae4423f5a121c251b83a7de98e2d165c566df2d049e546b60a69b SHA512 871a98b24e7a89a554d181338d359f6b298e19f6c251b1c5fc81ad6f4ab46c49a9ae14e6fc68766b427c24e0cd25b6abe468bce5d8637fe0d4433bbecfe46418
 EBUILD bundler-2.1.4.ebuild 930 BLAKE2B d544c059292750ec7a8b094c0070db97757046fef2f966b929eb28669ff297a4e9012560199d313aa7b0090f60ab7a05746eb0f72feb24f0d9248547ef0bee52 SHA512 59bb513b6dbd329255ff208b1fce606ac1f812672c21e92f7c962b5334dd2d3b124ddc9e0dc2d2b3e70fc1d1a8fa659389cdbcb59edaae145f7d25f6a0aa7420
-EBUILD bundler-2.2.10.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
-EBUILD bundler-2.2.11.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
-EBUILD bundler-2.2.12.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
-EBUILD bundler-2.2.13.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.14.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.15.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.16.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 EBUILD bundler-2.2.17.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
+EBUILD bundler-2.2.18.ebuild 905 BLAKE2B a16b0446efa247f2d3e6530db4fd5b933321488357783cb9317e40868b3cdb6b701eccedbe4103644c4974492de3d8f3c75477f9842ed85c38611ab2e0d51727 SHA512 3e46e8408b4b609e4e9972330aad5b8d7f2743f7900837d9e178d5a4e02ed020df4447fb5181a23beda91674c208725484ab5404077ce60f591fab094e123feb
 MISC metadata.xml 342 BLAKE2B 9247517894a366c8b67564e015ff966b22eb3df924ec8438d9886ee854d922e376a274e1dcb455e23451febbb1bf4d8f60023e6b7763cd42772749de1bab372c SHA512 2eb67c3eb94b1d7dfe3e3c818588e6a8b15b375e2e4497afbed91dd0ac28b261cc53e2c04a7f713db710c90566ffea60a0d27acc56893010f9f1b31a6f34cb3e
diff --git a/dev-ruby/bundler/bundler-2.2.11.ebuild b/dev-ruby/bundler/bundler-2.2.11.ebuild
deleted file mode 100644
index 8256c6960865..000000000000
--- a/dev-ruby/bundler/bundler-2.2.11.ebuild
+++ /dev/null
@@ -1,30 +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"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.12.ebuild b/dev-ruby/bundler/bundler-2.2.12.ebuild
deleted file mode 100644
index 8256c6960865..000000000000
--- a/dev-ruby/bundler/bundler-2.2.12.ebuild
+++ /dev/null
@@ -1,30 +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"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.13.ebuild b/dev-ruby/bundler/bundler-2.2.13.ebuild
deleted file mode 100644
index 8256c6960865..000000000000
--- a/dev-ruby/bundler/bundler-2.2.13.ebuild
+++ /dev/null
@@ -1,30 +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"
-
-# The specs require a number of gems to be installed in a temporary
-# directory, but this requires network access. They also don't work
-# when run with a path that contains "-".
-RUBY_FAKEGEM_RECIPE_TEST="none"
-
-# No documentation task
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md"
-
-RUBY_FAKEGEM_BINDIR="exe"
-
-inherit ruby-fakegem
-
-DESCRIPTION="An easy way to vendor gem dependencies"
-HOMEPAGE="https://github.com/carlhuda/bundler"
-
-LICENSE="MIT"
-SLOT="$(ver_cut 1)"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+doc test"
-
-ruby_add_rdepend virtual/rubygems
-
-RDEPEND+=" dev-vcs/git !<dev-ruby/bundler-1.17.3-r1:0"
diff --git a/dev-ruby/bundler/bundler-2.2.10.ebuild b/dev-ruby/bundler/bundler-2.2.18.ebuild
index 8256c6960865..8256c6960865 100644
--- a/dev-ruby/bundler/bundler-2.2.10.ebuild
+++ b/dev-ruby/bundler/bundler-2.2.18.ebuild
diff --git a/dev-ruby/cliver/Manifest b/dev-ruby/cliver/Manifest
index 506b186c5842..4a98c6e2900d 100644
--- a/dev-ruby/cliver/Manifest
+++ b/dev-ruby/cliver/Manifest
@@ -1,3 +1,5 @@
 DIST cliver-0.3.2.gem 16384 BLAKE2B a96637b5da20ebc28a29479bda76100b2ce7dac1c3620509c2891ffad8f195a54dcb381190a22abc02d1e3df1d69bf9ffa194e19c836115a70232fa7a783ecb8 SHA512 db0eff5119b84b4390f0c2f3e68cab891daedbf06eae55267c798787172734d3355cd82f2b6775e54fca26ed54c6ad4688743af588c76aa0ec6507a77443362f
+DIST cliver-0.3.2.tar.gz 14022 BLAKE2B aaaec8d52db1ad5f2b6cbe483e7e63ec8204ff4b465239f4d2a4b714037c922c2b417cd26e1fbf2da86aa9f999b1c1bfc6dbc7efb363fa016e713385f8713189 SHA512 96786561c3cacfce1f3d3be71461cc227620e81035ca594e65fb351e477ebdae9057c8cdc3a91ca62af7251afb39bf3aa633e79fbc77d2b7e921fbf398974014
+EBUILD cliver-0.3.2-r1.ebuild 596 BLAKE2B d2f761d8da392aa98fc485f4dc7fc10d8a0c9360d69e08f54c04d37af1f7612e9038e51c02d048618b90e8ab6f25faf45bc8eb498fb3e6d6dd0ba359a49c61d7 SHA512 dcdbf8c82a245a993127a6ab4c6728d96fe557916916c513ee9b359d107602e284606253cefd62933b46b4dc174d25669dbdd115005f412a76bd0619eaa7b2f2
 EBUILD cliver-0.3.2.ebuild 397 BLAKE2B 74e895c914de1c7f09a05b127fafa5aa0dca24caeabdb8ce0884219a817ba8940cb831c205d64179b51d8bafed7094f22affc5c4e419ccdbca0f4b495072d855 SHA512 7c1c43787e2ba601514b49f2d5ba94c825c6caad553ca0f921b3ab0fe7404a96d9a949988cd9a137546c844e96b4e7d448b15de0556c5d1c544d2c089d281478
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/cliver/cliver-0.3.2-r1.ebuild b/dev-ruby/cliver/cliver-0.3.2-r1.ebuild
new file mode 100644
index 000000000000..b45a1f891a6f
--- /dev/null
+++ b/dev-ruby/cliver/cliver-0.3.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_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_GEMSPEC="cliver.gemspec"
+
+inherit ruby-fakegem
+
+COMMIT=3d72e99af19c273a3f88adcd4b96c4b65b1b6d4b
+
+DESCRIPTION="An easy way to detect and use command-line dependencies"
+HOMEPAGE="https://yaauie.github.io/cliver/"
+SRC_URI="https://github.com/yaauie/cliver/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cliver-${COMMIT}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
diff --git a/dev-ruby/curses/Manifest b/dev-ruby/curses/Manifest
index a62195e65f77..1a294bbc0a6d 100644
--- a/dev-ruby/curses/Manifest
+++ b/dev-ruby/curses/Manifest
@@ -1,5 +1,7 @@
 DIST curses-1.3.2.gem 43520 BLAKE2B ec8ccfa48113ed6c564b33b1e17e8230d72de3e997a92bae930c71da5bc9159aecffbde3fa56ee1781cb9cbd58b564759df24e0a2ad0025085684b36173912d1 SHA512 3025597242cebbd080f26b38c442c515a78e9a6b11ec366d11d7cae46906b95d1851ade8c2f8390b846d50eeb0755f85a81106725b4fa0ba897de62784d59ed4
 DIST curses-1.4.0.gem 523264 BLAKE2B a713bc4786275593715a222beb249cd3ac3a3655cbf06afc7a327524f3bef69486517726e05f7f725e986613e8197c881914eeaa05846a7e9f3f36b618270b8f SHA512 417c2b31d4d2e306a727dc651eab1bf0323b9222ddd6839a84c41383523d929352b75f2516232948fc8beac35854c4ba9a2ff0f2f304a557b4abf3f8b5140d99
+DIST curses-1.4.1.gem 522752 BLAKE2B 0facf410ff548b50fa1ff0e12fce0a29843d3a8c2557549af51efff74ff73926bb592fbbd7394a8e803684de528e3a75bf0031a51aab9878513993e64132b69d SHA512 13e80b80d6a672b3a9eb2260e9effc95a82ad96ee4d1a09d9a94037f0ae7506a6349bf5250842abdfeb04d9aa937c955b631045ef3b15dad52508d2218d759b2
 EBUILD curses-1.3.2.ebuild 623 BLAKE2B ce7017e6496064a9042590ce5a2606ee5c5f1701b71b32eb861385be4cf58ba75401e6a6cbc9a62027de43d0de9660a4bbac3b7d94da2f344043669e4ced014f SHA512 0b0b6743dea327aa0f73584a8531f0502984b8ad1ec0044a9a59e24c22de11f1aff344b8c14fbdc7de69cad454822ee127881c45dd9abc4422431d466b8de4a1
 EBUILD curses-1.4.0.ebuild 623 BLAKE2B ce7017e6496064a9042590ce5a2606ee5c5f1701b71b32eb861385be4cf58ba75401e6a6cbc9a62027de43d0de9660a4bbac3b7d94da2f344043669e4ced014f SHA512 0b0b6743dea327aa0f73584a8531f0502984b8ad1ec0044a9a59e24c22de11f1aff344b8c14fbdc7de69cad454822ee127881c45dd9abc4422431d466b8de4a1
+EBUILD curses-1.4.1.ebuild 526 BLAKE2B 8a28ae67038c529c86ae7c475262a1987d577c8ce3df198f953b5fa5a0187f2c544fdcbda891e99593ec11d1fe844779068216e2bbe968d5b5a5d9b7b0f3b0ea SHA512 b723d14689b3422d01837463f073091779eed2cb98dbf3454726ba97f20d8883ea721a821eea1377d0f693de50dfd6bb891f171cf797a362cdc84106bd3386ee
 MISC metadata.xml 337 BLAKE2B f68ad5630ff84b55238f101e480a86102303dceaf6b05716d38966d567dfb894f668acdd0f1178ee61ae550e829c053868867d73e9935cde24677b3e14735277 SHA512 3f64366e00d412b476b81e46f0d9d4144d6f698fdc277f59cbefacbce8d9e35bf9fcd2d45dcfd5ba8a386e5972492004f693976f85a90ad69ebbbcf46542971a
diff --git a/dev-ruby/curses/curses-1.4.1.ebuild b/dev-ruby/curses/curses-1.4.1.ebuild
new file mode 100644
index 000000000000..10a1ee551bca
--- /dev/null
+++ b/dev-ruby/curses/curses-1.4.1.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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/curses/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="Ruby binding for curses, ncurses, and PDCurses"
+HOMEPAGE="https://github.com/ruby/curses"
+LICENSE="|| ( Ruby BSD-2 )"
+
+KEYWORDS="~amd64 ~x86"
+
+SLOT="1"
+IUSE=""
+
+DEPEND+=" sys-libs/ncurses:0"
+RDEPEND+=" sys-libs/ncurses:0"
diff --git a/dev-ruby/erubis/Manifest b/dev-ruby/erubis/Manifest
index 822aef1deaf7..fe23007c247e 100644
--- a/dev-ruby/erubis/Manifest
+++ b/dev-ruby/erubis/Manifest
@@ -1,3 +1,4 @@
 DIST erubis-2.7.0.gem 173056 BLAKE2B b1059469b5d75dd71be32eabfae0f1715dca11b9c5eb79499a5a8835a4db44e8c2163386af1e4ef9cab8cecf4ae6f2eb57b5105d53d56e5784b06d65398b22fb SHA512 49b08b28656acaf3b0c88fe064bb0d5f79fd08b834d7eba9294217b0893c5a0244ac5dd54de0e52dd17e828a0110e54b29e8c2d75171d527da957917344a0f27
 EBUILD erubis-2.7.0-r2.ebuild 1093 BLAKE2B 987a269b2a58579ff5e3b939559c5ccf30e25fc117c219576730454d428510d118335c727bb92180b1b7a43ea26d529d27543ccccfa4729a2b1bc70511bfcac4 SHA512 4e8e796e311b5654f3e5736d6bdb4bd4e2695be5d1dae1290c950953e466de8b0e234001d00b1e49b1aeae13fbe5ccaedc1a7ff76f281bd0390b0eb05f1da91d
+EBUILD erubis-2.7.0-r3.ebuild 1099 BLAKE2B 9d61a30b365ff8fdddbc0c4d13d605376c99b4352e5c9b32c7d9e98055e637f27047fbe6248bb177b9339fa18a31beefb51a58d41b4bbb4f3e132c3becac84ad SHA512 a2ab92f75a450018acc65ad7cdad873f9d32dc4492ce924bb7ace0e726a2dd21ea88f4894a270a9e51940c9bd92c823edcbd4ac0bb00371e50cc1a8d02b6fa6b
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/erubis/erubis-2.7.0-r3.ebuild b/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
new file mode 100644
index 000000000000..3c03492b0c70
--- /dev/null
+++ b/dev-ruby/erubis/erubis-2.7.0-r3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.txt"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Erubis is an implementation of eRuby"
+HOMEPAGE="http://www.kuwata-lab.com/erubis/"
+
+LICENSE="MIT"
+SLOT="0"
+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"
+IUSE=""
+
+# http://rubyforge.org/tracker/index.php?func=detail&aid=29484&group_id=1320&atid=5201
+# Tests are not compatible with Psych as YAML module.
+RESTRICT="test"
+
+ruby_add_rdepend ">=dev-ruby/abstract-1.0.0"
+
+all_ruby_prepare() {
+	# These tests now fail due to other ordering and fact that sym
+	# are now returned.
+	rm test/test-users-guide.rb || die
+	sed -i -e '/test-users-guide/ s:^:#:' test/test.rb || die
+}
+
+each_ruby_test() {
+	PATH="${S}/bin:${PATH}" RUBYLIB="${S}/lib" ${RUBY} -I. test/test.rb || die
+}
diff --git a/dev-ruby/ffi/Manifest b/dev-ruby/ffi/Manifest
index e4ff9350dee1..1fb44d2652fe 100644
--- a/dev-ruby/ffi/Manifest
+++ b/dev-ruby/ffi/Manifest
@@ -4,10 +4,12 @@ DIST ffi-git-1.13.1.tgz 161660 BLAKE2B b8a6c3f4b9bbd94378ab2adbf40c0bbf56883e34c
 DIST ffi-git-1.14.1.tgz 165025 BLAKE2B 020b3954ac08fc9fe077cc9116b21e40de8458eb79cc6ae1664d638c8a36df1e919cf6a603332f9513167b3f8d8bc342f04c2c1ee60fc9197d75de74fd69ca2e SHA512 8f3e97aa3fc3e5c404864d56b62d568ca464db741c1e526f971df4d96e61ebb8ce5899ecc207ba3d094efeaacd20633a250f2f072392a7369b179166bb780712
 DIST ffi-git-1.14.2.tgz 165100 BLAKE2B 598d1771860a7884f8dc6a4cf0006cb42f741308bdd01720d7ea4b63690d42ff6e93f2d48de7132f5d82b275b30672b0bf1ac586b713994b68e98da4cf71a481 SHA512 20fffab047d810ddea1d4d2b66a563adf5787a0602a26cc59724090d393852ae57464a8c7b5a47ca0534efc453bb06d2f8fbf00a203a7060cd3ac78b683119f5
 DIST ffi-git-1.15.0.tgz 167263 BLAKE2B 441b234ff8b5c65cb409451df60c8bfb5d4e071383e637b7864087ac144705d8f0dfdfb442971c4c98b0e1ed7c18b763c198f6d9c151b16de2a876a3466c369a SHA512 be1c6d85b91ad3148fe79628596fb800d40c1e1efc6efb67ab78c88a71b6f978492f6e571a9c9768956e9d4f3b5940df0de1620f30d63a2dd76e0fe31d357e78
+DIST ffi-git-1.15.1.tgz 167429 BLAKE2B 6012234f7145c5b291dd03f37d36c51b3ca0d14779b24c02da325b2075564a210566e64eb54caf4c32b4bbfe0c032f4d2c0a316c8c0cf559e14cbe6a922ebd7b SHA512 1e2cd70a8b921c6840b8b990d79819e2bc12f82c2bbef9952a59026de093002d1356642f6637f6bd7b0c94a6205401d88db6b83d1a479b4591c1041ca76f8e5a
 EBUILD ffi-1.11.3.ebuild 1514 BLAKE2B e9f0371a43b379abe302818e5cf837022f049bd66396554fe90abbf36754a8ae350733ea258df8a90e07165db6af5b250867396c3995202555ed6561f2f9a575 SHA512 f4e8db2b0a3e73d050178bfd92a5227ad74575e3f3ba6eed5f6be25fc33651adad54e8b6527532e713136a065e2385ef574b3e010dc5c08c930082e88ea32798
 EBUILD ffi-1.12.2.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
 EBUILD ffi-1.13.1.ebuild 1528 BLAKE2B 1d7207005ec67b4a0a2378a3652a439c9b19f7371c14b41aac973abf4d3aaf496ee146748df74e0734cff355a9cfcfa15724f7301fa23ca5936930fcbf3e9361 SHA512 c8bb83a35f41ecea01465b129194c16ea1d93b3fbc67147fb0cd297f6d5a6600342cd6f18543bd454a706121e15b3e770b2a4f16dce75d1333ce23a06949fdd1
 EBUILD ffi-1.14.1.ebuild 1641 BLAKE2B 56bed9dc915a805e160af30e7f883d9cf30660937768ccfefbe38abc1f04934b98af1a90c05095855a8463f21f24a30953c8ef55e5a6311ee9463d447205e242 SHA512 8592be06dccc1b8c1464997dee29dfab2b6f3268f7ed5904d4fba10a239a3b4c3c368f46f84376fa023f37b243c2bed3111df8b75c5852b2f8cbd121cde092d5
 EBUILD ffi-1.14.2.ebuild 1576 BLAKE2B b8ea5c66d926ff7d2b7bf4c9443935e4a2274afc1a8bcf84abaafde9ec71e4313bd0392ff34aa12c47bb23852b53b559445e0b212142caf4a2d33641460578d2 SHA512 b5f3415732613101f21e60d12cfc5349e56b49eed982687d1ee98a76c4e88cd5868a6212361e41ccfedee70f237b5f7a8e9c4be8b7be3dece295e9cdcb658d20
 EBUILD ffi-1.15.0.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
+EBUILD ffi-1.15.1.ebuild 1665 BLAKE2B 04fad5bb54cb08a52525a413b04662e1e0fe4745b72bfc5aa7ac3bcd70939078cd2aa4860afed7f6a518d9b7f7b47f62162c3eb7d558a377641f71475d3fa766 SHA512 e5fe8935e8ffe610e9cf85862e29e6539792335787ab408df1ec625e3681d58117f537d49598a297731733d72c226d8a51d7af5aa7bf027154d0c81f30604e09
 MISC metadata.xml 333 BLAKE2B ccc40c1a86563165c3d6aba6bb40012dc02d86f836a5e050dafc34298c9b08aaa676be33e7c2ce5bf6acd36cdd8250328150383652ac5a1515c2832969c481ae SHA512 9105a49b39afce8695d4c8e7082690ca25806cf08ad6b6b9528343e1bfc72097369ab2868b3eebde55c6cd70d0baae1f085b4ad3468a9c5621d97dd8def76173
diff --git a/dev-ruby/ffi/ffi-1.15.1.ebuild b/dev-ruby/ffi/ffi-1.15.1.ebuild
new file mode 100644
index 000000000000..244b9737ea49
--- /dev/null
+++ b/dev-ruby/ffi/ffi-1.15.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="ffi.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/ffi_c/extconf.rb)
+
+inherit multilib ruby-fakegem toolchain-funcs
+
+DESCRIPTION="Ruby extension for programmatically loading dynamic libraries"
+HOMEPAGE="https://wiki.github.com/ffi/ffi"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${PV}.tgz"
+
+IUSE=""
+LICENSE="BSD"
+SLOT="0"
+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"
+
+RDEPEND+=" dev-libs/libffi:0="
+DEPEND+=" dev-libs/libffi"
+
+ruby_add_bdepend "dev-ruby/rake"
+
+all_ruby_prepare() {
+	sed -i -e '/tasks/ s:^:#:' \
+		-e '/Gem::Tasks/,/end/ s:^:#:' Rakefile || die
+
+	sed -e '/require/c\require "./lib/ffi/version"' \
+		-e 's/git ls-files -z/find * -print0/' \
+		-e '/^  lfs/,/^  end/ s:^:#:' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Fix Makefile for tests
+	sed -i -e '/CCACHE :=/ s:^:#:' \
+		-e 's/-O2//' \
+		-e 's/^CFLAGS =/CFLAGS +=/' spec/ffi/fixtures/GNUmakefile || die
+
+	# Remove bundled version of libffi.
+	rm -rf ext/ffi_c/libffi || die
+}
+
+each_ruby_compile() {
+	each_fakegem_compile
+
+	${RUBY} -S rake -f gen/Rakefile || die "types.conf generation failed"
+}
+
+each_ruby_test() {
+	CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" ${RUBY} -S rspec spec || die
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	docinto examples
+	dodoc samples/*
+}
diff --git a/dev-ruby/gruff/Manifest b/dev-ruby/gruff/Manifest
index e0e0e00eaa07..428fcf42b5a2 100644
--- a/dev-ruby/gruff/Manifest
+++ b/dev-ruby/gruff/Manifest
@@ -1,9 +1,11 @@
 DIST gruff-0.12.1.tar.gz 27157241 BLAKE2B 18e0fc5398c16bc6eea9e628b4be887e9bd9e260e23476fbf7115a0db952ec036d36e5d28edf1b0dd121bf6193cc01fd00d629ba88da33b796db5618e3d401ab SHA512 553419952279cb26043d394286de26b0b63a57495a51e595d344cf8613bbf08b6838fd07d77e8c9272a1f3cb45042f88b9d3500ebbb6acca2bae8c6ded12b3bb
 DIST gruff-0.12.2.tar.gz 27157493 BLAKE2B 230e6c70226e3754719f8ca059ba6cfa68909b98b63d7a4ac753f7c6d5993117e3aeae2703565c8202c75863f142c3caa1d52e65fbcb8f26f173ac4f95e5ecd4 SHA512 a278066eb9e22dc1c30b3b607fac78e0f232a1c086412d895a648f640aaea5812b4783ff9f2fbe96e3200ceef7b58362571dd857da75266f124f415ca5527d9e
+DIST gruff-0.13.0.tar.gz 20027648 BLAKE2B 53a21a99df834d68ba3100111bb7141bc8aa4fd861e5ca2bd963882fc15c1778315b63297ce12ecef19548791c2d573254eb8e38fd47b55092889f82646a9ed4 SHA512 6c2e1c484c081f67797a073d33e4774f484d2e2c27f9cced2ebccb377e806669470f2be23070b9d151a8a5cb1af01ea92dbfcefa5f79bc269a18f6523807b1da
 DIST gruff-0.7.0.gem 318464 BLAKE2B bcc51f524089f53b89778143b444c70d4e168983edda247cdb4c9c84c288450154ce6e5234bbf7a0a8ae7251df611333c8bb411a8fd3765ccc5fe9650c3efc38 SHA512 b9842213ab3da7b4eccf8bd06e18d62aea14a6a15d7c45ebe7e51a76acd456ce140f094a9419d4c0bd1774e7d203bea49f9c39aca36c75d744f2732bcde9f688
 DIST gruff-0.8.0.tar.gz 24712264 BLAKE2B 836ea41e8c7a91ec09ef5356e4f021f99381be4ba437bd043ac628a31ad02f1846cfcf182c2ee038ff90918386413cc9d213d9958412c2bd0c89b1ee2d5c481d SHA512 867fdf50c41bf0e1040ef954c00bced11df0c3d382333aef42f6325a30a950f2ab04e0a5beedf1ab5c3cb23d1682b56d2a398d8afc8d7aa665980ddac4e6cdcb
 EBUILD gruff-0.12.1.ebuild 1593 BLAKE2B e26f323d958c2cb9c1a977ced3887ffb920535de99571a73ecb423b9a53800cfbc6a4895b87fa272e487098759b75af6f72c5bbb5c69b04a303b9be997a40440 SHA512 ea15cc517500e6814bd171bfd7ded6ef23c50c5a9214a9b2e544e99eff79def8bb67147053c179c02e2905a337cf471817f15c794bb63c7a35e9ee8e435d7a78
 EBUILD gruff-0.12.2.ebuild 1593 BLAKE2B e26f323d958c2cb9c1a977ced3887ffb920535de99571a73ecb423b9a53800cfbc6a4895b87fa272e487098759b75af6f72c5bbb5c69b04a303b9be997a40440 SHA512 ea15cc517500e6814bd171bfd7ded6ef23c50c5a9214a9b2e544e99eff79def8bb67147053c179c02e2905a337cf471817f15c794bb63c7a35e9ee8e435d7a78
+EBUILD gruff-0.13.0.ebuild 1608 BLAKE2B 500779630786842908dca5c04da966577ae3894636fbb61d65269ae84e80b63caf338e17b16a856404aa66f1fff0ec9a914c89464c0c879d3753c774f13409ed SHA512 db58b519acdc8e9d51b19b25de60e3fc72f4e8318543a4deef6e07471701687d4c8da6c3924abd7694096fce62dd2042816bc5bdbb502e55b81a8531ac3db73d
 EBUILD gruff-0.7.0-r2.ebuild 1448 BLAKE2B a177b6d58f8fb977308f86fa0372919d90cbff9be96d1a1ffcb362c1faad11aa0d423d7894ed8aab312bdd22f6dac58506401de873ffa18de704111fdb08092e SHA512 4790cde6289b55df95aa2ea410c7aff604b45b5056d1251c130e87939d0a06f6ba2c15c808c1920246fd5af6af5559a903e569a12c5858a2476bb155aafbfee6
 EBUILD gruff-0.8.0.ebuild 1416 BLAKE2B e77119bba425b5ecc75e1adf342f10e41487fb012a94fca1e8bab5bfce2d55f682756cb9acceccf3e04ca4941ceb096ec298777d9bfa12437ad4047d8a160bec SHA512 97c2e62b99ce63e11355fa7e94f530d909b31342360b91a93ac4c8d8ec01b57607535b404c8b1781608bcf46b958c43119bfc2974b6edc6f6ba299e941725748
 MISC metadata.xml 340 BLAKE2B e3adfc25e09939c98ba4a4323afd0babccd4b0c11ea712e93a454ea4d3074f12a895d674735f8209598336a1d62ea61d6d00c8956a47cccd583857c36f261ab7 SHA512 1136e2805ed73f18bba2c981e2788fa635face71a9b1b384e3dc20680afd4fb354f33ac099077568f7fa1f3510e1c46771f663341153ae64ef961508243c16d6
diff --git a/dev-ruby/gruff/gruff-0.13.0.ebuild b/dev-ruby/gruff/gruff-0.13.0.ebuild
new file mode 100644
index 000000000000..66c4f93f1b47
--- /dev/null
+++ b/dev-ruby/gruff/gruff-0.13.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_DOCDIR="doc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="assets rails_generators"
+
+RUBY_FAKEGEM_GEMSPEC="gruff.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Beautiful graphs for one or multiple datasets"
+HOMEPAGE="https://github.com/topfunky/gruff"
+SRC_URI="https://github.com/topfunky/gruff/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+# imagemagick is an indirect dependency through rmagick. However, for
+# gruff to work properly imagemagick needs to be compiled with truetype
+# support and this cannot be expressed in the rmagick dependency. Tests
+# also require imagemagick to have jpeg and png support.
+DEPEND="${DEPEND} test? ( media-gfx/imagemagick[jpeg,png,truetype,webp] )"
+RDEPEND="${RDEPEND} media-gfx/imagemagick[truetype]"
+
+ruby_add_rdepend "dev-ruby/histogram dev-ruby/rmagick:*"
+ruby_add_bdepend "
+	test? (
+		dev-ruby/test-unit
+	)"
+
+all_ruby_prepare() {
+	sed -i -e '/\(reporters\|simplecov\)/I s:^:#:' test/gruff_test_case.rb || die
+	sed -i -e '2irequire "date"' test/test_scatter.rb || die
+
+	sed -e 's/git ls-files/find . -print/' \
+		-i ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	# Skip the image comparison checks since the images are not
+	# pixel-perfect identical, most likely due to the use of a slightly
+	# different font.
+	SKIP_CHECK=true ${RUBY} -Ilib:. -e "Dir['test/test_*.rb'].each{|f| require f}" || die
+}
diff --git a/dev-ruby/ice_nine/Manifest b/dev-ruby/ice_nine/Manifest
index afb2bf58628a..106bb565d76a 100644
--- a/dev-ruby/ice_nine/Manifest
+++ b/dev-ruby/ice_nine/Manifest
@@ -1,4 +1,4 @@
 DIST ice_nine-0.11.2.gem 17920 BLAKE2B d70aee3ba5d82719936e355bacd0c157fae262abb494c8d584e8530928218fb3c8a736e15903cdef2acd421fa5d08eafda11a0544651389e8b4b791299f1afca SHA512 e75237d901235dadeea159279b324982c6288d7c200ef3363eaa09340a480d5d94b8977915341218e6e2e6e439d40364f8569d757cdf47175bdc69ddb8d959ac
-EBUILD ice_nine-0.11.2-r1.ebuild 482 BLAKE2B e0907bf274cffcc39a4abbc9a46d72a1d8c117b08070941c219efde519c4043c1e54409599f83b02f6f702184f4e008d91f2c4cc45b0f2c144b787902483291d SHA512 fdac88b2feb36f706f857c06fff21f9cf452fea5c5ca6a0008ee704e1d5b4a8e4f53097674a3927865f19b307b3d8459d717c3e1137a0489ec9ffd2e325c1e19
+EBUILD ice_nine-0.11.2-r1.ebuild 507 BLAKE2B 834150c14a3d0b13f3fecf51ac6fd01039a2bb4186fea5d751035d581d461b3ea83589e9f8fbe15dd150f8ecfb1de5d340cbe88aeb2dd0849e61993868ba1556 SHA512 de324b610af791636c96eba8f575aa03d909ee32ff23672a0dea4d357edbc281a25c38214ad0ba6816bb46e8bf7819703be26c6057816bfaf446ac10bc5b7fae
 EBUILD ice_nine-0.11.2.ebuild 482 BLAKE2B f82c6d3f77d67f3625d762095f13d41b2286bd5dfee0524dfae92c5e8ba9480868b10589316f5c27e97f652a2bdf7a8642231cf5cfdf925f362816585d914cd0 SHA512 375acc105766abd661058257f73b0a1d7e1389c7e6babc722f7cbf5ffc4574f0d85a82942dbdd989e4e7ea3dd4008cfc8808a59ac0cb3d0fdfe598fdf08f6d61
 MISC metadata.xml 392 BLAKE2B c266b687f07d70619208ddebacab2982db31ddb32360e98ee1ac693ccb561cf29288429a4f563b0dc03b0d8ca3d80adb8df8a2c24da351138dbf124b8f3b73a9 SHA512 9af884bfae6d4066b734267f544edd4b9cb82ec6ff01ba510cf404abd198ddadc626812978cfd3ee9c66015fe602f806d49535fa51c72df9d5a88973b32984ac
diff --git a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
index dd8f7eb82dbd..f3f634c7260b 100644
--- a/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
+++ b/dev-ruby/ice_nine/ice_nine-0.11.2-r1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://rubygems.org/gems/ice_nine https://github.com/dkubb/ice_nine"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc"
 IUSE=""
 
 RESTRICT="test"
diff --git a/dev-ruby/nokogiri/Manifest b/dev-ruby/nokogiri/Manifest
index b2f1102e0246..f81fffea1f72 100644
--- a/dev-ruby/nokogiri/Manifest
+++ b/dev-ruby/nokogiri/Manifest
@@ -1,7 +1,5 @@
-DIST nokogiri-1.11.1-git.tgz 5835648 BLAKE2B e8c84fe72063ac3d764ea71fe469a8f7d0499487e523563e0ab737e69e06279b112c666aa254e0075740b27690ba96162a5c6e39f125b58360fbb5720104935d SHA512 47974f05b6788f2e04ef9ed7d0fc33790cdadbd258408e0242a14521cc996b6d42878b5bba3334b4bde2970dbadda0cde93a00e30fcddd100401186a90617502
 DIST nokogiri-1.11.4-git.tgz 5867481 BLAKE2B d9b0df4d6301a510824f8f31bd51e0f3beaf3cf7d3685a703782ae5fab0667b6276c0ccea20032252efc6c2dd6515577fcb21942f5d27a65815bc48f8af91137 SHA512 ca4bf385b06416f5a5b7f8fd742739181cccf93b42590c7d2d4f666846fd3a25d45c16717ae50bacd85e25644efe8584e195df7174450b8a59f2c6ef47624354
-DIST nokogiri-1.11.5-git.tgz 5869095 BLAKE2B b5ab85a22adf1a5e6f7f3f57b433c723a34eb17cbfd5d667f56fd439700ff72068212b3a831d5798ed627ebd115d2a0297bd83b54977473ac9f217af04c46296 SHA512 d82f620875416a77727dea600dd17bf0a3c126fdc6f9b9a2cc7cf3f182a8eb14302e167bc397d04dcadcfffbc400369d5aa66f0fee7f5e285414e454059b95ba
-EBUILD nokogiri-1.11.1-r1.ebuild 2883 BLAKE2B f57e4f27c25dce68560d50bdaad3fbe31833088bc0b4d486e3fc1036e2ebcfa5c2e449babd9a6cb79bf70dfb3eedda2011dbedb1ddf354b6abd8921b4a4be437 SHA512 22bee11c3b28a0be289c884f92a6ddab91afb45e40b6044bf0275e16698a2afbeb9c9a28775d788a8bfccba38028615e86ea32834ccf249c58b2dc8e3113bf57
-EBUILD nokogiri-1.11.4.ebuild 3110 BLAKE2B 18db2d2b23e97bc8aaecdf83e59868f18541a18328418078a65e56daabf870cf1e8ec5416f71dfbd6ad95e1debcfc15a880939a1598c93333581c4d19bd8f77d SHA512 783a90acfc6d6c3f831320b595fc7af338697b99e1acedec4a6ebe891da09a3a5e8f84cc8a21d76b4c565c7949f8e971cc0c9021468522312fb08e80c63bd7cc
-EBUILD nokogiri-1.11.5.ebuild 3117 BLAKE2B 2904a64ee1a6fb65b9c37f906ce146479e48e5347a03e9939fbc22618a9569a75c49ffb96f5667b95a58b004d4cd0a1d7d61d60d4642cbb11eb98e30c414fa14 SHA512 d0a1e864dea2713ff0b6bf86e59a3e31c795b291cdd95940bebd99681cbb71b9e95a427004399caa2a59d2b0e4c68c236588c2e3a026481ebb93cb5393bb3a4a
+DIST nokogiri-1.11.6-git.tgz 5869434 BLAKE2B 222b6b9e871c124a14ac5d9ac3901d9edfa057daaba7e1179853746af50d661bd70568b326603663f890b4b0d80fbb68f8cc22637ca340fa49699f475cce1bec SHA512 a9d2977ba5a12cb252ee615cffbbf043227e78d746ecba4bfcd82fa825f5ef9fdb74feae27115b16cd65da6dd189e4ac88f1d605e776dfbc52aaf2e0e3044381
+EBUILD nokogiri-1.11.4.ebuild 3140 BLAKE2B b53910356936e9e450ecc28220343ca68491ea93eceb070c4adb09d67e9017f0d9b20319ed2d2ba2494dc8cc40df220d49450001cb8f60b881f88564464871e4 SHA512 3fe0a0805e12b52556483f1e0a0daa6ac84a0faddad121d2fa0b3f62976f289fe5fb50881ce493d712f2f39408acce5c9b174f515da64fde3ae33c0b4dcc1899
+EBUILD nokogiri-1.11.6.ebuild 3147 BLAKE2B eae6d6a5380b6168830c9ed3a5e59ba71a567134ea7b9604263c27517b2111346cd2792f4f366ae1c0983d7a0b359f8f4b5343eddcb5dc72656fc861a29f3991 SHA512 0d8a1ba138ef5ae9305c79b7d3faa49e6a54dc312e131a83e2eaea7ac2b281c40ec3a473e11a46ed204cc854c10538b59ebc9d00968101158b5211fba74358a8
 MISC metadata.xml 348 BLAKE2B 343ce4d884b8ae636991396c8d2eb1c59bec6db00204eec79bc070ce4b61505b1290ee393e2311e2fd3976e66993c9ba51878767c0d28ff8767786039b97fd7c SHA512 94d5836e5bca783420a76f15d70e3fd29515bc7b9152410d11ba0a01d778530e0d87c4954d118313f8afc340260a12157748db94342b4f12fc5e2756c1f2ff34
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
deleted file mode 100644
index 77baeeff1663..000000000000
--- a/dev-ruby/nokogiri/nokogiri-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md ROADMAP.md STANDARD_RESPONSES.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="ext"
-
-RUBY_FAKEGEM_GEMSPEC="nokogiri.gemspec"
-
-inherit ruby-fakegem multilib
-
-DESCRIPTION="Nokogiri is an HTML, XML, SAX, and Reader parser"
-HOMEPAGE="https://www.nokogiri.org/"
-LICENSE="MIT"
-SRC_URI="https://github.com/sparklemotion/nokogiri/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-RDEPEND="${RDEPEND}
-	>=dev-libs/libxml2-2.9.10:=
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-DEPEND="${DEPEND}
-	>=dev-libs/libxml2-2.9.10
-	>=dev-libs/libxslt-1.1.34
-	virtual/libiconv"
-
-ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
-
-ruby_add_bdepend "
-	>=dev-ruby/pkg-config-1.1.7
-	>=dev-ruby/rexical-1.0.7
-	dev-ruby/rdoc
-	test? ( dev-ruby/minitest )"
-
-all_ruby_prepare() {
-	sed -i \
-		-e '/tasks\/cross_compile/s:^:#:' \
-		-e '/:test.*prerequisites/s:^:#:' \
-		-e '/license/ s:^:#:' \
-		Rakefile || die
-	# Remove the cross compilation options since they interfere with
-	# native building.
-	sed -i -e 's/cross_compile  = true/cross_compile = false/' Rakefile || die
-	sed -i -e '/cross_config_options/d' Rakefile || die
-
-	sed -e '/simplecov/,/^end/ s:^:#:' \
-		-e '/reporters/I s:^:#:' \
-		-i test/helper.rb || die
-
-	sed -i -e '/mini_portile2/ s:^:#:' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
-
-each_ruby_configure() {
-	NOKOGIRI_USE_SYSTEM_LIBRARIES=true \
-		${RUBY} -Cext/${PN} extconf.rb \
-		--with-zlib-include="${EPREFIX}"/usr/include \
-		--with-zlib-lib="${EPREFIX}"/$(get_libdir) \
-		--with-iconv-include="${EPREFIX}"/usr/include \
-		--with-iconv-lib="${EPREFIX}"/$(get_libdir) \
-		--with-xml2-include="${EPREFIX}"/usr/include/libxml2 \
-		--with-xml2-lib="${EPREFIX}"/usr/$(get_libdir) \
-		--with-xslt-dir="${EPREFIX}"/usr \
-		--with-iconvlib=iconv \
-		|| die "extconf.rb failed"
-}
-
-each_ruby_compile() {
-	if ! [[ -f lib/nokogiri/css/tokenizer.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/tokenizer.rb || die "rexical failed"
-	fi
-
-	if ! [[ -f lib/nokogiri/css/parser.rb ]]; then
-		${RUBY} -S rake lib/nokogiri/css/parser.rb || die "racc failed"
-	fi
-
-	emake -Cext/${PN} \
-		V=1 \
-		CFLAGS="${CFLAGS} -fPIC" \
-		archflag="${LDFLAGS}" || die "make extension failed"
-	cp -l ext/${PN}/${PN}$(get_modname) lib/${PN}/ || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each {|f| require f}' || die
-}
-
-each_ruby_install() {
-	# Clean up "ext" directory before installing it. nokogumbo expects
-	# the header files and shared object to be in ext.
-	rm -rf ext/java ext/nokogiri/*.o ext/nokogiri/{mkmf.log,Makefile} || die
-
-	each_fakegem_install
-}
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
index 6968b0b8646c..863fd634fec6 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.4.ebuild
@@ -27,10 +27,12 @@ IUSE=""
 RDEPEND="${RDEPEND}
 	>=dev-libs/libxml2-2.9.12:=
 	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
 	>=dev-libs/libxml2-2.9.12
 	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
 	virtual/libiconv"
 
 ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
diff --git a/dev-ruby/nokogiri/nokogiri-1.11.5.ebuild b/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
index a12fe2fd24d7..0a05340414ac 100644
--- a/dev-ruby/nokogiri/nokogiri-1.11.5.ebuild
+++ b/dev-ruby/nokogiri/nokogiri-1.11.6.ebuild
@@ -27,10 +27,12 @@ IUSE=""
 RDEPEND="${RDEPEND}
 	>=dev-libs/libxml2-2.9.12:=
 	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
 	virtual/libiconv"
 DEPEND="${DEPEND}
 	>=dev-libs/libxml2-2.9.12
 	>=dev-libs/libxslt-1.1.34
+	sys-libs/zlib
 	virtual/libiconv"
 
 ruby_add_rdepend ">=dev-ruby/racc-1.4:0"
diff --git a/dev-ruby/parser/Manifest b/dev-ruby/parser/Manifest
index d6e4392180c5..45355bdaa0c2 100644
--- a/dev-ruby/parser/Manifest
+++ b/dev-ruby/parser/Manifest
@@ -8,5 +8,5 @@ EBUILD parser-2.7.2.0-r1.ebuild 961 BLAKE2B b983259aeb654773b384d9be90469bfef795
 EBUILD parser-2.7.2.0.ebuild 907 BLAKE2B d35a64e967f77f719d793f1ea5ae3eb3760fd002e9493efb83bb4d865c7ea2b999178e88e7411047d670ed8534f2cc9b7275f527ae1ad1367b1685297513f779 SHA512 a06d1fef1f0ec987b77a1b8b47c3adcd7b2f4dada76c59c56bf8f08b36a37da996661fb20ca31dea7493f67c30768b591fdf6a385e0eb72039e998721750b202
 EBUILD parser-3.0.0.0.ebuild 961 BLAKE2B 7b640a4417f8207d551bed77033fad859cafca4671e9763fef58078e6f8ad14eee83b9526a49503e2eeb9a48b9c163ab7d4f6b8d31687aa0966a531e642b7053 SHA512 00c75b48a6063de0371cf5c8b23e267022bf46dfd9db448da9b8f6c92f89e47f10f325f2c86ea52f6021c5f92b87cc0974a2d1ec0f45d87aab3d88212f30bda1
 EBUILD parser-3.0.1.0.ebuild 961 BLAKE2B 7b640a4417f8207d551bed77033fad859cafca4671e9763fef58078e6f8ad14eee83b9526a49503e2eeb9a48b9c163ab7d4f6b8d31687aa0966a531e642b7053 SHA512 00c75b48a6063de0371cf5c8b23e267022bf46dfd9db448da9b8f6c92f89e47f10f325f2c86ea52f6021c5f92b87cc0974a2d1ec0f45d87aab3d88212f30bda1
-EBUILD parser-3.0.1.1.ebuild 961 BLAKE2B 7b640a4417f8207d551bed77033fad859cafca4671e9763fef58078e6f8ad14eee83b9526a49503e2eeb9a48b9c163ab7d4f6b8d31687aa0966a531e642b7053 SHA512 00c75b48a6063de0371cf5c8b23e267022bf46dfd9db448da9b8f6c92f89e47f10f325f2c86ea52f6021c5f92b87cc0974a2d1ec0f45d87aab3d88212f30bda1
+EBUILD parser-3.0.1.1.ebuild 968 BLAKE2B de4555c5dc3c62802ef3bf7a68c0521dc828d0314e50f7af5ad9eba893a96ad0d00580dd3fcab82c50f5ed17eb4a09687872ad9e203c589f759830bc2499312c SHA512 cf277daa666c688d1392f0e1e650eb17a21d7a69264d6835fc67c82bf479b7d4dd9c2475c15ba41d787d2f24789d88cabfdaf419dd221927daf5325cbee808e8
 MISC metadata.xml 343 BLAKE2B 7da9e267560e7a67c7a8afd5c283389dea1d4db2cb0ca65e4fda61a576036bb8068005b5e31ba9cc8fe7b68b8f8af5f93bd104e6d63412842dd7d0030b83fbd5 SHA512 f8dccc996237113d4add61dcc46e1407ea6edf156b001994e31d920f688dfcf9efe8d3d991ef31dc0084b7695b57b5d51471c57e9e945308279dec7909c69517
diff --git a/dev-ruby/parser/parser-3.0.1.1.ebuild b/dev-ruby/parser/parser-3.0.1.1.ebuild
index 9fcc1bd5357f..34448e62151e 100644
--- a/dev-ruby/parser/parser-3.0.1.1.ebuild
+++ b/dev-ruby/parser/parser-3.0.1.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_DOC="yard"
 RUBY_FAKEGEM_TASK_TEST="test"
diff --git a/dev-ruby/puppetdb-termini/Manifest b/dev-ruby/puppetdb-termini/Manifest
index 69a849107791..2ab7e618be0d 100644
--- a/dev-ruby/puppetdb-termini/Manifest
+++ b/dev-ruby/puppetdb-termini/Manifest
@@ -1,9 +1,7 @@
 DIST puppetdb-termini_6.13.0-1stretch_all.deb 21296 BLAKE2B 6ef6f82047f293b854e1b0d6db2933e18bc922225d1bb7fe4a3d03d2dbe5da00cdb68e7e3ac35097f466ee21de5a7ed584606684a52c088a9e31abe9fe11d7cf SHA512 bbcf8d2ed996925ead0add6899b266ca9308b01cc12d0dfa6f61956e801a092abf5a01ae4647bf96778f9fe0fa95e17bfae0a3b30576346093651141c1982ebf
-DIST puppetdb-termini_7.0.1-1stretch_all.deb 21154 BLAKE2B 6b64de09d6b6c76395f79acda6322c4221cf58efb03442faee697736faa3fbfc0d3e4e0c0f318a3374a5b6b6844312a469656d3e31a5534f484c568d9d5e7fe1 SHA512 29b0e380d3e62bb714838c7e4dac0e296c69297bd4e4a4097ba006f846eb4166051d0c76195afb0a661e6e34726acbcc858e7897128f1bbe14b99a4ea44a9ff3
 DIST puppetdb-termini_7.2.0-1stretch_all.deb 21158 BLAKE2B bb74c11735a557bbee8452f4eb356c1ca038f8cf41bf1b5404f6f204d1d89e8bb532b8a6db8a92ebba9045e744a8a0b68629d60ab295660381a582273a0a67f3 SHA512 6dd4ee1e3d2fd069d5689cbaf0faeb417e5c12bd6d06c721923cbe92b739fa39a658675b40f0474010b3c6a6cabbff8a3fa49f8f79cbcc7bd4fbb1c68b1805f6
 DIST puppetdb-termini_7.3.1-1stretch_all.deb 21144 BLAKE2B 34e925a93b9f0c882e051ca0ff4368c06ef2467211e645a976453e60008e1a02ccf76ba8b53270ceba830e43be5d8ababf601c6a5ecad5f9d603dcf56c78e19f SHA512 745cb5fe4eb6e4bb720028f794a767fd7eeb936f310c18f153a94bab28a36e35fc1bd5559b1be20a3ef5573227cbc4f013673eca3d85ff15e8a29d238ffd0370
 EBUILD puppetdb-termini-6.13.0.ebuild 663 BLAKE2B 147e2a56aa251a1655e5019f086d7ac2b2a3a75935559589c1d41207026cb5d885e3dd93f8251dcf97f220a53a4f86d507ce5b4ca3a42a8927542bd81c53b081 SHA512 7174a6cd165c552282272ed7f0a40a437a8f9111f80cad4e0ee29f29ba0c7ef8317bb7e6d2be517f2210754fbcd9054401de203c2fc2e11d994e8b00f43141e9
-EBUILD puppetdb-termini-7.0.1.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
 EBUILD puppetdb-termini-7.2.0.ebuild 663 BLAKE2B 85e09da58e2c7ad55aeac75a1a641a3c26714547f6b488bea929ecc4336aac424b65c35dd37e24c53d517bcea6d22a4cee7471a824f3257e4b5b69e19559b94d SHA512 5e6417c98ae0fdf7e7f552086bb66814795df5583e08574a32dcac58f06e0b48b32775ea1925b953631a35b364ba219e3701a0a47ecf6100ff36518959048c69
-EBUILD puppetdb-termini-7.3.1.ebuild 665 BLAKE2B 493069cdb3bb7b80150656a5e4791b8c8e5906a5b3b3470efb8196903e404caef5d9319fd1018939a86ad4a4156434a0b52c9b931a424ccfbb5c1008b5222e50 SHA512 281d8569336911f65b13b2d16730d2dc17c8476723746d249919add79f103c45185dabd9f98165d0ce7780e218265791584da14703e69eadc65a660cb9d526db
+EBUILD puppetdb-termini-7.3.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.0.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.1.ebuild
deleted file mode 100644
index e88438205f95..000000000000
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.0.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.3.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild
index 57a8294eabe9..e88438205f95 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.3.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/rack-protection/Manifest b/dev-ruby/rack-protection/Manifest
index d488192e34b4..31ac0768d972 100644
--- a/dev-ruby/rack-protection/Manifest
+++ b/dev-ruby/rack-protection/Manifest
@@ -1,3 +1,3 @@
 DIST rack-protection-2.1.0.gem 17408 BLAKE2B e4804273d346c76e9e7348bfa9575f16c9d415da9db4e8677782aed70fa613b6f322c82808707734276b8db60fce9d87fbbaac807c1b8df7f6bf1960c76ae244 SHA512 965388584a2cae9065ccc0d041bbd40951f22420f05e657586d710f87ae8f854a0be32c3274b9373f96b5f8eb19354d371e3bce9b2df83c013abfea99f16bded
-EBUILD rack-protection-2.1.0.ebuild 718 BLAKE2B fb3603129df95c11c499d7cc56960c2da500da197b0080e4e0faabb0cae5a7aa80d888c1d9f10c17b8761a61b557e50c68f8508d630365d35dd05d435c372c68 SHA512 e67fb4ebe3d88f90cf4b0bea33b98f852dd2af9045ca7aadf85bf7166667b6dafa4e4fdbc58dc5d09857eb7dc82c0a412e6d815d391908c8e6940faebce7ec05
+EBUILD rack-protection-2.1.0.ebuild 725 BLAKE2B e99e45212581b2f384217c7579f7791a3df3e47c81edfb72ecd86c9c87bfee381bf53dc80d855ac06a80153ecfc36c2ccfc1b58a33ad125feed7605388528e4d SHA512 9fec9442ca712a30b429fa85e30894cb36789dcbacbaf58b2c4b9a9dde2ad581a077fb91a737b6d4cbdad1d7776c0615ff3c83ddc086245addc927cc632ccdb7
 MISC metadata.xml 488 BLAKE2B 1db94e175d1248a334fa9ff0b5936d0281a1ee2ef69974cc33ba65e19de9ae043e98599a52f5cc55d3e1ca3e5bef3e223cab7f3be0ad9b561b05d81da8c09687 SHA512 ad0122f6e0dde2c02a1af8b8e81a5aebb1a13e0f56dd8f222d6f051da55015a89db0430efa6c1e6b5e193a94ba69d0244498d7cc14f0212f8032393a7f5988b8
diff --git a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
index 35febe98e552..749cd6610d3f 100644
--- a/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
+++ b/dev-ruby/rack-protection/rack-protection-2.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27 ruby30"
 
 # There are no specs in the gem and the source cannot be downloaded separately.
 RUBY_FAKEGEM_RECIPE_TEST="none"
diff --git a/dev-ruby/rbs/Manifest b/dev-ruby/rbs/Manifest
index d9f6ba0ab051..2f0bb6b5857a 100644
--- a/dev-ruby/rbs/Manifest
+++ b/dev-ruby/rbs/Manifest
@@ -1,7 +1,9 @@
 DIST rbs-1.0.6.tar.gz 519090 BLAKE2B 1614320b8f77fcf4880cec6b7e4dc5fcb6b73f59410aa4dc51fb61b2868313acb242dc5a572c6cb96d9a819bade4b1d3aee2196189ea3fcc84d718ebbe9ff1d7 SHA512 a63c5781e6f73e998ea10c1a821d4f33388387caf6cd8e1ea607a9cd009d3f793e59c93b140e2539291a6b1d50b6ac40be7b484a8de0594f0ccff8a2db1e8425
 DIST rbs-1.1.1.tar.gz 547506 BLAKE2B 5bfb64214d4fe0d19ec1c633b3f42567d2615fb0ed34ec78dd3defa3d185adbeab71ad523285d2877babcac4bb61ed2ec60eba80871cd4c631a2017f49768488 SHA512 f31894c1a52679241ef04f03d1aff545f9cc53a460d8933b7064b8403bbd6ef46fbfcdbda00189b158770389bba38b3978ad7d5dd0e7e0594540841e237adfc2
 DIST rbs-1.2.0.tar.gz 560408 BLAKE2B f1f1491018897ca445bb1e49d6d8965af7bc8f19657130fd1f6233bb2d63cac9ecdffba8e41232d2152a6db3007f597a62b7a1cce6c1cf9b2b794b8550b45de9 SHA512 877341ecbe9764431de95c431aa757533c21ba3b51b625a5b1d74d9b76be4c32829f64859befe252162e5dc40ddb1d30ea569e0d7a1e739777f7c8143389dfe9
+DIST rbs-1.2.1.tar.gz 560668 BLAKE2B 25cd2c232a26527e7693d8fe80f0aea08c1d261bbff0d1cd9d20d5d6e06423d3b06e86bdd0ebfdfaf3224307dab683588959f23306fc48953ea2a96fd93b0176 SHA512 8c2e791cf751581720238a6fce347dd03378c42e5d7eb1495c191677bd443ec6294d082e22f589d28ad63ab2f4c98575f1619bad7e31e72af98914695eab2d86
 EBUILD rbs-1.0.6.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
 EBUILD rbs-1.1.1.ebuild 1179 BLAKE2B 9ade58dc806c870b471fb5632946f3810383077649e032254ed170cc955afe8ea5dae28a9c89ce6771777854435e2a6d690f9b5b197cef088361992cfe46432c SHA512 f9c8c3cda17eaf589757498fd345a58f25a7d5646675799b3de4dc5911e84fa32d5ee9721417c72378ff955c2578de53f3fb1e9779a5168db4a3f4a4cbbb7e65
 EBUILD rbs-1.2.0.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
+EBUILD rbs-1.2.1.ebuild 1181 BLAKE2B 25f78efd7c8b626fd3440cd438b0d50b69780506c3230cf0e307d55855438511c5ee89efd5a6ba7098fe3682b4373726aae81e3c66c3fa15acff692410455088 SHA512 5eb3c4e31348e760d3386edcbc89f209505ca2e42a9821629dbb420402b0d9c7e86926f9aae8d5e2b2012b3212be72b42ad234259153ad54e82255b24fa603bc
 MISC metadata.xml 334 BLAKE2B 06663250439d029482e4050e769ba2e5bdf9813dcb9244e06a260247d0275b9a172f0cf06dff21bc81d4eeb2eee2bcb73a11fbd3b9cede4abc7d4edacc6d0d5c SHA512 2e1b1fb38bdf7b589cfc2b448cdcbf7786179b92d391a7db698a1fa8ffc6b7a3f6f7f52356ba76cd367314bc6596a735a17743f06d3141fb817abb4aa63b1cf4
diff --git a/dev-ruby/rbs/rbs-1.2.1.ebuild b/dev-ruby/rbs/rbs-1.2.1.ebuild
new file mode 100644
index 000000000000..900ed36a1e92
--- /dev/null
+++ b/dev-ruby/rbs/rbs-1.2.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby26 ruby27 ruby30"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+RUBY_FAKEGEM_EXTRAINSTALL="core schema sig stdlib"
+
+RUBY_FAKEGEM_GEMSPEC="rbs.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="The language for type signatures for Ruby and standard library definitions"
+HOMEPAGE="https://github.com/ruby/rbs"
+SRC_URI="https://github.com/ruby/rbs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( Ruby-BSD BSD-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"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/test-unit )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find * -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Avoid JSON schema validation tests due to a large dependency stack
+	# that would be needed.
+	rm -f test/rbs/schema_test.rb || die
+
+	sed -i -e '/def test_paths/aomit "Different paths in Gentoo test environment"' test/rbs/cli_test.rb || die
+}
diff --git a/dev-ruby/rcairo/Manifest b/dev-ruby/rcairo/Manifest
index 329260d989b6..cd3bc95ea27a 100644
--- a/dev-ruby/rcairo/Manifest
+++ b/dev-ruby/rcairo/Manifest
@@ -3,5 +3,5 @@ DIST cairo-1.16.6.gem 197120 BLAKE2B d5c1f1704592afb096d30504f2d74d27e29e6222fd1
 DIST cairo-1.17.5.gem 197120 BLAKE2B 6788c4832331407802d56dc429d665d8a82d9e69a7bf9958391b02003e71d7449cabd65fb97916e8e06a16fa599bae1c514e8ace75304f746db3051bb6bc21ee SHA512 f2ade6fb6b9fccd81a11061b277d4a9077936e0beef42c61225bd4d5630586a57a3fa192a20a0f7e4922313e2a8215268bc9a5d007d2805cf1f80714fd9ad1ba
 EBUILD rcairo-1.16.5.ebuild 1850 BLAKE2B 9c5512c5bfd2430614351e2d042112571bec231a5948f46711699f56a838ea601b36f24c2f85548722ec49bb9147f817bbfe4d70ca81a99e620960ab374f7b5e SHA512 ab5c12e5d02cdf9bb6ccf4a569c51ea12371250251f29a5864ae23c067ca010f1f03bc5b4513e9db890a3b4fe6389a027be243299a2bf77db0622fc1335bbef9
 EBUILD rcairo-1.16.6.ebuild 1812 BLAKE2B bffb4cbc3a6af87f881a3f84a405094edff6fc6219e498fb3944fe70a3d5c6236f3a2d46d607f7002aa9af6f6b360f3a509a20feb4b5d181202aac0613962637 SHA512 2f2be83f7b2de88d7112d255139518a0b308eaf86e503b4a7540035adbbf5f69ffa91c57b42cff9f3a867b87eb108837e8c423039e8490a3200bfe08b4fd4b43
-EBUILD rcairo-1.17.5.ebuild 1650 BLAKE2B 74b5cce128745c4e83f86699b2b14421d6c16cd6dcb38a988203f35b5587f578832c79aa0e65f724b084aca8a941f814f9413beb211cbd4eaf4539430542e3b0 SHA512 712aff97d9694788b42f34a0b2bc40d6f4ec047e45747cf018f675bb42a3f9b040d53462dd869e3b3845a1ff06cf90e088e142a17e483c6a66db8eb92f2f72f0
+EBUILD rcairo-1.17.5.ebuild 1766 BLAKE2B 8c821c8c7683a0f1f75dc54aa77e7cb6eb9345bf21b612f2ec6972bac020b1372e061070ecef7fc77cfdd86277a34bd25031ff34a8c10327da4772d18fc85c96 SHA512 bf4d4826a9f2453cab1f688e0802686d3c827452d479b257e78e719200f968e490ff42356f4771bff362408ec684bea146bd5acdd2c7378313eabbe609c87c61
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/rcairo/rcairo-1.17.5.ebuild b/dev-ruby/rcairo/rcairo-1.17.5.ebuild
index f4126a769e6c..a19e1514dfce 100644
--- a/dev-ruby/rcairo/rcairo-1.17.5.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.17.5.ebuild
@@ -48,6 +48,10 @@ all_ruby_prepare() {
 
 	# Avoid test that requires unpackaged fixture
 	sed -i -e '/sub_test_case..FreeTypeFontFace/,/^  end/ s:^:#:' test/test_font_face.rb || die
+
+	# Bug 790131
+	sed -i -e '/^install-headers:/s!$! $(TIMESTAMP_DIR)/.sitearchdir.time!' \
+		ext/cairo/depend || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/regexp_parser/Manifest b/dev-ruby/regexp_parser/Manifest
index 3f9e8f2c668d..a3fb4c41e897 100644
--- a/dev-ruby/regexp_parser/Manifest
+++ b/dev-ruby/regexp_parser/Manifest
@@ -11,6 +11,6 @@ EBUILD regexp_parser-1.8.2.ebuild 888 BLAKE2B 5908b7be2be373462cd50b9445e1b11149
 EBUILD regexp_parser-2.0.0.ebuild 888 BLAKE2B f4c4432751aeba693e2d7ef3769b96fdea6ec480a0fb7d0393770cd9c98c32181cbcc12c0dc185e7996f1e4cffc4ceba47123d1246d123456a420316f58e3752 SHA512 18364c915f58475c0ae9175a928d3c033211048ecb33ef0787f5ba3e10416fb619722cd37280f74610ebe49b8c382ef524bebf37a8a9184f3dcf791829a5f708
 EBUILD regexp_parser-2.0.3.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
 EBUILD regexp_parser-2.1.0.ebuild 900 BLAKE2B f565c500647465eb66745b750f0ed2213b8b25f7966baf7b0cf6101ab80a5713baa7a35cfd7bd1536246c938e078f6f5fe6fa0a7d75e40fcdd5e56cf445411bc SHA512 f9ca3cc108e5b5c31e13c99468aa5ff0003fcdaa4841351e35581b73defb13c7df04c6ad85921084339e9c09ad82901534d00b416e84cd7237cdef53b9aa1f83
-EBUILD regexp_parser-2.1.1-r1.ebuild 897 BLAKE2B 913e9020a9e75a450623d0d6fd25541ef862a8358b2ef0958b639148394aeb38e64f62a4f42ef635c937723255f390e7945e8c43827c731c3fb6c33ebd85c87c SHA512 9910d0186d4cc07799e0a6341b591e5986b94177ae4e3d1ae1995a849997e8f240803181cc6f72de9cb0def373ba9f3607c1102986874683ac2507c70594e199
+EBUILD regexp_parser-2.1.1-r1.ebuild 922 BLAKE2B fc2d2be3b974dacfa67df09e05ff4bf61623567b8c54c53f261586566f433e6d441bce7d74c07336fab5aab88f41b48989159af95842445470e35911180641d1 SHA512 a10e0cf15b3d8a8978bc91fc92c5b81ead52d89c3c86df8d1dbbe0903a72d05799d6253e849f9ce6ae20a94d0fa0a38a0542c395a881399210e5ebdd3e311036
 EBUILD regexp_parser-2.1.1.ebuild 907 BLAKE2B 6bd68f31925a8eaca632e9e15c2863a080d0b0c81cf2ee09f6a96f30f8b54e6ce41b3a0be4ce45b7bc01713d952028245e9b08aa42cd197d710677cd6b4ecd85 SHA512 a9d499694fb8da3f72c5e306c266d43d55e12fb6e093c93917fa46ec624ad2d4ce8c9e1487f3d3b6b61b2f479d8a1426620c179efcb212b4e22b228b1382c1e3
 MISC metadata.xml 345 BLAKE2B 1b8ad1173966e2528e85b076052a92f378eccb6bc3159a69de1a276dea6e65c3b2e83db43d65ab9cd357fa58ee0af3cde2485b0926002cb74e0fe1d54cef375c SHA512 aeac372e6213e9b018782fb640fe6d88b3d86d8f5d02b8511f69980df204dd82d45443c371e81527fc6c34b2c1684ff04b3a7789808b884644c348139b4999ff
diff --git a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
index 154f1879c015..71af07902089 100644
--- a/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
+++ b/dev-ruby/regexp_parser/regexp_parser-2.1.1-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/ammar/regexp_parser/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc"
 IUSE=""
 
 DEPEND+=" =dev-util/ragel-6*"
diff --git a/dev-ruby/ruby-prof/Manifest b/dev-ruby/ruby-prof/Manifest
index 3a8d3eae3f73..7000c7c5aec7 100644
--- a/dev-ruby/ruby-prof/Manifest
+++ b/dev-ruby/ruby-prof/Manifest
@@ -1,7 +1,7 @@
 DIST ruby-prof-0.18.0.tgz 93925 BLAKE2B f7e0825e5291fdab017035b2a71029407d2b01161f4c4c7aa1f10a80b4080ac14f7adaa2c0340fe5c80f7352181d085d724dee66597ed29825ab7116d37c5e58 SHA512 1743bbd97789c9de66e9479384d204b0870e43a265471f0fbdf7a72bb19d77a30afc25da9d0ac66a921c28ce83d8a8d72279bdd9b23cf8505ccde952092dd9a5
 DIST ruby-prof-1.4.1.tgz 90180 BLAKE2B d996474330146a5daac50f1dcc2e39ed9d3c43ab5f4851805ab264168d3a242371cf216df53c474360de164dd42c14465b4d660c4a6aee7e8983d69ea52dc4e0 SHA512 a436f5fb81bc972c799591ee1077d8fe3d092680c8c0c40ca3607f7ba49611e6fb986464df16bacc7e429ad51276f76c800457a3a68beb659ef8ad01d183434a
 DIST ruby-prof-1.4.2.tgz 90386 BLAKE2B 55263f6cd24b18112a917c2b03a57ca91619419244f79b2b06f6d6794f76d9411d4e1b39dbb2e4b7e2ca6cc03b244f529f4b56fec54ef5fda18853ec2ef05fb4 SHA512 e75a8898533dd2ce9098fcf940883e3cbeaeaecdaebe3592ee67321feb4e294e25bdf14ce6cac50fb6d582cd55d33f175929a1d5446a21b74eb86c468e779fc3
-EBUILD ruby-prof-0.18.0.ebuild 1557 BLAKE2B e61085830ea7864252534c335cbae9cdee387fc5f2ce891b9f31d01e4893e60adb147833cd4fd0a63cb86f3e8217443bc3a09bed5d93ece2f48a601a175f5565 SHA512 6064d1e707aff7caa56899087f40e2e25199ae3228237fb464cb993cd4521e84d9a674954efe4c26df7d8dca7f6b475a5e28ca8ac57cc842805b1ac0533c30c8
+EBUILD ruby-prof-0.18.0.ebuild 1561 BLAKE2B b40c03ca0544a6c08a4268e94063224124e6f4f2b6547a8b0ff589b0c495ac0224e56a311d75d32d3e622307df13f787fde893ffcacc261702da59f25e649595 SHA512 e102520ec428e74171e4b21c27887b6ff5b167ffbe070900ed3bf826e17e8cf342b81102431fb1d343e85bb6a77c6085ca819b825f30955b64531f387bf8765b
 EBUILD ruby-prof-1.4.1.ebuild 1314 BLAKE2B 1419b093586c754b90b5b7178c7095a24107def55933ba924ac722f5a53c183cd0381fe8e996ec947fbdca027cf5a626804aa22a8127d7713d9915a9f66ba533 SHA512 3415902005abf753ddcef077af7c654a9d455eb9f39eb7e80b298007ea9f705d0f3f24ffb435a2984f1b34ccb311513d002776cc95cb26a77a611ecab2c50764
 EBUILD ruby-prof-1.4.2.ebuild 1336 BLAKE2B 244a6ec8cf01fd2726f6c7b5d6f0bbf379b63aae51b576bee68d7bfaf753bbb2070425c5640550f4be27041207305be0a544efbedb90b7bb7b194dae21daa77c SHA512 4367d812a86f884fb2822d1f140746b8773f67cc7ba8f4863edd605a9ec90d454e1849074f36fd09fc8484d90beff228785c9a04670d2784e15dc41abb9114b5
 MISC metadata.xml 345 BLAKE2B abf08843e05ea5a260b8d3b1de88259aa5b593ef0be34c9066cc9f53aec48f13e962ee77224e28b7253f45850af20222d672578f57111bbca2d250458515c26d SHA512 e1647ce0131d640e8de67cdaf4bedd36d5cf3cc1d251e08b3f36a7c82bf356f80a3911984adbe14d25250b2f5c3333a988b5baed8978adea0b68594d985f22ef
diff --git a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
index d29eeb957fdb..867b5dd4fab2 100644
--- a/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
+++ b/dev-ruby/ruby-prof/ruby-prof-0.18.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -56,7 +56,7 @@ all_ruby_install() {
 	all_fakegem_install
 
 	for dir in examples ; do
-		docinto "$dir"
-		dodoc -r "$dir"/*
+		docinto "${dir}"
+		dodoc -r "${dir}"/.
 	done
 }
diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest
index 0e0f00c776f7..df4669cee9f9 100644
--- a/dev-ruby/test-unit/Manifest
+++ b/dev-ruby/test-unit/Manifest
@@ -6,10 +6,12 @@ DIST test-unit-3.3.8.gem 121856 BLAKE2B f47ef205c566fc404d7ffb9380502ae18224c395
 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
 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
+EBUILD test-unit-3.4.2.ebuild 881 BLAKE2B 3c0a623e3a0b315c4248c35810777d1c1cf81adb786ba176043662e5d41c3c42dd044d748f6ed76e8b9bb29087e382fb79c5d9866f95cc182255cb033efd1de0 SHA512 9c8709502f25136fb18b18bf17d47f1093150148f506b62c60db3312e1f9356e2378f98bbc371b24938618d8da3563d11229dad70bcd987bbffb52bfad2e3c6c
 MISC metadata.xml 337 BLAKE2B 0a43a0dc135bad049718f93d6347df3e9b610845ab2e59201f998c2523a6a67769a5591b678093eea2b18276972cf2cfe633892ab3b86acf0ecce357a31cd236 SHA512 82719d56184698a8bd8e03c0c71f2071eb2bd7d7394093b908a69c031c73ae5634ce3739e371b9d57723b78e7a154f26f6d48f270adb8ca0d89b88fdf13ce3be
diff --git a/dev-ruby/test-unit/test-unit-3.4.2.ebuild b/dev-ruby/test-unit/test-unit-3.4.2.ebuild
new file mode 100644
index 000000000000..805bffe784ad
--- /dev/null
+++ b/dev-ruby/test-unit/test-unit-3.4.2.ebuild
@@ -0,0 +1,33 @@
+# 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/twitter-text/Manifest b/dev-ruby/twitter-text/Manifest
index b5afb9a88c5e..d796b7f38327 100644
--- a/dev-ruby/twitter-text/Manifest
+++ b/dev-ruby/twitter-text/Manifest
@@ -1,3 +1,5 @@
+AUX twitter-text-3.1.0-frozen-string.patch 3372 BLAKE2B 2c6eb1fcb05561a8bed4114f8b86547532f53c4b2981e14387518ccc7daa69ff0ddbdabeb892cb125c97420a74e8c121f5241b500803ba6a8ef27e6c6d297c1f SHA512 153e0eb1d41e43517ea9604aaebcea40ab814c168654c76276a94833d393250ae10a3be54b83ee839660c37645df25f4144a124e4942aa34b5fd8471ef065320
 DIST twitter-text-3.1.0.gem 59392 BLAKE2B 91f906db8d4cc17086b7bc421f1730646756aec9e041166e18d816da4b680282f312743c52e412e6595d7565c2c7faf0dd18fea815f3bbc53afa675a33ac3c66 SHA512 b0d5a876bd9c1d4788378ebd5029bed51db6a0c3a7cd2c97433eab3ec3655d7bc427c3873364a368c0a10216871c7373e762cfd57c4bdd69800adc95869aa03a
+EBUILD twitter-text-3.1.0-r1.ebuild 784 BLAKE2B e0fc371ae59480613b87c22503c8528ec9aa7e419ea18c3f8799f40cb95095d8ce215711dbc9fc0a036ab6374c72f2fb9d95905b0bf85d01de744010dc667989 SHA512 355e14ac0acceec1e330f0a388b8f1c86bb1fd7e3e5765e0130bccff907cb3fdd2109c96303a34b55f48ff10be1ee5736fed06089ead5463efbb8b0ba92d6942
 EBUILD twitter-text-3.1.0.ebuild 717 BLAKE2B a2c2697c6e3425ad1020b702b423b6edae1c2eed07253d06417f456f15d8e72ec599fcc95f31edbfc382e053269e1a0f15ddffdd8a82a6738578950dd8116612 SHA512 a74baba26339ee53568978ce19d35e28fecee4ff924542d9f35f7c9c6fabca22776bb443f23de444fba8ca892704a5a2070c2d026155ad3ca80483334e9a2cf5
 MISC metadata.xml 346 BLAKE2B 3c20459269b0d8df90be33c5884c0e5925e9f2cde075ebac70a03e74e8afc51cb0d652aa4825099a775cd266e50e47ed6b2efc12a1ac253b68fce15a97766101 SHA512 89f26f9a6f6b3ae47bfbfcdb944b44b17f4fc9217c6858d88c3127dbe580f8e00575c6214cbe62f8e5e83e3d662255757c03d4c5608e69229c0417f55ae23bb1
diff --git a/dev-ruby/twitter-text/files/twitter-text-3.1.0-frozen-string.patch b/dev-ruby/twitter-text/files/twitter-text-3.1.0-frozen-string.patch
new file mode 100644
index 000000000000..02959cafb983
--- /dev/null
+++ b/dev-ruby/twitter-text/files/twitter-text-3.1.0-frozen-string.patch
@@ -0,0 +1,69 @@
+# https://github.com/twitter/twitter-text/pull/337
+diff --git a/lib/twitter-text/deprecation.rb b/lib/twitter-text/deprecation.rb
+index b377abf9..bc66d60f 100644
+--- a/lib/twitter-text/deprecation.rb
++++ b/lib/twitter-text/deprecation.rb
+@@ -8,7 +8,7 @@ module Deprecation
+       def deprecate(method, new_method = nil)
+         deprecated_method = :"deprecated_#{method}"
+         message = "Deprecation: `#{method}` is deprecated."
+-        message << " Please use `#{new_method}` instead." if new_method
++        message += " Please use `#{new_method}` instead." if new_method
+ 
+         alias_method(deprecated_method, method)
+         define_method method do |*args, &block|
+
+diff --git a/lib/twitter-text/autolink.rb b/lib/twitter-text/autolink.rb
+index 82f35302..9b243ec6 100644
+--- a/lib/twitter-text/autolink.rb
++++ b/lib/twitter-text/autolink.rb
+@@ -325,10 +326,10 @@ def link_url_with_entity(entity, options)
+           #   <span style='font-size:0'>&nbsp;</span>
+           #   …
+           # </span>
+-          %(<span class="tco-ellipsis">#{preceding_ellipsis}<span #{invisible_tag_attrs}>&nbsp;</span></span>) <<
+-            %(<span #{invisible_tag_attrs}>#{html_escape(before_display_url)}</span>) <<
+-            %(<span class="js-display-url">#{html_escape(display_url_sans_ellipses)}</span>) <<
+-            %(<span #{invisible_tag_attrs}>#{html_escape(after_display_url)}</span>) <<
++          %(<span class="tco-ellipsis">#{preceding_ellipsis}<span #{invisible_tag_attrs}>&nbsp;</span></span>) +
++            %(<span #{invisible_tag_attrs}>#{html_escape(before_display_url)}</span>) +
++            %(<span class="js-display-url">#{html_escape(display_url_sans_ellipses)}</span>) +
++            %(<span #{invisible_tag_attrs}>#{html_escape(after_display_url)}</span>) +
+             %(<span class="tco-ellipsis"><span #{invisible_tag_attrs}>&nbsp;</span>#{following_ellipsis}</span>)
+         else
+           html_escape(display_url)
+@@ -444,7 +445,7 @@ def tag_attrs(attributes)
+                     else
+                       value
+                     end
+-            attrs << %( #{html_escape(key)}="#{html_escape(value)}")
++            attrs = attrs + %( #{html_escape(key)}="#{html_escape(value)}")
+           end
+ 
+           attrs
+diff --git a/lib/twitter-text/deprecation.rb b/lib/twitter-text/deprecation.rb
+index bc66d60f..cfc4858c 100644
+--- a/lib/twitter-text/deprecation.rb
++++ b/lib/twitter-text/deprecation.rb
+@@ -8,7 +9,7 @@ module Deprecation
+       def deprecate(method, new_method = nil)
+         deprecated_method = :"deprecated_#{method}"
+         message = "Deprecation: `#{method}` is deprecated."
+-        message += " Please use `#{new_method}` instead." if new_method
++        message = "#{message} Please use `#{new_method}` instead." if new_method
+ 
+         alias_method(deprecated_method, method)
+         define_method method do |*args, &block|
+diff --git a/lib/twitter-text/extractor.rb b/lib/twitter-text/extractor.rb
+index a2fd7db7..c96ec200 100644
+--- a/lib/twitter-text/extractor.rb
++++ b/lib/twitter-text/extractor.rb
+@@ -19,7 +20,7 @@ def codepoint_length
+ 
+   # Helper function to convert this string into an array of unicode code points.
+   def to_codepoint_a
+-    @to_codepoint_a ||= if chars.kind_of?(Enumerable)
++    if chars.kind_of?(Enumerable)
+       chars.to_a
+     else
+       codepoint_array = []
diff --git a/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild b/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
new file mode 100644
index 000000000000..ec9980d121a6
--- /dev/null
+++ b/dev-ruby/twitter-text/twitter-text-3.1.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_EXTRAINSTALL="config"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Text handling for Twitter"
+HOMEPAGE="https://github.com/twitter/twitter-text"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "
+	dev-ruby/idn-ruby
+	=dev-ruby/unf-0.1*
+"
+
+ruby_add_bdepend "test? ( >=dev-ruby/multi_json-1.3
+	>=dev-ruby/nokogiri-1.8.0 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.1.0-frozen-string.patch"
+)
+
+all_ruby_prepare() {
+	#sed -i -e 's/2.14.0/2.14/' twitter-text.gemspec || die
+	sed -i -e '/simplecov/,/end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/websocket-driver/Manifest b/dev-ruby/websocket-driver/Manifest
index 4b30efad28b2..3baf8a089ae1 100644
--- a/dev-ruby/websocket-driver/Manifest
+++ b/dev-ruby/websocket-driver/Manifest
@@ -1,8 +1,10 @@
 DIST websocket-driver-0.6.5.tar.gz 24737 BLAKE2B 137c16a69309a1aad07fff663ff95a888a151f0fa20e78e754ae62ddfc8c2bdbfda926d7f4c53549e92646d018df7f374721e95246eb2985012e6b219970c4c6 SHA512 6915fdefac26a24e1f7d3d9a7e6bc6afc84b491150290a75a14243c233f5029d7d6e90a803b34bd6a8e8717322c6ae6fd4d3f3dad7a50c8eb18f17c3f2e9bbd0
 DIST websocket-driver-0.7.2.tar.gz 25998 BLAKE2B a14af62a6189a4ec476352fd587e210e6ecf7f48845e06aae87a3bf78d7f55a1dd50177b29d5759416c6debf24b8d249fa2cf41f1a282044ecef8cd6fa963adf SHA512 05a0ae12e8fcf1c6734bedd8837857d71387844cbfbb768d8b81d8b890e3735c272b7a397ee9f3d20db82939a06694e4bbc6a42d06436911997588917b7fe7af
 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
 EBUILD websocket-driver-0.6.5.ebuild 963 BLAKE2B 3ef1c98fee0e175e302a46841bee7b371b2e3430ea57565ae781128d2c654d64d5b08f61c4601cf5491c293efabdb4b437c89a2b09002eec7e04663c9e1bfc23 SHA512 419ee174c8e39baf21159308e94e2bce1f81772cf37c82ddedc65e12e2baee99b009911bda70719bbbc2da0ae1d58be449a3c362da50adfeff40a21355e28eeb
 EBUILD websocket-driver-0.7.2.ebuild 940 BLAKE2B 28fd1f2b91e9bb351dfaf95b2a30dbd9b4eb85fcf6fae7bbd8cbc41754e2bc7cfef491f9d7441be6c9840a30d88c20e9583ff80ead5c30e6b546fbd3c5753d3b SHA512 1fe910ecb8e284e9328340241c6ece931404f0f6416ceeb70d8e54c6be437150a0a2b3e1bb44a4eb73d62dff0e0119ded544f1d93506f5d3a1aa7c98b6e3138f
 EBUILD websocket-driver-0.7.3-r1.ebuild 808 BLAKE2B c6fb6477a787cb43b4b7994449deb5aff4dce829e865fca738ad3ec7bedce99fab29a3923b5ca05064b1701b40adabb3a0e840f67c063f9b4747162e0c7a75e2 SHA512 3b05437086870eed96f46c72d680c81e570a1f0dc8d9bde4500c25385176c1f79e9ab4fc8e04fc29327e70fbfd0490392aa11b3709ae9025c21d95bda0355e7d
 EBUILD websocket-driver-0.7.3.ebuild 940 BLAKE2B f9cf0d99c0bba1fd0309e6a9128253d0e64e8a63d50c1a47e8fd40e4e8698223f30b68e247bbd8d96f651563dc61e512f5008d1080c5b711e5455a74b0be7b10 SHA512 96a4cc10b3190c12fc5cec9b349e6df2c53662005c0a3b12e2505e88bef9da7c46fe983f4afd5eca16af739b72c03626a0107318bfbbf14161ba1f39968db853
+EBUILD websocket-driver-0.7.4.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.4.ebuild b/dev-ruby/websocket-driver/websocket-driver-0.7.4.ebuild
new file mode 100644
index 000000000000..fffb5983f6ca
--- /dev/null
+++ b/dev-ruby/websocket-driver/websocket-driver-0.7.4.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_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_EXTENSIONS=(ext/websocket-driver/extconf.rb)
+
+inherit ruby-fakegem
+
+DESCRIPTION="A complete implementation of the WebSocket protocols"
+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"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/websocket-extensions-0.1.0"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' spec/spec_helper.rb || die
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-05-31 20:59:14 +0100
commit	e748ba9741f6540f4675c23e3e37b73e822c13a4 (patch)
tree	23dece8beabb3a3d7c6c0273b0eb40b21c62a889 /dev-ruby
parent	908778078736bd36f7a60a2d576d415cb8e000fa (diff)