View | Details | Raw Unified | Return to bug 258108 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Scripts/qa.sh (-1 / +1 lines)
Lines 846-852 gemdeps() Link Here
846
				EOF
846
				EOF
847
			fi
847
			fi
848
		done <<-EOF
848
		done <<-EOF
849
		$(grep -a 'add_runtime_dependency' ${STAGEDIR}${PREFIX}/lib/ruby/gems/*/specifications/${PORTNAME}-*.gemspec \
849
		$(grep -a 's.add_runtime_dependency' ${STAGEDIR}${PREFIX}/lib/ruby/gems/*/specifications/${PORTNAME}-*.gemspec \
850
			| sed 's|.*<\(.*\)>.*\[\(.*\)\])|\1 \2|' \
850
			| sed 's|.*<\(.*\)>.*\[\(.*\)\])|\1 \2|' \
851
			| sort -u)
851
			| sort -u)
852
		EOF
852
		EOF
(-)devel/ruby-gems/Makefile (-3 / +13 lines)
Lines 1-7 Link Here
1
# Created by: Alexander Novitsky <alecn2002@yandex.ru>
1
# Created by: Alexander Novitsky <alecn2002@yandex.ru>
2
2
3
PORTNAME=	gems
3
PORTNAME=	gems
4
PORTVERSION=	3.0.8
4
PORTVERSION=	3.2.29
5
CATEGORIES=	devel ruby
5
CATEGORIES=	devel ruby
6
MASTER_SITES=	https://rubygems.org/rubygems/
6
MASTER_SITES=	https://rubygems.org/rubygems/
7
PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
7
PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
Lines 16-30 LICENSE_COMB= dual Link Here
16
LICENSE_FILE_MIT=	${WRKSRC}/MIT.txt
16
LICENSE_FILE_MIT=	${WRKSRC}/MIT.txt
17
LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
17
LICENSE_FILE_RUBY=	${WRKSRC}/LICENSE.txt
18
18
19
RUN_DEPENDS=	ca_root_nss>=0:security/ca_root_nss
20
19
USES=		cpe tar:tgz
21
USES=		cpe tar:tgz
20
USE_RUBY=	yes
22
USE_RUBY=	yes
21
23
22
GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
24
GEMS_BASE_DIR=	lib/ruby/gems/${RUBY_VER}
23
GEMS_ENV=	DONT_USE_BUNDLER_FOR_GEMDEPS=true GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
25
GEMS_ENV=	GEM_HOME=${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
24
NO_ARCH=	yes
26
NO_ARCH=	yes
25
NO_BUILD=	yes
27
NO_BUILD=	yes
26
RUBY_SETUP=	setup.rb
28
RUBY_SETUP=	setup.rb
27
RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR} --no-regenerate-binstubs
29
RUBY_SETUP_OPTIONS=	--destdir=${STAGEDIR} \
30
	--no-regenerate-binstubs \
31
	--no-regenerate-plugins \
32
	--format-executable
28
33
29
CACHE_DIR=	${GEMS_BASE_DIR}/cache
34
CACHE_DIR=	${GEMS_BASE_DIR}/cache
30
DOC_DIR=	${GEMS_BASE_DIR}/doc
35
DOC_DIR=	${GEMS_BASE_DIR}/doc
Lines 45-53 OPTIONS_DEFINE= DOCS Link Here
45
50
46
DOCS_VARS_OFF=	RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc"
51
DOCS_VARS_OFF=	RUBY_SETUP_OPTIONS+="--no-ri --no-rdoc"
47
52
53
post-extract:
54
	${RM} -r ${WRKSRC}/bundler
55
	${RM} -r ${WRKSRC}/lib/rubygems/ssl_certs
56
48
do-install:
57
do-install:
49
	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
58
	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}
50
	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info
59
	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/build_info
60
	${MKDIR} ${STAGEDIR}${PREFIX}/${GEMS_BASE_DIR}/plugins
51
	${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR}
61
	${MKDIR} ${STAGEDIR}${PREFIX}/${CACHE_DIR}
