From 4d8baa65fa7dd1d5b1789c177df95dc1f74cdbd8 Mon Sep 17 00:00:00 2001
From: miqlas <5569059+extrowerk@users.noreply.github.com>
Date: Wed, 25 Dec 2019 20:22:12 +0100
Subject: [PATCH] Ruby: add 2.7 recipe (#4488)

---
 ...uby-2.6.5.patchset => ruby-2.7.0.patchset} | 40 +++++++++++++++----
 .../{ruby-2.6.5.recipe => ruby-2.7.0.recipe}  | 10 +++--
 2 files changed, 39 insertions(+), 11 deletions(-)
 rename dev-lang/ruby/patches/{ruby-2.6.5.patchset => ruby-2.7.0.patchset} (63%)
 rename dev-lang/ruby/{ruby-2.6.5.recipe => ruby-2.7.0.recipe} (90%)

diff --git a/dev-lang/ruby/patches/ruby-2.6.5.patchset b/dev-lang/ruby/patches/ruby-2.7.0.patchset
similarity index 63%
rename from dev-lang/ruby/patches/ruby-2.6.5.patchset
rename to dev-lang/ruby/patches/ruby-2.7.0.patchset
index e549e99cf..4853db1ff 100644
--- a/dev-lang/ruby/patches/ruby-2.6.5.patchset
+++ b/dev-lang/ruby/patches/ruby-2.7.0.patchset
@@ -1,14 +1,14 @@
-From d7a959f117b0d7ce3dbf03de28a5e04a33684624 Mon Sep 17 00:00:00 2001
+From b48ccadf943b0dde5e1166555e0d058edc028aaa Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 5 May 2019 11:57:46 +0200
 Subject: We don't allow unsetting O_NONBLOCK or O_NDELAY on packaged FS
 
 
 diff --git a/ruby.c b/ruby.c
-index 2c8b29a..9449a17 100644
+index 7903f58..0a17782 100644
 --- a/ruby.c
 +++ b/ruby.c
-@@ -2045,10 +2045,10 @@ open_load_file(VALUE fname_v, int *xflag)
+@@ -2090,10 +2090,10 @@ open_load_file(VALUE fname_v, int *xflag)
  	int fd;
  	/* open(2) may block if fname is point to FIFO and it's empty. Let's
  	   use O_NONBLOCK. */
@@ -22,20 +22,20 @@ index 2c8b29a..9449a17 100644
  #else
  # define MODE_TO_LOAD (O_RDONLY)
 -- 
-2.21.0
+2.24.1
 
 
-From e5cc7b856931e82fa5c95578e97464084bff6dd1 Mon Sep 17 00:00:00 2001
+From f9761d73a43fc9ac6d76f20115379a69725c7df1 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
 Date: Sun, 5 May 2019 15:35:20 +0200
 Subject: Test fix for Haiku
 
 
 diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb
-index 4aaa55e..61662cb 100644
+index 57ded49..8a33200 100644
 --- a/test/fiddle/helper.rb
 +++ b/test/fiddle/helper.rb
-@@ -84,6 +84,18 @@
+@@ -100,6 +100,18 @@ when /aix/
        end
      end
    end
@@ -55,5 +55,29 @@ index 4aaa55e..61662cb 100644
    libc_so = ARGV[0] if ARGV[0] && ARGV[0][0] == ?/
    libm_so = ARGV[1] if ARGV[1] && ARGV[1][0] == ?/
 -- 
-2.21.0
+2.24.1
+
+
+From cdb9ed2975540492117e11c20eb8d5573dfca087 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
+Date: Wed, 25 Dec 2019 19:53:24 +0100
+Subject: Add Haiku to the context support list
+
+
+diff --git a/configure.ac b/configure.ac
+index f1ed36b..fc28564 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2343,6 +2343,9 @@ AS_CASE([$rb_cv_coroutine], [yes|''], [
+         [*-openbsd*], [
+             rb_cv_coroutine=copy
+         ],
++        [*-haiku*], [
++            rb_cv_coroutine=copy
++        ],
+         [*], [
+             rb_cv_coroutine=ucontext
+         ]
+-- 
+2.24.1
 
diff --git a/dev-lang/ruby/ruby-2.6.5.recipe b/dev-lang/ruby/ruby-2.7.0.recipe
similarity index 90%
rename from dev-lang/ruby/ruby-2.6.5.recipe
rename to dev-lang/ruby/ruby-2.7.0.recipe
index 2d663ee20..6abeab991 100644
--- a/dev-lang/ruby/ruby-2.6.5.recipe
+++ b/dev-lang/ruby/ruby-2.7.0.recipe
@@ -14,8 +14,8 @@ COPYRIGHT="1993-2019 Yukihiro Matsumoto"
 LICENSE="Ruby
 	BSD (3-clause)"
 REVISION="1"
-SOURCE_URI="https://cache.ruby-lang.org/pub/ruby/2.6/ruby-$portVersion.tar.xz"
-CHECKSUM_SHA256="d5d6da717fd48524596f9b78ac5a2eeb9691753da5c06923a6c31190abe01a62"
+SOURCE_URI="https://cache.ruby-lang.org/pub/ruby/${portVersion%.*}/ruby-$portVersion.tar.xz"
+CHECKSUM_SHA256="27d350a52a02b53034ca0794efe518667d558f152656c2baaf08f3d0c8b02343"
 PATCHES="ruby-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86 x86_64"
@@ -31,11 +31,14 @@ PROVIDES="
 	cmd:erb = $libVersionCompat
 	cmd:gem = $libVersionCompat
 	cmd:irb = $libVersionCompat
+	cmd:racc = $libVersionCompat
+	cmd:racc2y = $libVersionCompat
 	cmd:rake = $libVersionCompat
 	cmd:rdoc = $libVersionCompat
 	cmd:ri = $libVersionCompat
 	cmd:ruby = $libVersionCompat
 	cmd:testrb = $libVersionCompat
+	cmd:y2racc = $libVersionCompat
 	lib:libruby$secondaryArchSuffix = $libVersionCompat
 	"
 REQUIRES="
@@ -69,7 +72,7 @@ BUILD_REQUIRES="
 	devel:libz$secondaryArchSuffix
 	"
 BUILD_PREREQUIRES="
-	cmd:autoconf
+	cmd:autoreconf
 	cmd:bison
 	cmd:g++$secondaryArchSuffix
 	cmd:gcc$secondaryArchSuffix
@@ -86,6 +89,7 @@ BUILD()
 {
 	export CFLAGS="-D_BSD_SOURCE"
 	export LDFLAGS="-lssp"
+	autoreconf -i
 	runConfigure --omit-dirs binDir ./configure \
 		--enable-shared \
 		--disable-silent-rules \