Revbump to add ruby21 support.

(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x6F48D3DA05C2DADB!)

2 files changed, 15 insertions, 7 deletions

diff --git a/dev-ruby/rbpdf/ChangeLog b/dev-ruby/rbpdf/ChangeLog
index af68024bdee5..c677d649d2c2 100644
--- a/dev-ruby/rbpdf/ChangeLog
+++ b/dev-ruby/rbpdf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/rbpdf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbpdf/ChangeLog,v 1.3 2015/06/27 23:54:14 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbpdf/ChangeLog,v 1.4 2015/07/03 21:50:17 mjo Exp $
+
+*rbpdf-1.18.6-r1 (03 Jul 2015)
+
+  03 Jul 2015; Michael Orlitzky <mjo@gentoo.org> +rbpdf-1.18.6-r1.ebuild,
+  -rbpdf-1.18.6.ebuild:
+  Revbump to add ruby21 support.
 
 *rbpdf-1.18.6 (27 Jun 2015)
 
diff --git a/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild b/dev-ruby/rbpdf/rbpdf-1.18.6-r1.ebuild
index afbdfcae1492..f126af45209c 100644
--- a/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild
+++ b/dev-ruby/rbpdf/rbpdf-1.18.6-r1.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbpdf/rbpdf-1.18.6.ebuild,v 1.1 2015/06/27 23:54:14 mjo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rbpdf/rbpdf-1.18.6-r1.ebuild,v 1.1 2015/07/03 21:50:17 mjo Exp $
 
 EAPI=5
 
 # ruby22 support waiting on dev-ruby/action{pack,view}.
-# ruby21 works, but not while we support rails-3.2.
-USE_RUBY="ruby19 ruby20"
+USE_RUBY="ruby19 ruby20 ruby21"
 
 # Avoid the complexity of the "rake" recipe and run the tests manually.
 RUBY_FAKEGEM_RECIPE_TEST=none
@@ -24,12 +23,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-# Try to pick the right version of minitest. Conflicts are still
-# possible, but this is probably the best we can do...
+# Try to pick the right version of minitest. In order to run, the test
+# suite needs matching versions of actionview and activesupport. The
+# easiest way to do this is to pull them in simultaneously with
+# actionpack.
 ruby_add_bdepend "test? ( || (
 	( dev-ruby/actionpack:3.2 dev-ruby/minitest:0 )
 	( dev-ruby/actionpack:4.0 dev-ruby/minitest:0 )
-	( dev-ruby/actionview:*   dev-ruby/minitest:5 )
+	( dev-ruby/actionpack:4.1 dev-ruby/minitest:5 )
+	( dev-ruby/actionpack:4.2 dev-ruby/minitest:5 )
 ) )"
 
 # We need the action_view gem; it was split out of actionpack in 4.1.