From 60c6a46787ce1d07e8a97de9f98d8765ef72efcb Mon Sep 17 00:00:00 2001
From: Hans de Graaff <graaff@gentoo.org>
Date: Sat, 30 Mar 2013 13:18:13 +0000
Subject: Version bump for security bug 462452.

(Portage version: 2.1.11.55/cvs/Linux x86_64, signed Manifest commit with key 0x8883FA56A308A8D7!)
---
 dev-ruby/railties/ChangeLog              |  8 ++++-
 dev-ruby/railties/railties-3.1.11.ebuild |  4 +--
 dev-ruby/railties/railties-3.1.12.ebuild | 57 ++++++++++++++++++++++++++++++++
 3 files changed, 66 insertions(+), 3 deletions(-)
 create mode 100644 dev-ruby/railties/railties-3.1.12.ebuild

(limited to 'dev-ruby/railties')

diff --git a/dev-ruby/railties/ChangeLog b/dev-ruby/railties/ChangeLog
index 7ce838c7d3aa..193d6712cf29 100644
--- a/dev-ruby/railties/ChangeLog
+++ b/dev-ruby/railties/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ruby/railties
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.52 2013/03/27 13:31:31 moult Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/ChangeLog,v 1.53 2013/03/30 13:18:13 graaff Exp $
+
+*railties-3.1.12 (30 Mar 2013)
+
+  30 Mar 2013; Hans de Graaff <graaff@gentoo.org> +railties-3.1.12.ebuild,
+  railties-3.1.11.ebuild:
+  Version bump for security bug 462452.
 
   27 Mar 2013; Dion Moult <moult@gentoo.org> -railties-3.0.20.ebuild:
   Remove dev-ruby/railties:3.0 due to lack of upstream support
diff --git a/dev-ruby/railties/railties-3.1.11.ebuild b/dev-ruby/railties/railties-3.1.11.ebuild
index 314399f3cc53..3b09f718f73a 100644
--- a/dev-ruby/railties/railties-3.1.11.ebuild
+++ b/dev-ruby/railties/railties-3.1.11.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.11.ebuild,v 1.1 2013/02/11 20:48:23 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.11.ebuild,v 1.2 2013/03/30 13:18:13 graaff Exp $
 
 EAPI=4
-USE_RUBY="ruby18 ruby19 ree18"
+USE_RUBY="ruby18 ruby19"
 
 RUBY_FAKEGEM_TASK_TEST="test:regular"
 RUBY_FAKEGEM_TASK_DOC="generate_guides"
diff --git a/dev-ruby/railties/railties-3.1.12.ebuild b/dev-ruby/railties/railties-3.1.12.ebuild
new file mode 100644
index 000000000000..a015817b6291
--- /dev/null
+++ b/dev-ruby/railties/railties-3.1.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/railties/railties-3.1.12.ebuild,v 1.1 2013/03/30 13:18:13 graaff Exp $
+
+EAPI=4
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_TEST="test:regular"
+RUBY_FAKEGEM_TASK_DOC="generate_guides"
+RUBY_FAKEGEM_DOCDIR="guides/output"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="railties.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Tools for creating, working with, and running Rails applications."
+HOMEPAGE="http://github.com/rails/rails"
+SRC_URI="http://github.com/rails/rails/tarball/v${PV} -> rails-${PV}.tgz"
+
+LICENSE="MIT"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~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-*/railties"
+
+# The test suite has many failures, most likely due to a mismatch in
+# exact dependencies or environment specifics. Needs further
+# investigation.
+RESTRICT="test"
+
+ruby_add_rdepend "
+	~dev-ruby/activesupport-${PV}
+	~dev-ruby/actionpack-${PV}
+	>=dev-ruby/rdoc-3.4
+	>=dev-ruby/thor-0.14.6
+	>=dev-ruby/rack-ssl-1.3.2:1.3
+	>=dev-ruby/rake-0.8.7"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/mocha-0.9.5
+		virtual/ruby-test-unit
+	)
+	doc? (
+		>=dev-ruby/redcloth-4.1.1
+	)"
+
+all_ruby_prepare() {
+	# Remove items from the common Gemfile that we don't need for this
+	# test run. This also requires handling some gemspecs.
+	sed -i -e '/\(uglifier\|system_timer\|sdoc\|w3c_validators\|pg\)/d' ../Gemfile || die
+
+	# allow newer thor
+	sed -i -e '/dependency.*thor/s:~>:>=:' ${RUBY_FAKEGEM_GEMSPEC} || die
+}
-- 
cgit v1.2.3-65-gdbad