[gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/, dev-ruby/rubygems/files/

[Hans de Graaff]

commit:     05be1308f64a6ee663e8c2d1a5a7f60caa904b2a
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 16 16:03:27 2022 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 16:03:38 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05be1308

dev-ruby/rubygems: add 3.2.33 and update gentoo-defaults

This version uses a new set of defaults that make better use of the
existing mechanism for configuration and require us to overwrite less
methods.

Bug: https://bugs.gentoo.org/789957
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 dev-ruby/rubygems/Manifest                         |  2 +-
 dev-ruby/rubygems/files/gentoo-defaults-5.rb       | 44 +++++++---------------
 ...bygems-3.2.31.ebuild => rubygems-3.2.33.ebuild} |  2 +-
 3 files changed, 15 insertions(+), 33 deletions(-)

diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index e538c8bead67..69451bd9f650 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -3,4 +3,4 @@ DIST rubygems-3.0.9.tgz 886153 BLAKE2B 942f641c7dec30d3dd2f0756d04b1b6b071f5d3b5
 DIST rubygems-3.1.6.tgz 996339 BLAKE2B 8dc242a64c6f934b876de841cb6ea86455d7754cbe3902620a10ac40bb97264c03c1002b45a5734d1882617d95e8b390873ed390d00fe7e54b6d8f11a301c2b3 SHA512 730381cf683cd57f7ea7889f63cf21abb699bf28d2a25fa63f510756ece285cb63e4208130c20fa7c0232d6093d869e5d99d5b5fdad9bc68be5e8ead21863d97
 DIST rubygems-3.2.14.tgz 987419 BLAKE2B cfd1545f022194f8b7a99b1698a38d4cfae08b8fe25c45fc7b7c935953ec7a66b0b00f21f77eefe757226d80f19a2093f2b85767e5caabfe13f445fbf6dc5508 SHA512 de28bdfdc239cd49bb5a1f78f0a9e3ec432fb70c8326c7899f7ef0a088f60becd99ba81285b20388296f96afb46ca3ca359208621d88a6be68b7388d155a2383
 DIST rubygems-3.2.22.tgz 1236895 BLAKE2B c4782e064d2d9748519f915264411e11151edf9273e6a0473e70c39d9fc484b0c2d45e5fe4f00c6b83d9f27393a487c9e0b87a6f9d02449b370ae64a32f891a6 SHA512 6872e08b22ed3903e9d6e67ed03bb79f1ab6819eac0837b9f1003c0ef88ee751a380f9f55e548988baf2658470fcad204eca289acbd2043e04a9d12ed23eac16
-DIST rubygems-3.2.31.tar.gz 11219985 BLAKE2B befb5910365e109e130ca63fb71cc9b94ad92ab0eac41808a2d1955bb062a0c548e9faf283e0bc4b65409041ba4ffdc665335c920417e176bea7d2b08b7c2418 SHA512 34f934b4091a883c9e583563e37f7238c817c1dc9634506239ecd177b7c3cffee49eaaa33c6e9f52dfd7ee195609f2b6d7096254e2fb995396b835c9526f0a3f
+DIST rubygems-3.2.33.tar.gz 12131881 BLAKE2B 6ec9321d808df2ee1bbde7f9889471bb7dbadb719872577a9f04863ccf7c314f6b9e2edb178efa8b1996070112673163efb2cf7501d289cecbddd134770dcb12 SHA512 dcabbbbc57031ffa3ca04227a631323559ea99cb0b26e082b3bc51dd4f9b34b996903c7701932aa303192c0483a9e1c66661424233937d1d406773b4279263a4

diff --git a/dev-ruby/rubygems/files/gentoo-defaults-5.rb b/dev-ruby/rubygems/files/gentoo-defaults-5.rb
index 602ad0e4055e..b6ac5554b121 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults-5.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults-5.rb
@@ -6,30 +6,23 @@
 # /usr/local and to keep /usr managed by Gentoo. This policy file
 # ensures that all manually installed gems using "gem install" as root
 # 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
+    def gentoo_gems_dir
       RbConfig::CONFIG['sitelibdir'].gsub('site_ruby', 'gems')
     end
 
-    def bindir
+    def gentoo_bindir
       Process.euid.zero? ? '@GENTOO_PORTAGE_EPREFIX@/usr/local/bin' : File.join(user_home, 'bin')
     end
 
-    def local_dir
-      portage_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
-                            '@GENTOO_PORTAGE_EPREFIX@/usr/local')
+    def gentoo_local_dir
+      gentoo_gems_dir.gsub('@GENTOO_PORTAGE_EPREFIX@/usr',
+                           '@GENTOO_PORTAGE_EPREFIX@/usr/local')
     end
 
-    def install_dir
-      Process.euid.zero? ? local_dir : user_dir
+    def gentoo_install_dir
+      Process.euid.zero? ? gentoo_local_dir : user_dir
     end
 
     undef :default_path
@@ -38,27 +31,16 @@ module Gem
       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'
+      path << gentoo_local_dir
+      path << gentoo_gems_dir
     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
+      options = "--install-dir #{gentoo_install_dir} --bindir #{gentoo_bindir}"
       {
-        'install' => "--install-dir #{install_dir}",
-        'uninstall' => "--install-dir #{install_dir}",
-        'update' => "--install-dir #{install_dir}"
+        'install' => options,
+        'uninstall' => options,
+        'update' => options
       }
     end
   end

diff --git a/dev-ruby/rubygems/rubygems-3.2.31.ebuild b/dev-ruby/rubygems/rubygems-3.2.33.ebuild
similarity index 98%
rename from dev-ruby/rubygems/rubygems-3.2.31.ebuild
rename to dev-ruby/rubygems/rubygems-3.2.33.ebuild
index b0596c49d95d..752c178a4872 100644
--- a/dev-ruby/rubygems/rubygems-3.2.31.ebuild
+++ b/dev-ruby/rubygems/rubygems-3.2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8