gentoo resync : 28.11.2020

13 files changed, 159 insertions, 46 deletions

diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index d6ec25cbb750..6a3ecdb3b676 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 5ad0bf147cd7..c614e708dfcd 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,7 +1,9 @@
 DIST capybara-3.31.0.gem 363520 BLAKE2B 246a199d89f5120bd1be7b36b5aee5bd4143ee5d1c8953cc2e65e805c234d902c5d898f873c562b8457c6e09af507cf81ddc178bcb617f2730b5db1f9ddd97c8 SHA512 920dbd331eff5300cfa575689f7c62f502cea5782ad58eff168ffc274f2622a95869a7ab90e53fc010bc7f5c0847caa5dcf69cb74eecc2a82f0f449c11be3edb
 DIST capybara-3.32.2.gem 365056 BLAKE2B c193f188aec6089aabafb5d09cb540f914d8c257d3faafa0d59f674069a39c29a3750c80bb269bf2d010cc7608aec1699c7d75d96c7c85c201aaa0f99adddf83 SHA512 b1b21615b5f87012a71a7901a4f9bb9cda61f1a455299d4ad05b05e0281985a6c158a1549864e551c2ca4b97e921139b35843a1d23efc45557647328c0d1c2a3
 DIST capybara-3.33.0.gem 366592 BLAKE2B fb64b301051011aa82194480bb79a33d06345cbe250fd7a32d54cb32038651f8598e860269c67efc58a87410a213f07e8f7107b725bd6286ebb93e7fd6ff125a SHA512 b169a12f330fdc016dbba6c7478cf52a51006499197bba67e6953f36929099212e209d2803511ca623b7e2b1fc0288fad1975fd426047c95680309145abb9977
+DIST capybara-3.34.0.gem 369664 BLAKE2B 4f55388b809e5d808f4cc3a45690eedc86d2bacd30498af8c891757881c527b0142a8b6cf2d46302d400c77e75eee33b4206b8d01fa416211895bfcb6b5175d3 SHA512 ee722be02cc0b23b7b7c92b29c7eb702a035a95e21c10c237eb6922fbc285c43431deca8bc8e445948a767265f4e8b6ef451f46168f26f8ad6dc6e1c88966537
 EBUILD capybara-3.31.0.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.32.2.ebuild 1789 BLAKE2B 0144d4405f871d24f715b1ee0e8e6797b37178939ad921f64d83e033256aa8228900ace9df68358e1d1222ff0ae7adcae830e8cd9e8b6d4a5f521224c618ed71 SHA512 502598533960c4d2fb06e8bec9859067246321ea625c1961c7ef115c44664b3f9b533cedb6c630c9c7dd5093cf873e0d16ea80d3d2d704db950e22bd9a980601
 EBUILD capybara-3.33.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
