Date: Friday, January 10, 2014 @ 20:36:28 Author: td123 Revision: 203426
archrelease: copy trunk to staging-i686, staging-x86_64 Added: ruby/repos/staging-i686/0001-Fix-installing-gem-from-file-without-dependencies.patch (from rev 203425, ruby/trunk/0001-Fix-installing-gem-from-file-without-dependencies.patch) ruby/repos/staging-i686/PKGBUILD (from rev 203425, ruby/trunk/PKGBUILD) ruby/repos/staging-i686/gemrc (from rev 203425, ruby/trunk/gemrc) ruby/repos/staging-i686/ruby.install (from rev 203425, ruby/trunk/ruby.install) ruby/repos/staging-x86_64/0001-Fix-installing-gem-from-file-without-dependencies.patch (from rev 203425, ruby/trunk/0001-Fix-installing-gem-from-file-without-dependencies.patch) ruby/repos/staging-x86_64/PKGBUILD (from rev 203425, ruby/trunk/PKGBUILD) ruby/repos/staging-x86_64/gemrc (from rev 203425, ruby/trunk/gemrc) ruby/repos/staging-x86_64/ruby.install (from rev 203425, ruby/trunk/ruby.install) Deleted: ruby/repos/staging-i686/PKGBUILD ruby/repos/staging-i686/gemrc ruby/repos/staging-i686/ruby.install ruby/repos/staging-x86_64/PKGBUILD ruby/repos/staging-x86_64/gemrc ruby/repos/staging-x86_64/ruby.install -----------------------------------------------------------------------------+ /PKGBUILD | 148 ++++++++++ /gemrc | 10 /ruby.install | 44 ++ staging-i686/0001-Fix-installing-gem-from-file-without-dependencies.patch | 84 +++++ staging-i686/PKGBUILD | 67 ---- staging-i686/gemrc | 5 staging-i686/ruby.install | 22 - staging-x86_64/0001-Fix-installing-gem-from-file-without-dependencies.patch | 84 +++++ staging-x86_64/PKGBUILD | 67 ---- staging-x86_64/gemrc | 5 staging-x86_64/ruby.install | 22 - 11 files changed, 370 insertions(+), 188 deletions(-) Copied: ruby/repos/staging-i686/0001-Fix-installing-gem-from-file-without-dependencies.patch (from rev 203425, ruby/trunk/0001-Fix-installing-gem-from-file-without-dependencies.patch) =================================================================== --- staging-i686/0001-Fix-installing-gem-from-file-without-dependencies.patch (rev 0) +++ staging-i686/0001-Fix-installing-gem-from-file-without-dependencies.patch 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,84 @@ +From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001 +From: Tim Moore <tmo...@incrementalism.net> +Date: Tue, 31 Dec 2013 17:39:45 +1100 +Subject: [PATCH] Fix installing gem from file without dependencies. + +Commit 9437ccc fixed the ability to install remote gems that was accidentally +broken by d97fba1, but in the process accidentally broke installing from local +files. + +This also changes the order to check for local first, to avoid unnecessary +network requests in the case where the gem is local. + +Closes #760. +--- + lib/rubygems/commands/install_command.rb | 20 ++++++++++++-------- + test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++ + 2 files changed, 26 insertions(+), 8 deletions(-) + +diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb +index 4485eb1..8219eef 100644 +--- a/lib/rubygems/commands/install_command.rb ++++ b/lib/rubygems/commands/install_command.rb +@@ -228,7 +228,18 @@ to write the specification by hand. For example: + def install_gem_without_dependencies name, req # :nodoc: + gem = nil + +- if remote? then ++ if local? then ++ if name =~ /\.gem$/ and File.file? name then ++ source = Gem::Source::SpecificFile.new name ++ spec = source.spec ++ else ++ source = Gem::Source::Local.new ++ spec = source.find_gem name, req ++ end ++ gem = source.download spec if spec ++ end ++ ++ if remote? and not gem then + dependency = Gem::Dependency.new name, req + dependency.prerelease = options[:prerelease] + +@@ -236,13 +247,6 @@ to write the specification by hand. For example: + gem = fetcher.download_to_cache dependency + end + +- if local? and not gem then +- source = Gem::Source::Local.new +- spec = source.find_gem name, req +- +- gem = source.download spec +- end +- + inst = Gem::Installer.new gem, options + inst.install + +diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb +index 76ea6b4..a5917c0 100644 +--- a/test/rubygems/test_gem_commands_install_command.rb ++++ b/test/rubygems/test_gem_commands_install_command.rb +@@ -560,6 +560,20 @@ ERROR: Possible alternatives: non_existent_with_hint + assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name } + end + ++ def test_install_gem_ignore_dependencies_specific_file ++ spec = quick_spec 'a', 2 ++ ++ util_build_gem spec ++ ++ FileUtils.mv spec.cache_file, @tempdir ++ ++ @cmd.options[:ignore_dependencies] = true ++ ++ @cmd.install_gem File.join(@tempdir, spec.file_name), nil ++ ++ assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name } ++ end ++ + def test_parses_requirement_from_gemname + spec_fetcher do |fetcher| + fetcher.gem 'a', 2 +-- +1.8.5.2 + Deleted: staging-i686/PKGBUILD =================================================================== --- staging-i686/PKGBUILD 2014-01-10 19:35:22 UTC (rev 203425) +++ staging-i686/PKGBUILD 2014-01-10 19:36:28 UTC (rev 203426) @@ -1,67 +0,0 @@ -# Maintainer: Thomas Dziedzic <gos...@gmail.com> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: John Proctor <jproc...@prium.net> -# Contributor: Jeramy Rutley <jrut...@gmail.com> - -pkgname=('ruby' 'ruby-docs') -pkgver=2.1.0 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.ruby-lang.org/en/' -license=('BSD' 'custom') -makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') -options=('!emptydirs' '!makeflags' 'staticlibs') -source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2" - 'gemrc') -md5sums=('1546eeb763ac7754365664be763a1e8f' - '6fb8e7a09955e0f64be3158fb4a27e7a') - -build() { - cd ruby-${pkgver} - - PKG_CONFIG=/usr/bin/pkg-config ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --disable-rpath \ - --with-dbm-type=gdbm_compat - - make -} - -check() { - cd ruby-${pkgver} - - make test -} - -package_ruby() { - pkgdesc='An object-oriented language for quick and easy programming' - depends=('gdbm' 'openssl' 'libffi' 'libyaml') - optdepends=('tk: for Ruby/TK' - 'ruby-docs: Ruby documentation') - provides=('rubygems' 'rake') - conflicts=('rake') - 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" -} - -package_ruby-docs() { - pkgdesc='Documentation files for ruby' - - cd ruby-${pkgver} - - make DESTDIR="${pkgdir}" install-doc install-capi - - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" -} Copied: ruby/repos/staging-i686/PKGBUILD (from rev 203425, ruby/trunk/PKGBUILD) =================================================================== --- staging-i686/PKGBUILD (rev 0) +++ staging-i686/PKGBUILD 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,74 @@ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: John Proctor <jproc...@prium.net> +# Contributor: Jeramy Rutley <jrut...@gmail.com> + +pkgname=('ruby' 'ruby-docs') +pkgver=2.1.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.ruby-lang.org/en/' +license=('BSD' 'custom') +# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk' +# https://bugs.ruby-lang.org/issues/8000 +# wait for upstream to start supporting tk 8.6 +makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk' +options=('!emptydirs' '!makeflags' 'staticlibs') +source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2" + 'gemrc' + '0001-Fix-installing-gem-from-file-without-dependencies.patch') +md5sums=('1546eeb763ac7754365664be763a1e8f' + '6fb8e7a09955e0f64be3158fb4a27e7a' + '61a1507f260866805fc6451c14733b25') + +build() { + cd ruby-${pkgver} + + # fixes https://github.com/rubygems/rubygems/issues/760 + patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch + + PKG_CONFIG=/usr/bin/pkg-config ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-rpath \ + --with-dbm-type=gdbm_compat + + make +} + +check() { + cd ruby-${pkgver} + + make test +} + +package_ruby() { + pkgdesc='An object-oriented language for quick and easy programming' + depends=('gdbm' 'openssl' 'libffi' 'libyaml') + optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK' + provides=('rubygems' 'rake') + conflicts=('rake') + 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" +} + +package_ruby-docs() { + pkgdesc='Documentation files for ruby' + + cd ruby-${pkgver} + + make DESTDIR="${pkgdir}" install-doc install-capi + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" +} Deleted: staging-i686/gemrc =================================================================== --- staging-i686/gemrc 2014-01-10 19:35:22 UTC (rev 203425) +++ staging-i686/gemrc 2014-01-10 19:36:28 UTC (rev 203426) @@ -1,5 +0,0 @@ -# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 - -# --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 Copied: ruby/repos/staging-i686/gemrc (from rev 203425, ruby/trunk/gemrc) =================================================================== --- staging-i686/gemrc (rev 0) +++ staging-i686/gemrc 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,5 @@ +# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 + +# --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 Deleted: staging-i686/ruby.install =================================================================== --- staging-i686/ruby.install 2014-01-10 19:35:22 UTC (rev 203425) +++ staging-i686/ruby.install 2014-01-10 19:36:28 UTC (rev 203426) @@ -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 -rubygems -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 -} Copied: ruby/repos/staging-i686/ruby.install (from rev 203425, ruby/trunk/ruby.install) =================================================================== --- staging-i686/ruby.install (rev 0) +++ staging-i686/ruby.install 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,22 @@ +#!/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 -rubygems -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 +} Copied: ruby/repos/staging-x86_64/0001-Fix-installing-gem-from-file-without-dependencies.patch (from rev 203425, ruby/trunk/0001-Fix-installing-gem-from-file-without-dependencies.patch) =================================================================== --- staging-x86_64/0001-Fix-installing-gem-from-file-without-dependencies.patch (rev 0) +++ staging-x86_64/0001-Fix-installing-gem-from-file-without-dependencies.patch 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,84 @@ +From f5bbf838c8b13369a61c6756355305388df5824f Mon Sep 17 00:00:00 2001 +From: Tim Moore <tmo...@incrementalism.net> +Date: Tue, 31 Dec 2013 17:39:45 +1100 +Subject: [PATCH] Fix installing gem from file without dependencies. + +Commit 9437ccc fixed the ability to install remote gems that was accidentally +broken by d97fba1, but in the process accidentally broke installing from local +files. + +This also changes the order to check for local first, to avoid unnecessary +network requests in the case where the gem is local. + +Closes #760. +--- + lib/rubygems/commands/install_command.rb | 20 ++++++++++++-------- + test/rubygems/test_gem_commands_install_command.rb | 14 ++++++++++++++ + 2 files changed, 26 insertions(+), 8 deletions(-) + +diff --git a/lib/rubygems/commands/install_command.rb b/lib/rubygems/commands/install_command.rb +index 4485eb1..8219eef 100644 +--- a/lib/rubygems/commands/install_command.rb ++++ b/lib/rubygems/commands/install_command.rb +@@ -228,7 +228,18 @@ to write the specification by hand. For example: + def install_gem_without_dependencies name, req # :nodoc: + gem = nil + +- if remote? then ++ if local? then ++ if name =~ /\.gem$/ and File.file? name then ++ source = Gem::Source::SpecificFile.new name ++ spec = source.spec ++ else ++ source = Gem::Source::Local.new ++ spec = source.find_gem name, req ++ end ++ gem = source.download spec if spec ++ end ++ ++ if remote? and not gem then + dependency = Gem::Dependency.new name, req + dependency.prerelease = options[:prerelease] + +@@ -236,13 +247,6 @@ to write the specification by hand. For example: + gem = fetcher.download_to_cache dependency + end + +- if local? and not gem then +- source = Gem::Source::Local.new +- spec = source.find_gem name, req +- +- gem = source.download spec +- end +- + inst = Gem::Installer.new gem, options + inst.install + +diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb +index 76ea6b4..a5917c0 100644 +--- a/test/rubygems/test_gem_commands_install_command.rb ++++ b/test/rubygems/test_gem_commands_install_command.rb +@@ -560,6 +560,20 @@ ERROR: Possible alternatives: non_existent_with_hint + assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name } + end + ++ def test_install_gem_ignore_dependencies_specific_file ++ spec = quick_spec 'a', 2 ++ ++ util_build_gem spec ++ ++ FileUtils.mv spec.cache_file, @tempdir ++ ++ @cmd.options[:ignore_dependencies] = true ++ ++ @cmd.install_gem File.join(@tempdir, spec.file_name), nil ++ ++ assert_equal %w[a-2], @cmd.installed_specs.map { |spec| spec.full_name } ++ end ++ + def test_parses_requirement_from_gemname + spec_fetcher do |fetcher| + fetcher.gem 'a', 2 +-- +1.8.5.2 + Deleted: staging-x86_64/PKGBUILD =================================================================== --- staging-x86_64/PKGBUILD 2014-01-10 19:35:22 UTC (rev 203425) +++ staging-x86_64/PKGBUILD 2014-01-10 19:36:28 UTC (rev 203426) @@ -1,67 +0,0 @@ -# Maintainer: Thomas Dziedzic <gos...@gmail.com> -# Contributor: Allan McRae <al...@archlinux.org> -# Contributor: John Proctor <jproc...@prium.net> -# Contributor: Jeramy Rutley <jrut...@gmail.com> - -pkgname=('ruby' 'ruby-docs') -pkgver=2.1.0 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.ruby-lang.org/en/' -license=('BSD' 'custom') -makedepends=('gdbm' 'openssl' 'tk' 'libffi' 'doxygen' 'graphviz' 'libyaml') -options=('!emptydirs' '!makeflags' 'staticlibs') -source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2" - 'gemrc') -md5sums=('1546eeb763ac7754365664be763a1e8f' - '6fb8e7a09955e0f64be3158fb4a27e7a') - -build() { - cd ruby-${pkgver} - - PKG_CONFIG=/usr/bin/pkg-config ./configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --enable-shared \ - --disable-rpath \ - --with-dbm-type=gdbm_compat - - make -} - -check() { - cd ruby-${pkgver} - - make test -} - -package_ruby() { - pkgdesc='An object-oriented language for quick and easy programming' - depends=('gdbm' 'openssl' 'libffi' 'libyaml') - optdepends=('tk: for Ruby/TK' - 'ruby-docs: Ruby documentation') - provides=('rubygems' 'rake') - conflicts=('rake') - 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" -} - -package_ruby-docs() { - pkgdesc='Documentation files for ruby' - - cd ruby-${pkgver} - - make DESTDIR="${pkgdir}" install-doc install-capi - - install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" - install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" -} Copied: ruby/repos/staging-x86_64/PKGBUILD (from rev 203425, ruby/trunk/PKGBUILD) =================================================================== --- staging-x86_64/PKGBUILD (rev 0) +++ staging-x86_64/PKGBUILD 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,74 @@ +# Maintainer: Thomas Dziedzic <gos...@gmail.com> +# Contributor: Allan McRae <al...@archlinux.org> +# Contributor: John Proctor <jproc...@prium.net> +# Contributor: Jeramy Rutley <jrut...@gmail.com> + +pkgname=('ruby' 'ruby-docs') +pkgver=2.1.0 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.ruby-lang.org/en/' +license=('BSD' 'custom') +# disable ruby tk since 1.9.3 it has caused a segfault on require 'tk' +# https://bugs.ruby-lang.org/issues/8000 +# wait for upstream to start supporting tk 8.6 +makedepends=('gdbm' 'openssl' 'libffi' 'doxygen' 'graphviz' 'libyaml') # 'tk' +options=('!emptydirs' '!makeflags' 'staticlibs') +source=("http://cache.ruby-lang.org/pub/ruby/ruby-${pkgver}.tar.bz2" + 'gemrc' + '0001-Fix-installing-gem-from-file-without-dependencies.patch') +md5sums=('1546eeb763ac7754365664be763a1e8f' + '6fb8e7a09955e0f64be3158fb4a27e7a' + '61a1507f260866805fc6451c14733b25') + +build() { + cd ruby-${pkgver} + + # fixes https://github.com/rubygems/rubygems/issues/760 + patch -Np1 -i ${srcdir}/0001-Fix-installing-gem-from-file-without-dependencies.patch + + PKG_CONFIG=/usr/bin/pkg-config ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --enable-shared \ + --disable-rpath \ + --with-dbm-type=gdbm_compat + + make +} + +check() { + cd ruby-${pkgver} + + make test +} + +package_ruby() { + pkgdesc='An object-oriented language for quick and easy programming' + depends=('gdbm' 'openssl' 'libffi' 'libyaml') + optdepends=('ruby-docs: Ruby documentation') # 'tk: for Ruby/TK' + provides=('rubygems' 'rake') + conflicts=('rake') + 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" +} + +package_ruby-docs() { + pkgdesc='Documentation files for ruby' + + cd ruby-${pkgver} + + make DESTDIR="${pkgdir}" install-doc install-capi + + install -D -m644 COPYING "${pkgdir}/usr/share/licenses/ruby-docs/LICENSE" + install -D -m644 BSDL "${pkgdir}/usr/share/licenses/ruby-docs/BSDL" +} Deleted: staging-x86_64/gemrc =================================================================== --- staging-x86_64/gemrc 2014-01-10 19:35:22 UTC (rev 203425) +++ staging-x86_64/gemrc 2014-01-10 19:36:28 UTC (rev 203426) @@ -1,5 +0,0 @@ -# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 - -# --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 Copied: ruby/repos/staging-x86_64/gemrc (from rev 203425, ruby/trunk/gemrc) =================================================================== --- staging-x86_64/gemrc (rev 0) +++ staging-x86_64/gemrc 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,5 @@ +# Read about the gemrc format at http://docs.rubygems.org/read/chapter/11 + +# --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 Deleted: staging-x86_64/ruby.install =================================================================== --- staging-x86_64/ruby.install 2014-01-10 19:35:22 UTC (rev 203425) +++ staging-x86_64/ruby.install 2014-01-10 19:36:28 UTC (rev 203426) @@ -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 -rubygems -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 -} Copied: ruby/repos/staging-x86_64/ruby.install (from rev 203425, ruby/trunk/ruby.install) =================================================================== --- staging-x86_64/ruby.install (rev 0) +++ staging-x86_64/ruby.install 2014-01-10 19:36:28 UTC (rev 203426) @@ -0,0 +1,22 @@ +#!/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 -rubygems -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 +}