Updating liguros repo

33 files changed, 232 insertions, 119 deletions

diff --git a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
index 5f8e594c9af4..3d29baeb7816 100644
--- a/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
+++ b/dev-ruby/asciidoctor/asciidoctor-2.0.10.ebuild
@@ -26,12 +26,12 @@ ruby_add_bdepend "test? (
 	dev-ruby/rspec-expectations:*
 	dev-ruby/asciimath
 	dev-ruby/coderay
+	dev-ruby/concurrent-ruby
 	dev-ruby/erubis
 	dev-ruby/haml
 	dev-ruby/nokogiri
 	dev-ruby/rouge
 	dev-ruby/slim
-	dev-ruby/thread_safe
 	dev-ruby/tilt )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/autoprefixer-rails/Manifest b/dev-ruby/autoprefixer-rails/Manifest
index 495b4bbf4f8b..b51cfd872394 100644
--- a/dev-ruby/autoprefixer-rails/Manifest
+++ b/dev-ruby/autoprefixer-rails/Manifest
@@ -4,3 +4,4 @@ DIST autoprefixer-rails-9.6.5.gem 221184 BLAKE2B 0a8d3dcd87cf4ad54252110bd60e86a
 DIST autoprefixer-rails-9.7.6.gem 226304 BLAKE2B 51481173acc0200e7287e8f448fa99f56f7548cf5df142705f6e4143f42bc079ab2c4d4459d4cbe62417b9f873b9e32d64a96ce61e0e8cdd7501203a33c0dae7 SHA512 4855843d270536607a705ab7a1fcb20fade8270ee957de3150b3892cf81442fecb5d501f07276761aba76c44edef15235d0f68e91ae76d2fe09dfa16179faa7c
 DIST autoprefixer-rails-9.8.1.gem 225280 BLAKE2B 8c6fac92414ba153fdeb974b5e82a9550bd2f18c00af1813984e5cc2b239ab961d597fe66dc8d7a160564f06597da5ac5415c77d73db3d6cfd966dc4cb94ab93 SHA512 5f9d514170551e0c657e5116e76745411d396a02815f44cd2bd0b6c45d7c85cca7af6705ecaa98f4ef069c9d68a941dc9b728d837e9158e56dd9aa9110043bad
 DIST autoprefixer-rails-9.8.2.gem 225280 BLAKE2B 50ba378c775c9781cc2fe5ac4e10cdb29848613a17f1f78811518dc1f58abee9176843a412703505d2ccf15c9dae6025c07f9a60b323db2878cc44e51f6be281 SHA512 6ab2d6106654a41095610dbf3eb383772eaf4c4e56e8790d8207ce2b9e218f276be00a011c6976c1b7b555f691366082d9a1fbeb53dae66e3599e67b2c3cb245
+DIST autoprefixer-rails-9.8.4.gem 224768 BLAKE2B 9d0d4691355c9d92e9e7f960549b40e19b10cf5024e7b23b6c36d99d6c48911237b289f191d0ecddf3e0cc2c12313f27ef5c4db047f5c6f6877c196b6bf75171 SHA512 3680da201cf4eb18eaeeeb8a9bc46af372f8aef035689525cf8354c362df23d329befa05c293d534d88eabedd984c510cf5b6753faba3184a6533a1a88cdbc5c
diff --git a/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
new file mode 100644
index 000000000000..bc06b1290578
--- /dev/null
+++ b/dev-ruby/autoprefixer-rails/autoprefixer-rails-9.8.4.ebuild
@@ -0,0 +1,38 @@
+# 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"
+
+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"
+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/,+3d" \
+		-e '/config.sass/ s:^:#:' spec/app/config/application.rb || die
+	sed -i -e '/standard/ s:^:#:' autoprefixer-rails.gemspec || 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/backports/Manifest b/dev-ruby/backports/Manifest
index 2e9633d3d5f2..293bfc848a05 100644
--- a/dev-ruby/backports/Manifest
+++ b/dev-ruby/backports/Manifest
@@ -1,6 +1,4 @@
 DIST backports-3.15.0.gem 152064 BLAKE2B a2c2a1f35ab6f682be23a5189bafec563a2d028ed5f0e0a4880ad85e09ac7af1085a601323ec3459c5be87a5271c6c3e47b6e80005c50e3084d4ac1dc9f2fd35 SHA512 4eb1f928c37596971fa274d838ab991bce462a7f571cb68501fc81e579693528e93536c25e4b64d93f4f0edfd313c8aacd8af014bb5c586cc182867e78f614d5
