ruby-2.4.0-1.parabola1: updating version

2 files changed, 35 insertions, 34 deletions

diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD
index 61c865d05..532578395 100644
--- a/libre/ruby/PKGBUILD
+++ b/libre/ruby/PKGBUILD
@@ -6,9 +6,9 @@
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=(ruby ruby-docs)
-pkgver=2.3.3
+pkgver=2.4.0
 _jsonver=1.8.1
-pkgrel=2.parabola1
+pkgrel=1.parabola1
 arch=(i686 x86_64 armv7h)
 url='http://www.ruby-lang.org/en/'
 license=(BSD custom)
@@ -21,12 +21,12 @@ source=(https://repo.parabola.nu/other/ruby-libre/ruby-libre-${pkgver}.tar.xz
         remove-nonfree-json-references.patch
         remove-nonfree-ruby-references.patch
         gemrc)
-mksha1sums=('f2318460606d410e80dd5c82862a93e5736534de'
+mksha1sums=('038804bbd0e77508dd2510b729a9f3b325489b2e'
             '043ed2df4b0ce2174c9c020ffcb4ec31f9fde560')
-sha1sums=('0759618f0dbfbd9b8beaa6add6c76bd98932e215'
+sha1sums=('3e57270b244017d78bf7adc00718bee80734a1cc'
           '2cd288d00c5211e4c9d9338080b30af65cbb143a'
           '0ba1010a271e6fcc1734f7382b99963f46133ea5'
-          'da8bdd298104be19221d5ba5353b992d07943840'
+          'b016c04b5b9b6c8db57859d4c9765b325fe96ef1'
           'dc536754c8fac2c3d82965c5a708cd8f79562d98')
 
 mksource() {
diff --git a/libre/ruby/remove-nonfree-ruby-references.patch b/libre/ruby/remove-nonfree-ruby-references.patch
index 057a3b0ee..3f6647cca 100644
--- a/libre/ruby/remove-nonfree-ruby-references.patch
+++ b/libre/ruby/remove-nonfree-ruby-references.patch
@@ -1,25 +1,26 @@
-diff -Nur ruby-2.3.0.orig/common.mk ruby-2.3.0/common.mk
---- ruby-2.3.0.orig/common.mk	2015-12-24 04:21:30.000000000 -0300
-+++ ruby-2.3.0/common.mk	2016-01-01 00:58:13.284858253 -0300
-@@ -15,7 +15,7 @@
- 
+diff -Nur ruby-2.4.0.orig/common.mk ruby-2.4.0/common.mk
+--- ruby-2.4.0.orig/common.mk	2016-11-30 14:29:19.000000000 -0300
++++ ruby-2.4.0/common.mk	2017-01-11 14:30:02.197544090 -0300
+@@ -27,7 +27,7 @@
+ RUBY_RELEASE_DATE = $(RUBY_RELEASE_YEAR)-$(RUBY_RELEASE_MONTH)-$(RUBY_RELEASE_DAY)
  RUBYLIB       = $(PATH_SEPARATOR)
  RUBYOPT       = -
 -RUN_OPTS      = --disable-gems
 +RUN_OPTS      = --disable-gems -I$(srcdir)/../json-1.8.1/lib
  
- GEM_HOME =
- GEM_PATH =
-@@ -781,8 +781,6 @@
+ INCFLAGS = -I. -I$(arch_hdrdir) -I$(hdrdir) -I$(srcdir) -I$(UNICODE_HDR_DIR)
+ 
+@@ -814,8 +814,7 @@
  
  srcs-ext: $(EXT_SRCS)
  
--srcs-extra: $(srcdir)/ext/json/parser/parser.c
--
- LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
+-srcs-extra: $(srcdir)/ext/json/parser/parser.c \
+-	    $(srcdir)/ext/date/zonetab.h \
++srcs-extra: $(srcdir)/ext/date/zonetab.h \
+ 	    $(empty)
  
- srcs-lib: $(LIB_SRCS)
-@@ -875,11 +873,6 @@
+ LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
+@@ -911,11 +910,6 @@
  		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$(PWD)" \
  		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
  
@@ -28,12 +29,12 @@ diff -Nur ruby-2.3.0.orig/common.mk ruby-2.3.0/common.mk
 -	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
 -		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 -
- $(srcdir)/ext/rbconfig/sizeof/sizes.c: $(srcdir)/ext/rbconfig/sizeof/depend \
- 		$(srcdir)/tool/generic_erb.rb $(srcdir)/template/sizes.c.tmpl $(srcdir)/configure.in
+ $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list
  	$(ECHO) generating $@
-diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document
---- ruby-2.2.3.orig/ext/.document	2014-08-02 11:55:36.000000000 -0300
-+++ ruby-2.2.3/ext/.document	2015-08-20 01:58:55.065621626 -0300
+ 	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(MFLAGS) \
+diff -Nur ruby-2.4.0.orig/ext/.document ruby-2.4.0/ext/.document
+--- ruby-2.4.0.orig/ext/.document	2014-08-02 11:55:36.000000000 -0300
++++ ruby-2.4.0/ext/.document	2017-01-11 14:25:50.386510205 -0300
 @@ -35,9 +35,6 @@
  io/nonblock/nonblock.c
  io/wait/lib
@@ -44,17 +45,17 @@ diff -Nur ruby-2.2.3.orig/ext/.document ruby-2.2.3/ext/.document
  mathn/complex/complex.c
  mathn/rational/rational.c
  nkf/lib
-diff -Nur ruby-2.3.0.orig/gems/bundled_gems ruby-2.3.0/gems/bundled_gems
---- ruby-2.3.0.orig/gems/bundled_gems	2015-12-22 14:30:22.000000000 -0300
-+++ ruby-2.3.0/gems/bundled_gems	2016-01-01 00:59:51.899771661 -0300
-@@ -4,3 +4,4 @@
- rake 10.4.2
- net-telnet 0.1.1
- did_you_mean 1.0.0
+diff -Nur ruby-2.4.0.orig/gems/bundled_gems ruby-2.4.0/gems/bundled_gems
+--- ruby-2.4.0.orig/gems/bundled_gems	2016-12-22 00:53:53.000000000 -0300
++++ ruby-2.4.0/gems/bundled_gems	2017-01-11 14:28:18.729284682 -0300
+@@ -5,3 +5,4 @@
+ rake 12.0.0
+ test-unit 3.2.3
+ xmlrpc 0.2.1
 +json 1.8.1
-diff -Nur ruby-2.3.0.orig/test/ruby/test_module.rb ruby-2.3.0/test/ruby/test_module.rb
---- ruby-2.3.0.orig/test/ruby/test_module.rb	2015-12-17 23:32:17.000000000 -0300
-+++ ruby-2.3.0/test/ruby/test_module.rb	2016-01-01 00:58:15.961386861 -0300
+diff -Nur ruby-2.4.0.orig/test/ruby/test_module.rb ruby-2.4.0/test/ruby/test_module.rb
+--- ruby-2.4.0.orig/test/ruby/test_module.rb	2016-11-14 16:27:24.000000000 -0300
++++ ruby-2.4.0/test/ruby/test_module.rb	2017-01-11 14:25:50.386510205 -0300
 @@ -211,7 +211,6 @@
  
      ancestors = Object.ancestors
@@ -63,7 +64,7 @@ diff -Nur ruby-2.3.0.orig/test/ruby/test_module.rb ruby-2.3.0/test/ruby/test_mod
      assert_equal([Object, Kernel, BasicObject], ancestors - mixins)
      assert_equal([String, Comparable, Object, Kernel, BasicObject], String.ancestors - mixins)
    end
-@@ -445,7 +444,6 @@
+@@ -449,7 +448,6 @@
      assert_equal([Mixin], User.included_modules)
  
      mixins = Object.included_modules - [Kernel]