[arch-commits] Commit in ruby-etc/trunk (PKGBUILD ruby-etc_fix_gemspec.patch)

[Andreas Schleifer]

    Date: Sunday, September 11, 2022 @ 13:30:22
  Author: segaja
Revision: 1300538

upgpkg: ruby-etc 1.3.0-3: restructure stdlib to fit into ruby structure

Added:
  ruby-etc/trunk/ruby-etc_fix_gemspec.patch
Modified:
  ruby-etc/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   51 +++++++++++++++++++------------------------
 ruby-etc_fix_gemspec.patch |   25 +++++++++++++++++++++
 2 files changed, 48 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-11 13:26:54 UTC (rev 1300537)
+++ PKGBUILD	2022-09-11 13:30:22 UTC (rev 1300538)
@@ -3,7 +3,7 @@
 _gemname='etc'
 pkgname="ruby-${_gemname}"
 pkgver=1.3.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Provides access to information typically stored in UNIX /etc directory'
 arch=('x86_64')
 url="https://github.com/ruby/${_gemname}"
@@ -11,8 +11,10 @@
 depends=('ruby')
 makedepends=('ruby-rake' 'ruby-rake-compiler')
 options=(!emptydirs)
-source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz")
-sha512sums=('f192bd189ff368e98c289fc9b6302a5786932fc477c7e70699100d2cb00341bafe1b2180dc674f952f88bc2e74be719f485079439a0efff5b2a4c7c1f4ed7b4a')
+source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
+    "${pkgname}_fix_gemspec.patch")
+sha512sums=('f192bd189ff368e98c289fc9b6302a5786932fc477c7e70699100d2cb00341bafe1b2180dc674f952f88bc2e74be719f485079439a0efff5b2a4c7c1f4ed7b4a'
+            'bc894abf6ff4b3a1145517b58021af75480503db66b00a247000477c3bda065eda86eac08aadd288d85654d98d868ec7d05e00f4f9e379c9c53b8eb3ebc211d2')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
@@ -38,6 +40,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 \
@@ -48,32 +52,23 @@
     --bindir "${pkgdir}/usr/bin" \
     "pkg/${_gemname}-${pkgver}.gem"
 
+  install --verbose --directory --mode=0755 \
+    "${pkgdir}/usr/lib/ruby/${_extension_api_version}/${_platform}" \
+    "${pkgdir}${_gemdir}/specifications/default"
+
+  cp --verbose "${_gemname}.gemspec" "${pkgdir}${_gemdir}/specifications/default/${_gemname}-${pkgver}.gemspec"
+  mv --verbose "${pkgdir}${_gemdir}/extensions/${_platform}/${_extension_api_version}/${_gemname}-${pkgver}/${_gemname}.so" "${pkgdir}/usr/lib/ruby/${_extension_api_version}/${_platform}/${_gemname}.so"
+
   # 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-etc_fix_gemspec.patch
===================================================================
--- ruby-etc_fix_gemspec.patch	                        (rev 0)
+++ ruby-etc_fix_gemspec.patch	2022-09-11 13:30:22 UTC (rev 1300538)
@@ -0,0 +1,25 @@
+diff --git a/etc.gemspec b/etc.gemspec
+index 7d687e3..9d68939 100644
+--- a/etc.gemspec
++++ b/etc.gemspec
+@@ -1,19 +1,8 @@
+ # frozen_string_literal: true
+ 
+-version = ["", "ext/etc/"].find do |dir|
+-  begin
+-    break File.open(File.expand_path("../#{dir}/etc.c", __FILE__)) do |f|
+-      f.gets "\n#define RUBY_ETC_VERSION "
+-      f.gets[/"(.+)"/, 1]
+-    end
+-  rescue
+-    next
+-  end
+-end
+-
+ Gem::Specification.new do |spec|
+   spec.name          = "etc"
+-  spec.version       = version
++  spec.version       = "1.3.0"
+   spec.authors       = ["Yukihiro Matsumoto"]
+   spec.email         = ["matz at ruby-lang.org"]
+