gentoo resync : 15.12.2019

3 files changed, 9 insertions, 9 deletions

diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index f7ad72527290..3301ba047380 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,8 +1,8 @@
 AUX json-1.8.6-heap-exposure.patch 2937 BLAKE2B 204f4c5a16df8fa99ea46e7d29c4a7e8790da9c11ff1dddfeba47b73a3bbf3e06a9243a48fa1d95fc029d21a1031e689b16a91295a1601d4e62a4c18cee2bb3b SHA512 42545c069c8c36b120b63e74b8276b8a6b57237e6cd8ccdeb0e6e9b9acd4f9213e5a4fc35b2f804300e8d00a12546c51b9ef944bde60d679567544de796c87e1
 DIST json-1.8.6.gem 144384 BLAKE2B db9e407be4ac7e0cb2e09369637b88f70cdac7a659c600dc83a5390746dfd21b0a5243af62afaeeff013b5a4116a3b22c65a481cad89f1ca9be8904af87d0345 SHA512 8f393da080293965389df4a606e0604c500b4b267897b3c1b9007b7700dde8156f6598c25790e84fa20a7e03c7ae359a0b267c7b84e52dfe2a1ac83cf652ad9b
-DIST json-2.1.0.gem 140800 BLAKE2B 28bb5334358369351ec9f13f5fb609ce34eb429cfeffb8dfde70864541516a0c2abd00a640b4647f76dcef198f967456bae0a858a2f213e5a30272c1be1878c7 SHA512 bffbe462e952bca321d4325ecb9c5e9f61e51cad13758581ecfaa6a038bac4e30dc7db50bd897086a5592f6fc437d0e0909f91e279aaf4dd71cf127100c3550b
 DIST json-2.2.0.gem 112640 BLAKE2B 973fe22979f4e2fa64a1090e44e5e149029881f20ec2749ce040b79a94610003941f6f3471bbc71e581491df74201bc4201419081c04a03790caaed888dfed1c SHA512 855d5cbeb6e62a7deb009ad454944430c0370cc98c53a1126d8ca3cac4b11a191bfb2ded84a957d4caa0f59cc9b6308e320a58569bddba8d6984078ea34703f2
+DIST json-2.3.0.gem 114176 BLAKE2B 329f1305a0cae3d44c74cc7475c7340e86b8447d5e4ffdd5854620669ee4ef5bba0ed7dbc617b0beffb7bfd8b3d79d46ce26feef37685413a4a5a9c230d0ce0c SHA512 9086a64b664f2d774439c0c9f10c2c1cd897684050eb60f8e3ad9256e0b9541deec3bd22fab0bdcf66e3d5bc795720c6923d514b6edb824c9962fc22f162b332
 EBUILD json-1.8.6-r1.ebuild 2095 BLAKE2B 7b8628800c3c6d6a601efd0ed6e991ca1e47f19edc52f636a8d1de48911fbf2b5a49f2671f996b6a06f4f2d6e24552081296b437fd04264a8d03c0a8fa44f49a SHA512 95db4c2c9fd82752f0c2c11a2271379d2d0e80f981a1b0bd7b553abbcab648281a1ed7e67b254842981cf75bb6eb88d59cd10a4b6c17c81ffcfa5723bef52ee0
-EBUILD json-2.1.0.ebuild 2027 BLAKE2B 228e9bb057775ddc64785f12bdfac0ed48c0813d693e09c70bac5d60c1e8b2072424b2bf2ce18438718d33d6c558be711acacf39482ea58cd1fe3870e2868f12 SHA512 15a9e83874d4fb33346f58b232406bc4f5cd5a745d913cb1d04b6b06eb56c0db9133b5634c8798cbbd8141489cc9a1237620d1dcece789cad95ba14f6055bc1e
-EBUILD json-2.2.0.ebuild 2070 BLAKE2B b752db23a11a8b332190535333e1e7695d3be45efe9fbed3c54c59d3f21caef5635261e0a4f2b2e84fc792fb7f442d50bf909faf82df75e9ff56668987e65355 SHA512 62cfb4369e0a9d5458a4f39ed99102ea1b70127fe9f0b6dc29a218618946e73142ca2a5af7b132d2045853c77595ff9cd5682966862d65cbdaf3785a03c89c85
+EBUILD json-2.2.0.ebuild 2059 BLAKE2B e8721a9232d7efec91d354dc75cc13838465b039e68abb1d6131b7bed104c4d91d4f4f6ed46ffe5b20a46b24e7082ce6c08856cf7eba6243209a6d17c4657fb7 SHA512 539b550f0fb3abf504cc35f7a70102b58f6eeb388bbf5caecdb93c1eb1406277cfacb7f9f169869850f95983c09b377257c4b6d8cd257306fbd42a0d58f10f26
+EBUILD json-2.3.0.ebuild 2032 BLAKE2B bdac61211bb28a8166d3d47fa45c1aebeecbc902ffcfc13c6ab15109ccc33da3bde6129c0377780d4552adf09ba665793214468d6ef79a9c0223f614b57cb0d3 SHA512 742d1802283a885040ee9b744a310855ddb1d85c935a8aa3c01359c2a02a798cd3ad65a6bc7278adbcffc5f694acacf5965a99293e76da927feebec88a6476fc
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-2.2.0.ebuild b/dev-ruby/json/json-2.2.0.ebuild
index c7d0735f909f..18a5f502c9d6 100644
--- a/dev-ruby/json/json-2.2.0.ebuild
+++ b/dev-ruby/json/json-2.2.0.ebuild
@@ -16,7 +16,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="Ruby"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-ruby/json/json-2.1.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
index 5ed953f6b777..075feb4751ad 100644
--- a/dev-ruby/json/json-2.1.0.ebuild
+++ b/dev-ruby/json/json-2.3.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+EAPI=7
+USE_RUBY="ruby24 ruby25 ruby26"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
 RUBY_FAKEGEM_DOCDIR="doc"
 
@@ -16,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="Ruby"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""
 
@@ -25,7 +24,8 @@ DEPEND="${DEPEND}
 	dev-util/ragel"
 
 ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )"
+	doc? ( dev-ruby/rdoc )
+	test? ( dev-ruby/test-unit:2 )"
 
 all_ruby_prepare() {
 	# Avoid building the extension twice!