-DIST backports-3.16.0.gem 154624 BLAKE2B a35adb965c3f9f42fab5fe80fa1ca20a59511e9b265da28bef059e3477fa6a291c86e3b16f837e1f2d2f7e36e6660be29a9fc02713c3f46ad36767dd87baa1f9 SHA512 500386a74162e6c66e606c705dd26296f56118460f300005f0db44025f49bb8f516805921f23e17d0959056a2a8fc320b5ad4c514dd9c22ef811f6325113ae8a
 DIST backports-3.16.1{P}.tar.gz 156181 BLAKE2B c7cc842fb9bf8fcc7b55c8a572cc7a01a63008ad20f63142f339d24d7bf04202f4def2f03261d23d6c41c8c3bd0af8fce76a323e25585b6874c1428eb2a9ef90 SHA512 d907d729dd37ebfb175f8274078664fc4eee51de773cd0871b8bec9a8808052fbdea8571f0a402b1a6ca88ca7cd7b6b9984f66799abf92f300f1f8bc7b8f3f9b
-DIST backports-3.17.0{P}.tar.gz 158065 BLAKE2B 33df81f32aa36b8039e021dbbf9ebd265a73cc5f74069472773ccf8f71d9378820671055c8130282a95ee8a5b32d3fe13a04394fb8f9b4c01c38f13582447063 SHA512 4acea191916bb067856c42665c10fad52a275193fc5cd04cb73bc5ce7967033d055acbf682f5e7abc8058fafd5150fb8154495a964d09664bf1ffcf91dd154c8
-DIST backports-3.17.1{P}.tar.gz 158209 BLAKE2B caecc782c7949d2b6408a31c3d5f7e1599c49a0593761c2e75fc8181b28db42797fc10ea8149e6f6d3d60c6561bedea536b80b271ba4243c9cf933414e8aca71 SHA512 87cd790099c5265bbb3d6f91fd40429f65b97c4dcdd5126c2a8c4376efac047883271e447ecc3512999c2470b291258b1d45600fe55ad687d4eab8ab12cca37a
 DIST backports-3.17.2{P}.tar.gz 158235 BLAKE2B bc761ee147adec209f2dcc3ff95e8ba82b8388c58b3b6aeb11c4f294ebf8aed74ca8bea54833df5adf32b2fd65ec01b621d2e8422d344fe9e1fa228542cb6118 SHA512 2194dd0e89c111f02d161ebc60827fb0276ad32c9e611156687a0f83604db2b25bdec626d7671a7a6fd7ce1395dc818a3735e63a2c165f41a0dd37ff37487d4e
