Version bump for Rails 3.1.7, bug 428254.

(Portage version: 2.1.10.65/cvs/Linux x86_64)

2 files changed, 68 insertions, 1 deletions

diff --git a/dev-ruby/activesupport/ChangeLog b/dev-ruby/activesupport/ChangeLog
index 408095772043..196f8346ff01 100644
--- a/dev-ruby/activesupport/ChangeLog
+++ b/dev-ruby/activesupport/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/activesupport
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.179 2012/07/27 06:12:01 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/ChangeLog,v 1.180 2012/07/28 07:37:24 graaff Exp $
+
+*activesupport-3.1.7 (28 Jul 2012)
+
+  28 Jul 2012; Hans de Graaff <graaff@gentoo.org> +activesupport-3.1.7.ebuild:
+  Version bump for Rails 3.1.7, bug 428254.
 
 *activesupport-3.2.7 (27 Jul 2012)
 
diff --git a/dev-ruby/activesupport/activesupport-3.1.7.ebuild b/dev-ruby/activesupport/activesupport-3.1.7.ebuild
new file mode 100644
index 000000000000..654c1e8ce5ef
--- /dev/null
+++ b/dev-ruby/activesupport/activesupport-3.1.7.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/activesupport/activesupport-3.1.7.ebuild,v 1.1 2012/07/28 07:37:24 graaff Exp $
+
+EAPI=4
+
+# jruby fails tests.
+USE_RUBY="ruby18 ree18 ruby19"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="activesupport.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Utility Classes and Extension to the Standard Library"
+HOMEPAGE="http://rubyforge.org/projects/activesupport/"
+SRC_URI="https://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.1"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RUBY_S="rails-rails-*/${PN}"
+
+ruby_add_rdepend ">=dev-ruby/memcache-client-1.5.8
+	>=dev-ruby/multi_json-1.0
+	dev-ruby/i18n:0.6
+	!!<dev-ruby/activesupport-3.0.11-r1:3.0"
+
+# libxml-ruby, nokogiri, and builder are not strictly needed, but there
+# are tests using this code.
+ruby_add_bdepend "test? (
+	virtual/ruby-test-unit
+	>=dev-ruby/libxml-2.0.0
+	dev-ruby/nokogiri
+	dev-ruby/builder:0
+	)"
+
+all_ruby_prepare() {
+	# don't support older mocha versions as the optional codepath
+	# breaks JRuby
+	epatch "${FILESDIR}"/${PN}-3.0.3-mocha-0.9.5.patch
+
+	# Set test environment to our hand.
+#	rm "${S}/../Gemfile" || die "Unable to remove Gemfile"
+	sed -i -e '/load_paths/d' test/abstract_unit.rb || die "Unable to remove load paths"
+
+	# Remove upper restriction from gemspec. All tests pass with
+	# multi_json 1.3.5. The upstream commit doesn't give details but
+	# most likely this was added to avoid multi_json 1.3.0 which broke
+	# compatibility. This was later fixed in 1.3.1. 1.3.0 is no longer
+	# in portage so from a Gentoo point of view it is safe to depend on
+	# => 1.0.
+	sed -i -e "s/, '< 1.3'//" activesupport.gemspec || die
+
+	# Avoid tests that do not work with newer versions of mocha.
+	rm test/whiny_nil_test.rb || die
+}