ruby-2.5.0-4.parabola1: rebuild

1 files changed, 20 insertions, 7 deletions

diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD
index 2f7008eea..c3a40afed 100644
--- a/libre/ruby/PKGBUILD
+++ b/libre/ruby/PKGBUILD
@@ -1,13 +1,13 @@
-# Maintainer (Arch): Thomas Dziedzic <gostrc@gmail.com>
+# Contributor (Arch): Thomas Dziedzic <gostrc@gmail.com>
 # Contributor (Arch): Allan McRae <allan@archlinux.org>
 # Contributor (Arch): John Proctor <jproctor@prium.net>
 # Contributor (Arch): Jeramy Rutley <jrutley@gmail.com>
 
-# Maintainer: fauno <fauno@parabola.nu>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 # Contributor: Daniel Milewski <niitotantei@riseup.net>
 # Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Luke Shumaker <lukeshu@parabola.nu>
-# Contributor: Omar Vega Ramos <ovruni@gnu.org.pe>
+# Contributor: fauno <fauno@parabola.nu>
 
 # Rationale for inclusion in [libre]: Problematic license of
 # generator.c in bundled json extension.
@@ -19,7 +19,7 @@
 pkgname=(ruby ruby-docs)
 pkgver=2.5.0
 _jsonver=2.1.0
-pkgrel=1.parabola2
+pkgrel=4.parabola1
 _srcrel=2 # increment this to rebuild the sourceball without bumping pkgver
 arch=(i686 x86_64 armv7h)
 url='http://www.ruby-lang.org/en/'
@@ -67,10 +67,16 @@ mksource() {
   rm -rf "json-${_jsonver}"
 }
 
+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 \
@@ -96,8 +102,7 @@ package_ruby() {
       'ruby-docs: Ruby documentation'
       'tk: for Ruby/TK'
   )
-  provides=(rubygems rake)
-  conflicts=(rake)
+  provides=(rubygems)
   backup=(etc/gemrc)
   install=ruby.install
 
@@ -109,6 +114,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() {