gentoo resync : 21.06.2020

3 files changed, 2 insertions, 66 deletions

diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index 94e02e5812bd..efff4bdcc3a3 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,7 +1,5 @@
 DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
-DIST multi_json-1.14.0.tar.gz 24558 BLAKE2B 78138ab956f71d5875d3ca0d0a7b10fc93fa303648de8515d705ac5e24ed5cf84b425ef4aeebb1ef80862cad373698c2f57eddf17e6558d810edd1a3da2ec342 SHA512 dc2adaa9b5092c653b0a6365ad254a8b920f391123c2625c6ea8168c675346da69f1f003face872e66f493e078f511872d3715e4eef242627b0862cdf4aa3735
 DIST multi_json-1.14.1.tar.gz 24713 BLAKE2B 188d0fa3bf7a46a6cf4a5aa1d613523b4da3dee5061a5288146d1a367835b255f103dec265da9a218dd6dd21ecb38a7ce35d16a758ac7754b440f52c25f0b703 SHA512 19e2b6704a8ed39b8714da449c8961e740198772718ddba3d3b651f71f2b7d8c2c198d9cc16fe290f1df7b1e54d029c01147fdc431a8d2763944a4de802b89d9
 EBUILD multi_json-1.13.1.ebuild 1908 BLAKE2B 47c9e593445a9597164535186839fff55f3b2637f0d936e939731d375047587701e20a237b288b4218ea9f5d251e02eab560ddbaafa31c42f3cd69edbe4beb41 SHA512 88c6571c406e1323fe456a02a1037da689d06d00e5138a7c68d53c067e315fe29947a5168b32ad4ed69a69253fed5148c86e633d1c4f5135ff622832ba5652cd
-EBUILD multi_json-1.14.0.ebuild 1968 BLAKE2B ee8b9726f1c2b54cc5e329d16b17b8cf3774d4a4a368d35398a6dcab190e4dbbf6238d4116004a2e08a54154672e77c350a9bdabb957ed3736d3933d94c62bba SHA512 b8939c1bc639865cb2f1444345b0a0f4ade0bb565b41657a9573fe0753b190fda4c460ed1ad9e94be5056640c8ad84f8b415b37cd4918364652b29f1ebfd138d
-EBUILD multi_json-1.14.1.ebuild 1975 BLAKE2B a513308b8fba0fc2cc1d5b743a810822a3cf0bb9578f57517e7443cdc12139cba12c9a8a4fd3b384d776349727746a2a4b43ec1c0cf883a058788a8fa5dae70a SHA512 e503e4a18a49859703a32db13ee94b536ef9001edcee7dee26bc1c4c8f710ffb2e447e9895621e84bb8363dd0cdd72793a76a94fc5958414506df3b8b82ab842
+EBUILD multi_json-1.14.1.ebuild 1968 BLAKE2B 3454c739720ed206a26f8acf1fb33095708842af64eb13e577c8effbc3ce0a654b2c6fb76aca6a9e6288814117859ed94a9f19c1d35ef6e58e70441bf243bc0a SHA512 b928c89017ce84ba990b3c03aa4c74398b9b6c718167ed5e7cc9e9d18506954ef42c7b62ffcc1b51ba4992b36c8c495934ae8f6cd67b2e3dd16f177c79d27cde
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.14.0.ebuild b/dev-ruby/multi_json/multi_json-1.14.0.ebuild
deleted file mode 100644
index 1e9dbe36ac55..000000000000
--- a/dev-ruby/multi_json/multi_json-1.14.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2019 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_TASK_DOC="yard"
-
-RUBY_FAKEGEM_DOCDIR="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-RUBY_FAKEGEM_GEMSPEC="multi_json.gemspec"
-
-inherit ruby-fakegem
-
-SRC_URI="https://github.com/intridea/multi_json/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-DESCRIPTION="A gem to provide swappable JSON backends"
-HOMEPAGE="https://github.com/intridea/multi_json"
-LICENSE="MIT"
-
-KEYWORDS="~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"
-SLOT="0"
-IUSE=""
-
-ruby_add_rdepend "|| ( >=dev-ruby/json-1.4:* >=dev-ruby/yajl-ruby-1.0 )"
-
-ruby_add_bdepend "doc? ( dev-ruby/rspec:3 dev-ruby/yard )"
-
-ruby_add_bdepend "test? ( dev-ruby/json
-	dev-ruby/yajl-ruby )"
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/d' Rakefile spec/spec_helper.rb || die "Unable to remove bundler."
-
-	# Remove unimportant rspec options not supported by rspec 2.6.
-	rm .rspec || die
-
-	# Remove specs specific to oj since we don't package oj yet.
-	sed -i -e '/defaults to the best available gem/,/^  end/ s:^:#:' \
-		-e '/Oj does not create symbols on parse/,/^    end/ s:^:#:' \
-		-e '/with Oj.default_settings/,/^    end/ s:^:#:' \
-		-e '/using one-shot parser/,/^  end/ s:^:#:' \
-		-e '/jrjackson/askip "unpackaged"' \
-		spec/multi_json_spec.rb
-
-	# Avoid simplecov which only works with ruby 1.9
-	sed -i -e '/simplecov/d' -e '/SimpleCov.formatter/,/SimpleCov.start/ d' spec/spec_helper.rb || die
-
-	# Remove unpackaged and for our purposes unneeded coveralls
-	sed -i -e '/coveralls/d' spec/spec_helper.rb || die
-
-	# Avoid testing unpackaged adapters
-	rm spec/{gson,nsjsonserialization,jr_jackson,oj}_adapter_spec.rb || die
-}
-
-each_ruby_test() {
-	for t in spec/*_spec.rb; do
-		${RUBY} -S rspec-3 ${t} || die
-	done
-}
diff --git a/dev-ruby/multi_json/multi_json-1.14.1.ebuild b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
index acad6c0bdb2e..58e3dea6028c 100644
--- a/dev-ruby/multi_json/multi_json-1.14.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.14.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="~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"
+KEYWORDS="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"
 SLOT="0"
 IUSE=""