* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/, dev-ruby/rubygems/files/
@ 2019-06-30 8:46 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2019-06-30 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 21b6f7a6b0f447e550cc50d44ea05137a49d00df
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 30 08:46:17 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 30 08:46:38 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b6f7a6
dev-ruby/rubygems: fix rubygems gentoo defaults
Take into account that ruby 2.4 and ruby 2.5 have rubygems 2.7 bundled.
Fixes: https://bugs.gentoo.org/688340
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
dev-ruby/rubygems/files/gentoo-defaults-3.rb | 8 +-
dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild | 120 ---------------------
...ygems-3.0.4.ebuild => rubygems-3.0.4-r1.ebuild} | 0
3 files changed, 7 insertions(+), 121 deletions(-)
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-3.rb b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
index b8ad8f1227c..9d499b73f89 100644
--- a/dev-ruby/rubygems/files/gentoo-defaults-3.rb
+++ b/dev-ruby/rubygems/files/gentoo-defaults-3.rb
@@ -44,7 +44,13 @@ module Gem
end
# Set Gentoo defaults for gem commands
- undef :operating_system_defaults
+ 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}",
diff --git a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild b/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild
deleted file mode 100644
index 8c6d1f49acf..00000000000
--- a/dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby24 ruby25 ruby26"
-
-inherit ruby-ng prefix
-
-DESCRIPTION="Centralized Ruby extension management system"
-HOMEPAGE="https://rubygems.org/"
-LICENSE="GPL-2 || ( Ruby MIT )"
-
-SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE="server test"
-
-PDEPEND="server? ( =dev-ruby/builder-3* )"
-
-ruby_add_bdepend "
- test? (
- dev-ruby/json
- dev-ruby/minitest:5
- dev-ruby/rdoc
- )"
-
-all_ruby_prepare() {
-
- mkdir -p lib/rubygems/defaults || die
- cp "${FILESDIR}/gentoo-defaults-3.rb" lib/rubygems/defaults/operating_system.rb || die
-
- eprefixify lib/rubygems/defaults/operating_system.rb
-
- # Disable broken tests when changing default values:
- sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
- sed -i -e '/assert_self_install_permissions/,/^ end/ s/^.*RUBY_INSTALL_NAME.*//' test/rubygems/test_gem.rb || die
-
- # Skip tests for default gems that all fail
-# sed -i -e '/test_default_gems_use_full_paths/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
-# sed -i -e '/test_execute_ignore_default_gem_verbose/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_cleanup_command.rb || die
-# sed -i -e '/test_execute_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_contents_command.rb test/rubygems/test_gem_commands_pristine_command.rb || die
-# sed -i -e '/test_execute_\(default_details\|show_default_gems\)/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_query_command.rb || die
-# sed -i -e '/test_execute_all/,/^ end/ s:^:#:' test/rubygems/test_gem_commands_uninstall_command.rb || die
-# sed -i -e '/\(test_default_gem\|test_check_executable_overwrite\|test_require_works_after_cleanup\)/,/^ end/ s:^:#:' \
-# test/rubygems/test_{gem_installer,require}.rb || die
-# sed -i -e '/test_\(load_default_gem\|default_spec_stub\|self_stubs\)/,/^ end/ s:^:#:' test/rubygems/test_gem_specification.rb || die
-# sed -i -e '/test_uninstall_default_gem/,/^ end/ s:^:#:' test/rubygems/test_gem_uninstaller.rb || die
-# rm -f test/rubygems/test_gem_indexer.rb || die
-# sed -i -e '/test_\(require_when_gem_defined\|realworld_default_gem\)/,/^ end/ s:^:#:' test/rubygems/test_require.rb || die
-# rm -f test/rubygems/test_gem_commands_setup_command.rb || die
-
- # Avoid tests playing tricks with ruby engine that don't seem to
- # work for us.
- rm test/rubygems/test_gem_request_set_gem_dependency_api.rb || die
-
- # Avoid test requiring network access
- sed -i -e '/test_download_to_cache/askip "requires network access"' test/rubygems/test_gem_remote_fetcher.rb || die
-
- # Avoid test requiring file system permission changes
- sed -i -e '/test_traverse_parents_does_not_crash_on_permissions_error/,/^ end/ s:^:#:' test/rubygems/test_gem_util.rb || die
-
- # Avoid uninvestigated test failure in favor of security release
- sed -i -e '/test_self_install_permissions_with_format_executable/askip "uninvestigated failure"' test/rubygems/test_gem.rb || die
-}
-
-each_ruby_compile() {
- # Not really a build but...
- sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
-}
-
-each_ruby_test() {
- # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
- #unset RUBYOPT
-
- if [[ "${EUID}" -ne "0" ]]; then
- RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
- -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
- else
- ewarn "The userpriv feature must be enabled to run tests, bug 408951."
- eerror "Testsuite will not be run."
- fi
-}
-
-each_ruby_install() {
- # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
- unset RUBYOPT
- export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
-
- pushd lib &>/dev/null
- doruby -r *
- popd &>/dev/null
-
- local sld=$(ruby_rbconfig_value 'sitelibdir')
- insinto "${sld#${EPREFIX}}" # bug #320813
- newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb || die
-
- newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:') || die
-}
-
-all_ruby_install() {
- dodoc History.txt README.md
-
- if use server; then
- newinitd "${FILESDIR}/init.d-gem_server2" gem_server || die "newinitd failed"
- newconfd "${FILESDIR}/conf.d-gem_server" gem_server || die "newconfd failed"
- fi
-}
-
-pkg_postinst() {
- if [[ ! -n $(readlink "${ROOT}"usr/bin/gem) ]] ; then
- eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
- fi
-
- ewarn
- ewarn "To switch between available Ruby profiles, execute as root:"
- ewarn "\teselect ruby set ruby(23|24|...)"
- ewarn
-}
diff --git a/dev-ruby/rubygems/rubygems-3.0.4.ebuild b/dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
similarity index 100%
rename from dev-ruby/rubygems/rubygems-3.0.4.ebuild
rename to dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/, dev-ruby/rubygems/files/
@ 2019-12-26 6:30 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2019-12-26 6:30 UTC (permalink / raw
To: gentoo-commits
commit: 5a867a40d121dddb477eb425e3119dc6ecbe206f
Author: Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 06:30:36 2019 +0000
Commit: Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 06:30:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a867a40
dev-ruby/rubygems: add 3.1.2
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>
dev-ruby/rubygems/Manifest | 1 +
dev-ruby/rubygems/files/gentoo-defaults-4.rb | 63 ++++++++++++++++++
dev-ruby/rubygems/rubygems-3.1.2.ebuild | 99 ++++++++++++++++++++++++++++
3 files changed, 163 insertions(+)
diff --git a/dev-ruby/rubygems/Manifest b/dev-ruby/rubygems/Manifest
index 81d240ab47a..8d258b5df1c 100644
--- a/dev-ruby/rubygems/Manifest
+++ b/dev-ruby/rubygems/Manifest
@@ -2,3 +2,4 @@ DIST rubygems-2.7.10.tgz 863618 BLAKE2B 26a453d2808cbf03caa6f2ef4a829418de58f4ed
DIST rubygems-3.0.3.tgz 904175 BLAKE2B d99de4bdd51779ab214bc4a81f55483341a2c193d4304b8eeb6105cb95877e0a33fe03d93c47433ad3c6bdc8d3e453e33ffb799fd36164feac31616f95eeced4 SHA512 1dd585243341901c7b4cc60a4902000c10ce57fe2cc9c28e27e274a2e6029f936cde1c99d7097c93c2c5b2c8bcee5d692c8fe5cc00c996a040e4954b674e330e
DIST rubygems-3.0.4.tgz 883664 BLAKE2B d5ec493657c055561aa9c0c09719529857706db197bf266ef4c51e48e6f97c08d85a8923b0c6fd72b3fd6ecb584533ff8ca56515c555e9c5b786b0d99ad2a16e SHA512 887c64226ec0b32d33f2ea331936683406d54dc74d19e658a23521e25ab50aa23534fe9eecaf696154247ad1df1d24c233d8900b9aabc79096eebd6afef3f775
DIST rubygems-3.0.6.tgz 887156 BLAKE2B 685cfb108cc684ecbbcee6fe341baa429ac28f331b3db444c5ed3557bc169147dddc8d226780a85842bf1de2e24f6a60b0464820afa2a6838221c22543a36daa SHA512 1ef1822a2b19790a36a6d242b7d4584222617baa27787ec58961a9cfeb2733f19f9085490ffc72ee375d3153c7114e050c42e68fc8039e727fe5961b09365ee5
+DIST rubygems-3.1.2.tgz 995386 BLAKE2B bddf5dfc3568402257a2218642e6a15fe904b837114b9ce3a1aad155b235e42d96b1b0d4c6be1ee2e71712b8f1876902c343afdcb6d191ae0a6560f582cb282c SHA512 707525a98d14d46e69922e1deecd3b6c4caa090ee8113ba43b3912dc615cd2b1e0a083ecd0876a08b69c209bc05bba67d179f70d65aca45a92ac543170f13d39
diff --git a/dev-ruby/rubygems/files/gentoo-defaults-4.rb b/dev-ruby/rubygems/files/gentoo-defaults-4.rb
new file mode 100644
index 00000000000..1da07f64dde
--- /dev/null
+++ b/dev-ruby/rubygems/files/gentoo-defaults-4.rb
@@ -0,0 +1,63 @@
+# 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
diff --git a/dev-ruby/rubygems/rubygems-3.1.2.ebuild b/dev-ruby/rubygems/rubygems-3.1.2.ebuild
new file mode 100644
index 00000000000..aabe914b1b9
--- /dev/null
+++ b/dev-ruby/rubygems/rubygems-3.1.2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+USE_RUBY="ruby24 ruby25 ruby26"
+
+inherit ruby-ng prefix
+
+DESCRIPTION="Centralized Ruby extension management system"
+HOMEPAGE="https://rubygems.org/"
+LICENSE="GPL-2 || ( Ruby MIT )"
+
+SRC_URI="https://rubygems.org/rubygems/${P}.tgz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE="server test"
+RESTRICT="!test? ( test )"
+
+PDEPEND="server? ( =dev-ruby/builder-3* )"
+
+ruby_add_bdepend "
+ test? (
+ dev-ruby/json
+ dev-ruby/minitest:5
+ dev-ruby/rake
+ dev-ruby/rdoc
+ )"
+
+all_ruby_prepare() {
+
+ mkdir -p lib/rubygems/defaults || die
+ cp "${FILESDIR}/gentoo-defaults-4.rb" lib/rubygems/defaults/operating_system.rb || die
+
+ eprefixify lib/rubygems/defaults/operating_system.rb
+
+ # Disable broken tests when changing default values:
+ sed -i -e '/test_default_path/,/^ end/ s:^:#:' test/rubygems/test_gem.rb || die
+ # Avoid test that won't work as json is also installed as plain ruby code
+ sed -i -e '/test_realworld_default_gem/askip "gentoo"' test/rubygems/test_require.rb || die
+
+ # Update manifest after changing files to avoid a test failure
+ rake update_manifest || die
+}
+
+each_ruby_compile() {
+ # Not really a build but...
+ sed -i -e 's:#!.*:#!'"${RUBY}"':' bin/gem
+}
+
+each_ruby_test() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ #unset RUBYOPT
+
+ if [[ "${EUID}" -ne "0" ]]; then
+ RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}" ${RUBY} --disable-gems -I.:lib:test:bundler/lib \
+ -e 'require "rubygems"; gem "minitest", "~>5.0"; Dir["test/**/test_*.rb"].each { |tu| require tu }' || die "tests failed"
+ else
+ ewarn "The userpriv feature must be enabled to run tests, bug 408951."
+ eerror "Testsuite will not be run."
+ fi
+}
+
+each_ruby_install() {
+ # Unset RUBYOPT to avoid interferences, bug #158455 et. al.
+ unset RUBYOPT
+ export RUBYLIB="$(pwd)/lib${RUBYLIB+:${RUBYLIB}}"
+
+ pushd lib &>/dev/null
+ doruby -r *
+ popd &>/dev/null
+
+ local sld=$(ruby_rbconfig_value 'sitelibdir')
+ insinto "${sld#${EPREFIX}}" # bug #320813
+ newins "${FILESDIR}/auto_gem.rb.ruby19" auto_gem.rb
+
+ newbin bin/gem $(basename ${RUBY} | sed -e 's:ruby:gem:')
+}
+
+all_ruby_install() {
+ dodoc History.txt README.md
+
+ if use server; then
+ newinitd "${FILESDIR}/init.d-gem_server2" gem_server
+ newconfd "${FILESDIR}/conf.d-gem_server" gem_server
+ fi
+}
+
+pkg_postinst() {
+ if [[ ! -n $(readlink "${ROOT}"/usr/bin/gem) ]] ; then
+ eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
+ fi
+
+ ewarn
+ ewarn "To switch between available Ruby profiles, execute as root:"
+ ewarn "\teselect ruby set ruby(25|26|...)"
+ ewarn
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/, dev-ruby/rubygems/files/
@ 2022-01-16 16:03 Hans de Graaff
0 siblings, 0 replies; 3+ messages in thread
From: Hans de Graaff @ 2022-01-16 16:03 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-01-16 16:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-12-26 6:30 [gentoo-commits] repo/gentoo:master commit in: dev-ruby/rubygems/, dev-ruby/rubygems/files/ Hans de Graaff
-- strict thread matches above, loose matches on Subject: below --
2022-01-16 16:03 Hans de Graaff
2019-06-30 8:46 Hans de Graaff
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox