From 6bc2e4d7c5906e46a8f275a876ead6ec41aca5bb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 10 Feb 2019 15:40:27 +0000 Subject: gentoo resync : 10.02.2019 --- dev-ruby/bourne/Manifest | 2 +- dev-ruby/bourne/bourne-1.6.0.ebuild | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'dev-ruby/bourne') diff --git a/dev-ruby/bourne/Manifest b/dev-ruby/bourne/Manifest index 49e97ddcad1e..081a1500a4a3 100644 --- a/dev-ruby/bourne/Manifest +++ b/dev-ruby/bourne/Manifest @@ -1,3 +1,3 @@ DIST bourne-1.6.0.gem 15872 BLAKE2B 0167dada4ef99bdb184cea9368d225ce80a34cf57c7c619507f1b219e6f8b814ed68672b147227694b47eefa8d0d9a74cf343f003945697cbc6390a614b254ca SHA512 85bdc52b7e86bc86882ac3d815088da1ea882f828613079075a90b3a40cc41ac87bc503b36ee4ee5812374eb1cd83602832b15f2aaf0e01ea54244cc14bf71ac -EBUILD bourne-1.6.0.ebuild 778 BLAKE2B 612b92bbd16ace8eade6b0c8abda8bcd7f8a742371ac74befae03e26e47d67f38ab07fed63a82a9f1f19764f45bfb8c4659e459ffe3eec32a28fb6e15678f71e SHA512 557837c8d8368bbc3a4d582a3b0e9492e1f37bb74526a0db51aa3c8219eb6f96cb48eeafe1f52ff2ddeec47487aa424b32a0db4720f5b98953098e8ec1a1cc66 +EBUILD bourne-1.6.0.ebuild 1013 BLAKE2B 69ab2df030670fbb0db5408c779bdc8ee6d2188ad31329bf2419b6c04961bf0716fb5de69d1ac7cc7dbfbde03376b75d0298fc5852ec06191e26800a40600ffd SHA512 643a6bfac5c013266e4bc6cb5b23766dc2fe40fca5c33de44e6acf5b8d7424b642a477a51bc158fc8026203aa64c9446a067fb685d89f544418b2dbe5ed2c7b9 MISC metadata.xml 343 BLAKE2B 3d0a780b992abe50a2f5548adf9aa173d8a64d9f8637317aabb6aeb9e79c532adcceac4427ec9d33b98e5660bc71ca75ba2f466e0b816ea80bbfd1c8ba2d5c94 SHA512 60ae96342af2c960a714c0859285deb9cfdb69f40d100f8c2aa02e643f29d88471d0fecde882a408fc84d65c78593177d7af3f6d4f43ade2288c68670d23ef40 diff --git a/dev-ruby/bourne/bourne-1.6.0.ebuild b/dev-ruby/bourne/bourne-1.6.0.ebuild index 2e540174232c..51ad07639436 100644 --- a/dev-ruby/bourne/bourne-1.6.0.ebuild +++ b/dev-ruby/bourne/bourne-1.6.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 -USE_RUBY="ruby21 ruby22 ruby23 ruby24" +USE_RUBY="ruby23 ruby24 ruby25 ruby26" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="README.md" @@ -21,11 +21,15 @@ SLOT="0" KEYWORDS="~amd64 ~arm ~x86" IUSE="" -ruby_add_rdepend ">=dev-ruby/mocha-1.1:1.0" +ruby_add_rdepend ">=dev-ruby/mocha-1.5.0:1.0" ruby_add_bdepend "test? ( dev-ruby/test-unit:2 )" all_ruby_prepare() { sed -i -e '/git ls-files/d' "${RUBY_FAKEGEM_GEMSPEC}" || die sed -i -e '/bundler/d' Rakefile || die + + # Fix tests to work with mocha 1.5.0 or newer where reset_instance is gone + sed -i -e '/reset_instance/ s:^:#:' test/unit/*received_test.rb || die + sed -i -e 's/Mockery.reset_instance/mocha_teardown/' test/unit/mockery_test.rb || die } -- cgit v1.2.3