+DIST backports-3.18.1{P}.tar.gz 158453 BLAKE2B a50efaea7a97d25dd760a8fb592c664c011818933b346b959611d02592e2d7fda46fe16a805290340bd5323397f33ee4d613b9698b70a29714e5429a2d320783 SHA512 38a057d5eeaab45cea4d7a8dd9ec8d0e98c5efdf18056576574733387d84a4ec8388f4797c527e240ef0bc026dc730c7eebfcabd42e1111b2d5727b9cbca4016
diff --git a/dev-ruby/backports/backports-3.16.0.ebuild b/dev-ruby/backports/backports-3.16.0.ebuild
deleted file mode 100644
index fea2b86091ce..000000000000
--- a/dev-ruby/backports/backports-3.16.0.ebuild
+++ /dev/null
@@ -1,23 +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_TASK_TEST="test"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-}
diff --git a/dev-ruby/backports/backports-3.17.1.ebuild b/dev-ruby/backports/backports-3.17.1.ebuild
deleted file mode 100644
index 10f3947595ba..000000000000
--- a/dev-ruby/backports/backports-3.17.1.ebuild
+++ /dev/null
@@ -1,28 +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_TASK_TEST="test"
-
-RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Backports of Ruby features for older Ruby"
-HOMEPAGE="https://github.com/marcandre/backports"
-SRC_URI="https://github.com/marcandre/backports/archive/v${PV}.tar.gz -> $P{P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-all_ruby_prepare() {
-	# Avoid activesupport test that no longer works in Rails 5. This also avoids
-	# a dependency on activesupport
-	sed -i -e '/test_rails/,/^  end/ s:^:#:' test/_backport_guards_test.rb || die
-
-	sed -i -e '/rubocop/I s:^:#:' Rakefile || die
-}
diff --git a/dev-ruby/backports/backports-3.17.0.ebuild b/dev-ruby/backports/backports-3.18.1.ebuild
index 10f3947595ba..c1798ee2c098 100644
--- a/dev-ruby/backports/backports-3.17.0.ebuild
+++ b/dev-ruby/backports/backports-3.18.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby25 ruby26 ruby27"
 RUBY_FAKEGEM_TASK_TEST="test"
 
 RUBY_FAKEGEM_GEMSPEC="backports.gemspec"
