From 4d9a47a1e9e4a214057db1c34b32de1c57097071 Mon Sep 17 00:00:00 2001 From: Omar Vega Ramos Date: Sat, 21 Apr 2018 13:13:45 -0500 Subject: ruby-2.5.1-1.parabola1: updating version --- libre/ruby/PKGBUILD | 36 ++++++------ libre/ruby/gemrc | 5 -- libre/ruby/ruby-2.5.0-add-json_pure.patch | 22 ------- libre/ruby/ruby-2.5.0-remove-json-ext.patch | 91 ----------------------------- libre/ruby/ruby-2.5.1-add-json_pure.patch | 22 +++++++ libre/ruby/ruby-2.5.1-remove-json-ext.patch | 91 +++++++++++++++++++++++++++++ libre/ruby/ruby.install | 22 ------- 7 files changed, 130 insertions(+), 159 deletions(-) delete mode 100644 libre/ruby/gemrc delete mode 100644 libre/ruby/ruby-2.5.0-add-json_pure.patch delete mode 100644 libre/ruby/ruby-2.5.0-remove-json-ext.patch create mode 100644 libre/ruby/ruby-2.5.1-add-json_pure.patch create mode 100644 libre/ruby/ruby-2.5.1-remove-json-ext.patch delete mode 100644 libre/ruby/ruby.install (limited to 'libre/ruby') diff --git a/libre/ruby/PKGBUILD b/libre/ruby/PKGBUILD index c3a40afed..69cdfbb63 100644 --- a/libre/ruby/PKGBUILD +++ b/libre/ruby/PKGBUILD @@ -17,19 +17,17 @@ # https://github.com/flori/json/issues/277 pkgname=(ruby ruby-docs) -pkgver=2.5.0 +pkgver=2.5.1 _jsonver=2.1.0 -pkgrel=4.parabola1 -_srcrel=2 # increment this to rebuild the sourceball without bumping pkgver +pkgrel=1.parabola1 +_srcrel=1 # increment this to rebuild the sourceball without bumping pkgver arch=(i686 x86_64 armv7h) url='http://www.ruby-lang.org/en/' license=(BSD2 custom) makedepends=(gdbm openssl libffi doxygen graphviz libyaml ttf-dejavu tk) options=(!emptydirs) -source=(https://repo.parabola.nu/other/ruby-libre/ruby-${pkgver}-libre${_srcrel}.tar.gz - gemrc) -sha512sums=('c4c9927aeb493b181e95dcdd2e167de66cc855102acda59e4795b7fa974d2005878dbd019cb8380ad2bdf6c67c72990cf84260769ffa57c8033b975f455197a7' - '8cafd14d414ee3c16aa94f79072bc6c100262f925dc1300e785846c3fabbbbffc1356b8e2223af5684e3340c55032d41231179ffa948bb12e01dbae0f4131911') +source=(https://repo.parabola.nu/other/ruby-libre/ruby-${pkgver}-libre${_srcrel}.tar.gz) +sha512sums=('0e312bb211abff335cb1a65f0e6645f0dfcaa9bf9790cae11ad200027719f73f17793d4b7b6462aaaec043a72ad60b54cc92b6c686027a7715a011bc73ee1852') mkdepends=('ruby') # for 'gem build' mksource=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar.xz @@ -37,7 +35,7 @@ mksource=(https://cache.ruby-lang.org/pub/ruby/${pkgver:0:3}/ruby-${pkgver}.tar. ruby-${pkgver}-add-json_pure.patch json-${_jsonver}.tar.gz::https://github.com/flori/json/archive/v${_jsonver}.tar.gz json-${_jsonver}-libre.patch) -mksha512sums=('55714a33d7661fe8b432f73c34fd67b49699f8b79df1cbd680a74899124d31111ab0f444677672aac1ba725820182940d485efb2db0bf2bc96737c5d40c54578' +mksha512sums=('31bacf58469953282cd5d8b51862dcf4b84dedb927c1871bc3fca32fc157fe49187631575a70838705fe246f4555647577a7ecc26894445a7d64de5503dc11b4' 'dbfd2517e87571e25fea832f50535e76c07972e15f48050ad7b08b04993c566ae7b5e8b1dd0e3cd65eb6161290026eaa71ff4528e98a92e37983066b4929cfb1' '303172561a4ba54515fddfd9ea7e0c833e550b0ae5e9f331956f178f8c5e20aa0e3c4036251ddfd04312769ef7d71d83fde0afe64f6fa8e9052ca5a294c62927' '6019cc26a0919e4d39ae0bf737b51cd9a474c74a55d25f6931ac04d61826bb810d063190a80a29810e57d7457d1a247acd82fd78de2c4c01acb7d73ee9fde603' @@ -97,31 +95,31 @@ check() { package_ruby() { pkgdesc='An object-oriented language for quick and easy programming' - depends=(gdbm openssl libffi libyaml gmp zlib) + depends=(gdbm openssl libffi libyaml gmp zlib rubygems) optdepends=( 'ruby-docs: Ruby documentation' 'tk: for Ruby/TK' ) - provides=(rubygems) - backup=(etc/gemrc) - install=ruby.install cd ruby-${pkgver} make DESTDIR="${pkgdir}" install-nodoc - install -D -m644 ${srcdir}/gemrc "${pkgdir}/etc/gemrc" - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby/LICENSE" install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby/BSDL" - gemver=${pkgver:0:3}.0 + rubyver=${pkgver:0:3}.0 + + # remove rubygems as it shipped in a separate package + rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/{rubygems,rubygems.rb} + rm "${pkgdir}"/usr/bin/gem + # remove bundled rdoc gem # we are doing it here instead of prepare() because rdoc used doring Ruby build process - rm -r "${pkgdir}"/usr/lib/ruby/${gemver}/rdoc/ - rm -r "${pkgdir}"/usr/bin/{rdoc,ri} - rm -r "${pkgdir}"/usr/lib/ruby/gems/${gemver}/gems/* - rm -r "${pkgdir}"/usr/lib/ruby/gems/${gemver}/specifications/default/rdoc-*.gemspec + rm -r "${pkgdir}"/usr/lib/ruby/${rubyver}/rdoc/ + rm "${pkgdir}"/usr/bin/{rdoc,ri} + rm -r "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/gems/* + rm "${pkgdir}"/usr/lib/ruby/gems/${rubyver}/specifications/default/rdoc-*.gemspec } package_ruby-docs() { diff --git a/libre/ruby/gemrc b/libre/ruby/gemrc deleted file mode 100644 index 65163119a..000000000 --- a/libre/ruby/gemrc +++ /dev/null @@ -1,5 +0,0 @@ -# Read about the gemrc format at http://guides.rubygems.org/command-reference/#gem-environment - -# --user-install is used to install to $HOME/.gem/ by default since we want to separate -# pacman installed gems and gem installed gems -gem: --user-install diff --git a/libre/ruby/ruby-2.5.0-add-json_pure.patch b/libre/ruby/ruby-2.5.0-add-json_pure.patch deleted file mode 100644 index 5630451ea..000000000 --- a/libre/ruby/ruby-2.5.0-add-json_pure.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc -index ec6a6b7134..11a1079e57 100644 ---- a/doc/maintainers.rdoc -+++ b/doc/maintainers.rdoc -@@ -72,6 +72,8 @@ Zachary Scott (zzak) - Akinori MUSHA (knu) - [lib/irb.rb, lib/irb/*] - Keiju ISHITSUKA (keiju) -+[lib/json] -+ NARUSE, Yui (naruse) - [lib/logger.rb] - Naotoshi Seo (sonots) - [lib/mathn.rb] -diff --git a/lib/json/.document b/lib/json/.document -new file mode 100644 -index 0000000000..7ae6b614de ---- /dev/null -+++ b/lib/json/.document -@@ -0,0 +1,3 @@ -+*.rb -+add/*.rb -+pure/*.rb diff --git a/libre/ruby/ruby-2.5.0-remove-json-ext.patch b/libre/ruby/ruby-2.5.0-remove-json-ext.patch deleted file mode 100644 index 507f8283a..000000000 --- a/libre/ruby/ruby-2.5.0-remove-json-ext.patch +++ /dev/null @@ -1,91 +0,0 @@ ---- a/LEGAL 2017-12-22 18:08:05.000000000 -0500 -+++ b/LEGAL 2018-01-07 09:52:56.660004692 -0500 -@@ -625,28 +625,6 @@ - OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - --ext/json/generator/generator.c: -- -- Copyright 2001-2004 Unicode, Inc. -- -- Disclaimer -- -- This source code is provided as is by Unicode, Inc. No claims are -- made as to fitness for any particular purpose. No warranties of any -- kind are expressed or implied. The recipient agrees to determine -- applicability of information provided. If this file has been -- purchased on magnetic or optical media from Unicode, Inc., the -- sole remedy for any claim will be exchange of defective media -- within 90 days of receipt. -- -- Limitations on Rights to Redistribute This Code -- -- Unicode, Inc. hereby grants the right to freely use the information -- supplied in this file in the creation of products supporting the -- Unicode Standard, and to make copies of this file in any form -- for internal or external distribution as long as this notice -- remains attached. -- - ext/nkf/nkf-utf8/config.h: - ext/nkf/nkf-utf8/nkf.c: - ext/nkf/nkf-utf8/utf8tbl.c: ---- a/common.mk 2017-12-22 18:08:05.000000000 -0500 -+++ b/common.mk 2018-01-07 09:56:46.206272867 -0500 -@@ -903,8 +903,7 @@ - - srcs-ext: $(EXT_SRCS) - --srcs-extra: $(srcdir)/ext/json/parser/parser.c \ -- $(srcdir)/ext/date/zonetab.h \ -+srcs-extra: $(srcdir)/ext/date/zonetab.h \ - $(empty) - - LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb -@@ -1006,11 +1005,6 @@ - Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \ - RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" - --$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl -- $(ECHO) generating $@ -- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \ -- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" -- - $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list - $(ECHO) generating $@ - $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \ ---- a/doc/maintainers.rdoc 2017-12-22 18:08:05.000000000 -0500 -+++ b/doc/maintainers.rdoc 2018-01-07 09:57:59.999596681 -0500 -@@ -253,9 +253,6 @@ - [ext/io/console] - Nobuyuki Nakada (nobu) - https://github.com/ruby/io-console --[ext/json] -- NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt) -- https://github.com/flori/json - [ext/openssl] - Kazuki Yamaguchi (rhe) - https://github.com/ruby/openssl ---- a/ext/.document 2017-09-03 08:31:34.000000000 -0500 -+++ b/ext/.document 2018-01-07 09:58:54.180475610 -0500 -@@ -27,9 +27,6 @@ - io/console/console.c - io/nonblock/nonblock.c - io/wait/wait.c --json/generator/generator.c --json/lib --json/parser/parser.c - nkf/lib - nkf/nkf.c - objspace/objspace.c ---- a/ext/Setup 2017-04-20 03:21:24.000000000 -0500 -+++ b/ext/Setup 2018-01-07 10:06:52.168822642 -0500 -@@ -20,9 +20,6 @@ - #io/console - #io/nonblock - #io/wait --#json --#json/generator --#json/parser - #nkf - #objspace - #openssl diff --git a/libre/ruby/ruby-2.5.1-add-json_pure.patch b/libre/ruby/ruby-2.5.1-add-json_pure.patch new file mode 100644 index 000000000..5630451ea --- /dev/null +++ b/libre/ruby/ruby-2.5.1-add-json_pure.patch @@ -0,0 +1,22 @@ +diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc +index ec6a6b7134..11a1079e57 100644 +--- a/doc/maintainers.rdoc ++++ b/doc/maintainers.rdoc +@@ -72,6 +72,8 @@ Zachary Scott (zzak) + Akinori MUSHA (knu) + [lib/irb.rb, lib/irb/*] + Keiju ISHITSUKA (keiju) ++[lib/json] ++ NARUSE, Yui (naruse) + [lib/logger.rb] + Naotoshi Seo (sonots) + [lib/mathn.rb] +diff --git a/lib/json/.document b/lib/json/.document +new file mode 100644 +index 0000000000..7ae6b614de +--- /dev/null ++++ b/lib/json/.document +@@ -0,0 +1,3 @@ ++*.rb ++add/*.rb ++pure/*.rb diff --git a/libre/ruby/ruby-2.5.1-remove-json-ext.patch b/libre/ruby/ruby-2.5.1-remove-json-ext.patch new file mode 100644 index 000000000..507f8283a --- /dev/null +++ b/libre/ruby/ruby-2.5.1-remove-json-ext.patch @@ -0,0 +1,91 @@ +--- a/LEGAL 2017-12-22 18:08:05.000000000 -0500 ++++ b/LEGAL 2018-01-07 09:52:56.660004692 -0500 +@@ -625,28 +625,6 @@ + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +-ext/json/generator/generator.c: +- +- Copyright 2001-2004 Unicode, Inc. +- +- Disclaimer +- +- This source code is provided as is by Unicode, Inc. No claims are +- made as to fitness for any particular purpose. No warranties of any +- kind are expressed or implied. The recipient agrees to determine +- applicability of information provided. If this file has been +- purchased on magnetic or optical media from Unicode, Inc., the +- sole remedy for any claim will be exchange of defective media +- within 90 days of receipt. +- +- Limitations on Rights to Redistribute This Code +- +- Unicode, Inc. hereby grants the right to freely use the information +- supplied in this file in the creation of products supporting the +- Unicode Standard, and to make copies of this file in any form +- for internal or external distribution as long as this notice +- remains attached. +- + ext/nkf/nkf-utf8/config.h: + ext/nkf/nkf-utf8/nkf.c: + ext/nkf/nkf-utf8/utf8tbl.c: +--- a/common.mk 2017-12-22 18:08:05.000000000 -0500 ++++ b/common.mk 2018-01-07 09:56:46.206272867 -0500 +@@ -903,8 +903,7 @@ + + srcs-ext: $(EXT_SRCS) + +-srcs-extra: $(srcdir)/ext/json/parser/parser.c \ +- $(srcdir)/ext/date/zonetab.h \ ++srcs-extra: $(srcdir)/ext/date/zonetab.h \ + $(empty) + + LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb +@@ -1006,11 +1005,6 @@ + Q=$(Q) ECHO=$(ECHO) RM="$(RM)" top_srcdir=../.. srcdir=. VPATH="$${VPATH}" \ + RUBY="$(BASERUBY)" PATH_SEPARATOR="$(PATH_SEPARATOR)" + +-$(srcdir)/ext/json/parser/parser.c: $(srcdir)/ext/json/parser/parser.rl +- $(ECHO) generating $@ +- $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \ +- Q=$(Q) ECHO=$(ECHO) top_srcdir=../../.. srcdir=. VPATH=../../.. BASERUBY="$(BASERUBY)" +- + $(srcdir)/ext/date/zonetab.h: $(srcdir)/ext/date/zonetab.list + $(ECHO) generating $@ + $(Q) $(CHDIR) $(@D) && $(exec) $(MAKE) -f prereq.mk $(mflags) \ +--- a/doc/maintainers.rdoc 2017-12-22 18:08:05.000000000 -0500 ++++ b/doc/maintainers.rdoc 2018-01-07 09:57:59.999596681 -0500 +@@ -253,9 +253,6 @@ + [ext/io/console] + Nobuyuki Nakada (nobu) + https://github.com/ruby/io-console +-[ext/json] +- NARUSE, Yui (naruse), Hiroshi SHIBATA (hsbt) +- https://github.com/flori/json + [ext/openssl] + Kazuki Yamaguchi (rhe) + https://github.com/ruby/openssl +--- a/ext/.document 2017-09-03 08:31:34.000000000 -0500 ++++ b/ext/.document 2018-01-07 09:58:54.180475610 -0500 +@@ -27,9 +27,6 @@ + io/console/console.c + io/nonblock/nonblock.c + io/wait/wait.c +-json/generator/generator.c +-json/lib +-json/parser/parser.c + nkf/lib + nkf/nkf.c + objspace/objspace.c +--- a/ext/Setup 2017-04-20 03:21:24.000000000 -0500 ++++ b/ext/Setup 2018-01-07 10:06:52.168822642 -0500 +@@ -20,9 +20,6 @@ + #io/console + #io/nonblock + #io/wait +-#json +-#json/generator +-#json/parser + #nkf + #objspace + #openssl diff --git a/libre/ruby/ruby.install b/libre/ruby/ruby.install deleted file mode 100644 index 165936c23..000000000 --- a/libre/ruby/ruby.install +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -print_gem_default_target() { - echo 'The default location of gem installs is $HOME/.gem/ruby' - echo 'Add the following line to your PATH if you plan to install using gem' - echo '$(ruby -e "puts Gem.user_dir")/bin' - echo 'If you want to install to the system wide location, you must either:' - echo 'edit /etc/gemrc or run gem with the --no-user-install flag.' -} - -# arg 1: the new package version -post_install() { - print_gem_default_target -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - if [ "$(vercmp $2 1.9.3_p125-4)" -lt 0 ]; then - print_gem_default_target - fi -} -- cgit v1.2.3