commit: 7cd0e9b6233cbf7a9ffb2ce77344e30e5d9862d3 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Aug 30 17:00:57 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Aug 30 22:57:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd0e9b6
dev-ruby/rubygems: remove unused files Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Portage 3.0.30 / pkgdev 0.2.1 / pkgcheck 0.10.11 Closes: https://github.com/gentoo/gentoo/pull/27072 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-ruby/rubygems/files/gentoo-defaults-3.rb | 63 ---------------------------- dev-ruby/rubygems/files/gentoo-defaults.rb | 42 ------------------- 2 files changed, 105 deletions(-) diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb deleted file mode 100644 index 9d499b73f89d..000000000000 --- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb +++ /dev/null @@ -1,63 +0,0 @@ -# frozen_string_literal: true - -# Gentoo defaults for rubygems 3.x -# -# Gentoo policy is to install all manually installed code into -# /usr/local and to keep /usr managed by Gentoo. This policy file -# ensures that all manually installed gems using "gem install" are -# installed in /usr/local. Gentoo gems are installed in /usr. - -# TODO: We used to manipulate the default_dir, but this no longer -# works since this is now the base for the new "default" gems that -# ruby 2.6 uses with irb. So default_dir should refer to the system -# default now. rubygems also provides various hooks so we may be able -# to use those to install gems in /usr/local by default in a less -# intrusive way. -module Gem - - class << self - def portage_gems_dir - ConfigMap[:sitelibdir].gsub('site_ruby', 'gems') - end - - def local_dir - portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', - '@GENTOO_PORTAGE_EPREFIX@/usr/local') - end - - def install_dir - Process.euid.zero? ? local_dir : user_dir - end - - undef :default_path - def default_path - path = [] - path << user_dir if user_home && File.exist?(user_home) - path << default_dir - path << vendor_dir if vendor_dir && File.directory?(vendor_dir) - path << local_dir - path << portage_gems_dir - end - - def system_config_path - '@GENTOO_PORTAGE_EPREFIX@/etc' - end - - # Set Gentoo defaults for gem commands - begin - undef :operating_system_defaults - rescue NameError - # Avoid either runtime errors or redefinition warnings since - # this method is not present in all rubygem versions distributed - # with dev-lang/ruby. - end - def operating_system_defaults - { - 'install' => "--install-dir #{install_dir}", - 'uninstall' => "--install-dir #{install_dir}", - 'update' => "--install-dir #{install_dir}" - } - end - - end -end diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb deleted file mode 100644 index a645f4868281..000000000000 --- a/dev-ruby/rubygems/files/gentoo-defaults.rb +++ /dev/null @@ -1,42 +0,0 @@ -module Gem - - class << self - def portage_gems_dir - ConfigMap[:sitelibdir].gsub('site_ruby', 'gems') - end - - def local_dir - portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', '@GENTOO_PORTAGE_EPREFIX@/usr/local') - end - - undef :default_dir - def default_dir - Process.euid == 0 ? local_dir : user_dir - end - - undef :default_path - def default_path - [user_dir, local_dir, portage_gems_dir] - end - - undef :default_bindir - def default_bindir - Process.euid == 0 ? "@GENTOO_PORTAGE_EPREFIX@/usr/local/bin" : File.join(user_dir, 'bin') - end - - undef :ruby_engine - def ruby_engine - if defined? RUBY_DESCRIPTION and RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/ - "rubyee" - else - # Ruby 1.8 and Ruby 1.9.2_rc2 and later install here, and JRuby - # rewrites that anyway. - "ruby" - end - end - - def system_config_path - "@GENTOO_PORTAGE_EPREFIX@/etc" - end - end -end
