gentoo resync : 24.12.2018

3 files changed, 2 insertions, 50 deletions

diff --git a/dev-ruby/rspec-mocks/Manifest b/dev-ruby/rspec-mocks/Manifest
index 16e7262a8342..38e925f7c0c4 100644
--- a/dev-ruby/rspec-mocks/Manifest
+++ b/dev-ruby/rspec-mocks/Manifest
@@ -1,11 +1,9 @@
 AUX rspec-mocks-3.7.0-ruby25-1.patch 1164 BLAKE2B c7fe549bdbd85ab2868bc6cc02f6f6811d60b484acce08de8c7d5596ef36b6f63f63023fd2f708f0f0e855137e5d03ea283fcb2f713d755d8f067d86e8cdcf14 SHA512 ff92bd1a227a6c95c9fc04a10373f7924f09533fab56748554929a24fbd8147c82d1a3b15400f1b6ae003ebd2c0b0a4e719211fba2f43929f05cae2cc6ab894e
 AUX rspec-mocks-3.7.0-ruby25-2.patch 1496 BLAKE2B 1f03651f0f0ee76e055b3dc8f823f2b9e119d7d5f5583ddb44ed15152ec852eaacd1e78a56b401a606777ecc726f0820feb7975c2064fc22430ba28509b52016 SHA512 ed06d7c0c23ccde64393dfad26a70c698973817e077b2db592d908e55827b210bbbe4d95e1d5c92866336456ac21566a96c08d8dc7e84386c1ca8d3d25d5a445
 DIST rspec-mocks-2.99.2-git.tgz 101731 BLAKE2B 27ae180381d427b642c53c351e7b53602caba4252ddf5393949d940be8474110eb0697901afaaa878cd8d368f081c6644c0fcbce86d9d14b9f93f48c027ae808 SHA512 dd3b9394d56de8d3089db7777cda1e1a5bbdc46486876a99a8a83b602b84ba0320913d8e8dabe5e0367645eb01b943607b93e67d87cc26e380c8db6e048e4e0d
-DIST rspec-mocks-3.6.0-git.tgz 189000 BLAKE2B d8fcc25983eeeafdba69bce80bccac2ff9b1e269b739bbd41a87f4839468fe5e4bd3298d2a63aa315d87422a9f30aaf1a776cb9b90ee1fd58ca05b5a08ea032e SHA512 42cc4870fde8eba0a6da7df4ab07e4d59c6447bb8f52e0172e7f231d47304c20c6e2edfceee698d5d344bb78384acbe3df4bb67de784cc24a63fae02ed1d4a7b
 DIST rspec-mocks-3.7.0-git.tgz 189170 BLAKE2B a0a622ac593660c673cd80b3f3caddd2ac389000f42a7ed1745e1fcfd28d1986e61e83c265d736f3ad0649531973719bc9c5f6ab07e289cb2da89c4482e64184 SHA512 8673726571ccf8a901281e44faeb25ffcb59579dc380138f0557cd9310192cd340081e5e8ad65ae281777727b502cca2f6877134b0fb48f2e0ea40b133002aff
 DIST rspec-mocks-3.8.0-git.tgz 191102 BLAKE2B a8dc3794245e4508fb57874ba11a753db5622abda2d34a022c6f01b2e95bf43dd2df8612abcb84c32cff632f70083ea9d76171de73720d00dd929d562fa5993d SHA512 0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba
 EBUILD rspec-mocks-2.99.2.ebuild 1532 BLAKE2B b8cf9d6afcc3f38d304daf6abd0610f4fad1e21f1985a01c906e476a35f50f129175fbe7e457509a7eb65f6a09cbca301deb84c9c70abfec23b48016e52d0356 SHA512 98dadc99f3a3bd894ccca1d2763526acb9754646e5b13fc471672d86a96efc10921742f626ef1090d6285faaf6e7f047abdeaee3217d681e7f4583b19ca774f5
