[arch-commits] Commit in ruby-cgi/repos/community-testing-x86_64 (5 files)
Andreas Schleifer
segaja at gemini.archlinux.org
Sat Sep 10 10:41:11 UTC 2022
Date: Saturday, September 10, 2022 @ 10:41:10
Author: segaja
Revision: 1298804
archrelease: copy trunk to community-testing-x86_64
Added:
ruby-cgi/repos/community-testing-x86_64/PKGBUILD
(from rev 1298803, ruby-cgi/trunk/PKGBUILD)
ruby-cgi/repos/community-testing-x86_64/ruby-cgi_fix_gemspec.patch
(from rev 1298803, ruby-cgi/trunk/ruby-cgi_fix_gemspec.patch)
Deleted:
ruby-cgi/repos/community-testing-x86_64/PKGBUILD
ruby-cgi/repos/community-testing-x86_64/ruby-cgi_fix_gemspec.patch
ruby-cgi/repos/community-testing-x86_64/ruby-cgi_fix_tests.patch
----------------------------+
PKGBUILD | 176 +++++++++++++++++++++----------------------
ruby-cgi_fix_gemspec.patch | 42 +++++-----
ruby-cgi_fix_tests.patch | 29 -------
3 files changed, 107 insertions(+), 140 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-09-10 10:40:58 UTC (rev 1298803)
+++ PKGBUILD 2022-09-10 10:41:10 UTC (rev 1298804)
@@ -1,90 +0,0 @@
-# Maintainer: Andreas 'Segaja' Schleifer <segaja at archlinux dot org>
-
-_gemname='cgi'
-pkgname="ruby-${_gemname}"
-pkgver=0.3.2
-pkgrel=6
-pkgdesc='Support for the Common Gateway Interface protocol.'
-arch=('x86_64')
-url="https://github.com/ruby/${_gemname}"
-license=('BSD' 'RUBY')
-depends=('ruby')
-makedepends=('ruby-rake-compiler')
-#checkdepends=('ruby-cgi' 'ruby-rake')
-#checkdepends=('ruby-rake')
-options=(!emptydirs)
-source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
- "${pkgname}_fix_gemspec.patch"
- "${pkgname}_fix_tests.patch")
-sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b'
- 'c1b8b1b7bc4274d3eedc75bad90d1a4a1149217cb2863269e6af1f69d240ac810642633cd42bd5ef1f0812d112a1ccb80c6268cf3d1282259638c2017085de39'
- 'c34deb31bd3510e3dc688a2f726090d423ebe604323f8351064c23db6ebbdb15e42e8275a784238f8529002705161c84d7ef2ababb7af6a9d8b9186758fcd7f7')
-
-prepare() {
- cd "${_gemname}-${pkgver}"
-
- 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"
-
- # 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"
-
- rm --verbose \
- rakelib/changelogs.rake \
- rakelib/epoch.rake
-}
-
-build() {
- cd "${_gemname}-${pkgver}"
-
- rake compile
- rake build
-}
-
-#check() {
-# cd "${_gemname}-${pkgver}"
-#
-# 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 \
- --verbose \
- --ignore-dependencies \
- --no-user-install \
- --install-dir "${pkgdir}/${_gemdir}" \
- --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}/build_info/" \
- "${pkgdir}${_gemdir}/extensions/" \
- "${pkgdir}${_gemdir}/gems/" \
- "${pkgdir}${_gemdir}/plugins/" \
- "${pkgdir}${_gemdir}/specifications/${_gemname}-${pkgver}.gemspec" \
- "${pkgdir}${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
-
- 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}"
-}
Copied: ruby-cgi/repos/community-testing-x86_64/PKGBUILD (from rev 1298803, ruby-cgi/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-09-10 10:41:10 UTC (rev 1298804)
@@ -0,0 +1,86 @@
+# Maintainer: Andreas 'Segaja' Schleifer <segaja at archlinux dot org>
+
+_gemname='cgi'
+pkgname="ruby-${_gemname}"
+pkgver=0.3.2
+pkgrel=7
+pkgdesc='Support for the Common Gateway Interface protocol.'
+arch=('x86_64')
+url="https://github.com/ruby/${_gemname}"
+license=('BSD' 'RUBY')
+depends=('ruby')
+makedepends=('ruby-rake-compiler')
+checkdepends=('ruby-rake')
+options=(!emptydirs)
+source=("${url}/archive/v${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ "${pkgname}_fix_gemspec.patch")
+sha512sums=('8a92f58bb0d831a8786826d9755aeb2cc56241837a60893f730986da7cd3efb9b8b51f9eb1c42857fcbac30f0f15fee6cb93646b473585a0871c4b044a95061b'
+ 'c1b8b1b7bc4274d3eedc75bad90d1a4a1149217cb2863269e6af1f69d240ac810642633cd42bd5ef1f0812d112a1ccb80c6268cf3d1282259638c2017085de39')
+
+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"
+
+ rm --verbose \
+ rakelib/changelogs.rake \
+ rakelib/epoch.rake
+}
+
+build() {
+ cd "${_gemname}-${pkgver}"
+
+ rake compile
+ rake build
+}
+
+check() {
+ cd "${_gemname}-${pkgver}"
+
+ 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 \
+ --verbose \
+ --ignore-dependencies \
+ --no-user-install \
+ --install-dir "${pkgdir}/${_gemdir}" \
+ --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}/build_info/" \
+ "${pkgdir}${_gemdir}/extensions/" \
+ "${pkgdir}${_gemdir}/gems/" \
+ "${pkgdir}${_gemdir}/plugins/" \
+ "${pkgdir}${_gemdir}/specifications/${_gemname}-${pkgver}.gemspec" \
+ "${pkgdir}${_gemdir}/doc/${_gemname}-${pkgver}/ri/ext/"
+
+ 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}"
+}
Deleted: ruby-cgi_fix_gemspec.patch
===================================================================
--- ruby-cgi_fix_gemspec.patch 2022-09-10 10:40:58 UTC (rev 1298803)
+++ ruby-cgi_fix_gemspec.patch 2022-09-10 10:41:10 UTC (rev 1298804)
@@ -1,21 +0,0 @@
-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"]
-
Copied: ruby-cgi/repos/community-testing-x86_64/ruby-cgi_fix_gemspec.patch (from rev 1298803, ruby-cgi/trunk/ruby-cgi_fix_gemspec.patch)
===================================================================
--- ruby-cgi_fix_gemspec.patch (rev 0)
+++ ruby-cgi_fix_gemspec.patch 2022-09-10 10:41:10 UTC (rev 1298804)
@@ -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"]
+
Deleted: ruby-cgi_fix_tests.patch
===================================================================
--- ruby-cgi_fix_tests.patch 2022-09-10 10:40:58 UTC (rev 1298803)
+++ ruby-cgi_fix_tests.patch 2022-09-10 10:41:10 UTC (rev 1298804)
@@ -1,29 +0,0 @@
-diff --git a/test/lib/core_assertions.rb b/test/lib/core_assertions.rb
-index bac3856..e668ac2 100644
---- a/test/lib/core_assertions.rb
-+++ b/test/lib/core_assertions.rb
-@@ -45,7 +45,6 @@ module Test
- def assert_in_out_err(args, test_stdin = "", test_stdout = [], test_stderr = [], message = nil,
- success: nil, **opt)
- args = Array(args).dup
-- args.insert((Hash === args[0] ? 1 : 0), '--disable=gems')
- stdout, stderr, status = EnvUtil.invoke_ruby(args, test_stdin, true, true, **opt)
- desc = FailDesc[status, message, stderr]
- if block_given?
-@@ -110,7 +109,6 @@ module Test
- token_re = Regexp.quote(token)
- envs = args.shift if Array === args and Hash === args.first
- args = [
-- "--disable=gems",
- "-r", File.expand_path("../memory_status", __FILE__),
- *args,
- "-v", "-",
-@@ -275,7 +273,7 @@ BEGIN {
- #{line -= __LINE__; src}
- eom
- args = args.dup
-- args.insert((Hash === args.first ? 1 : 0), "-w", "--disable=gems", *$:.map {|l| "-I#{l}"})
-+ args.insert((Hash === args.first ? 1 : 0), "-w", *$:.map {|l| "-I#{l}"})
- stdout, stderr, status = EnvUtil.invoke_ruby(args, src, capture_stdout, true, **opt)
- ensure
- if res_c
More information about the arch-commits
mailing list