pkgsrc-ng/lang/ruby23-base/patches/patch-lib_rubygems.rb
2016-11-18 22:39:22 +01:00

45 lines
1.4 KiB
Ruby

$NetBSD: patch-lib_rubygems.rb,v 1.1 2015/12/30 14:59:42 taca Exp $
* Add install_root option for pkgsrc's rubygems support.
--- lib/rubygems.rb.orig 2015-12-16 05:07:31.000000000 +0000
+++ lib/rubygems.rb
@@ -263,10 +263,16 @@ module Gem
##
# The path where gem executables are to be installed.
- def self.bindir(install_dir=Gem.dir)
- return File.join install_dir, 'bin' unless
- install_dir.to_s == Gem.default_dir.to_s
- Gem.default_bindir
+ def self.bindir(install_dir=Gem.dir, install_root=nil)
+ if install_dir.to_s == Gem.default_dir.to_s
+ install_dir = Gem.default_bindir
+ else
+ install_dir = File.join install_dir, 'bin'
+ end
+ unless install_root.nil? or install_root.empty?
+ install_dir = File.join install_root, install_dir
+ end
+ install_dir
end
##
@@ -581,7 +587,7 @@ module Gem
return i if path.instance_variable_defined?(:@gem_prelude_index)
end
- index = $LOAD_PATH.index RbConfig::CONFIG['sitelibdir']
+ index = $LOAD_PATH.index RbConfig::CONFIG['vendorlibdir']
index
end
@@ -756,6 +762,7 @@ module Gem
prefix = File.dirname RUBYGEMS_DIR
if prefix != File.expand_path(RbConfig::CONFIG['sitelibdir']) and
+ prefix != File.expand_path(ConfigMap[:vendorlibdir]) and
prefix != File.expand_path(RbConfig::CONFIG['libdir']) and
'lib' == File.basename(RUBYGEMS_DIR) then
prefix