diff --git a/dev-ruby/childprocess/childprocess-4.0.0.ebuild b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
index 79eebd325338..f5e6313be959 100644
--- a/dev-ruby/childprocess/childprocess-4.0.0.ebuild
+++ b/dev-ruby/childprocess/childprocess-4.0.0.ebuild
@@ -32,7 +32,8 @@ all_ruby_prepare() {
 }
 
 each_ruby_prepare() {
-	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb || die
+	sed -i -e "s:'ruby':'"${RUBY}"':" spec/childprocess_spec.rb spec/spec_helper.rb || die
+	sed -i -e '/system/ s:ruby:'${RUBY}':' spec/spec_helper.rb || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/diff-lcs/Manifest b/dev-ruby/diff-lcs/Manifest
index 62199d0286ea..16de94edfcb5 100644
--- a/dev-ruby/diff-lcs/Manifest
+++ b/dev-ruby/diff-lcs/Manifest
@@ -1,2 +1,3 @@
 DIST diff-lcs-1.3.gem 46080 BLAKE2B 907536d75c34de86ef28fa044ae785d8ba34c8d1f4d38964f08ef80c14a4fb6176504a39c2e074fb58fc5456214555461a18ae42dc04f371d85dd335b1cbc3dc SHA512 b82de390d22e0c1337ddca923621b1cc842f583a93953ef07a303b428fe3a389f8a4a1a63617a58136c8d6215aff025a3bbec2a2f618e9ea81f471964f93b078
+DIST diff-lcs-1.4.1.gem 48128 BLAKE2B edd92f00b858c716787974772858f65d98b1a07ea4e8697eed190d09e2cead7b3f2518ee96521b0cda1cd4b938365705cf969ef2d8cf1333ff843202ea2b6c90 SHA512 d084ee628caafe4b61e66142d57e25dd2c8e9423a5d0d042911a4816ce391528f03ea2c6226d29c953a83e6642d0c3328ea5a22216011f112f64030c6808a7bc
 DIST diff-lcs-1.4.gem 48128 BLAKE2B 6ec3259dc366769c4008c6ea6c7e5f1fe75350dc0318c8d45991bb8173274630b3be734fe6375dbb131620d8124faa7c0567e57d299393c3165b0e1c2d29c138 SHA512 a352fdfb89587b38f3e518f76dddd048530501080dba5abb0c37033f44bee65bca12550ea7d6f1edb8a719092538c20d1c58dfe7a6f67ba1d46549608c09feae
diff --git a/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
new file mode 100644
index 000000000000..83d94225b6f1
--- /dev/null
+++ b/dev-ruby/diff-lcs/diff-lcs-1.4.1.ebuild
@@ -0,0 +1,19 @@
+# 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_EXTRADOC="README.rdoc History.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Use the McIlroy-Hunt LCS algorithm to compute differences"
+HOMEPAGE="https://github.com/halostatue/diff-lcs"
+
+LICENSE="|| ( MIT Ruby GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
diff --git a/dev-ruby/faker/Manifest b/dev-ruby/faker/Manifest
index 940531cd362d..42ef17b5abf4 100644
--- a/dev-ruby/faker/Manifest
+++ b/dev-ruby/faker/Manifest
@@ -1,3 +1,4 @@
 DIST faker-1.9.6.tar.gz 1833392 BLAKE2B 826ee480515873d1e250147e5c3749e222b1273a00fd4ae0a2a28dca91c5981290c8540602d89d406e91d98a0f5dbc6fc4a54ab6d7d2b716a4d4957ab32254dc SHA512 1ea0c4194603b5eaec0f4abc2460fb39cb9de97179d7699c3cb37673731ebf8bf03d20fb422911d4725d4308691d4c92a82f5a661e034381cc04066ddcc955bc
 DIST faker-2.11.0.tar.gz 1033369 BLAKE2B 51677346980bd5070a145b1d8dd11a6426cf9da5c407e030d9722ed8ccc4ed1a0a8b2d5534c96b50fbe79e84fe71e4268f3228c223dc61fe4c74cda0de18a790 SHA512 9adc03cdef0714656738d354d787a99cb9fcc85718847db7b183b02f38d550ff86d65c8e6ed13be3c839cc64f36f3e95ff25dd5d2f8f45c7207dbe5735238e0a
 DIST faker-2.12.0.tar.gz 1100460 BLAKE2B 8be31911c9612d7433433121344a1fbfc735740898cb4fa7115a9ec33d22f610e5eca9ace3369da7f6e107478493e7b732a74650a233171ebb8b306f3e2d872e SHA512 7adc89cc3ba7e4d802d5f96199e21a6ed1dc9f0144d2da5a9a5adb705097d1acf4830c7ff0ce733fb9b0ddc11fba0290cade9f791824db5ab737b3facd93f93d
+DIST faker-2.13.0.tar.gz 1129212 BLAKE2B 358a959a600d5638681bbad20b05618cd2d67857de120a4ff6d8d6c3c723d1efd24ebfa617e3d2090862e111271bd3c12ac3f3f340e8eda6811760c1de31f642 SHA512 700a3d4d6f9019bd7c7e61ed770c6eb2e9dede6e4af9e3a06ca1858a2eebdd67491b94a41396ba1ab4940f0f7fd00f2203db78f5267adb08360b95823c633131
diff --git a/dev-ruby/faker/faker-2.13.0.ebuild b/dev-ruby/faker/faker-2.13.0.ebuild
new file mode 100644
index 000000000000..e02e94be8040
--- /dev/null
+++ b/dev-ruby/faker/faker-2.13.0.ebuild
@@ -0,0 +1,30 @@
+# 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_DOC="none"
+
+RUBY_FAKEGEM_GEMSPEC="faker.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for generating fake data such as names, addresses, and phone numbers"
+HOMEPAGE="https://github.com/stympy/faker"
+SRC_URI="https://github.com/stympy/faker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/i18n-1.6:1 !!<dev-ruby/faker-1.9.6-r1"
+
+ruby_add_bdepend "test? ( dev-ruby/timecop )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(bundler\|rubocop\)/I s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/,/^end/ s:^:#:' test/test_helper.rb || die
+}
diff --git a/dev-ruby/gh/Manifest b/dev-ruby/gh/Manifest
index 8464b093c178..8d6cd31d4a05 100644
--- a/dev-ruby/gh/Manifest
+++ b/dev-ruby/gh/Manifest
@@ -1,2 +1,3 @@
 DIST gh-0.16.0.tar.gz 129499 BLAKE2B 6dea86bcaa8191b2eb19daed487d80e5b55adadccb1c063320b44e742895cad1956e06a917ff35659834b4cf541892d3cd0b432f03783b4b860cf4c7136c7c49 SHA512 141a432b8d5f43feea6cc86be504e35b5133590466f1a28c5ba60a208cde9d3cc1a6f19702757e132e4255220e1161f6dc9621ec18a789d963738b9801e52da1
 DIST gh-0.17.0.tar.gz 129494 BLAKE2B c7c777fb1f0f417c62c9ec0598716302c2cb0a6870ff9534cabf03baea33e73581cac9bbe1f803d23adeb16b15e5af06e4dcc61ab2300846b6c5c227ddf7aaea SHA512 b655552180dd48a9de05d925d9795278ba8f293d03e07fc0675aae9bcef264f45a840b37cc855718c1118c31964625775b1156facf52781e99255bb16e7895a1
