From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1C8B158009 for ; Fri, 23 Jun 2023 21:29:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6D10BE0897; Fri, 23 Jun 2023 21:29:44 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 081F2E0897 for ; Fri, 23 Jun 2023 21:29:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31E70340B29 for ; Fri, 23 Jun 2023 21:29:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 963AEA9E for ; Fri, 23 Jun 2023 21:29:41 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1687555705.451ddf734cfe9a2395c36d93ebcb2565b41701fa.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-ruby/rubygems/files/gentoo-defaults-4.rb X-VCS-Directories: dev-ruby/rubygems/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 451ddf734cfe9a2395c36d93ebcb2565b41701fa X-VCS-Branch: master Date: Fri, 23 Jun 2023 21:29:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c3d7b63f-22dc-46c3-aada-34ef593809af X-Archives-Hash: 9475ac9231cc97cd17a8e2e008284c93 commit: 451ddf734cfe9a2395c36d93ebcb2565b41701fa Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Jun 20 10:44:23 2023 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Fri Jun 23 21:28:25 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451ddf73 dev-ruby/rubygems: remove unused file Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/31553 Signed-off-by: Conrad Kostecki gentoo.org> dev-ruby/rubygems/files/gentoo-defaults-4.rb | 63 ---------------------------- 1 file changed, 63 deletions(-) diff --git a/dev-ruby/rubygems/files/gentoo-defaults-4.rb b/dev-ruby/rubygems/files/gentoo-defaults-4.rb deleted file mode 100644 index 1da07f64ddef..000000000000 --- a/dev-ruby/rubygems/files/gentoo-defaults-4.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 - RbConfig::CONFIG['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