gentoo Easter resync : 12.04.2020

4 files changed, 5 insertions, 81 deletions

diff --git a/dev-ruby/json/Manifest b/dev-ruby/json/Manifest
index 4daa995d178a..93e40e757796 100644
--- a/dev-ruby/json/Manifest
+++ b/dev-ruby/json/Manifest
@@ -1,8 +1,6 @@
 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.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 2093 BLAKE2B d5ca481b73345b41c86b885025645151bccc3c25469327fb333f297eed1adb7fb09b8aba0137805b477ccd36172737d781821f267bb2dbf3da6e52049d1174d2 SHA512 d6dbb06eb41a417c270e5a6eaf68921cfb5d507f115b30bec59ee947fc0d0f1c29043e82327345842b0bda1ed67e74b50912a63a510188a48b7cf5a45f725503
-EBUILD json-2.2.0.ebuild 2060 BLAKE2B 14083594cd84105147bdd90641fc01277f9a744d968001eba312d52e6bec61f35c194188f773a7db9562c8588599c85e91e41198b5303f2002b65397ed8bc076 SHA512 892e26d190b9e4fdc9e90f8ed4049c07df5d9a2afbc5f6d07d1a0f14ced585aa401abc8fd8131b9f00ea7a6787d959d6630e9a84c555c951633e2363e138fb85
-EBUILD json-2.3.0.ebuild 2039 BLAKE2B dfa4aeba99fdc95c6c96eb6f1cf44691f0a5b00e4a5db1f1c78db96887cf79f6baaa925e9dc6d5e8811104e59895590f700c9edd352e1b14030627e7be419eab SHA512 a7a97871a1ec8484179099e7fb259f805c07e0c412785e290fd7cd880985eafd95c72864174dd5bea72f49026d87301aab75b3268addf63c54a954112bece5dd
+EBUILD json-1.8.6-r1.ebuild 2090 BLAKE2B 9b5721f2bac70d6bcb1dd0def68a8bb71175c99352852dcfe099bf04302474ae77e08522e119acbc4b2829a52c2ccf687b9afa040b109c62db7caf585f2a6a98 SHA512 e45ed7215a3ddc367f8d532c9be2eb824316dfeaa76862ef73509a83a8b2712a433b9ec8eb9afadb22103323ce83abd4fb5b5161863f4074359d747c58d139a5
+EBUILD json-2.3.0.ebuild 2026 BLAKE2B 6456fcf7d737d7183780766d56fead7e91f9e6a3573e2a9b1dd36c6fad05c041480e4b8dd8f95729fa5ea58e0411becdb025255194d771e41faabc1e2e380912 SHA512 cc8f68e59f40c1bfd6e81fe3310ebad5b4cde383f7cfe1aee71a3c2b97eca709b2c2249047b41f03bb4369cf407685b6ba49df2c453b551c2c1b7038d759b539
 MISC metadata.xml 336 BLAKE2B e1094160e19b252f7b3233dbd2006c889c0a02aa4b04063caeb7ded80bb2f08a2c4bc31cfb7bdc17398b8d1b8c3fc9f3600eafad9920fe0355c807d3899f794f SHA512 8b4fa7ef9b753bbf1206b1f8a796d3f3b8e3f9ca07906a2e01dbcc8c69d4cb5e5cb26c395d0676b4dedd70fb910cf0abd3be83d3c94f0b90aee87ea6fda12877
diff --git a/dev-ruby/json/json-1.8.6-r1.ebuild b/dev-ruby/json/json-1.8.6-r1.ebuild
index b8622f37c359..a76ce9feccaf 100644
--- a/dev-ruby/json/json-1.8.6-r1.ebuild
+++ b/dev-ruby/json/json-1.8.6-r1.ebuild
@@ -15,7 +15,7 @@ DESCRIPTION="A JSON implementation as a Ruby extension"
 HOMEPAGE="https://github.com/flori/json"
 LICENSE="|| ( Ruby GPL-2 )"
 
-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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/dev-ruby/json/json-2.2.0.ebuild b/dev-ruby/json/json-2.2.0.ebuild
deleted file mode 100644
index 166259933d95..000000000000
--- a/dev-ruby/json/json-2.2.0.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby23 ruby24 ruby25 ruby26"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGES.md README.md"
-RUBY_FAKEGEM_DOCDIR="doc"
-
-RUBY_FAKEGEM_GEMSPEC="json.gemspec"
-
-inherit multilib ruby-fakegem
-
-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"
-SLOT="2"
-IUSE=""
-
-RDEPEND="${RDEPEND}"
-DEPEND="${DEPEND}
-	dev-util/ragel"
-
-ruby_add_bdepend "dev-ruby/rake
-	doc? ( dev-ruby/rdoc )
-	test? ( dev-ruby/test-unit:2 )"
-
-all_ruby_prepare() {
-	# Avoid building the extension twice!
-	# And use rdoc instead of sdoc which we don't have packaged
-	# And don't call git to list files. We're using the pregenerated spec anyway.
-	sed -i \
-		-e '/task :test/ s|:compile,||' \
-		-e 's| => :clean||' \
-		-e 's|sdoc|rdoc|' \
-		-e 's|`git ls-files`|""|' \
-		Rakefile || die "rakefile fix failed"
-
-	# Remove hardcoded and broken -O setting.
-	sed -i -e '/^  \(if\|unless\)/,/^  end/ s:^:#:' \
-		-e '/^unless/,/^end/ s:^:#:' ext/json/ext/*/extconf.rb || die
-
-	# Avoid setting gem since it will not be available yet when installing
-	sed -i -e '/gem/ s:^:#:' tests/test_helper.rb || die
-}
-
-each_ruby_configure() {
-	for ext in parser generator ; do
-		${RUBY} -Cext/json/ext/${ext} extconf.rb || die
-	done
-}
-
-each_ruby_compile() {
-	for ext in parser generator ; do
-		emake V=1 -Cext/json/ext/${ext}
-		cp ext/json/ext/${ext}/${ext}$(get_modname) ext/json/ext/ || die
-	done
-}
-
-each_ruby_test() {
-	for t in pure ext ; do
-		JSON=${T} ${RUBY} -S rake do_test_${t} || die
-	done
-}
-
-each_ruby_install() {
-	each_fakegem_install
-
-	ruby_fakegem_newins ext/json/ext/generator$(get_modname) lib/json/ext/generator$(get_modname)
-	ruby_fakegem_newins ext/json/ext/parser$(get_modname) lib/json/ext/parser$(get_modname)
-}
diff --git a/dev-ruby/json/json-2.3.0.ebuild b/dev-ruby/json/json-2.3.0.ebuild
index ccb0114c8065..31f1010c5ae0 100644
--- a/dev-ruby/json/json-2.3.0.ebuild
+++ b/dev-ruby/json/json-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="2"
 IUSE=""