+DIST gh-0.18.0.tar.gz 129730 BLAKE2B e4e9a3b158daf83f8a0f0a809eff87e169c7a0a23120b9ae002d0fee4be166d3e6a09ef85ed61b35148d4285dc358a8d616e09c71403b85293574f3bfbbf922c SHA512 a265d25984d4c40340d4e80ce615f2f291f5636725e7dcdc181e3351d00fe8c3355148f206807180041f20db7f09bf94f5d279ceb25ea12ec19215640fff7839
diff --git a/dev-ruby/gh/gh-0.18.0.ebuild b/dev-ruby/gh/gh-0.18.0.ebuild
new file mode 100644
index 000000000000..8bdd3083a66c
--- /dev/null
+++ b/dev-ruby/gh/gh-0.18.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_GEMSPEC="gh.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="multi-layer client for the github api v3"
+HOMEPAGE="https://github.com/travis-ci/gh"
+SRC_URI="https://github.com/travis-ci/gh/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "
+	dev-ruby/webmock
+"
+
+ruby_add_rdepend "
+	dev-ruby/activesupport:5.2
+	>=dev-ruby/addressable-2.4.0:0
+	dev-ruby/faraday:1
+	dev-ruby/faraday_middleware:1
+	>dev-ruby/multi_json-1.0
+	dev-ruby/net-http-pipeline
+	>=dev-ruby/net-http-persistent-2.9:*
+"
+
+all_ruby_prepare() {
+	sed -i \
+		-e '/net-http-persistent/ s/~> 2.9/>= 2.9/' \
+		-e 's/git ls-files/find/' \
+		"${RUBY_FAKEGEM_GEMSPEC}" || die
+}
diff --git a/dev-ruby/lumberjack/Manifest b/dev-ruby/lumberjack/Manifest
index 87f4ef2a7a47..145276504436 100644
--- a/dev-ruby/lumberjack/Manifest
+++ b/dev-ruby/lumberjack/Manifest
@@ -1 +1,2 @@
 DIST lumberjack-1.0.13.gem 26624 BLAKE2B 16e911d832425d0adf8ee1bd18435733c5451b705c48493dd80e5e8f6b07cb462be2686dcce7a8c46b799fb8a4fa1a82d4d9c06e675cd6e7a990d93140cea395 SHA512 e9e9c65bdeb42de51ad27b70c86d36c5e63e8d73c3568661d52619ca9eeab36cf6aede5e6cd6ab8e8d30446c0b0e7a9702f696e03e06d8b7a73e1c028953eef4
