diff options
author | 2015-08-08 13:49:04 -0700 | |
---|---|---|
committer | 2015-08-08 17:38:18 -0700 | |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-ruby/gherkin/files/gherkin-2.12.0-ruby21.patch | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-ruby/gherkin/files/gherkin-2.12.0-ruby21.patch')
-rw-r--r-- | dev-ruby/gherkin/files/gherkin-2.12.0-ruby21.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/dev-ruby/gherkin/files/gherkin-2.12.0-ruby21.patch b/dev-ruby/gherkin/files/gherkin-2.12.0-ruby21.patch new file mode 100644 index 000000000000..8931c5dce8e5 --- /dev/null +++ b/dev-ruby/gherkin/files/gherkin-2.12.0-ruby21.patch @@ -0,0 +1,42 @@ +commit 021309d273960bb5625f8072b8366eab7d077d25 +Author: Cédric Boutillier <boutil@debian.org> +Date: Fri Apr 25 13:34:41 2014 +0200 + + change regexp matchin Ruby versions to support Ruby2.1 + +diff --git a/lib/gherkin/formatter/pretty_formatter.rb b/lib/gherkin/formatter/pretty_formatter.rb +index 28c8b54..ff13c70 100644 +--- a/lib/gherkin/formatter/pretty_formatter.rb ++++ b/lib/gherkin/formatter/pretty_formatter.rb +@@ -199,7 +199,7 @@ module Gherkin + end + end + +- if(RUBY_VERSION =~ /^1\.9|2\.0/) ++ if(RUBY_VERSION =~ /^(1\.9|2\.)/) + START = /#{'^'.encode('UTF-8')}/ + TRIPLE_QUOTES = /#{'"""'.encode('UTF-8')}/ + else +diff --git a/ragel/lexer.rb.rl.erb b/ragel/lexer.rb.rl.erb +index 7fd85b4..4be053e 100644 +--- a/ragel/lexer.rb.rl.erb ++++ b/ragel/lexer.rb.rl.erb +@@ -165,7 +165,7 @@ module Gherkin + utf8_pack(rest[0..rest.index(10)||-1]).strip # 10 is \n + end + +- if (RUBY_VERSION =~ /^1\.9|2\.0/) ++ if (RUBY_VERSION =~ /^(1\.9|2\.)/) + def utf8_pack(array) + array.pack("c*").force_encoding("UTF-8") + end +diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb +index 72333a7..0f6e3ae 100644 +--- a/spec/spec_helper.rb ++++ b/spec/spec_helper.rb +@@ -6,4 +6,4 @@ def silence_warnings(&block) +-if RUBY_VERSION =~ /1\.9|2\.0/ ++if RUBY_VERSION =~ /^(1\.9|2\.)/ + Encoding.default_external = Encoding::UTF_8 + Encoding.default_internal = Encoding::UTF_8 + end |