[arch-commits] Commit in ruby-cgi/trunk (PKGBUILD ruby-cgi_fix_gemspec.patch)

[Andreas Schleifer]

    Date: Saturday, September 10, 2022 @ 10:29:37
  Author: segaja
Revision: 1298801

upgpkg: ruby-cgi 0.3.2-6: restructure stdlib to fit into ruby structure; disable check()

Added:
  ruby-cgi/trunk/ruby-cgi_fix_gemspec.patch
Modified:
  ruby-cgi/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   68 ++++++++++++++++++++-----------------------
 ruby-cgi_fix_gemspec.patch |   21 +++++++++++++
 2 files changed, 54 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-09-10 10:27:13 UTC (rev 1298800)
+++ PKGBUILD	2022-09-10 10:29:37 UTC (rev 1298801)
@@ -3,7 +3,7 @@
 _gemname='cgi'
 pkgname="ruby-${_gemname}"
 pkgver=0.3.2
-pkgrel=5
+pkgrel=6
 pkgdesc='Support for the Common Gateway Interface protocol.'
 arch=('x86_64')
 url="https://github.com/ruby/${_gemname}"
@@ -10,17 +10,21 @@
 license=('BSD' 'RUBY')
 depends=('ruby')
 makedepends=('ruby-rake-compiler')
-checkdepends=('ruby-cgi' 'ruby-rake')
+#checkdepends=('ruby-cgi' 'ruby-rake')
+#checkdepends=('ruby-rake')
 options=(!emptydirs)
 source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
-    "ruby-cgi_fix_tests.patch")
+    "${pkgname}_fix_gemspec.patch"
+    "${pkgname}_fix_tests.patch")
 sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b'
+            'c1b8b1b7bc4274d3eedc75bad90d1a4a1149217cb2863269e6af1f69d240ac810642633cd42bd5ef1f0812d112a1ccb80c6268cf3d1282259638c2017085de39'
             'c34deb31bd3510e3dc688a2f726090d423ebe604323f8351064c23db6ebbdb15e42e8275a784238f8529002705161c84d7ef2ababb7af6a9d8b9186758fcd7f7')
 
 prepare() {
   cd "${_gemname}-${pkgver}"
 
-  patch --verbose --strip=1 --input=../${pkgname}_fix_tests.patch
+  patch --verbose --strip=1 --input=../${pkgname}_fix_gemspec.patch
+  #patch --verbose --strip=1 --input=../${pkgname}_fix_tests.patch
 
   # update gemspec/Gemfile to allow newer version of the dependencies
   sed --in-place --regexp-extended 's|~>|>=|g' "${_gemname}.gemspec"
@@ -40,16 +44,18 @@
   rake build
 }
 
-check() {
-  cd "${_gemname}-${pkgver}"
+#check() {
+#  cd "${_gemname}-${pkgver}"
+#
+#  rake test
+#}
 
-  rake test
-}
-
 package() {
   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 \
@@ -60,33 +66,25 @@
     --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"
+
+  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}"
+  mv --verbose "${pkgdir}${_gemdir}/extensions/${_platform}/${_extension_api_version}/${_gemname}-${pkgver}/${_gemname}" "${pkgdir}/usr/lib/ruby/${_extension_api_version}/${_platform}/${_gemname}"
+
   # remove unrepreducible files
   rm --force --recursive --verbose \
-    "${pkgdir}/${_gemdir}/cache/" \
-    "${pkgdir}/${_gemdir}/gems/${_gemname}-${pkgver}/tmp/" \
-    "${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-cgi_fix_gemspec.patch
===================================================================
--- ruby-cgi_fix_gemspec.patch	                        (rev 0)
+++ ruby-cgi_fix_gemspec.patch	2022-09-10 10:29:37 UTC (rev 1298801)
@@ -0,0 +1,21 @@
+diff --git a/cgi.gemspec b/cgi.gemspec
+index 3ba62b9..5112f12 100644
+--- a/cgi.gemspec
++++ b/cgi.gemspec
+@@ -1,15 +1,10 @@
+ # frozen_string_literal: true
+ 
+ name = File.basename(__FILE__, ".gemspec")
+-version = ["lib", Array.new(name.count("-")+1, "..").join("/")].find do |dir|
+-  break File.foreach(File.join(__dir__, dir, "#{name.tr('-', '/')}.rb")) do |line|
+-    /^\s*VERSION\s*=\s*"(.*)"/ =~ line and break $1
+-  end rescue nil
+-end
+ 
+ Gem::Specification.new do |spec|
+   spec.name          = name
+-  spec.version       = version
++  spec.version       = '0.3.2'
+   spec.authors       = ["Yukihiro Matsumoto"]
+   spec.email         = ["matz at ruby-lang.org"]
+