gentoo resync : 18.05.2019

3 files changed, 2 insertions, 65 deletions

diff --git a/dev-ruby/multi_json/Manifest b/dev-ruby/multi_json/Manifest
index b994973873ee..152fcdd151de 100644
--- a/dev-ruby/multi_json/Manifest
+++ b/dev-ruby/multi_json/Manifest
@@ -1,5 +1,3 @@
-DIST multi_json-1.12.1.tar.gz 25579 BLAKE2B 50fa37b907289b8247ffff1e22ebde1b07ee32e5ca97984be1243340f14185ebaaeb72cb28a18c5c77b1b48bfd0b400479fe7ef532e40cef3736d782c84c0d09 SHA512 f61e500197c5a1373443b308bd9307238c54d2d23ba9da91843c667c12e491f34fd87575028c3630a81a7355d4903344996f20408bbb7971b12dfba3cc4f76df
 DIST multi_json-1.13.1.tar.gz 26098 BLAKE2B e82a08a747a092a9094cd7b35b4f933b5ac922a01f45a51b215ca9c4cdb9a083a4808d4bbe67a147ecb57e0b7b7e313c3d896f8cd80c79338c24abc3b90a09f9 SHA512 7c98392bd1c909fcc05249a02a010b561bf6c2d812ae42413d6e8dafa62926d8cb76226ded4c61558a00e5fa531ba33b6f4ef562648c52ba9b552ff7b7e27682
-EBUILD multi_json-1.12.1.ebuild 1928 BLAKE2B e145efe7580001ff4e92dd2d524e08328de8b1fc6bdf8e958f7a4a3928baf9c01a1bd26a6e5db16c8d5aedebcede110872ae60db7e066df62b51d6e872e75236 SHA512 dd0e27bebc519457ef67e425889e515aa77fe8adce279bd265477ccc2b8fe19c93f884fd8dc1b8f65b9602246370ac46a8e8a6edba22c549b3c5285d66af462e
-EBUILD multi_json-1.13.1.ebuild 1933 BLAKE2B 5c904c35904c57dedfc574a0a63a2be8b4d85f4629a0079621e4d2e6be7edcf02688d383b79ec4f1481f6d65c3d9e5bd5a463c1533c285ca756be17762ac17f0 SHA512 2b8ede3df0a32c0fd21b70404033d0765e998d92f53dcc1b4f8366c21e7e97371bbdc40938e21e8387e51707743568355d529d5e415adca6ffecd7ea9aec88be
+EBUILD multi_json-1.13.1.ebuild 1929 BLAKE2B 922b847d6cfc8c82635ac877dd445c9faaf561f5e74a7a05eb97ac2dd5d95336cf3248d7f4c7fc71947849efbf876991009bcc9208e2975ccdc8ada9928c724c SHA512 3dd99ef2b56d185588770d9dc0e72466aa51e57f858efbd92bea441dbac0ff22749fe46348e64cc1ec417710a25e3efc049cc41737462fefb05233b44ba371dd
 MISC metadata.xml 345 BLAKE2B 7d7684a1546dcc97e934f1a7df4484b568c5e8043dcfd0493e03124fa9f96959de5dccb78d22b1ff51ebc39b5fbec8b9a1dfd24531d676b8982b1f1dbd5097d0 SHA512 5fe7f117806d67e0d295bfcbdd07d4bbe8d3c3875e07cc3d276f2aee81b89f2e90174cbf4264d647384817fe0e8c81c2f2c9d9d67e3f78b46c3c194001bcace9
diff --git a/dev-ruby/multi_json/multi_json-1.12.1.ebuild b/dev-ruby/multi_json/multi_json-1.12.1.ebuild
deleted file mode 100644
index 7f357ab7ec0b..000000000000
--- a/dev-ruby/multi_json/multi_json-1.12.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-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="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~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:^:#:' \
-		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,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.13.1.ebuild b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
index 26b5975cefef..da4329ed04f2 100644
--- a/dev-ruby/multi_json/multi_json-1.13.1.ebuild
+++ b/dev-ruby/multi_json/multi_json-1.13.1.ebuild
@@ -20,7 +20,7 @@ DESCRIPTION="A gem to provide swappable JSON backends"
 HOMEPAGE="https://github.com/intridea/multi_json"
 LICENSE="MIT"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~s390 sparc ~x86 ~x86-fbsd ~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 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""