+EBUILD capybara-3.34.0.ebuild 1783 BLAKE2B c9be1ebcbae6b2141e9c0f967d92284c736c57046a30eee07705567e16aa065033ee307ad722aafe07bbe8080e9bb56636f16b0596d8b7a03c48dfc4a091bb0e SHA512 83c5ba82043668977392824b28125859ccaf75fef8cd4dcf829cb163c09b3f5e7603def865ba66dcd2a5a88b7016146e819ab6df58316df11269f463bb95c92c
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-3.34.0.ebuild b/dev-ruby/capybara/capybara-3.34.0.ebuild
new file mode 100644
index 000000000000..b0688ebe995b
--- /dev/null
+++ b/dev-ruby/capybara/capybara-3.34.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="History.md README.md"
+
+# Rake tasks are not distributed in the gem.
+RUBY_FAKEGEM_TASK_TEST=""
+
+inherit virtualx ruby-fakegem
+
+DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
+HOMEPAGE="https://github.com/jnicklas/capybara"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+SLOT="3"
+IUSE="test"
+
+DEPEND="${DEPEND} test? ( || ( www-client/firefox www-client/firefox-bin ) )"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	>=dev-ruby/launchy-2.4.0
+	>=dev-ruby/selenium-webdriver-3.5:3
+	dev-ruby/sinatra:2
+	www-servers/puma
+)"
+
+ruby_add_rdepend "
+	dev-ruby/addressable
+	>=dev-ruby/mini_mime-0.1.3
+	>=dev-ruby/nokogiri-1.8:0
+	>=dev-ruby/rack-1.6.0:*
+	>=dev-ruby/rack-test-0.6.3:*
+	>=dev-ruby/regexp_parser-1.5:1
+	>=dev-ruby/xpath-3.2:3"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' -e '/statistics/Id' spec/spec_helper.rb || die
+
+	# Avoid window-manager specific tests (sizes are specific for fluxbox)
+	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
+
+	# Avoid spec that requires unpackaged geckodriver
+	#sed -i -e '/describe.*register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Avoid test dependency on puma server for now
+	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
+
+	# Update spec to catch the right error code. This seems to have
+	# changed recently accross ruby versions.
+	sed -i -e '/raise_error/ s/EOFError/Net::ReadTimeout/' spec/server_spec.rb || die
+}
+
+each_ruby_test() {
+	virtx ${RUBY} -Ilib -S rspec-3 spec
+}
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index 11b88b65c530..abb1f0dac5e7 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -2,8 +2,10 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.2.1.tar.gz 51030 BLAKE2B 1c7df3910c856c472f42417d51449f04d56635f0c77dbc6eb7a30d25042482f4efc7bbfa2d74609aa9f8d4ae134f53dc675b621efe35c2cc6faed8780d7128c8 SHA512 24cd67b926589401123dfce1a344a6d1ab1d0f9435b9646b7f638deebc0f683b77df70064537f84538eaf800beca4c67fd7c02e40d955fac92866b8ce1eeb769
 DIST listen-3.3.0.tar.gz 53387 BLAKE2B 4e68e0789fde26c43bdeaba3742d1e3ca6f573441ed0b71f54ca85712c39727cb5dc4975b06a6ce52ac2e7049588442a787c7deaada7e162076af5a514884f1f SHA512 c3a4df6293429962c6412b16c7bbabe0244e1296a6bd5516397699f8770793cb7f7dfac78f74593183c2312eb8832f4ab7a650ee29722c7e4e1493faace1b726
 DIST listen-3.3.1.tar.gz 53470 BLAKE2B 6dfe8074883cbced8f7b707414309428b16e755e6652106cb0525dbee0a7596ae1b57b22e8dca665294d9a23de6776738ecb527ea8467fa6c0ff5a04ecdd04f6 SHA512 fbdd743eecd7be5431e7a698d8a00b17f0889975292b1eb798ab8fbddf997aaeb296ee13f846481bc68fbcd512e91f65296792829557a1d420a422717bf1e8a5
+DIST listen-3.3.2.tar.gz 52911 BLAKE2B c9a086a37def00b6d48477a3ebac9735ceb4dd08c122555e45223dc60a382d313de0aadc86c853f1c6f3b91d82a7f5dfb5b2bacfa19fd7768ef6aced8ae0e4d0 SHA512 9f9f04138c836872370fca766fda0f8305c953ab2ee06790112692d5c19529b0c16b9cccd492003778972aca700dbdcfcb111b23f22c2c3ba5252dbeebb21e07
 EBUILD listen-1.3.1-r4.ebuild 972 BLAKE2B c8062f42d923c5dfc3b352bd14c96a5afc6d79b1b4756a3fc0e6792f89179e454bcdbba2d2697433b33180c0edbbb503a81a1b252109ea8a3cc1b7c7d302c8f8 SHA512 31c83048aee128b6e90303e7eea9f8fc16faa0814db329283a58adb9dcac275efb1586814a5ce999f0525fe7829130dcf8bd2fdfb32e5efaf197517400bfe444
 EBUILD listen-3.2.1.ebuild 1208 BLAKE2B fe6653f617c1f0caf4c4cb39ab27977acd22af42ac1ecbdd03be705918050d4b973eb6410a1eb1e484a2ba90c51c2c9ca6d18e0d259d160c911e41d7916e680e SHA512 6c54b1af911554bd2c91e94ee7b6e005715fffa9b31594a270c7b49f819bd38e427b9fd376c2d027bf97400d67bc49688487166de0597a47185cbafddb1e1549
 EBUILD listen-3.3.0.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
 EBUILD listen-3.3.1.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
