diff options
Diffstat (limited to 'devel/ruby-gems')
-rw-r--r-- | devel/ruby-gems/Makefile | 17 | ||||
-rw-r--r-- | devel/ruby-gems/distinfo | 6 | ||||
-rw-r--r-- | devel/ruby-gems/files/patch-bundler-remove.patch | 42 | ||||
-rw-r--r-- | devel/ruby-gems/pkg-plist | 35 |
4 files changed, 82 insertions, 18 deletions
diff --git a/devel/ruby-gems/Makefile b/devel/ruby-gems/Makefile index 8f6eceea3a04..141bd7a9ed80 100644 --- a/devel/ruby-gems/Makefile +++ b/devel/ruby-gems/Makefile @@ -1,7 +1,7 @@ # Created by: Alexander Novitsky <alecn2002@yandex.ru> PORTNAME= gems -PORTVERSION= 3.0.8 +PORTVERSION= 3.3.7 CATEGORIES= devel ruby MASTER_SITES= https://rubygems.org/rubygems/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -16,15 +16,20 @@ LICENSE_COMB= dual LICENSE_FILE_MIT= ${WRKSRC}/MIT.txt LICENSE_FILE_RUBY= ${WRKSRC}/LICENSE.txt +RUN_DEPENDS= ca_root_nss>=0:security/ca_root_nss + USES= cpe tar:tgz USE_RUBY= yes GEMS_BASE_DIR= lib/ruby/gems/${RUBY_VER} -GEMS_ENV= DONT_USE_BUNDLER_FOR_GEMDEPS=true GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} +GEMS_ENV= GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} NO_ARCH= yes NO_BUILD= yes RUBY_SETUP= setup.rb -RUBY_SETUP_OPTIONS= --destdir=${STAGEDIR} --no-regenerate-binstubs +RUBY_SETUP_OPTIONS= --destdir=${STAGEDIR} \ + --no-regenerate-binstubs \ + --no-regenerate-plugins \ + --format-executable CACHE_DIR= ${GEMS_BASE_DIR}/cache DOC_DIR= ${GEMS_BASE_DIR}/doc @@ -45,9 +50,15 @@ OPTIONS_DEFINE= DOCS DOCS_VARS_OFF= RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc" +post-extract: + ${RM} -r ${WRKSRC}/bundler + ${RM} -r ${WRKSRC}/lib/rubygems/ssl_certs + ${FIND} ${WRKSRC} -name .document -delete + do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info + ${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/plugins ${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR} ${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR} diff --git a/devel/ruby-gems/distinfo b/devel/ruby-gems/distinfo index b39eec5b0356..4888baa1ac15 100644 --- a/devel/ruby-gems/distinfo +++ b/devel/ruby-gems/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1602602939 -SHA256 (ruby/rubygems-3.0.8.tgz) = d9d3fa3f6fed192f408e551617f64cc615024edc70828b45edf88b0591987263 -SIZE (ruby/rubygems-3.0.8.tgz) = 888058 +TIMESTAMP = 1645107035 +SHA256 (ruby/rubygems-3.3.7.tgz) = 537475b3a75d4989a9f61c552c7249001a617e84e6cdfb533ff19ecfdeeaf183 +SIZE (ruby/rubygems-3.3.7.tgz) = 1265681 diff --git a/devel/ruby-gems/files/patch-bundler-remove.patch b/devel/ruby-gems/files/patch-bundler-remove.patch new file mode 100644 index 000000000000..cc0c271578b8 --- /dev/null +++ b/devel/ruby-gems/files/patch-bundler-remove.patch @@ -0,0 +1,42 @@ +commit b110d12e9c3bd2d153886681ff42c53c59ecd12d +Author: Thibault Jouan <tj@a13.fr> +AuthorDate: Mon Oct 11 23:54:27 2021 +0000 +Commit: Thibault Jouan <tj@a13.fr> +CommitDate: Wed Oct 13 11:49:25 2021 +0000 + + Prevent bundler installation + + Since RubyGems 3.1 the `setup' command also installs bundler and the + `USE_BUNDLER_FOR_GEMDEPS' environment variable has been removed. + + We have to manually patch this command to remove bundler installation. + +diff --git lib/rubygems/commands/setup_command.rb lib/rubygems/commands/setup_command.rb +index 2f7f29575..8fef1c539 100644 +--- lib/rubygems/commands/setup_command.rb ++++ lib/rubygems/commands/setup_command.rb +@@ -180,8 +180,6 @@ def execute + # Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir) + remove_old_man_files man_dir if man_dir && File.exist?(man_dir) + +- install_default_bundler_gem bin_dir +- + if mode = options[:dir_mode] + @mkdirs.uniq! + File.chmod(mode, @mkdirs) +@@ -311,7 +309,6 @@ def shebang + + def install_lib(lib_dir) + libs = { 'RubyGems' => 'lib' } +- libs['Bundler'] = 'bundler/lib' + libs.each do |tool, path| + say "Installing #{tool}" if @verbose + +@@ -520,7 +517,6 @@ def remove_old_bin_files(bin_dir) + + def remove_old_lib_files(lib_dir) + lib_dirs = { File.join(lib_dir, 'rubygems') => 'lib/rubygems' } +- lib_dirs[File.join(lib_dir, 'bundler')] = 'bundler/lib/bundler' + lib_dirs.each do |old_lib_dir, new_lib_dir| + lib_files = files_in(new_lib_dir) + diff --git a/devel/ruby-gems/pkg-plist b/devel/ruby-gems/pkg-plist index 3e04be24e353..f63ddbdbc651 100644 --- a/devel/ruby-gems/pkg-plist +++ b/devel/ruby-gems/pkg-plist @@ -46,6 +46,7 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_gem.rb %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_require.rb %%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_warn.rb +%%RUBY_SITELIBDIR%%/rubygems/core_ext/tcpsocket_init.rb %%RUBY_SITELIBDIR%%/rubygems/defaults.rb %%RUBY_SITELIBDIR%%/rubygems/dependency.rb %%RUBY_SITELIBDIR%%/rubygems/dependency_installer.rb @@ -68,10 +69,22 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/install_message.rb %%RUBY_SITELIBDIR%%/rubygems/install_update_options.rb %%RUBY_SITELIBDIR%%/rubygems/installer.rb -%%RUBY_SITELIBDIR%%/rubygems/installer_test_case.rb +%%RUBY_SITELIBDIR%%/rubygems/installer_uninstaller_utils.rb %%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb %%RUBY_SITELIBDIR%%/rubygems/mock_gem_ui.rb %%RUBY_SITELIBDIR%%/rubygems/name_tuple.rb +%%RUBY_SITELIBDIR%%/rubygems/openssl.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/COPYING +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optionparser.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/ac.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/date.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/kwargs.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/shellwords.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/time.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/uri.rb +%%RUBY_SITELIBDIR%%/rubygems/optparse/lib/optparse/version.rb %%RUBY_SITELIBDIR%%/rubygems/package.rb %%RUBY_SITELIBDIR%%/rubygems/package/digest_io.rb %%RUBY_SITELIBDIR%%/rubygems/package/file_source.rb @@ -81,13 +94,13 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader.rb %%RUBY_SITELIBDIR%%/rubygems/package/tar_reader/entry.rb -%%RUBY_SITELIBDIR%%/rubygems/package/tar_test_case.rb %%RUBY_SITELIBDIR%%/rubygems/package/tar_writer.rb %%RUBY_SITELIBDIR%%/rubygems/package_task.rb %%RUBY_SITELIBDIR%%/rubygems/path_support.rb %%RUBY_SITELIBDIR%%/rubygems/platform.rb %%RUBY_SITELIBDIR%%/rubygems/psych_additions.rb %%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb +%%RUBY_SITELIBDIR%%/rubygems/query_utils.rb %%RUBY_SITELIBDIR%%/rubygems/rdoc.rb %%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb %%RUBY_SITELIBDIR%%/rubygems/request.rb @@ -103,6 +116,7 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/resolver.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb +%%RUBY_SITELIBDIR%%/rubygems/resolver/api_set/gem_parser.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/api_specification.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/best_set.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/composed_set.rb @@ -119,6 +133,7 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_set.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/lock_specification.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo.rb +%%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/LICENSE %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/delegates/resolution_state.rb %%RUBY_SITELIBDIR%%/rubygems/resolver/molinillo/lib/molinillo/delegates/specification_provider.rb @@ -155,7 +170,6 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/security/signer.rb %%RUBY_SITELIBDIR%%/rubygems/security/trust_dir.rb %%RUBY_SITELIBDIR%%/rubygems/security_option.rb -%%RUBY_SITELIBDIR%%/rubygems/server.rb %%RUBY_SITELIBDIR%%/rubygems/source.rb %%RUBY_SITELIBDIR%%/rubygems/source/git.rb %%RUBY_SITELIBDIR%%/rubygems/source/installed.rb @@ -164,20 +178,17 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb %%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb %%RUBY_SITELIBDIR%%/rubygems/source_list.rb -%%RUBY_SITELIBDIR%%/rubygems/source_local.rb -%%RUBY_SITELIBDIR%%/rubygems/source_specific_file.rb %%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb %%RUBY_SITELIBDIR%%/rubygems/specification.rb %%RUBY_SITELIBDIR%%/rubygems/specification_policy.rb -%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem -%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem -%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem %%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb -%%RUBY_SITELIBDIR%%/rubygems/syck_hack.rb -%%RUBY_SITELIBDIR%%/rubygems/test_case.rb -%%RUBY_SITELIBDIR%%/rubygems/test_utilities.rb %%RUBY_SITELIBDIR%%/rubygems/text.rb +%%RUBY_SITELIBDIR%%/rubygems/tsort.rb +%%RUBY_SITELIBDIR%%/rubygems/tsort/LICENSE.txt +%%RUBY_SITELIBDIR%%/rubygems/tsort/lib/tsort.rb %%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb +%%RUBY_SITELIBDIR%%/rubygems/unknown_command_spell_checker.rb +%%RUBY_SITELIBDIR%%/rubygems/uri.rb %%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb %%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb %%RUBY_SITELIBDIR%%/rubygems/util.rb @@ -186,8 +197,8 @@ bin/gem%%RUBY_SUFFIX%% %%RUBY_SITELIBDIR%%/rubygems/validator.rb %%RUBY_SITELIBDIR%%/rubygems/version.rb %%RUBY_SITELIBDIR%%/rubygems/version_option.rb -%%RUBY_SITELIBDIR%%/ubygems.rb @dir lib/ruby/gems/%%RUBY_VER%%/build_info +@dir lib/ruby/gems/%%RUBY_VER%%/plugins @dir %%CACHE_DIR%% @dir %%DOC_DIR%% @dir %%EXT_DIR%% |