From 70b0b9ed587ecef3ff7f524a70d9d178bb946a87 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Mon, 29 Jan 2018 20:16:38 +0000
Subject: [PATCH] extra/ruby to 2.5.0-4

---
 extra/ruby/PKGBUILD | 31 +++++++++++++++++++++++--------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/extra/ruby/PKGBUILD b/extra/ruby/PKGBUILD
index 070de1e84..7ca5c13df 100644
--- a/extra/ruby/PKGBUILD
+++ b/extra/ruby/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Thomas Dziedzic <gostrc@gmail.com>
+# Contributor: Thomas Dziedzic <gostrc@gmail.com>
 # Contributor: Allan McRae <allan@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Jeramy Rutley <jrutley@gmail.com>
@@ -8,7 +8,7 @@
 
 pkgname=(ruby ruby-docs)
 pkgver=2.5.0
-pkgrel=2
+pkgrel=4
 arch=(x86_64)
 url='http://www.ruby-lang.org/en/'
 license=(BSD custom)
@@ -21,15 +21,23 @@ sha512sums=('55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab
             '8cafd14d414ee3c16aa94f79072bc6c100262f925dc1300e785846c3fabbbbffc1356b8e2223af5684e3340c55032d41231179ffa948bb12e01dbae0f4131911'
             '5b3a73b66ed35eb25997109076ec3146ff5f7f843b2e39e7a15b32349c3b38c6035668e8b5d6dd94d97030dea52187e481e8ccdcb6bfc7a79bb12043a322711e')
 
+prepare() {
+  cd ruby-${pkgver}
+  # remove bundled gems, we are going to ship them as separate packages
+  rm -rf gems/
+  # fixes https://bugs.ruby-lang.org/issues/9507
+  [[ $CARCH == 'arm' ]] && patch -Np1 -i ../0002-Use-only-unsigned-long-for-rb_serial_t.patch
+}
+
 build() {
   cd ruby-${pkgver}
 
-  # fixes https://bugs.ruby-lang.org/issues/9507
-  [[ $CARCH == 'arm' ]] && patch -Np1 -i ../0002-Use-only-unsigned-long-for-rb_serial_t.patch
-
-  PKG_CONFIG=/usr/bin/pkg-config ./configure \
+  ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
+    --localstatedir=/var \
+    --sharedstatedir=/var/lib \
+    --libexecdir=/usr/lib/ruby \
     --enable-shared \
     --disable-rpath \
     --with-dbm-type=gdbm_compat
@@ -50,8 +58,7 @@ package_ruby() {
       'ruby-docs: Ruby documentation'
       'tk: for Ruby/TK'
   )
-  provides=(rubygems rake)
-  conflicts=(rake)
+  provides=(rubygems)
   backup=(etc/gemrc)
   install=ruby.install
 
@@ -63,6 +70,14 @@ package_ruby() {
 
   install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE"
   install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL"
+
+  gemver=${pkgver:0:3}.0
+  # remove bundled rdoc gem
+  # we are doing it here instead of prepare() because rdoc used doring Ruby build process
+  rm -r "${pkgdir}"/usr/lib/ruby/${gemver}/rdoc/
+  rm -r "${pkgdir}"/usr/bin/{rdoc,ri}
+  rm -r "${pkgdir}"/usr/lib/ruby/gems/${gemver}/gems/*
+  rm -r "${pkgdir}"/usr/lib/ruby/gems/${gemver}/specifications/default/rdoc-*.gemspec
 }
 
 package_ruby-docs() {