+EBUILD listen-3.3.2.ebuild 1202 BLAKE2B 3cc3d6fbcceb441f1686b9e63068ff7a023037a8bdf3a3fc9d7c3dda0f62946f35d8d5a2349a2c7931f41f7f12ddcf568dd3ff1bcca7cb28e435eb4608be95b9 SHA512 a26d23061fe17642f5f85173bf4e97daa912dde4bf100ee8f12268975326dcca07599534101b7f24e0f66034108eea4f53b7afe4d1d386e0f3e88e0d0ff4b8de
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.3.2.ebuild b/dev-ruby/listen/listen-3.3.2.ebuild
new file mode 100644
index 000000000000..7120fbcdf848
--- /dev/null
+++ b/dev-ruby/listen/listen-3.3.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="none"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit ruby-fakegem
+
+SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Listens to file modifications and notifies you about the changes"
+HOMEPAGE="https://github.com/guard/listen"
+
+LICENSE="MIT"
+SLOT="3"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+# Block on other packages trying to install a /usr/bin/listen
+RDEPEND+="!!media-radio/ax25-apps !!<dev-ruby/listen-2.8.6-r1:2"
+
+ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.10"
+
+ruby_add_bdepend "test? ( dev-ruby/thor )"
+
+all_ruby_prepare() {
+	rm -f Gemfile || die
+	sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
+	sed -i -e "/rb-fsevent/d"  lib/listen/adapter/darwin.rb || die
+	rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
+}
+
+each_ruby_prepare() {
+	mkdir spec/.fixtures || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	rm -rf spec/.fixtures || die
+}
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index a1088927f2f5..08290c4f4cd8 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,9 +1,7 @@
-DIST loofah-2.4.0.gem 68096 BLAKE2B 7bffd489c6234b3afeebafad5029802aa0370ded269de018517e914c4c2ec151936e899c633e157045f93dce3e0d829e9821a3ab42447f71ca679f1bd3965423 SHA512 95bea374c0cf9e49becd4533c141a6ebb388f4ae0a1c27263612d3a4089177fd97956e4fbe7a8c8a8b17d8d69387e4629cf7c004f17008fb592f6b71297ed22a
-DIST loofah-2.5.0.tar.gz 68497 BLAKE2B a4e13bb4b7e5b76b9cc753031617110c61db8b7f13c2dc7f0f9423a1ff106e45e79f62b80f595a3e1e2958de9ed717e718b5d58e57a32d4baaa2d8355713580e SHA512 77d84a26f93605bf231e893dd7b010013d97077ceed44ae16164210f029a044e36d5bcacebffbbefdd8fe371e7ab0aa322bc48565c2ccaed1e8a386385176301
 DIST loofah-2.6.0.tar.gz 68970 BLAKE2B 507e907e9c744734594dbb0aefdfb76f57f57ccb9fde6c52b15b56289d6cbeb8c1a7bc0fff0259d22204c45f55b06a360cb56e8c8731736a0d70ef079e006cbb SHA512 6c3948844b5f66f14a86049fa0527967a120df9a51661bab88449f0a60093493b5b948901b7227995747d253d915ca0176f708b126000036ca3396b794cd49db
 DIST loofah-2.7.0.tar.gz 69272 BLAKE2B 1578cba4b4b12fb35a1095060af8d764ec55d3745a44cf756f1de5bf43bc0bde37276372e7aa53a3a26c2c83a8c3da417140d3addb102cc0429f7d47b8c01806 SHA512 698f7976e6048615643d8875aa4dc09c4bd261234bdc9908589edc08be9073a83f84f04fff7e32b518712d63cefe2611895543733967a8b8de12e6cecdb902c9
-EBUILD loofah-2.4.0.ebuild 983 BLAKE2B a49a9f19dc1807454a880247684007e31f7339747c4b783685a44944d9acd6f804a9ce84a3da46b971710896c973a454bdab4f8ddb3271ab646018022ed26309 SHA512 0a696fdd8a3f2a465d00b17aa4b6f81cc4771db0582456231ed966d2baddc6a270a77b9ddd0aaadb45160d42829b9f800b96fef2ed283aa0606771689c7d64fe
-EBUILD loofah-2.5.0-r2.ebuild 1209 BLAKE2B 5ea9866c4d1325c53d8dbec8150472ea0fdef9153ee9c5d00c5af1e9e84268315b9961af09e767e32d885bd6eecc13f3b6f3d5351866125f1d2763b635f7f3b3 SHA512 49a5e36fbf844f5cd95995f59ca4b40e9c0dca7402876f68f7371fd386572141e21acec71698d9c1caa875fe7a61285199e321cb74afb61681b80d85aa19f781
+DIST loofah-2.8.0.tar.gz 68844 BLAKE2B 52b5b5c7a70939069d84d0f66c4262e456d2ed81ab4ef2541eceb9068ccdddbb1c7b470ca7504700f6f66d4aa4507b9edfd4720c1302f6026008c10100c1fecb SHA512 a9d7c21be733e1aab8353ab7bfb3db14d47e8da2c3f20eba11d0041b782e4f2cb82865bbd5a2a9321aae7ea04089f6a5fd1bd3119cbfe8a00c2ea71a40cae53b
 EBUILD loofah-2.6.0-r1.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
