[arch-commits] Commit in ruby-erb/trunk (PKGBUILD ruby-erb_fix_gemspec.patch)

[Andreas Schleifer]

    Date: Saturday, September 10, 2022 @ 21:14:47
  Author: segaja
Revision: 1300425

upgpkg: ruby-erb 2.2.3-3: restructure stdlib to fit into ruby structure

Added:
  ruby-erb/trunk/ruby-erb_fix_gemspec.patch
Modified:
  ruby-erb/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   58 ++++++++++++++++++++-----------------------
 ruby-erb_fix_gemspec.patch |   19 ++++++++++++++
 2 files changed, 47 insertions(+), 30 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-10 21:08:43 UTC (rev 1300424)
+++ PKGBUILD	2022-09-10 21:14:47 UTC (rev 1300425)
@@ -3,25 +3,29 @@
 _gemname='erb'
 pkgname="ruby-${_gemname}"
 pkgver=2.2.3
-pkgrel=2
+pkgrel=3
 pkgdesc='An easy to use but powerful templating system for Ruby'
 arch=('any')
 url="https://github.com/ruby/${_gemname}"
 license=('BSD' 'RUBY')
-depends=('ruby')
+depends=('ruby' 'ruby-cgi')
 checkdepends=('ruby-rake')
 options=(!emptydirs)
-source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('a254837e89533c1c35c91991c073687bcc020d9143ff9251324b8becfdb950bd7e111269b3a4c3604dab0d3718c059b7e64b7c358d6a10124a338dd749e11583')
+source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
+    "${pkgname}_fix_gemspec.patch")
+sha512sums=('a254837e89533c1c35c91991c073687bcc020d9143ff9251324b8becfdb950bd7e111269b3a4c3604dab0d3718c059b7e64b7c358d6a10124a338dd749e11583'
+            '340783bc1bfb559e16aeb69ee9cfcad20ec7b4c0915b5ed11ef52fc4069e6364d90de2fa42a0644aac628676b5d00a26311c6b5bcfd89263e0c0f14a5a82b756')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
+  patch --verbose --strip=1 --input="../${pkgname}_fix_gemspec.patch"
+
   # update gemspec/Gemfile to allow newer version of the dependencies
   sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec"
 
   # we build based on a tar archive, not a git repo
-  sed --in-place --regexp-extended 's|git ls-files -z|find . -type f -not -path "*/\.git/*" -printf "%P\\\\0"|' "${_gemname}.gemspec"
+  sed --in-place --regexp-extended 's|git ls-files -z|find . -type f -not -path "*/\.git*" -printf "%P\\\\0"|' "${_gemname}.gemspec"
 }
 
 build() {
@@ -40,6 +44,8 @@
   cd "${_gemname}-${pkgver}"
 
   local _gemdir="$(gem env gemdir)"
+  local _platform="$(gem env platform | cut -d':' -f2)"
+  local _extension_api_version="$(ruby -e 'puts Gem.extension_api_version')"
 
   gem install \
     --local \
@@ -50,32 +56,24 @@
     --bindir "${pkgdir}/usr/bin" \
     "${_gemname}-${pkgver}.gem"
 
+  install --verbose --directory --mode=0755 \
+    "${pkgdir}/usr/lib/ruby/${_extension_api_version}/${_platform}" \
+    "${pkgdir}${_gemdir}/specifications/default"
+
+  mv --verbose "${pkgdir}${_gemdir}/gems/${_gemname}-${pkgver}/${_gemname}.gemspec" "${pkgdir}${_gemdir}/specifications/default/${_gemname}-${pkgver}.gemspec"
+  mv --verbose "${pkgdir}${_gemdir}/gems/${_gemname}-${pkgver}/lib/${_gemname}.rb" "${pkgdir}/usr/lib/ruby/${_extension_api_version}/${_gemname}.rb"
+  mv --verbose "${pkgdir}${_gemdir}/gems/${_gemname}-${pkgver}/lib/${_gemname}" "${pkgdir}/usr/lib/ruby/${_extension_api_version}/${_gemname}"
+
   # remove unrepreducible files
   rm --force --recursive --verbose \
-    "${pkgdir}/${_gemdir}/cache/" \
-    "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/vendor/" \
-    "${pkgdir}/${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
+    "${pkgdir}${_gemdir}/cache/" \
+    "${pkgdir}${_gemdir}/build_info/" \
+    "${pkgdir}${_gemdir}/extensions/" \
+    "${pkgdir}${_gemdir}/gems/" \
+    "${pkgdir}${_gemdir}/plugins/" \
+    "${pkgdir}${_gemdir}/specifications/${_gemname}-${pkgver}.gemspec" \
+    "${pkgdir}${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
 
-  find "${pkgdir}/${_gemdir}/gems/" \
-    -type f \
-    \( \
-      -iname "*.o" -o \
-      -iname "*.c" -o \
-      -iname "*.so" -o \
-      -iname "*.time" -o \
-      -iname "gem.build_complete" -o \
-      -iname "Makefile" \
-    \) \
-    -delete
-
-  find "${pkgdir}/${_gemdir}/extensions/" \
-    -type f \
-    \( \
-      -iname "mkmf.log" -o \
-      -iname "gem_make.out" \
-    \) \
-    -delete
-
-  install -D --mode=644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  install -D --mode=644 README.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
+  install --verbose -D --mode=0644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install --verbose -D --mode=0644 *.md --target-directory "${pkgdir}/usr/share/doc/${pkgname}"
 }

Added: ruby-erb_fix_gemspec.patch
===================================================================
--- ruby-erb_fix_gemspec.patch	                        (rev 0)
+++ ruby-erb_fix_gemspec.patch	2022-09-10 21:14:47 UTC (rev 1300425)
@@ -0,0 +1,19 @@
+diff --git a/erb.gemspec b/erb.gemspec
+index 43ffc89..5d51446 100644
+--- a/erb.gemspec
++++ b/erb.gemspec
+@@ -1,13 +1,6 @@
+-begin
+-  require_relative 'lib/erb/version'
+-rescue LoadError
+-  # for Ruby core repository
+-  require_relative 'erb/version'
+-end
+-
+ Gem::Specification.new do |spec|
+   spec.name          = 'erb'
+-  spec.version       = ERB.const_get(:VERSION, false)
++  spec.version       = '2.2.3'
+   spec.authors       = ['Masatoshi SEKI']
+   spec.email         = ['seki at ruby-lang.org']
+