dev-ruby/rubygems: fix rubygems gentoo defaults
authorHans de Graaff <graaff@gentoo.org>
Sun, 30 Jun 2019 08:46:17 +0000 (10:46 +0200)
committerHans de Graaff <graaff@gentoo.org>
Sun, 30 Jun 2019 08:46:38 +0000 (10:46 +0200)
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@gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

dev-ruby/rubygems/files/gentoo-defaults-3.rb
dev-ruby/rubygems/rubygems-3.0.3-r1.ebuild [deleted file]
dev-ruby/rubygems/rubygems-3.0.4-r1.ebuild [moved from dev-ruby/rubygems/rubygems-3.0.4.ebuild with 100% similarity]

index b8ad8f1227ce2df756360071d10f37e76118370d..9d499b73f89dae0a441720235d93e17b23314e34 100644 (file)
@@ -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 (file)
index 8c6d1f4..0000000
+++ /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
-}