[arch-commits] Commit in ruby/trunk (PKGBUILD)

[Anatol Pomozov]

    Date: Wednesday, January 9, 2019 @ 17:42:28
  Author: anatolik
Revision: 343190

Remove irb.rb from ruby package as the file is provided by ruby-irb

Modified:
  ruby/trunk/PKGBUILD

----------+
 PKGBUILD |   17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-01-09 12:56:33 UTC (rev 343189)
+++ PKGBUILD	2019-01-09 17:42:28 UTC (rev 343190)
@@ -67,14 +67,21 @@
   rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{bundler,bundler.rb}
   rm "${pkgdir}"/usr/bin/{bundle,bundler}
   rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/bundler-*.gemspec
-  rm "${pkgdir}"/usr/share/man/man1/{bundle,bundle-*,irb}.1
+  rm "${pkgdir}"/usr/share/man/man1/{bundle,bundle-*}.1
 
   # 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/${rubyver}/rdoc/
-  rm "${pkgdir}"/usr/bin/{rdoc,ri,irb}
+  rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rdoc,rdoc.rb}
+  rm "${pkgdir}"/usr/bin/{rdoc,ri}
+  rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/rdoc-*.gemspec
+
+  # remove irb as it is a separate package now
+  rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{irb,irb.rb}
+  rm "${pkgdir}"/usr/bin/irb
+  rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/irb-*.gemspec
+  rm "${pkgdir}"/usr/share/man/man1/irb.1
+
+  # remove all bundled gems to avoid conflicts with ruby-* Arch packages
   rm -r "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/gems/*
-  rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/rdoc-*.gemspec
 }
 
 package_ruby-docs() {