community/ruby-rake*: another try on /opt

2 files changed, 13 insertions, 6 deletions

diff --git a/community/ruby-rake-compiler/PKGBUILD b/community/ruby-rake-compiler/PKGBUILD
index 019e82a9..e76fc93c 100644
--- a/community/ruby-rake-compiler/PKGBUILD
+++ b/community/ruby-rake-compiler/PKGBUILD
@@ -1,11 +1,13 @@
-# no documentation during bootstrapping
-makedepends=(${makedepends[@]//ruby-rdoc/})
+# building with ruby-bootstrap in /opt/ruby-xxx, but install into /usr
+# and depend on 'ruby'
+makedepends+=(ruby-bootstrap)
 
 # install to final destination in /usr and not into /opt/ruby-xxx
 eval "$(
   declare -f package | \
     sed '
-      s|local _gemdir.*|local _gemdir="/usr/lib/ruby/gems/3.0.0"|g
-      /_gemdir/ a mkdir -p "${pkgdir}"/usr/bin/
+      s|local _gemdir.*|local _gemdir="/opt/${pkgname}-${pkgver}/lib/ruby/gems/3.0.0"|g
+      /local _gemdir/ a mkdir -p "${pkgdir}"/opt/${pkgname}-${pkgver}/bin
+      /local _gemdir/ a mkdir -p "${pkgdir}"/usr/bin
     '
 )"
diff --git a/community/ruby-rake/PKGBUILD b/community/ruby-rake/PKGBUILD
index 013d5c83..e76fc93c 100644
--- a/community/ruby-rake/PKGBUILD
+++ b/community/ruby-rake/PKGBUILD
@@ -1,8 +1,13 @@
+# building with ruby-bootstrap in /opt/ruby-xxx, but install into /usr
+# and depend on 'ruby'
+makedepends+=(ruby-bootstrap)
+
 # install to final destination in /usr and not into /opt/ruby-xxx
 eval "$(
   declare -f package | \
     sed '
-      s|local _gemdir.*|local _gemdir="/usr/lib/ruby/gems/3.0.0"|g
-      /_gemdir/ a mkdir -p "${pkgdir}"/usr/bin/
+      s|local _gemdir.*|local _gemdir="/opt/${pkgname}-${pkgver}/lib/ruby/gems/3.0.0"|g
+      /local _gemdir/ a mkdir -p "${pkgdir}"/opt/${pkgname}-${pkgver}/bin
+      /local _gemdir/ a mkdir -p "${pkgdir}"/usr/bin
     '
 )"