+DIST lumberjack-1.2.6.tar.gz 39474 BLAKE2B 2885a143afd4793ee78b0e8d849a677fbeae94c99bda0821f759b174f68d7c1de5e6e59ef2dc68f99e41c24c6228787098571276b2aef208cd1aecbd17afdea7 SHA512 d8b5a098c9a14fd5d4acc7fae5801a07fdb1927e456c90a666dae8107ee12cad20d34f0b9cf69f2d661fe07af11def74cd1d529c88e17df213754178492de44c
diff --git a/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
new file mode 100644
index 000000000000..941c0d361977
--- /dev/null
+++ b/dev-ruby/lumberjack/lumberjack-1.2.6.ebuild
@@ -0,0 +1,27 @@
+# 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_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_GEMSPEC="lumberjack.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="A simple, powerful, and very fast logging utility"
+HOMEPAGE="https://github.com/bdurand/lumberjack"
+SRC_URI="https://github.com/bdurand/lumberjack/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_bdepend "test? ( >=dev-ruby/timecop-0.8 )"
+
+all_ruby_prepare() {
+	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
diff --git a/dev-ruby/maildir/Manifest b/dev-ruby/maildir/Manifest
index c8c79ba20fed..b5d28f8540e3 100644
--- a/dev-ruby/maildir/Manifest
+++ b/dev-ruby/maildir/Manifest
@@ -1,2 +1,3 @@
 DIST maildir-2.2.1.gem 15360 BLAKE2B d3ea037ba38e83bc7b21bde9ccb2296fc922c3f657a73ad3637faf708cfa16ac75c2e6535714ba18b00aafc5a94265c56f6e086d25de5810c0a0112d6c876e1f SHA512 4c366333c802bbe0cbd19e6abaef1fa31ad84596518d24ddcc33aa3afe39890896d107bc864c68787c90c3a38115979f6a4fe8b442aecaead39306122d560f18
 DIST maildir-2.2.2.gem 15360 BLAKE2B 3e926057b4a625b95879a8ac91fbc5d0ae002ae7f4658c1a9b7a997a5071f30d05ff8e59df405139b0e3a0a060286c61112ca07671ae5e443b6eb2b2f0b33983 SHA512 90f4896cef297262d2bfafa9a2ec155d83f405114b80df8015cf0c6a5450e1b28807d073cf48b2ff03309bf2b7d50a77138cb524826cfb2c429b3c606e02c093
+DIST maildir-2.2.3.gem 15360 BLAKE2B 915abb1ee50a4151f22e0de4e92ff42d3f06b059478f6a4193866714e170cc88740a714bef54a530d3b85bf318c7f46dda6f42b48b7ceadf09c55eea31f5f5c2 SHA512 5dea021c49711f744429c6e5ea78bbb10e3aae1338f780107a1784f6ae8d3c598f9d17b8e0fa555dde4058041dbc7905d62f9d49375d6c4b822a7e88ca065a77
diff --git a/dev-ruby/maildir/maildir-2.2.3.ebuild b/dev-ruby/maildir/maildir-2.2.3.ebuild
new file mode 100644
index 000000000000..5e034bb678bd
--- /dev/null
+++ b/dev-ruby/maildir/maildir-2.2.3.ebuild
@@ -0,0 +1,31 @@
+# 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_EXTRAINSTALL="README.rdoc"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A library for reading and writing arbitrary messages in DJB's maildir format"
+HOMEPAGE="https://github.com/ktheory/maildir"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="2"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? ( >=dev-ruby/fakefs-0.3.2 dev-ruby/mail dev-ruby/shoulda-context dev-ruby/test-unit:2 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' Rakefile test/helper.rb || die
+	sed -i -e 's/shoulda/shoulda-context/' test/helper.rb || die
+
+	# Avoid tests that appear to need activesupport for .blank? support
+	sed -i -e '/add and remove flags/,/^    end/ s:^:#:' test/test_message.rb || die
+	sed -i -e '/be removed from flag list/,/^    end/ s:^:#:' test/test_maildir.rb || die
+}
diff --git a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
index daa192d2ecfb..d73279c77376 100644
--- a/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
+++ b/dev-ruby/multi_xml/multi_xml-0.6.0-r1.ebuild
@@ -31,7 +31,10 @@ all_ruby_prepare() {
 	eapply "${FILESDIR}/${P}-ox24.patch"
 
 	sed -i -e '/simplecov/,/^end/ s:^:#:' spec/helper.rb || die
-	sed -i -e '/bundler/I s:^:#:' -e '/yardstick/,/end/ s:^:#:' Rakefile || die
+	sed -e '/bundler/I s:^:#:' \
+		-e '/yardstick/,/end/ s:^:#:' \
+		-e '/rubocop/I s:^:#:' \
+		-i Rakefile || die
 }
 
 each_ruby_test() {
diff --git a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild b/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
deleted file mode 100644
index 99deb87ee5c4..000000000000
--- a/dev-ruby/net-sftp/net-sftp-2.1.2-r2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby23 ruby24 ruby25"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES.txt README.rdoc"
-
-inherit ruby-fakegem
-
-DESCRIPTION="SFTP in pure Ruby"
-HOMEPAGE="https://github.com/net-ssh/net-sftp"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RUBY_PATCHES=( "${FILESDIR}/${P}-net-ssh-4.patch" )
-
-ruby_add_rdepend "dev-ruby/net-ssh:4"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/mocha-0.13
-	)"
diff --git a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
index 0b3ff206b168..6749ed154883 100644
--- a/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
+++ b/dev-ruby/octokit/octokit-4.18.0-r1.ebuild
@@ -31,7 +31,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/jwt
 	dev-ruby/mime-types
 	>=dev-ruby/netrc-0.7.7
-	dev-ruby/vcr:3
+	dev-ruby/vcr:3[json]
 	dev-ruby/webmock:3 )"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
