[gentoo-commits] repo/gentoo:master commit in: dev-ruby/mini_magick/

[Hans de Graaff]

commit:     36a3e870ed52922daadaa76d5e9221d53c5f96f9
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sat May 19 07:27:13 2018 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sat May 19 07:27:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36a3e870

dev-ruby/mini_magick: add ruby25

Package-Manager: Portage-2.3.36, Repoman-2.3.9

 dev-ruby/mini_magick/mini_magick-4.8.0.ebuild | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild 
b/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
index 6a11e219fb8..509e1be7270 100644
--- a/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
+++ b/dev-ruby/mini_magick/mini_magick-4.8.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -31,7 +31,7 @@ IUSE=""
 RDEPEND+=" media-gfx/imagemagick"
 DEPEND+=" test? ( virtual/imagemagick-tools[jpeg,png,tiff] )"
 
-ruby_add_bdepend "test? ( dev-ruby/mocha dev-ruby/posix-spawn dev-ruby/webmock 
)"
+USE_RUBY="ruby23 ruby24" ruby_add_bdepend "test? ( dev-ruby/mocha 
dev-ruby/posix-spawn dev-ruby/webmock )"
 
 all_ruby_prepare() {
        # remove executable bit from all files
@@ -57,3 +57,14 @@ all_ruby_prepare() {
        sed -i -e '/identifies when gm exists/,/^    end/ s:^:#:' 
spec/lib/mini_magick/utilities_spec.rb || die
        sed -i -e '/returns GraphicsMagick/,/^    end/ s:^:#:' 
spec/lib/mini_magick_spec.rb || die
 }
+
+each_ruby_test() {
+       case ${RUBY} in
+               *ruby23|*ruby24)
+                       each_fakegem_test
+                       ;;
+               *)
+                       einfo "Skipping tests due to circular dependencies with 
Rails"
+                       ;;
+       esac
+}