-EBUILD loofah-2.7.0.ebuild 1203 BLAKE2B 9fc912673ccae3465c0052ddaaeb3128a48e8ca7adf001c9edb84e1ce6b07e405f85b7a27534f02f878b288768682a85aeeca325e9709cedfa6daa18903a8ad3 SHA512 71d7f379ae47270d7f811a6e7532091d76d2951ae7c3755412c865e0a5f83680e4a9f87929dee382daa4a63db2fb4780dd9925448b7acacd78198d4c22f0bf5c
+EBUILD loofah-2.7.0.ebuild 1202 BLAKE2B 7bb633aeb44c799ada5603b8f1b6a2e60c31aa7a392c394cfd672d3981c018b9f12150d93a82f0d6bbacb25db6d702b1d74133aad7dfbd95634b5ae77a673d18 SHA512 f5a776571965a1cc497565cbc27f59cb2ef47eeaa30b3d6ff022852b6bd42bd19843b01371d4a39dd59bdef869df02d8411b2ef1508cde09667e0eb768ef2365
+EBUILD loofah-2.8.0.ebuild 1203 BLAKE2B 9fc912673ccae3465c0052ddaaeb3128a48e8ca7adf001c9edb84e1ce6b07e405f85b7a27534f02f878b288768682a85aeeca325e9709cedfa6daa18903a8ad3 SHA512 71d7f379ae47270d7f811a6e7532091d76d2951ae7c3755412c865e0a5f83680e4a9f87929dee382daa4a63db2fb4780dd9925448b7acacd78198d4c22f0bf5c
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.4.0.ebuild b/dev-ruby/loofah/loofah-2.4.0.ebuild
deleted file mode 100644
index a1c0ba8a9d28..000000000000
--- a/dev-ruby/loofah/loofah-2.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Library for manipulating and transforming HTML/XML documents and fragments."
-HOMEPAGE="https://github.com/flavorjones/loofah"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
-
-ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
-
-all_ruby_prepare() {
-	# Avoid unneeded development dependencies
-	sed -i -e '/concourse/I s:^:#:' Rakefile || die
-
-	# Avoid test failing on different whitespace.
-	sed -i -e '/test_fragment_whitewash_on_microsofty_markup/askip "gentoo"' test/integration/test_ad_hoc.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -Ilib:.:test -e 'Dir["test/**/test_*.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/loofah/loofah-2.7.0.ebuild b/dev-ruby/loofah/loofah-2.7.0.ebuild
index 000b13cda4d8..58aad399e56f 100644
--- a/dev-ruby/loofah/loofah-2.7.0.ebuild
+++ b/dev-ruby/loofah/loofah-2.7.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flavorjones/loofah/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/loofah/loofah-2.5.0-r2.ebuild b/dev-ruby/loofah/loofah-2.8.0.ebuild
index aa2eaf69d5c7..000b13cda4d8 100644
--- a/dev-ruby/loofah/loofah-2.5.0-r2.ebuild
+++ b/dev-ruby/loofah/loofah-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
@@ -25,7 +25,7 @@ ruby_add_bdepend "test? ( >=dev-ruby/rr-1.1.0 )"
 
 all_ruby_prepare() {
 	# Fix version in gemspec
-	sed -i -e '/s.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
+	sed -i -e '/s\.version/ s/".*"/"'${PV}'"/' ${RUBY_FAKEGEM_GEMSPEC} || die
 
 	# Avoid unneeded development dependencies
 	sed -i -e '/concourse/I s:^:#:' Rakefile || die
diff --git a/dev-ruby/sshkit/Manifest b/dev-ruby/sshkit/Manifest
index 9df4f421cb7f..7e31bf6dbb07 100644
--- a/dev-ruby/sshkit/Manifest
+++ b/dev-ruby/sshkit/Manifest
@@ -1,5 +1,5 @@
-DIST sshkit-1.20.0.gem 155648 BLAKE2B fdb95aed6d407c598abde71591cbe2d7b1f98d91985695509a6545bcabc5c0f3337cfe8f73e82f4b212e3c04b6da09e7521637934baeea7a9b5e268ff72fcad1 SHA512 682234f99d6ae9533c99f0319ad0f3732f2ff166a8f1a07d5ce8ff59fd9606af9440798a39f657dd3899e9278639aa93d5fb29af8f64b2ebea7f3b8e75fb25fa
 DIST sshkit-1.21.0.gem 144384 BLAKE2B f4f77d9cf00db4bc0ab6ac092dc859af31fd50976fc9425c0e5ba1b5c1607bd9b50fff44f65f0207b9d9d604c5ace153ba05ec062fb064c44673572769416a22 SHA512 981fdaa19d633e92d4e3ef5fc9255a89d992813c400af4a468e6cf12ca52cbe612b771a87afe6392c4098d07b42162d5981025b8b214aafa197a68222b5e234e
-EBUILD sshkit-1.20.0.ebuild 1160 BLAKE2B 0d991bef3cb64cdf8d9c3325212092ff7534d8469b80c886ad3988179b2813bbbacd5a446746ed9963587963a2f2a74aa18231e5636da857a4ed40b3b834a06f SHA512 d011cacdd85ab31275bc552fb874371c73aaf9771b11bbf2cbae47099563ebe5bffd1999898cf5aa900db413967bbddd39c961deb92264711ddbb0f94ef2e75f
+DIST sshkit-1.21.1.gem 144384 BLAKE2B 961a3646b4401b1e4548b484143f12a9bc21644f710e19539c5831bbdb2f8a70449992c23858d31ce965a2139343d6e33eaa09650a753813191d655d0e73f83b SHA512 794ff492b737190470acdf8238ae4203ce1e66916ee2caba110eee7c92026897f89ee25d30971f9244359c51cc449f954ecabfd2f6a90b068cedf5ed253f8ba2
 EBUILD sshkit-1.21.0.ebuild 1167 BLAKE2B b79a936b31ae0f50cf33806253ad81e1dffe2931cc93d0a0a8b0f5512d76f68c1e455512f308d9708ec153cd43324bff591a02118d1f5d4e7684dc983e6cd1cb SHA512 927d673fb96100b59387fd45e65c1f91781a947f1a6aa4dcca1d485304c995c9dbae1c48008ebf3f8b26a38aa02b08493a53d95348ce75b0fcf0b9fe2690b8dc
+EBUILD sshkit-1.21.1.ebuild 1161 BLAKE2B 416b0ee8d20b4d8f162bdac3e3dcc683a8b2763f4ee7c57347b0191e63d4de384b7acbcb2865ddb06ba62bd97a3a52fbcaabdf7edc62f6310529247747aec052 SHA512 e485b70ba01292fd1e54a9a6c32f68b5734e7f6f5416e638986d315a8c9fffc1d73e9a16645c3b703430b6fcc0c5e2afa0b145df0d89fa9f7542f607c825cc47
 MISC metadata.xml 343 BLAKE2B 0f8326d45916642aa200df9ede8640367ffbf73022b847f54f8869884a592489bc26a0da45406cd5409973e43290dafa3cb785460e7da61c20de3a796e025a03 SHA512 852971e242c5500cf6ce4fb0c2bc58560b96fdb8cc0f366fa41cac8e066f408330962cb86a35171c08bdea3493be81fbb10bb501ce207f7016a2a1b7c42d263b
diff --git a/dev-ruby/sshkit/sshkit-1.20.0.ebuild b/dev-ruby/sshkit/sshkit-1.21.1.ebuild
index 9a29e10ccf72..b3fbf2b32b39 100644
--- a/dev-ruby/sshkit/sshkit-1.20.0.ebuild
+++ b/dev-ruby/sshkit/sshkit-1.21.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26"
+USE_RUBY="ruby25 ruby26 ruby27"
 
 # There are functional tests that require vagrant boxes to be set up.
 RUBY_FAKEGEM_TASK_TEST="test:units"
@@ -16,7 +16,7 @@ HOMEPAGE="https://github.com/capistrano/sshkit"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64"
+KEYWORDS="~amd64"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/zeitwerk/Manifest b/dev-ruby/zeitwerk/Manifest
index 6f262d7277b8..232ff9883df8 100644
--- a/dev-ruby/zeitwerk/Manifest
+++ b/dev-ruby/zeitwerk/Manifest
@@ -1,7 +1,9 @@
 DIST zeitwerk-2.3.1.tar.gz 97616 BLAKE2B d5b387f9a02c5f0250b709d144bc833a0f20164ab3065483cba177078fc04ada7fda99bbe5efa7c6481ae6c21006b6d9a73a31e18f40b19f9183efcf7f0f76cf SHA512 b0f782afde6f3a60e6dc3440316689ba39542e3c9d57129a433a0ea967869ca32d79ab1c522d84091b29a698e80ced31f94c9d12592f310945c4267d1e72b5f0
 DIST zeitwerk-2.4.0.tar.gz 98493 BLAKE2B 60b03153fc90b371d4b1ef59c7f61dd2f577a39ddcf946d8b1a52a2b982164260bc1fe86f79cb9c7937151e93d38a4dfbad7876d384d88b7f43161e1fd66c4e5 SHA512 2538cda71d5e1d381d8d455eba5e6fa115096ec36765d5ad11ee9f33d34d0d08ab594e6788f92053f76d239ec9b52027cb97c07e19d96852f4dc8767dc8e3057
 DIST zeitwerk-2.4.1.tar.gz 98440 BLAKE2B 619673331f866b1e566603727189cac02fb08e856ca10504c97dd6dcc2cff8e24d0b2bb6b462f62dc88696b96beb1df04161f72da691118c0d8414313d2ba290 SHA512 12d513fd16532ce510d83cf32710d734d24002bd5e77e0a37157e6521f3af67d379e915498c61114b5f9943763b59bbf38b7b6b2ea82957858129a6120c756bd
+DIST zeitwerk-2.4.2.tar.gz 99974 BLAKE2B 5913561057a6d5cd9bfa4eb549770ca18de3aafa1549a40e5315cd1d71a2dec5f865e7bc79f6ab2a098e515a930c5f8c83b85c91d7dbe441fa8dfb08ffdbdb03 SHA512 774cc17a8732afea0a854ea22ec860fa5bca65e8743aa800017c06a251dfdb1d2c5af8e541cb56d22a4202a9faa42707ed2ad395d9472360cf64f46ce9b907f2
 EBUILD zeitwerk-2.3.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 EBUILD zeitwerk-2.4.0.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 EBUILD zeitwerk-2.4.1.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
+EBUILD zeitwerk-2.4.2.ebuild 876 BLAKE2B cc0e637768e8add326ab61a654f1560af942de5c47c2492bbe5f4bf97032a9b3e5d7e7599e35331f92c6958c9ed68c816951445206f5ab24b84e6c5d74c2cb05 SHA512 7819df13cce152c5f21855db120b0df575766f484b29dd4b9276fcb11fd558e668c6d2f2b11718cb0cfdc23b18951f1b173747d559733583cf7f34695059fcaa
 MISC metadata.xml 640 BLAKE2B cdf101dca54d96dc5ce6713aecadb42050e945341cb19ff14088a258384259e5dc4d1668e2a8b161d787d21f79cd8a7c8cbdb47c10997e6ecc3b2ce7ec41497c SHA512 50b6eacea9ea202e3ff44b18046b5db26c5d4ed381664af46f9fecfdedcd69cb470fcc35010a747a21dbaebe1a8360b2f37d43aa22fbba31666704cdd9f39a48
diff --git a/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
new file mode 100644
index 000000000000..827d557e2223
--- /dev/null
+++ b/dev-ruby/zeitwerk/zeitwerk-2.4.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26 ruby27"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Efficient and thread-safe code loader for Ruby"
+HOMEPAGE="https://github.com/fxn/zeitwerk"
+SRC_URI="https://github.com/fxn/zeitwerk/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~sparc ~x86"
+IUSE=""
+
+ruby_add_bdepend "test? ( dev-ruby/bundler )"
+
+all_ruby_prepare() {
+	rm -f Gemfile.lock || die
+	sed -i -e '/\(focus\|reporters\|Reporters\)/ s:^:#:' Gemfile test/test_helper.rb || die
+
+	sed -i -e 's:require_relative "lib:require "./lib:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
+
+each_ruby_test() {
+	${RUBY} -S bundle exec rake test || die
+}