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

["Hans de Graaff" <graaff@gentoo.org>]

commit:     700a91cdc0de080c0cc47fabfdf312a4681828ab
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 19:21:20 2016 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 19:49:44 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700a91cd

dev-ruby/will_paginate: fix tests, add ruby23 revision

Package-Manager: portage-2.2.28

 ..._paginate-3.1.0.ebuild => will_paginate-3.1.0-r1.ebuild} | 13 ++++++++++---
 dev-ruby/will_paginate/will_paginate-3.1.0.ebuild           |  9 ++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/dev-ruby/will_paginate/will_paginate-3.1.0.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.0-r1.ebuild
similarity index 61%
copy from dev-ruby/will_paginate/will_paginate-3.1.0.ebuild
copy to dev-ruby/will_paginate/will_paginate-3.1.0-r1.ebuild
index a27a210..4a59d88 100644
--- a/dev-ruby/will_paginate/will_paginate-3.1.0.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.1.0-r1.ebuild
@@ -3,7 +3,7 @@
 # $Id$
 
 EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22"
+USE_RUBY="ruby20 ruby21 ruby22 ruby23"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec"
 
@@ -17,11 +17,18 @@ HOMEPAGE="https://github.com/mislav/will_paginate/"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~x86 ~x86-macos"
+KEYWORDS="~amd64 ~x86-macos"
 IUSE=""
 
+all_ruby_prepare() {
+	sed -i -e '1igem "rails", "<5"' spec/spec_helper.rb || die
+
+	# Remove tests for unpackaged ORMs
+	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
+}
+
 ruby_add_bdepend "
 	test? (
-		dev-ruby/rails
+		<dev-ruby/rails-5
 		dev-ruby/mocha
 	)"

diff --git a/dev-ruby/will_paginate/will_paginate-3.1.0.ebuild b/dev-ruby/will_paginate/will_paginate-3.1.0.ebuild
index a27a210..ec0e482 100644
--- a/dev-ruby/will_paginate/will_paginate-3.1.0.ebuild
+++ b/dev-ruby/will_paginate/will_paginate-3.1.0.ebuild
@@ -20,8 +20,15 @@ SLOT="3"
 KEYWORDS="~amd64 ~x86 ~x86-macos"
 IUSE=""
 
+all_ruby_prepare() {
+	sed -i -e '1igem "rails", "<5"' spec/spec_helper.rb || die
+
+	# Remove tests for unpackaged ORMs
+	rm -f spec/finders/{sequel,mongoid,data_mapper}* || die
+}
+
 ruby_add_bdepend "
 	test? (
-		dev-ruby/rails
+		<dev-ruby/rails-5
 		dev-ruby/mocha
 	)"