-EBUILD rspec-mocks-3.6.0.ebuild 1353 BLAKE2B 3bab6513a6cfbf127c706826e4f946c6ab76bf3dd3cef0bd21065b197b10a950b840d59bbc58fbd9b7c00335b83548f61f98360fc22ee47f8bc1050830975245 SHA512 b1320a3f762bc5e3aa63d9e3c3aecd93f254b217905eb5e752068c25c43d6679095b2664f833119a42b5b6a5ae1f85770d8386fa5e12dda79b8085f9a07ab6fd
-EBUILD rspec-mocks-3.7.0.ebuild 1434 BLAKE2B 1eb1de5f133f57903161e29aed90798c4d422ab2a11fe8bdf11b4e0c583a346ccbcadfc14d9e7e19e49a5b844fb8a154a17e4591ec8a81e769b5faf73c3c26af SHA512 748dcf45d9b79ec6f455972274ed86dce284309c0d95e9c0f63413cc8e37d1614f9ee191b212c0983aab08a50ca4cfc1e40e05e50814eba24b994c025792f018
+EBUILD rspec-mocks-3.7.0.ebuild 1431 BLAKE2B 2856371fdb0f9bbc3dfb45a9e064c96b0811ad357afe9423a55072d568687f750515409c96a55ff6f04b3e69fb33e346a7a2f8e3f8d97c9485e019351560fbba SHA512 92435f4b915785212754b088c288651be5a3f9d71b694349c55d5497c9ea051968a392eb4054deadff1c325025885edb29983c6080a0fdf9d2fc8d719dcc642c
 EBUILD rspec-mocks-3.8.0.ebuild 1345 BLAKE2B 3ac475af432a4af5e352ca2be716ee4ce46618ca921728c138f5ac935dacff07f072430adef1c8e84de6425b71b881f89f96446b3d15e0a5745fb84a2a2d5cd7 SHA512 5f4b3415624b24f2ba4ccc969056f2d4d5c7893a40b9cd6abc72be0dc9dc4a2f462932f45ebfeecc9241305c93fcda6ddda0b25aae8a60a7765d1dfac7440f56
 MISC metadata.xml 343 BLAKE2B 87ebb52b322f698e5242c517ca646e64b3a9a33c6b76d968847b2224b4dd683a9eaae5d03470efe775d350c65e3bfbe16547d4b4b99e2744379fbb7c76cc5680 SHA512 c7956e0175d9fdbfd423140f3c757d4c9e1deb6089577f60d11111a93fde6a7c056dcbac8620c30c8c02693297402aa2f0710e43f60abc0878a51bcb8c624667
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
deleted file mode 100644
index a0950a5eaf92..000000000000
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.6.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
-
-RUBY_FAKEGEM_RECIPE_DOC="none"
-RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Behaviour Driven Development (BDD) framework for Ruby"
-HOMEPAGE="https://github.com/rspec/rspec-mocks"
-SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-SUBVERSION="$(get_version_component_range 1-2)"
-
-ruby_add_rdepend "=dev-ruby/rspec-support-${SUBVERSION}*
-	>=dev-ruby/diff-lcs-1.2.0 =dev-ruby/diff-lcs-1*"
-
-ruby_add_bdepend "
-	test? (
-		>=dev-ruby/rspec-core-3.3.0:3
-		>=dev-ruby/rspec-expectations-2.99.0:3
-	)"
-
-all_ruby_prepare() {
-	# Don't set up bundler: it doesn't understand our setup.
-	sed -i -e '/[Bb]undler/d' Rakefile || die
-
-	# Remove the Gemfile to avoid running through 'bundle exec'
-	rm Gemfile || die
-
-	# Remove .rspec options to avoid dependency on newer rspec when
-	# bootstrapping.
-	rm .rspec || die
-
-	sed -i -e '1irequire "spec_helper"' spec/rspec/mocks/any_instance_spec.rb || die
-}
diff --git a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
index 2bda67348d43..bca7c1e18dd9 100644
--- a/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
+++ b/dev-ruby/rspec-mocks/rspec-mocks-3.7.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/rspec/${PN}/archive/v${PV}.tar.gz -> ${P}-git.tgz"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 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 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 SUBVERSION="$(get_version_component_range 1-2)"