From 04817bf514689f03d7a898c593d24ca9c37ac585 Mon Sep 17 00:00:00 2001
From: Christian Neukirchen <chneukirchen@gmail.com>
Date: Thu, 25 Dec 2014 14:52:00 +0100
Subject: [PATCH] ruby: update to 2.2.0.

---
 common/shlibs                       |  2 +-
 srcpkgs/ruby/patches/libressl.patch | 18 +++++++++---------
 srcpkgs/ruby/template               | 11 ++++++-----
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index e710b690da4..57e5bb18a7e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -444,7 +444,7 @@ libSDL_ttf-2.0.so.0 SDL_ttf-2.0.9_1
 libparted.so.2 libparted-3.1_1
 libparted-fs-resize.so.0 libparted-3.1_1
 libntfs-3g.so.85 ntfs-3g-2014.2.15_1
-libruby.so.2.1 ruby-2.1.2_1
+libruby.so.2.2 ruby-2.2.0_1
 libxenctrl.so.4.4 xen-libs-4.4_1<4.5
 libxenguest.so.4.4 xen-libs-4.4_1<4.5
 libxlutil.so.4.3 xen-libs-4.3_1
diff --git a/srcpkgs/ruby/patches/libressl.patch b/srcpkgs/ruby/patches/libressl.patch
index 78a4a525554..e13b3ec2e14 100644
--- a/srcpkgs/ruby/patches/libressl.patch
+++ b/srcpkgs/ruby/patches/libressl.patch
@@ -13,7 +13,7 @@ LibreSSL does not provide RAND_egd, drop wrappers for it.
 diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c
 --- ext/openssl/ossl_rand.c	2014-07-21 16:12:51.350690031 +0200
 +++ ext/openssl/ossl_rand.c	2014-07-21 16:16:58.322698863 +0200
-@@ -125,6 +125,7 @@
+@@ -148,6 +148,7 @@
      return str;
  }
  
@@ -21,7 +21,7 @@ diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c
  /*
   *  call-seq:
   *     egd(filename) -> true
-@@ -158,6 +159,7 @@
+@@ -186,6 +187,7 @@
      }
      return Qtrue;
  }
@@ -29,14 +29,14 @@ diff -ur /tmp/openssl/ossl_rand.c openssl/ossl_rand.c
  
  /*
   *  call-seq:
-@@ -195,8 +197,10 @@
-     DEFMETH(mRandom, "write_random_file", ossl_rand_write_file, 1);
-     DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
-     DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
+@@ -219,8 +221,10 @@
+     rb_define_module_function(mRandom, "write_random_file", ossl_rand_write_file, 1);
+     rb_define_module_function(mRandom, "random_bytes", ossl_rand_bytes, 1);
+     rb_define_module_function(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
 +#if defined(HAVE_RAND_EGD_METHOD)
-     DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
-     DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
+     rb_define_module_function(mRandom, "egd", ossl_rand_egd, 1);
+     rb_define_module_function(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
 +#endif
-     DEFMETH(mRandom, "status?", ossl_rand_status, 0)
+     rb_define_module_function(mRandom, "status?", ossl_rand_status, 0);
  }
  
diff --git a/srcpkgs/ruby/template b/srcpkgs/ruby/template
index 2a23b74324a..9f35f75167d 100644
--- a/srcpkgs/ruby/template
+++ b/srcpkgs/ruby/template
@@ -1,18 +1,19 @@
 # Template build file for 'ruby'.
-_ruby_abiver=2.1.0
+_ruby_abiver=2.2.0
 
 pkgname=ruby
-version=2.1.5
-revision=2
+version=2.2.0
+revision=1
 build_style=gnu-configure
 configure_args="--enable-shared --disable-rpath
  DOXYGEN=/usr/bin/doxygen DOT=/usr/bin/dot PKG_CONFIG=/usr/bin/pkg-config"
+make_build_args="all capi"
 short_desc="Ruby programming language"
 homepage="http://www.ruby-lang.org/en/"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
-distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.1/${pkgname}-${version}.tar.bz2"
-checksum=0241b40f1c731cb177994a50b854fb7f18d4ad04dcefc18acc60af73046fb0a9
+distfiles="ftp://ftp.ruby-lang.org/pub/ruby/2.2/${pkgname}-${version}.tar.bz2"
+checksum=1c031137999f832f86be366a71155113675b72420830ce432b777a0ff4942955
 
 hostmakedepends="pkg-config bison groff doxygen graphviz"
 makedepends="zlib-devel readline-devel>=6.3 libffi-devel libressl-devel