gentoo resync : 29.06.2020

6 files changed, 18 insertions, 34 deletions

diff --git a/dev-ruby/vcr/Manifest b/dev-ruby/vcr/Manifest
index 01fe17bb1fd0..6d4a5df4819d 100644
--- a/dev-ruby/vcr/Manifest
+++ b/dev-ruby/vcr/Manifest
@@ -1,9 +1,7 @@
 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
-EBUILD vcr-4.0.0.ebuild 709 BLAKE2B 360617e1a7aff37a255ea03f0af132648408024cbabf3737d85930124c304191824046d0290bedcadffd06cc48d0317165868e4dd970699eca76a70e7b0d9985 SHA512 e8424a267dc567b63e3d9d9da1214b3dcbf03ad3992f5e17dd8bae7436f70a8b0c5781455dee1832dd3cba67aca243fef7fb5159617ee245652ed8eb93e3d216
-EBUILD vcr-5.0.0.ebuild 703 BLAKE2B 46bf583f4250d89f7c4f8a189c7640fd8f5618ca9f5bb90964fd424dfd69977c561213aaf6417dca4f9c3a5a05f352ff854d0d5a5a9be02383016d780a6cf81c SHA512 ece96b85a4582222de655644e7031647149b6a21a907741ee80f139001352c36cb3ef1551256fd3602cf4982ed15347ee34e0f1e2ebf75bf4f45d843f5dd7245
-EBUILD vcr-5.1.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
-EBUILD vcr-6.0.0.ebuild 732 BLAKE2B 215ff9e86dd92891f4cb4d036c8d648bea16e8db53ff21927bdd696e466bffe37fb23939da819ef774e2a42d67e6f54c8dce81124cf9156950d5b9804eb27812 SHA512 d6bda4a9ecfff4963ccba5f78cd11a0298aab9521d3e23949b3f259498d23bf51b24c49361f95e931265e45bd7c68c21b97ccee4fc9140ee576daa59911923d0
-MISC metadata.xml 342 BLAKE2B 2e7bb825d3f1a6977404c0617c22057a8a0a487ce88c5cb46853b65987ac23d083bd9f1201e74a63a75e32c34862d836446a6fa2d6dd7da48cc33b7905fd18b2 SHA512 1fa01257b99e6ac0b535da28a6b30da72ee4ed4493b9b28427298216ef23a0d43417a5be745af3b10323fb86df38fc34942f0314fcf82d77b0e89e1f277a3431
+EBUILD vcr-4.0.0.ebuild 757 BLAKE2B 8311272847a0835c40add69aa2fbb9e7786d9897f1686d66d1bf823bf3ba47a1f9e95d566d9702828558b3be482ffcca44eee00ad583ee004bc53f26882c5c7c SHA512 ef3a7fe2bd5414a76ca389b1ad92e5601f47b0bac238a88984bf80c784f6e82c358c3a388827f7d8e637e24c86f00f46e0dbb7376b961a4c347f46221a998111
+EBUILD vcr-5.1.0.ebuild 787 BLAKE2B f9049aa0abc31db486d4d2c3b9ae551a5dbce57589a9874a17976136a6e0653c5d6e2fa3731f45a658a30c8ff5746bd239b002f40d94c50d7738ba0e84e87b44 SHA512 741fe620050fcf66fad5c144b5c863c48efd0ce752a865a70e29fc12e0d7c762fe23a7d9b71b090adc951a9ab58030f052c00a3de7326a701cc6bf107eaceda1
+EBUILD vcr-6.0.0.ebuild 781 BLAKE2B 2c32768fe421a77ca440ab62471451dde222261003b7eb250efcb17c4aab54fb63009389ad3008c321b62fb8f56008e30aa669c066509ad8fa27c19bf04e7b0d SHA512 e60f4a38a42723bcc2705fefddef1b80d302dae70877b92ef0ffbc30bb4a6227b33cb6b2c2a8764c206139049ac8e0bf55929123632e3640cf8505883f5cc53e
+MISC metadata.xml 434 BLAKE2B 1ca0dd18418173c3d463b6de56119e3ca95bfa7916c1e3a9b54b9d6137a60e00379e1d0ef2e02f2bfd444714c6b801b334b135e8631ffc2d547f6566198a0ab5 SHA512 d49cebc771dd4a5e0074576cc16c75a2893e2e55ab80ca15b15ef9f5c89c120e2e2815624c47153e9bf87aca8c28feb072ef72c23c7a47eda42b7659e047f3cc
diff --git a/dev-ruby/vcr/metadata.xml b/dev-ruby/vcr/metadata.xml
index 3e7ac4fc6b7b..588668ce56b8 100644
--- a/dev-ruby/vcr/metadata.xml
+++ b/dev-ruby/vcr/metadata.xml
@@ -8,4 +8,7 @@
   <upstream>
     <remote-id type="github">myronmarston/vcr</remote-id>
   </upstream>
+  <use>
+    <flag name="json">Add support for casettes serialized with JSON</flag>
+  </use>
 </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 )"