Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/files/
Date: Tue, 30 Aug 2022 22:57:55
Message-Id: 1661900254.7cd0e9b6233cbf7a9ffb2ce77344e30e5d9862d3.conikost@gentoo
1 commit: 7cd0e9b6233cbf7a9ffb2ce77344e30e5d9862d3
2 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
3 AuthorDate: Tue Aug 30 17:00:57 2022 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 30 22:57:34 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cd0e9b6
7
8 dev-ruby/rubygems: remove unused files
9
10 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
11 Portage 3.0.30 / pkgdev 0.2.1 / pkgcheck 0.10.11
12 Closes: https://github.com/gentoo/gentoo/pull/27072
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 dev-ruby/rubygems/files/gentoo-defaults-3.rb | 63 ----------------------------
16 dev-ruby/rubygems/files/gentoo-defaults.rb | 42 -------------------
17 2 files changed, 105 deletions(-)
18
19 diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
20 deleted file mode 100644
21 index 9d499b73f89d..000000000000
22 --- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb
23 +++ /dev/null
24 @@ -1,63 +0,0 @@
25 -# frozen_string_literal: true
26 -
27 -# Gentoo defaults for rubygems 3.x
28 -#
29 -# Gentoo policy is to install all manually installed code into
30 -# /usr/local and to keep /usr managed by Gentoo. This policy file
31 -# ensures that all manually installed gems using "gem install" are
32 -# installed in /usr/local. Gentoo gems are installed in /usr.
33 -
34 -# TODO: We used to manipulate the default_dir, but this no longer
35 -# works since this is now the base for the new "default" gems that
36 -# ruby 2.6 uses with irb. So default_dir should refer to the system
37 -# default now. rubygems also provides various hooks so we may be able
38 -# to use those to install gems in /usr/local by default in a less
39 -# intrusive way.
40 -module Gem
41 -
42 - class << self
43 - def portage_gems_dir
44 - ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
45 - end
46 -
47 - def local_dir
48 - portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
49 - '@GENTOO_PORTAGE_EPREFIX@/usr/local')
50 - end
51 -
52 - def install_dir
53 - Process.euid.zero? ? local_dir : user_dir
54 - end
55 -
56 - undef :default_path
57 - def default_path
58 - path = []
59 - path << user_dir if user_home && File.exist?(user_home)
60 - path << default_dir
61 - path << vendor_dir if vendor_dir && File.directory?(vendor_dir)
62 - path << local_dir
63 - path << portage_gems_dir
64 - end
65 -
66 - def system_config_path
67 - '@GENTOO_PORTAGE_EPREFIX@/etc'
68 - end
69 -
70 - # Set Gentoo defaults for gem commands
71 - begin
72 - undef :operating_system_defaults
73 - rescue NameError
74 - # Avoid either runtime errors or redefinition warnings since
75 - # this method is not present in all rubygem versions distributed
76 - # with dev-lang/ruby.
77 - end
78 - def operating_system_defaults
79 - {
80 - 'install' => "--install-dir #{install_dir}",
81 - 'uninstall' => "--install-dir #{install_dir}",
82 - 'update' => "--install-dir #{install_dir}"
83 - }
84 - end
85 -
86 - end
87 -end
88
89 diff --git a/dev-ruby/rubygems/files/gentoo-defaults.rb b/dev-ruby/rubygems/files/gentoo-defaults.rb
90 deleted file mode 100644
91 index a645f4868281..000000000000
92 --- a/dev-ruby/rubygems/files/gentoo-defaults.rb
93 +++ /dev/null
94 @@ -1,42 +0,0 @@
95 -module Gem
96 -
97 - class << self
98 - def portage_gems_dir
99 - ConfigMap[:sitelibdir].gsub('site_ruby', 'gems')
100 - end
101 -
102 - def local_dir
103 - portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr', '@GENTOO_PORTAGE_EPREFIX@/usr/local')
104 - end
105 -
106 - undef :default_dir
107 - def default_dir
108 - Process.euid == 0 ? local_dir : user_dir
109 - end
110 -
111 - undef :default_path
112 - def default_path
113 - [user_dir, local_dir, portage_gems_dir]
114 - end
115 -
116 - undef :default_bindir
117 - def default_bindir
118 - Process.euid == 0 ? "@GENTOO_PORTAGE_EPREFIX@/usr/local/bin" : File.join(user_dir, 'bin')
119 - end
120 -
121 - undef :ruby_engine
122 - def ruby_engine
123 - if defined? RUBY_DESCRIPTION and RUBY_DESCRIPTION =~ /Ruby Enterprise Edition/
124 - "rubyee"
125 - else
126 - # Ruby 1.8 and Ruby 1.9.2_rc2 and later install here, and JRuby
127 - # rewrites that anyway.
128 - "ruby"
129 - end
130 - end
131 -
132 - def system_config_path
133 - "@GENTOO_PORTAGE_EPREFIX@/etc"
134 - end
135 - end
136 -end