From 5a1149f15b0ed22595d0e82e49c92cb35476a9f4 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 23 Feb 2018 16:00:29 +0000
Subject: ruby: update to 2.5

---
 abs/extra/ruby/PKGBUILD     | 31 ++++++++++++++++++++++---------
 abs/extra/ruby/ruby.install |  2 +-
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/abs/extra/ruby/PKGBUILD b/abs/extra/ruby/PKGBUILD
index 2e104bd..057d0a2 100644
--- a/abs/extra/ruby/PKGBUILD
+++ b/abs/extra/ruby/PKGBUILD
@@ -1,25 +1,31 @@
-# 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>
 
 pkgname=(ruby ruby-docs)
-pkgver=2.4.0
-pkgrel=1
-arch=(i686 x86_64)
+pkgver=2.5.0
+pkgrel=4
+arch=(x86_64)
 url='http://www.ruby-lang.org/en/'
 license=(BSD custom)
 makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk)
 options=(!emptydirs)
 source=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz
         gemrc)
-sha1sums=('038804bbd0e77508dd2510b729a9f3b325489b2e'
-          'dc536754c8fac2c3d82965c5a708cd8f79562d98')
+sha512sums=('55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578'
+            '8cafd14d414ee3c16aa94f79072bc6c100262f925dc1300e785846c3fabbbbffc1356b8e2223af5684e3340c55032d41231179ffa948bb12e01dbae0f4131911')
+
+prepare() {
+  cd ruby-${pkgver}
+  # remove bundled gems, we are going to ship them as separate packages
+  rm -rf gems/
+}
 
 build() {
   cd ruby-${pkgver}
 
-  PKG_CONFIG=/usr/bin/pkg-config ./configure \
+  ./configure \
     --prefix=/usr \
     --sysconfdir=/etc \
     --localstatedir=/var \
@@ -45,8 +51,7 @@ package_ruby() {
       'ruby-docs: Ruby documentation'
       'tk: for Ruby/TK'
   )
-  provides=(rubygems rake)
-  conflicts=(rake)
+  provides=(rubygems)
   backup=(etc/gemrc)
   install=ruby.install
 
@@ -58,6 +63,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() {
diff --git a/abs/extra/ruby/ruby.install b/abs/extra/ruby/ruby.install
index ce78e96..165936c 100644
--- a/abs/extra/ruby/ruby.install
+++ b/abs/extra/ruby/ruby.install
@@ -3,7 +3,7 @@
 print_gem_default_target() {
   echo 'The default location of gem installs is $HOME/.gem/ruby'
   echo 'Add the following line to your PATH if you plan to install using gem'
-  echo '$(ruby -rubygems -e "puts Gem.user_dir")/bin'
+  echo '$(ruby -e "puts Gem.user_dir")/bin'
   echo 'If you want to install to the system wide location, you must either:'
   echo 'edit /etc/gemrc or run gem with the --no-user-install flag.'
 }
-- 
cgit v0.12