extra/ruby to 2.5.0-5

extra/ruby/PKGBUILD

@@ -8,17 +8,15 @@
 
 pkgname=(ruby ruby-docs)
 pkgver=2.5.0
-pkgrel=4
+pkgrel=5
 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
         0002-Use-only-unsigned-long-for-rb_serial_t.patch)
 sha512sums=('55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578'
-            '8cafd14d414ee3c16aa94f79072bc6c100262f925dc1300e785846c3fabbbbffc1356b8e2223af5684e3340c55032d41231179ffa948bb12e01dbae0f4131911'
             '5b3a73b66ed35eb25997109076ec3146ff5f7f843b2e39e7a15b32349c3b38c6035668e8b5d6dd94d97030dea52187e481e8ccdcb6bfc7a79bb12043a322711e')
 
 prepare() {
@@ -53,31 +51,31 @@ 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 rubygems)
   optdepends=(
       'ruby-docs: Ruby documentation'
       'tk: for Ruby/TK'
   )
-  provides=(rubygems)
-  backup=(etc/gemrc)
-  install=ruby.install
 
   cd ruby-${pkgver}
 
   make DESTDIR="${pkgdir}" install-nodoc
 
-  install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc"
-
   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
+  rubyver=${pkgver:0:3}.0
+
+  # remove rubygems as it shipped in a separate package
+  rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rubygems,rubygems.rb}
+  rm "${pkgdir}"/usr/bin/gem
+
   # 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
+  rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/rdoc/
+  rm "${pkgdir}"/usr/bin/{rdoc,ri}
+  rm -r "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/gems/*
+  rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/rdoc-*.gemspec
 }
 
 package_ruby-docs() {

extra/ruby/gemrc

@@ -1,5 +0,0 @@
-# Read about the gemrc format at http://guides.rubygems.org/command-reference/#gem-environment
-
-# --user-install is used to install to $HOME/.gem/ by default since we want to separate
-#                pacman installed gems and gem installed gems
-gem: --user-install

extra/ruby/ruby.install

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-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 -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.'
-}
-
-# arg 1:  the new package version
-post_install() {
-  print_gem_default_target
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then
-    print_gem_default_target
-  fi
-}