52
	${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
62
	${MKDIR} ${STAGEDIR}${PREFIX}/${DOC_DIR}
53
	${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR}
63
	${MKDIR} ${STAGEDIR}${PREFIX}/${EXT_DIR}
(-)devel/ruby-gems/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1602602939
1
TIMESTAMP = 1633989475
2
SHA256 (ruby/rubygems-3.0.8.tgz) = d9d3fa3f6fed192f408e551617f64cc615024edc70828b45edf88b0591987263
2
SHA256 (ruby/rubygems-3.2.29.tgz) = 878ed074fab60e148401dd8772c4e993d8cd44eadd565e1ce20c91d45eec4850
3
SIZE (ruby/rubygems-3.0.8.tgz) = 888058
3
SIZE (ruby/rubygems-3.2.29.tgz) = 1238459
(-)devel/ruby-gems/files/patch-bundler-remove.patch (+42 lines)
Added Link Here
1
commit b110d12e9c3bd2d153886681ff42c53c59ecd12d
2
Author:     Thibault Jouan <tj@a13.fr>
3
AuthorDate: Mon Oct 11 23:54:27 2021 +0000
4
Commit:     Thibault Jouan <tj@a13.fr>
5
CommitDate: Wed Oct 13 11:49:25 2021 +0000
6
7
    Prevent bundler installation
8
    
9
      Since RubyGems 3.1 the `setup' command also installs bundler and the
10
    `USE_BUNDLER_FOR_GEMDEPS' environment variable has been removed.
11
    
12
      We have to manually patch this command to remove bundler installation.
13
14
diff --git lib/rubygems/commands/setup_command.rb lib/rubygems/commands/setup_command.rb
15
index 2f7f29575..8fef1c539 100644
16
--- lib/rubygems/commands/setup_command.rb
17
+++ lib/rubygems/commands/setup_command.rb
18
@@ -180,8 +180,6 @@ def execute
19
     # Can be removed one we drop support for bundler 2.2.3 (the last version installing man files to man_dir)
20
     remove_old_man_files man_dir if man_dir && File.exist?(man_dir)
21
 
22
-    install_default_bundler_gem bin_dir
23
-
24
     if mode = options[:dir_mode]
25
       @mkdirs.uniq!
26
       File.chmod(mode, @mkdirs)
27
@@ -311,7 +309,6 @@ def shebang
28
 
29
   def install_lib(lib_dir)
30
     libs = { 'RubyGems' => 'lib' }
31
-    libs['Bundler'] = 'bundler/lib'
32
     libs.each do |tool, path|
33
       say "Installing #{tool}" if @verbose
34
 
35
@@ -520,7 +517,6 @@ def remove_old_bin_files(bin_dir)
36
 
37
   def remove_old_lib_files(lib_dir)
38
     lib_dirs = { File.join(lib_dir, 'rubygems') => 'lib/rubygems' }
39
-    lib_dirs[File.join(lib_dir, 'bundler')] = 'bundler/lib/bundler'
40
     lib_dirs.each do |old_lib_dir, new_lib_dir|
41
       lib_files = files_in(new_lib_dir)
42
 
(-)devel/ruby-gems/pkg-plist (-11 / +7 lines)
Lines 46-51 bin/gem%%RUBY_SUFFIX%% Link Here
46
%%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_gem.rb
46
%%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_gem.rb
47
%%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_require.rb
47
%%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_require.rb
48
%%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_warn.rb
48
%%RUBY_SITELIBDIR%%/rubygems/core_ext/kernel_warn.rb
49
%%RUBY_SITELIBDIR%%/rubygems/core_ext/tcpsocket_init.rb
49
%%RUBY_SITELIBDIR%%/rubygems/defaults.rb
50
%%RUBY_SITELIBDIR%%/rubygems/defaults.rb
50
%%RUBY_SITELIBDIR%%/rubygems/dependency.rb
51
%%RUBY_SITELIBDIR%%/rubygems/dependency.rb
51
%%RUBY_SITELIBDIR%%/rubygems/dependency_installer.rb
52
%%RUBY_SITELIBDIR%%/rubygems/dependency_installer.rb
Lines 68-77 bin/gem%%RUBY_SUFFIX%% Link Here
68
%%RUBY_SITELIBDIR%%/rubygems/install_message.rb
69
%%RUBY_SITELIBDIR%%/rubygems/install_message.rb
69
%%RUBY_SITELIBDIR%%/rubygems/install_update_options.rb
70
%%RUBY_SITELIBDIR%%/rubygems/install_update_options.rb
70
%%RUBY_SITELIBDIR%%/rubygems/installer.rb
71
%%RUBY_SITELIBDIR%%/rubygems/installer.rb
71
%%RUBY_SITELIBDIR%%/rubygems/installer_test_case.rb
72
%%RUBY_SITELIBDIR%%/rubygems/installer_uninstaller_utils.rb
72
%%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb
73
%%RUBY_SITELIBDIR%%/rubygems/local_remote_options.rb
73
%%RUBY_SITELIBDIR%%/rubygems/mock_gem_ui.rb
74
%%RUBY_SITELIBDIR%%/rubygems/mock_gem_ui.rb
74
%%RUBY_SITELIBDIR%%/rubygems/name_tuple.rb
75
%%RUBY_SITELIBDIR%%/rubygems/name_tuple.rb
76
%%RUBY_SITELIBDIR%%/rubygems/openssl.rb
75
%%RUBY_SITELIBDIR%%/rubygems/package.rb
77
%%RUBY_SITELIBDIR%%/rubygems/package.rb
76
%%RUBY_SITELIBDIR%%/rubygems/package/digest_io.rb
78
%%RUBY_SITELIBDIR%%/rubygems/package/digest_io.rb
77
%%RUBY_SITELIBDIR%%/rubygems/package/file_source.rb
79
%%RUBY_SITELIBDIR%%/rubygems/package/file_source.rb
Lines 81-93 bin/gem%%RUBY_SUFFIX%% Link Here
81
%%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
83
%%RUBY_SITELIBDIR%%/rubygems/package/tar_header.rb
82
%%RUBY_SITELIBDIR%%/rubygems/package/tar_reader.rb
84
%%RUBY_SITELIBDIR%%/rubygems/package/tar_reader.rb
83
%%RUBY_SITELIBDIR%%/rubygems/package/tar_reader/entry.rb
85
%%RUBY_SITELIBDIR%%/rubygems/package/tar_reader/entry.rb
84
%%RUBY_SITELIBDIR%%/rubygems/package/tar_test_case.rb
85
%%RUBY_SITELIBDIR%%/rubygems/package/tar_writer.rb
86
%%RUBY_SITELIBDIR%%/rubygems/package/tar_writer.rb
86
%%RUBY_SITELIBDIR%%/rubygems/package_task.rb
87
%%RUBY_SITELIBDIR%%/rubygems/package_task.rb
87
%%RUBY_SITELIBDIR%%/rubygems/path_support.rb
88
%%RUBY_SITELIBDIR%%/rubygems/path_support.rb
88
%%RUBY_SITELIBDIR%%/rubygems/platform.rb
89
%%RUBY_SITELIBDIR%%/rubygems/platform.rb
89
%%RUBY_SITELIBDIR%%/rubygems/psych_additions.rb
90
%%RUBY_SITELIBDIR%%/rubygems/psych_additions.rb
90
%%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb
91
%%RUBY_SITELIBDIR%%/rubygems/psych_tree.rb
92
%%RUBY_SITELIBDIR%%/rubygems/query_utils.rb
91
%%RUBY_SITELIBDIR%%/rubygems/rdoc.rb
93
%%RUBY_SITELIBDIR%%/rubygems/rdoc.rb
92
%%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb
94
%%RUBY_SITELIBDIR%%/rubygems/remote_fetcher.rb
93
%%RUBY_SITELIBDIR%%/rubygems/request.rb
95
%%RUBY_SITELIBDIR%%/rubygems/request.rb
Lines 103-108 bin/gem%%RUBY_SUFFIX%% Link Here
103
%%RUBY_SITELIBDIR%%/rubygems/resolver.rb
105
%%RUBY_SITELIBDIR%%/rubygems/resolver.rb
104
%%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb
106
%%RUBY_SITELIBDIR%%/rubygems/resolver/activation_request.rb
105
%%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb
107
%%RUBY_SITELIBDIR%%/rubygems/resolver/api_set.rb
108
%%RUBY_SITELIBDIR%%/rubygems/resolver/api_set/gem_parser.rb
106
%%RUBY_SITELIBDIR%%/rubygems/resolver/api_specification.rb
109
%%RUBY_SITELIBDIR%%/rubygems/resolver/api_specification.rb
107
%%RUBY_SITELIBDIR%%/rubygems/resolver/best_set.rb
110
%%RUBY_SITELIBDIR%%/rubygems/resolver/best_set.rb
108
%%RUBY_SITELIBDIR%%/rubygems/resolver/composed_set.rb
111
%%RUBY_SITELIBDIR%%/rubygems/resolver/composed_set.rb
Lines 164-183 bin/gem%%RUBY_SUFFIX%% Link Here
164
%%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb
167
%%RUBY_SITELIBDIR%%/rubygems/source/specific_file.rb
165
%%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb
168
%%RUBY_SITELIBDIR%%/rubygems/source/vendor.rb
166
%%RUBY_SITELIBDIR%%/rubygems/source_list.rb
169
%%RUBY_SITELIBDIR%%/rubygems/source_list.rb
167
%%RUBY_SITELIBDIR%%/rubygems/source_local.rb
168
%%RUBY_SITELIBDIR%%/rubygems/source_specific_file.rb
169
%%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
170
%%RUBY_SITELIBDIR%%/rubygems/spec_fetcher.rb
170
%%RUBY_SITELIBDIR%%/rubygems/specification.rb
171
%%RUBY_SITELIBDIR%%/rubygems/specification.rb
171
%%RUBY_SITELIBDIR%%/rubygems/specification_policy.rb
172
%%RUBY_SITELIBDIR%%/rubygems/specification_policy.rb
172
%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/index.rubygems.org/GlobalSignRootCA.pem
173
%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.global.ssl.fastly.net/DigiCertHighAssuranceEVRootCA.pem
174
%%RUBY_SITELIBDIR%%/rubygems/ssl_certs/rubygems.org/AddTrustExternalCARoot.pem
175
%%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb
173
%%RUBY_SITELIBDIR%%/rubygems/stub_specification.rb
176
%%RUBY_SITELIBDIR%%/rubygems/syck_hack.rb
177
%%RUBY_SITELIBDIR%%/rubygems/test_case.rb
178
%%RUBY_SITELIBDIR%%/rubygems/test_utilities.rb
179
%%RUBY_SITELIBDIR%%/rubygems/text.rb
174
%%RUBY_SITELIBDIR%%/rubygems/text.rb
180
%%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb
175
%%RUBY_SITELIBDIR%%/rubygems/uninstaller.rb
176
%%RUBY_SITELIBDIR%%/rubygems/uri.rb
181
%%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
177
%%RUBY_SITELIBDIR%%/rubygems/uri_formatter.rb
182
%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
178
%%RUBY_SITELIBDIR%%/rubygems/user_interaction.rb
183
%%RUBY_SITELIBDIR%%/rubygems/util.rb
179
%%RUBY_SITELIBDIR%%/rubygems/util.rb
Lines 186-193 bin/gem%%RUBY_SUFFIX%% Link Here
186
%%RUBY_SITELIBDIR%%/rubygems/validator.rb
182
%%RUBY_SITELIBDIR%%/rubygems/validator.rb
187
%%RUBY_SITELIBDIR%%/rubygems/version.rb
183
%%RUBY_SITELIBDIR%%/rubygems/version.rb
188
%%RUBY_SITELIBDIR%%/rubygems/version_option.rb
184
%%RUBY_SITELIBDIR%%/rubygems/version_option.rb
189
%%RUBY_SITELIBDIR%%/ubygems.rb
190
@dir lib/ruby/gems/%%RUBY_VER%%/build_info
185
@dir lib/ruby/gems/%%RUBY_VER%%/build_info
186
@dir lib/ruby/gems/%%RUBY_VER%%/plugins
191
@dir %%CACHE_DIR%%
187
@dir %%CACHE_DIR%%
192
@dir %%DOC_DIR%%
188
@dir %%DOC_DIR%%
193
@dir %%EXT_DIR%%
189
@dir %%EXT_DIR%%

Return to bug 258108