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

[Andreas Schleifer]

    Date: Monday, August 29, 2022 @ 18:26:09
  Author: segaja
Revision: 1285525

upgpkg: ruby 3.0.4-10: remove remnants of de-vendored stdlibs

Modified:
  ruby/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-08-29 18:21:51 UTC (rev 1285524)
+++ PKGBUILD	2022-08-29 18:26:09 UTC (rev 1285525)
@@ -8,7 +8,7 @@
 
 pkgname=(ruby ruby-docs ruby-stdlib ruby-bundledgems)
 pkgver=3.0.4
-pkgrel=9
+pkgrel=10
 arch=(x86_64)
 url='https://www.ruby-lang.org/en/'
 license=(BSD custom)
@@ -61,16 +61,13 @@
   rm "${pkgdir}"/usr/bin/gem
 
   # remove bundler as it shipped as a separate package
-  rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{bundler,bundler.rb}
   rm "${pkgdir}"/usr/bin/{bundle,bundler}
 
   # remove bundled rdoc gem
-  rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rdoc,rdoc.rb}
   rm "${pkgdir}"/usr/bin/{rdoc,ri}
   rm "${pkgdir}"/usr/share/man/man1/ri.1
 
   # 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/share/man/man1/irb.1
 
@@ -98,6 +95,7 @@
     digest
     drb
     english
+    English
     erb
     etc
     fcntl
@@ -126,8 +124,13 @@
   )
 
   for stdlib_gem in "${stdlib_gems[@]}"; do
-    rm -v "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/${stdlib_gem}-*.gemspec
+    rm --force --recursive --verbose \
+      "${pkgdir}"/usr/lib/ruby/${rubyver}/${stdlib_gem}* \
+      "${pkgdir}"/usr/lib/ruby/${rubyver}/x86_64-linux/${stdlib_gem}.so \
+      "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/${stdlib_gem}-*.gemspec
   done
+
+  rm "${pkgdir}"/usr/lib/ruby/${rubyver}/x86_64-linux/io/wait.so
 }
 
 package_ruby-docs() {