Update [libre-testing/ruby] the de-gemmed edition

3 files changed, 57 insertions, 44 deletions

diff --git a/libre-testing/ruby/PKGBUILD b/libre-testing/ruby/PKGBUILD
index b56dd678f..33d2a9321 100644
--- a/libre-testing/ruby/PKGBUILD
+++ b/libre-testing/ruby/PKGBUILD
@@ -18,14 +18,14 @@
 
 
 pkgname=(ruby ruby-docs)
-pkgver=2.6.3
+pkgver=2.7.0
 _jsonver=2.1.0
 pkgrel=1
-pkgrel+=.par2
+pkgrel+=.parabola1
 _srcrel=1 # increment this to rebuild the sourceball without bumping pkgver
 arch=(x86_64)
 arch+=(i686 armv7h)
-url='http://www.ruby-lang.org/en/'
+url='https://www.ruby-lang.org/en/'
 license=(BSD2 custom)
 makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk)
 options=(!emptydirs)
@@ -34,27 +34,28 @@ source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz
         remove-json-ext.patch
         add-json_pure.patch
         json-libre.patch)
-sha512sums=('959a613f5cf5b3185a1d7a7ba0e1921166b3930f30461b391b1c9fcfe396f56dc3c736123dfc7b4e72c32a97dc5a1eb1fd7f09bcc3793a3c5526f6644ba421c8'
+sha512sums=('dd5690c631bf3a2b76cdc06902bcd76a89713a045e136debab9b8a81ff8c433bbb254aa09e4014ca1cf85a69ff4bcb13de11da5e40c224e7268be43ef2194af7'
             '6019cc26a0919e4d39ae0bf737b51cd9a474c74a55d25f6931ac04d61826bb810d063190a80a29810e57d7457d1a247acd82fd78de2c4c01acb7d73ee9fde603'
-            '412dff58c77f6cbc598bf49fb09cb416ad88635e9213acc60a1d103e5d093b2d80260c41e07fbc0634047c655756f5bdd8b2f5e59ae8e4b992b598b251b4c3e9'
-            '303172561a4ba54515fddfd9ea7e0c833e550b0ae5e9f331956f178f8c5e20aa0e3c4036251ddfd04312769ef7d71d83fde0afe64f6fa8e9052ca5a294c62927'
+            'cce1402a062ab5a065e7554ae23189cb9c8de0acc27a4c96db5a90a52cfce37fde8d128e95b997e6df05d327d2279a8368276820dfad8b744747ea619ad187ab'
+            '9ff8a2ec9fdecd05fd506ed6f977dcd483e47611dc6bbe6c4622100a2071c0f6c7b3f813a94b73bebb9f0ed7fe9f6257289cdf971030ad525a3c8a0d065b09c2'
             '582017bd0f98878c0ac6f4625854422662d83ae6274a34762082a720052023780dceb17694b1f4e18d9a0dcbb525990341176eac31040aa63099a8b3a8d52071')
 
-
 prepare() {
-  # Start with the vanilla version of json
   cd "$srcdir/json-${_jsonver}"
-  # Modify it so that 'json' doesn't try to load (non-free!) 'json/ext'
+
+  # Modify 'json' so that it doesn't try to load (non-free!) 'json/ext'
+  msg "applying json-libre.patch"
   rm -rf -- json.gemspec ext lib/json/ext*
   patch -p1 -i ../json-libre.patch
 
-  # Now modify the ruby sources to include the json_pure lib instead
-  # of the json ext
+  # Now remove the json ext from the ruby sources
   cd "$srcdir/ruby-${pkgver}"
-  # remove the json ext
-  rm -rv ext/json test/json
+  msg "applying remove-json-ext.patch"
+  rm -r ext/json test/json
   patch -p1 -i ../remove-json-ext.patch
-  # and insert the json_pure lib
+
+  # and insert the json_pure lib instead
+  msg "applying add-json_pure.patch"
   cp -r  ../json-${_jsonver}/lib/*             -t lib/
   cp     ../json-${_jsonver}/json_pure.gemspec -t lib/json/
   cp -rT ../json-${_jsonver}/tests                test/json
@@ -93,9 +94,9 @@ check() {
 
 package_ruby() {
   pkgdesc='An object-oriented language for quick and easy programming'
-  depends=(gdbm openssl libffi libyaml gmp zlib)
+  depends=(gdbm openssl libffi libyaml gmp zlib ruby-irb)
   optdepends=(
-      'rubygems: Ruby package manager'
+      'rubygems: For ruby packages'
       'ruby-docs: Ruby documentation'
       'tk: for Ruby/TK'
   )
diff --git a/libre-testing/ruby/add-json_pure.patch b/libre-testing/ruby/add-json_pure.patch
index 5630451ea..5529cc58c 100644
--- a/libre-testing/ruby/add-json_pure.patch
+++ b/libre-testing/ruby/add-json_pure.patch
@@ -1,16 +1,17 @@
 diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
-index ec6a6b7134..11a1079e57 100644
+index 268293a..8063bbf 100644
 --- a/doc/maintainers.rdoc
 +++ b/doc/maintainers.rdoc
-@@ -72,6 +72,8 @@ Zachary Scott (zzak)
-   Akinori MUSHA (knu)
- [lib/irb.rb, lib/irb/*]
-   Keiju ISHITSUKA (keiju)
-+[lib/json]
-+  NARUSE, Yui (naruse)
- [lib/logger.rb]
-   Naotoshi Seo (sonots)
- [lib/mathn.rb]
+@@ -310,6 +310,9 @@ Zachary Scott (zzak)
+   Nobuyuki Nakada (nobu)
+   https://github.com/ruby/io-console
+   https://rubygems.org/gems/io-console
++[ext/json]
++  NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)
++  https://github.com/flori/json
+ [ext/openssl]
+   Kazuki Yamaguchi (rhe)
+   https://github.com/ruby/openssl
 diff --git a/lib/json/.document b/lib/json/.document
 new file mode 100644
 index 0000000000..7ae6b614de
diff --git a/libre-testing/ruby/remove-json-ext.patch b/libre-testing/ruby/remove-json-ext.patch
index ba168311a..f7111f6fd 100644
--- a/libre-testing/ruby/remove-json-ext.patch
+++ b/libre-testing/ruby/remove-json-ext.patch
@@ -1,9 +1,11 @@
+diff --git a/LEGAL b/LEGAL
+index 565c4c9..0a7cc0f 100644
 --- a/LEGAL
 +++ b/LEGAL
 @@ -657,31 +657,6 @@ ext/digest/sha2/sha2.h::
      OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
      SUCH DAMAGE.
-
+ 
 -ext/json/generator/generator.c::
 -
 -  The file contains the following copyright notice.
@@ -32,45 +34,52 @@
  ext/nkf/nkf-utf8/config.h::
  ext/nkf/nkf-utf8/nkf.c::
  ext/nkf/nkf-utf8/utf8tbl.c::
+diff --git a/common.mk b/common.mk
+index 3706aeb..9bf5627 100644
 --- a/common.mk
 +++ b/common.mk
-@@ -989,8 +989,7 @@ srcs-ext: $(EXT_SRCS)
+@@ -1026,8 +1026,7 @@ srcs-ext: $(EXT_SRCS)
  realclean-srcs-ext::
- 	     $(Q)$(RM) $(EXT_SRCS)
-
+ 	$(Q)$(RM) $(EXT_SRCS)
+ 
 -EXTRA_SRCS = $(srcdir)/ext/json/parser/parser.c \
 -	     $(srcdir)/ext/date/zonetab.h \
 +EXTRA_SRCS = $(srcdir)/ext/date/zonetab.h \
  	     $(empty)
-
+ 
  srcs-extra: $(EXTRA_SRCS)
-@@ -1006,11 +1005,6 @@
- 		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
+@@ -1140,11 +1139,6 @@ $(srcdir)/ext/ripper/ripper.c: $(srcdir)/ext/ripper/tools/preproc.rb $(srcdir)/p
+ 		Q=$(Q) ECHO=$(ECHO) RM="$(RM)" BISON=$(YACC) top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \
  		RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)"
  
--$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl
+-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl $(srcdir)/ext/json/parser/prereq.mk
 -	$(ECHO) generating $@
 -	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
 -		Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)"
 -
- $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list
+ $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list $(srcdir)/ext/date/prereq.mk
  	$(ECHO) generating $@
  	$(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \
---- a/doc/maintainers.rdoc	2017-12-22 18:08:05.000000000 -0500
-+++ b/doc/maintainers.rdoc	2018-01-07 09:57:59.999596681 -0500
-@@ -253,9 +253,6 @@
- [ext/io/console]
+diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc
+index 98de9f2..268293a 100644
+--- a/doc/maintainers.rdoc
++++ b/doc/maintainers.rdoc
+@@ -310,10 +310,6 @@ Zachary Scott (zzak)
    Nobuyuki Nakada (nobu)
    https://github.com/ruby/io-console
+   https://rubygems.org/gems/io-console
 -[ext/json]
 -  NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt)
 -  https://github.com/flori/json
+-  https://rubygems.org/gems/json
  [ext/openssl]
    Kazuki Yamaguchi (rhe)
    https://github.com/ruby/openssl
---- a/ext/.document	2017-09-03 08:31:34.000000000 -0500
-+++ b/ext/.document	2018-01-07 09:58:54.180475610 -0500
-@@ -27,9 +27,6 @@
+diff --git a/ext/.document b/ext/.document
+index 6a49157..97e5120 100644
+--- a/ext/.document
++++ b/ext/.document
+@@ -27,9 +27,6 @@ gdbm/gdbm.c
  io/console/console.c
  io/nonblock/nonblock.c
  io/wait/wait.c
@@ -80,8 +89,10 @@
  nkf/lib
  nkf/nkf.c
  objspace/objspace.c
---- a/ext/Setup	2017-04-20 03:21:24.000000000 -0500
-+++ b/ext/Setup	2018-01-07 10:06:52.168822642 -0500
+diff --git a/ext/Setup b/ext/Setup
+index ac79c86..e1b8d40 100644
+--- a/ext/Setup
++++ b/ext/Setup
 @@ -20,9 +20,6 @@
  #io/console
  #io/nonblock