summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-ruby/builder/ChangeLog5
-rw-r--r--dev-ruby/builder/builder-3.1.4.ebuild7
2 files changed, 9 insertions, 3 deletions
diff --git a/dev-ruby/builder/ChangeLog b/dev-ruby/builder/ChangeLog
index 34d86c361941..33fef21c922f 100644
--- a/dev-ruby/builder/ChangeLog
+++ b/dev-ruby/builder/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-ruby/builder
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.90 2013/12/24 12:56:50 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/ChangeLog,v 1.91 2013/12/25 10:26:18 graaff Exp $
+
+ 25 Dec 2013; Hans de Graaff <graaff@gentoo.org> builder-3.1.4.ebuild:
+ Add ruby20 to this slot as well for Rails 4.
24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> builder-3.0.4.ebuild:
Stable for x86, wrt bug #490912
diff --git a/dev-ruby/builder/builder-3.1.4.ebuild b/dev-ruby/builder/builder-3.1.4.ebuild
index f2afb616de28..c07b63219d8a 100644
--- a/dev-ruby/builder/builder-3.1.4.ebuild
+++ b/dev-ruby/builder/builder-3.1.4.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/builder/builder-3.1.4.ebuild,v 1.3 2013/01/28 15:16:22 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/builder/builder-3.1.4.ebuild,v 1.4 2013/12/25 10:26:18 graaff Exp $
EAPI=5
-USE_RUBY="ruby18 ruby19 ree18 jruby"
+USE_RUBY="ruby18 ruby19 ruby20 jruby"
RUBY_FAKEGEM_TASK_TEST="test_all"
@@ -26,4 +26,7 @@ all_ruby_prepare() {
sed -i \
-e '/rdoc\.template .*jamis/d' \
Rakefile || die
+
+ # Backport for from 3.2 for ruby20 file encoding.
+ sed -i -e '1i# encoding: us-ascii' test/test_xchar.rb || die
}