index 371902f19a89..b9c82b87c592 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.1-r1.ebuild
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
index b054ce03e312..c868c0d77462 100644
--- a/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
+++ b/dev-ruby/rrdtool-bindings/rrdtool-bindings-1.7.2.ebuild
@@ -16,7 +16,7 @@ RUBY_S="$MY_P"/bindings/ruby
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
 IUSE="graph test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( graph )"
@@ -32,7 +32,7 @@ DEPEND="
 "
 
 all_ruby_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
+	eapply -p3 "${FILESDIR}"/${PN}-1.4.8-graph-ruby.patch
 }
 
 each_ruby_configure() {
diff --git a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
index b0f14e38d54d..36a174b55d35 100644
--- a/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
+++ b/dev-ruby/rspec-support/rspec-support-3.9.2.ebuild
@@ -40,3 +40,8 @@ all_ruby_prepare() {
 	# should be fixed upstream in next version
 	#sed -i -e '/returns a hash containing nodes for each line number/askip "ruby26"' spec/rspec/support/source_spec.rb || die
 }
+
+each_ruby_prepare() {
+	# Use the ruby version being tested
+	sed -i -e '/shell_out/ s:ruby:'${RUBY}':' spec/rspec/support/spec/shell_out_spec.rb || die
+}
diff --git a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
index cc2a60650cc9..6d2228025de4 100644
--- a/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rubyzip/rubyzip/archive/v${PV}.tar.gz -> ${P}-git.tg
 
 LICENSE="Ruby"
 SLOT="1"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
@@ -46,4 +46,7 @@ all_ruby_prepare() {
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
 }
diff --git a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
index 16bec97ba963..f7274c64078d 100644
--- a/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
+++ b/dev-ruby/rubyzip/rubyzip-2.3.0.ebuild
@@ -48,4 +48,7 @@ all_ruby_prepare() {
 
 	# Add missing requires
 	sed -i -e '1irequire "forwardable"; require "pathname"' test/input_stream_test.rb || die
+
+	# Fix broken test that uses native endian
+	sed -i -e '/pack/ s/LLS/VVv/' test/file_extract_test.rb || die
 }
diff --git a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
index 7861daae85fa..cff54aa3f694 100644
--- a/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
+++ b/dev-ruby/tokyocabinet/tokyocabinet-1.32.0.ebuild
@@ -11,7 +11,7 @@ RUBY_FAKEGEM_TASK_TEST=""
 inherit ruby-fakegem
 
 DESCRIPTION="Ruby bindings for Tokyo Cabinet"
-HOMEPAGE="http://fallabs.com/tokyocabinet/"
+HOMEPAGE="https://fallabs.com/tokyocabinet/"
 LICENSE="GPL-2"
 
 KEYWORDS="~amd64 ~ppc ~x86"
diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index e2dcb0c762b7..8f23fa04f222 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,4 +1,3 @@
 DIST vcr-4.0.0.tar.gz 146920 BLAKE2B 19ae33d2f40821d2cfe5c0fc55d5e91e02b8e6ba2bba000c326d993987fd641dd5b4cedd6a8a441f86664ecb67dfe2501d335936af9271fa83aef6dc001b12f2 SHA512 2f98eedd021f7c125fc3f29189190ddc817bb95fc8e8e0ab53e65eaf94c5c0c41f3ca4abf9d829591acdefe97b931943c47129f95c21f2ef590ed500cc6f56f9
-DIST vcr-5.0.0.tar.gz 147602 BLAKE2B 031c9a70c9483b496ed3cda1c65138d214c257392aa5f9157135b0fd4c33d35dd6143afc0e775c5061bb823d936d1bdaa084eaf0024e87747e6101b582d8bd1e SHA512 88e4d82f1c5b3d48c89a75324a256c66858740d2889a4d86851ebb3a303745829e42f20b20d4cbc18d7b0510eb0b229a770bb6209be93dbb8c8b0be84bf5f645
 DIST vcr-5.1.0.tar.gz 150438 BLAKE2B 615a0ce570da29be402f97dcba1ba987c611c73cc9ebc561683333c752d57c1c2f0acae78b42164d8c56f71cded150a93566d45c0c84153bdc3dc8bb37199e4e SHA512 5297e46b1ffe31c3559df57f0af158cb8064ba48b83702ea3bf12eca4c7260bcb71d3df7ae645a3cc14817366992458beb4fd9771c1f98a56835dcd69ff107f9
 DIST vcr-6.0.0.tar.gz 153423 BLAKE2B 95f0794af34d4ce21c0ed3b3a77de64300fd3c844919624cd6021c2e74687d3a66b7d4f73b2b040f90774d9cea0305563cdfaab162b4a1df842f2367e72f6209 SHA512 9a19896ca4f5624c6e74772006aea4dfda0527d9ba733ec0d90418c6234fa5684121be1258badcfd647739cb47dbaae556b8c2e2636f309a79ea94e8835de40f
diff --git a/dev-ruby/vcr/metadata.xml b/dev-ruby/vcr/metadata.xml
index 0c11f5888a76..66768e16465e 100644
--- a/dev-ruby/vcr/metadata.xml
+++ b/dev-ruby/vcr/metadata.xml
@@ -8,5 +8,8 @@
   <upstream>
     <remote-id type="github">myronmarston/vcr</remote-id>
   </upstream>
+  <use>
+    <flag name="json">Add support for casettes serialized with JSON</flag>
+  </use>
 	<origin>gentoo-staging</origin>
 </pkgmetadata>
diff --git a/dev-ruby/vcr/vcr-4.0.0.ebuild b/dev-ruby/vcr/vcr-4.0.0.ebuild
index cae5212ae316..096a7318138b 100644
--- a/dev-ruby/vcr/vcr-4.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-4.0.0.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=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
+USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
@@ -16,8 +16,10 @@ LICENSE="MIT"
 
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="3"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-5.0.0.ebuild b/dev-ruby/vcr/vcr-5.0.0.ebuild
deleted file mode 100644
index ecf35311d517..000000000000
--- a/dev-ruby/vcr/vcr-5.0.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md CONTRIBUTING.md README.md Upgrade.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Records your test suite's HTTP interactions and replay them during test runs"
-HOMEPAGE="https://github.com/vcr/vcr/"
-SRC_URI="https://github.com/vcr/vcr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="MIT"
-
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-SLOT="5"
-IUSE="test"
-
-# Tests require all supported HTTP libraries to be present, and it is
-# not possible to avoid some of them without very extensive patches.
-RESTRICT="test"
diff --git a/dev-ruby/vcr/vcr-5.1.0.ebuild b/dev-ruby/vcr/vcr-5.1.0.ebuild
index ca4669a2923a..c6e6cd0a24d1 100644
--- a/dev-ruby/vcr/vcr-5.1.0.ebuild
+++ b/dev-ruby/vcr/vcr-5.1.0.ebuild
@@ -17,8 +17,10 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/multi_json )"
diff --git a/dev-ruby/vcr/vcr-6.0.0.ebuild b/dev-ruby/vcr/vcr-6.0.0.ebuild
index ca4669a2923a..9df479fba6a9 100644
--- a/dev-ruby/vcr/vcr-6.0.0.ebuild
+++ b/dev-ruby/vcr/vcr-6.0.0.ebuild
@@ -17,8 +17,10 @@ LICENSE="MIT"
 
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
 SLOT="$(ver_cut 1)"
-IUSE="test"
+IUSE="json test"
 
 # Tests require all supported HTTP libraries to be present, and it is
 # not possible to avoid some of them without very extensive patches.
 RESTRICT="test"
+
+ruby_add_rdepend "json? ( dev-ruby/json )"