pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/misc/rubygems Update rubygems to 2.4.5 and make this p...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a8a45ebdbb0c
branches: trunk
changeset: 645229:a8a45ebdbb0c
user: taca <taca%pkgsrc.org@localhost>
date: Sun Jan 25 16:13:13 2015 +0000
description:
Update rubygems to 2.4.5 and make this package for ruby18 only.
Changes are too many to write here, please refer rubygem's github:
https://github.com/rubygems/rubygems/blob/master/History.txt.
diffstat:
misc/rubygems/Makefile | 8 +-
misc/rubygems/PLIST | 60 ++++++++++++++++-
misc/rubygems/distinfo | 30 ++++----
misc/rubygems/patches/patch-aa | 44 +++++++++---
misc/rubygems/patches/patch-ab | 44 ++++---------
misc/rubygems/patches/patch-ac | 6 +-
misc/rubygems/patches/patch-ad | 34 +++++-----
misc/rubygems/patches/patch-af | 18 -----
misc/rubygems/patches/patch-ag | 31 ---------
misc/rubygems/patches/patch-ah | 29 +++-----
misc/rubygems/patches/patch-aj | 12 +-
misc/rubygems/patches/patch-am | 4 +-
misc/rubygems/patches/patch-ao | 10 +-
misc/rubygems/patches/patch-lib_rubygems_platform.rb | 20 ++++-
misc/rubygems/patches/patch-test_rubygems_test__gem.rb | 20 +++---
15 files changed, 191 insertions(+), 179 deletions(-)
diffs (truncated from 679 to 300 lines):
diff -r 989814ddbb26 -r a8a45ebdbb0c misc/rubygems/Makefile
--- a/misc/rubygems/Makefile Sun Jan 25 16:09:16 2015 +0000
+++ b/misc/rubygems/Makefile Sun Jan 25 16:13:13 2015 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.57 2014/03/13 18:05:49 taca Exp $
+# $NetBSD: Makefile,v 1.58 2015/01/25 16:13:13 taca Exp $
-DISTNAME= rubygems-2.0.10
-PKGREVISION= 2
+DISTNAME= rubygems-${RUBY_GEMS_PKGSRC_VERS}
CATEGORIES= misc ruby
MASTER_SITES= http://production.cf.rubygems.org/rubygems/
EXTRACT_SUFX= .tgz
@@ -15,6 +14,9 @@
.include "../../mk/bsd.prefs.mk"
+# Modern ruby bundles rubygems.
+RUBY_VERSION_SUPPORTED= 18
+
NO_CONFIGURE= yes
NO_BUILD= yes
diff -r 989814ddbb26 -r a8a45ebdbb0c misc/rubygems/PLIST
--- a/misc/rubygems/PLIST Sun Jan 25 16:09:16 2015 +0000
+++ b/misc/rubygems/PLIST Sun Jan 25 16:13:13 2015 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.24 2014/03/13 18:05:49 taca Exp $
+@comment $NetBSD: PLIST,v 1.25 2015/01/25 16:13:13 taca Exp $
bin/gem${RUBY_SUFFIX}.new
${RUBY_VENDORLIB}/gauntlet_rubygems.rb
${RUBY_VENDORLIB}/rubygems.rb
${RUBY_VENDORLIB}/rubygems/available_set.rb
+${RUBY_VENDORLIB}/rubygems/basic_specification.rb
${RUBY_VENDORLIB}/rubygems/command.rb
${RUBY_VENDORLIB}/rubygems/command_manager.rb
${RUBY_VENDORLIB}/rubygems/commands/build_command.rb
@@ -19,6 +20,7 @@
${RUBY_VENDORLIB}/rubygems/commands/list_command.rb
${RUBY_VENDORLIB}/rubygems/commands/lock_command.rb
${RUBY_VENDORLIB}/rubygems/commands/mirror_command.rb
+${RUBY_VENDORLIB}/rubygems/commands/open_command.rb
${RUBY_VENDORLIB}/rubygems/commands/outdated_command.rb
${RUBY_VENDORLIB}/rubygems/commands/owner_command.rb
${RUBY_VENDORLIB}/rubygems/commands/pristine_command.rb
@@ -44,12 +46,12 @@
${RUBY_VENDORLIB}/rubygems/dependency.rb
${RUBY_VENDORLIB}/rubygems/dependency_installer.rb
${RUBY_VENDORLIB}/rubygems/dependency_list.rb
-${RUBY_VENDORLIB}/rubygems/dependency_resolver.rb
${RUBY_VENDORLIB}/rubygems/deprecate.rb
${RUBY_VENDORLIB}/rubygems/doctor.rb
${RUBY_VENDORLIB}/rubygems/errors.rb
${RUBY_VENDORLIB}/rubygems/exceptions.rb
${RUBY_VENDORLIB}/rubygems/ext.rb
+${RUBY_VENDORLIB}/rubygems/ext/build_error.rb
${RUBY_VENDORLIB}/rubygems/ext/builder.rb
${RUBY_VENDORLIB}/rubygems/ext/cmake_builder.rb
${RUBY_VENDORLIB}/rubygems/ext/configure_builder.rb
@@ -58,6 +60,7 @@
${RUBY_VENDORLIB}/rubygems/gem_runner.rb
${RUBY_VENDORLIB}/rubygems/gemcutter_utilities.rb
${RUBY_VENDORLIB}/rubygems/indexer.rb
+${RUBY_VENDORLIB}/rubygems/install_default_message.rb
${RUBY_VENDORLIB}/rubygems/install_message.rb
${RUBY_VENDORLIB}/rubygems/install_update_options.rb
${RUBY_VENDORLIB}/rubygems/installer.rb
@@ -67,7 +70,10 @@
${RUBY_VENDORLIB}/rubygems/name_tuple.rb
${RUBY_VENDORLIB}/rubygems/package.rb
${RUBY_VENDORLIB}/rubygems/package/digest_io.rb
+${RUBY_VENDORLIB}/rubygems/package/file_source.rb
+${RUBY_VENDORLIB}/rubygems/package/io_source.rb
${RUBY_VENDORLIB}/rubygems/package/old.rb
+${RUBY_VENDORLIB}/rubygems/package/source.rb
${RUBY_VENDORLIB}/rubygems/package/tar_header.rb
${RUBY_VENDORLIB}/rubygems/package/tar_reader.rb
${RUBY_VENDORLIB}/rubygems/package/tar_reader/entry.rb
@@ -80,8 +86,39 @@
${RUBY_VENDORLIB}/rubygems/psych_tree.rb
${RUBY_VENDORLIB}/rubygems/rdoc.rb
${RUBY_VENDORLIB}/rubygems/remote_fetcher.rb
+${RUBY_VENDORLIB}/rubygems/request.rb
+${RUBY_VENDORLIB}/rubygems/request/connection_pools.rb
+${RUBY_VENDORLIB}/rubygems/request/http_pool.rb
+${RUBY_VENDORLIB}/rubygems/request/https_pool.rb
${RUBY_VENDORLIB}/rubygems/request_set.rb
+${RUBY_VENDORLIB}/rubygems/request_set/gem_dependency_api.rb
+${RUBY_VENDORLIB}/rubygems/request_set/lockfile.rb
${RUBY_VENDORLIB}/rubygems/requirement.rb
+${RUBY_VENDORLIB}/rubygems/resolver.rb
+${RUBY_VENDORLIB}/rubygems/resolver/activation_request.rb
+${RUBY_VENDORLIB}/rubygems/resolver/api_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/api_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/best_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/composed_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/conflict.rb
+${RUBY_VENDORLIB}/rubygems/resolver/current_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/dependency_request.rb
+${RUBY_VENDORLIB}/rubygems/resolver/git_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/git_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/index_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/index_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/installed_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/installer_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/local_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/lock_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/lock_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/requirement_list.rb
+${RUBY_VENDORLIB}/rubygems/resolver/set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/spec_specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/specification.rb
+${RUBY_VENDORLIB}/rubygems/resolver/stats.rb
+${RUBY_VENDORLIB}/rubygems/resolver/vendor_set.rb
+${RUBY_VENDORLIB}/rubygems/resolver/vendor_specification.rb
${RUBY_VENDORLIB}/rubygems/security.rb
${RUBY_VENDORLIB}/rubygems/security/policies.rb
${RUBY_VENDORLIB}/rubygems/security/policy.rb
@@ -89,21 +126,34 @@
${RUBY_VENDORLIB}/rubygems/security/trust_dir.rb
${RUBY_VENDORLIB}/rubygems/server.rb
${RUBY_VENDORLIB}/rubygems/source.rb
+${RUBY_VENDORLIB}/rubygems/source/git.rb
+${RUBY_VENDORLIB}/rubygems/source/installed.rb
+${RUBY_VENDORLIB}/rubygems/source/local.rb
+${RUBY_VENDORLIB}/rubygems/source/lock.rb
+${RUBY_VENDORLIB}/rubygems/source/specific_file.rb
+${RUBY_VENDORLIB}/rubygems/source/vendor.rb
${RUBY_VENDORLIB}/rubygems/source_list.rb
${RUBY_VENDORLIB}/rubygems/source_local.rb
${RUBY_VENDORLIB}/rubygems/source_specific_file.rb
${RUBY_VENDORLIB}/rubygems/spec_fetcher.rb
${RUBY_VENDORLIB}/rubygems/specification.rb
+${RUBY_VENDORLIB}/rubygems/ssl_certs/AddTrustExternalCARoot-2048.pem
${RUBY_VENDORLIB}/rubygems/ssl_certs/AddTrustExternalCARoot.pem
-${RUBY_VENDORLIB}/rubygems/ssl_certs/Entrust_net-Secure-Server-Certification-Authority.pem
-${RUBY_VENDORLIB}/rubygems/ssl_certs/GeoTrust_Global_CA.pem
-${RUBY_VENDORLIB}/rubygems/ssl_certs/VerisignClass3PublicPrimaryCertificationAuthority-G2.pem
+${RUBY_VENDORLIB}/rubygems/ssl_certs/Class3PublicPrimaryCertificationAuthority.pem
+${RUBY_VENDORLIB}/rubygems/ssl_certs/DigiCertHighAssuranceEVRootCA.pem
+${RUBY_VENDORLIB}/rubygems/ssl_certs/EntrustnetSecureServerCertificationAuthority.pem
+${RUBY_VENDORLIB}/rubygems/ssl_certs/GeoTrustGlobalCA.pem
+${RUBY_VENDORLIB}/rubygems/stub_specification.rb
${RUBY_VENDORLIB}/rubygems/syck_hack.rb
${RUBY_VENDORLIB}/rubygems/test_case.rb
${RUBY_VENDORLIB}/rubygems/test_utilities.rb
${RUBY_VENDORLIB}/rubygems/text.rb
${RUBY_VENDORLIB}/rubygems/uninstaller.rb
+${RUBY_VENDORLIB}/rubygems/uri_formatter.rb
${RUBY_VENDORLIB}/rubygems/user_interaction.rb
+${RUBY_VENDORLIB}/rubygems/util.rb
+${RUBY_VENDORLIB}/rubygems/util/list.rb
+${RUBY_VENDORLIB}/rubygems/util/stringio.rb
${RUBY_VENDORLIB}/rubygems/validator.rb
${RUBY_VENDORLIB}/rubygems/version.rb
${RUBY_VENDORLIB}/rubygems/version_option.rb
diff -r 989814ddbb26 -r a8a45ebdbb0c misc/rubygems/distinfo
--- a/misc/rubygems/distinfo Sun Jan 25 16:09:16 2015 +0000
+++ b/misc/rubygems/distinfo Sun Jan 25 16:13:13 2015 +0000
@@ -1,17 +1,15 @@
-$NetBSD: distinfo,v 1.47 2014/03/16 17:42:33 taca Exp $
+$NetBSD: distinfo,v 1.48 2015/01/25 16:13:13 taca Exp $
-SHA1 (rubygems-2.0.10.tgz) = e4119824649771958038b2347485df85c3a09fc6
-RMD160 (rubygems-2.0.10.tgz) = cc6c5adb29464217067eeab6e06bbb1b67d6cf42
-Size (rubygems-2.0.10.tgz) = 338280 bytes
-SHA1 (patch-aa) = ec1af229bb7cf9b36b0b5669b8c6f3d97f7ea15e
-SHA1 (patch-ab) = a960d57b48397fa499c0ee1a91b534eb10574d06
-SHA1 (patch-ac) = 1a59a5d2fc090dfcf6d3bd3b9c133f0ce4a1feee
-SHA1 (patch-ad) = 40819a75ae0094292417a7c682ed56abd98de1c2
-SHA1 (patch-af) = d96d5dafd830b0c94bf6c191a3274701ebc6d564
-SHA1 (patch-ag) = 1114e30ce7161a6aa98c3ac6c4ee81f1c22a10d8
-SHA1 (patch-ah) = ae9cd39b900793dbb3d22bad88163750e4d120fe
-SHA1 (patch-aj) = 3b77a675470ea3702b9870843d2bb39bb6a83f3e
-SHA1 (patch-am) = 9146ece86c0bae61553c916adafb2c108f3f07a9
-SHA1 (patch-ao) = 4a8be3bdab5e465814b626d17a5f2811fbfc808c
-SHA1 (patch-lib_rubygems_platform.rb) = 1a80ea59f02366c5de035783e40b7904df4be84f
-SHA1 (patch-test_rubygems_test__gem.rb) = 883675c1af0314c66c3d02fb9c012fac768ebb9b
+SHA1 (rubygems-2.4.5.tgz) = a7122c93b0f6b4aac5291772d5ed973a09c244cb
+RMD160 (rubygems-2.4.5.tgz) = d5de8615edbddfaa75b4e03bab27868198fa20e7
+Size (rubygems-2.4.5.tgz) = 446665 bytes
+SHA1 (patch-aa) = a4348c5389c1f758d8c43c3ac27b3d5f3db2bace
+SHA1 (patch-ab) = ac375cf0c8dd688e1b93709ea787def867efaa05
+SHA1 (patch-ac) = a5b0ed3e2cd8ea7385889fc084a5971b5db3c0a5
+SHA1 (patch-ad) = 197aa2711640ad734a9c97d8a04c9dd4b0ae4ac2
+SHA1 (patch-ah) = f606d0883b75e5b07224e521c3614ea9fcc4d52b
+SHA1 (patch-aj) = 6eb781e915c517b7f4e6c315873d1037793adf6b
+SHA1 (patch-am) = e65b9b9f5b0aff58ac6fc25d0f27811aefcbd90a
+SHA1 (patch-ao) = f8dd8b3734e6cc065cdebc97fd7fdc7601c9a175
+SHA1 (patch-lib_rubygems_platform.rb) = e7b2450a48fb58e2f0221f6de1bb87e22f87f4c2
+SHA1 (patch-test_rubygems_test__gem.rb) = 3d853bfe2100fde8314fd4c3281b1f511b386618
diff -r 989814ddbb26 -r a8a45ebdbb0c misc/rubygems/patches/patch-aa
--- a/misc/rubygems/patches/patch-aa Sun Jan 25 16:09:16 2015 +0000
+++ b/misc/rubygems/patches/patch-aa Sun Jan 25 16:13:13 2015 +0000
@@ -1,12 +1,14 @@
-$NetBSD: patch-aa,v 1.14 2013/09/10 16:33:29 taca Exp $
+$NetBSD: patch-aa,v 1.15 2015/01/25 16:13:13 taca Exp $
* Relax to allow some attribute could be nil.
* Complete "http://"; to homepage attribute if it isn't begin with it.
* Accpet date with Time, but ignore time part.
+* Skip checking gem.build_complete existence of file.
+* Allow duplicate dependencies but warn them.
---- lib/rubygems/specification.rb.orig 2013-09-09 23:41:27.000000000 +0000
+--- lib/rubygems/specification.rb.orig 2014-11-30 04:25:42.000000000 +0000
+++ lib/rubygems/specification.rb
-@@ -162,6 +162,12 @@ class Gem::Specification
+@@ -172,6 +172,12 @@ class Gem::Specification < Gem::BasicSpe
@@default_value[k].nil?
}
@@ -19,25 +21,36 @@
######################################################################
# :section: Required gemspec attributes
-@@ -2337,7 +2343,24 @@ class Gem::Specification
+@@ -1779,7 +1785,7 @@ class Gem::Specification < Gem::BasicSpe
+ # directory.
+
+ def gem_build_complete_path # :nodoc:
+- File.join extension_dir, 'gem.build_complete'
++ File.join extension_dir
+ end
+
+ ##
+@@ -2456,8 +2462,25 @@ class Gem::Specification < Gem::BasicSpe
+ extend Gem::UserInteraction
normalize
- nil_attributes = self.class.non_nil_attributes.find_all do |name|
+- nil_attributes = self.class.non_nil_attributes.find_all do |name|
- instance_variable_get("@#{name}").nil?
-+ val = instance_variable_get("@#{name}")
++ nil_attributes = self.class.non_nil_attributes.find_all do |attrname|
++ val = instance_variable_get("@#{attrname}")
+ if val.nil?
-+ if @@pkgsrc_nil_attributes.key?(name)
-+ case name
++ if @@pkgsrc_nil_attributes.key?(attrname)
++ case attrname
+ when :required_rubygems_version
+ val = Gem::Requirement.default
+ else
+ val = []
+ end
-+ instance_variable_set("@#{name}", val)
++ instance_variable_set("@#{attrname}", val)
+ false
+ end
+ end
-+ if name == :authors and val.empty?
++ if attrname == :authors and val.empty?
+ val = ['not specified']
+ self.authors = val
+ false
@@ -45,7 +58,7 @@
end
unless nil_attributes.empty? then
-@@ -2475,10 +2498,15 @@ class Gem::Specification
+@@ -2601,10 +2624,15 @@ http://opensource.org/licenses/alphabeti
raise Gem::InvalidSpecificationException, "#{lazy} is not a summary"
end
@@ -65,3 +78,12 @@
end
# Warnings
+@@ -2647,7 +2675,7 @@ http://opensource.org/licenses/alphabeti
+
+ dependencies.each do |dep|
+ if prev = seen[dep.name] then
+- raise Gem::InvalidSpecificationException, <<-MESSAGE
++ warn <<-MESSAGE
+ duplicate dependency on #{dep}, (#{prev.requirement}) use:
+ add_runtime_dependency '#{dep.name}', '#{dep.requirement}', '#{prev.requirement}'
+ MESSAGE
diff -r 989814ddbb26 -r a8a45ebdbb0c misc/rubygems/patches/patch-ab
--- a/misc/rubygems/patches/patch-ab Sun Jan 25 16:09:16 2015 +0000
+++ b/misc/rubygems/patches/patch-ab Sun Jan 25 16:13:13 2015 +0000
@@ -1,10 +1,10 @@
-$NetBSD: patch-ab,v 1.18 2014/02/19 15:47:32 taca Exp $
+$NetBSD: patch-ab,v 1.19 2015/01/25 16:13:13 taca Exp $
Add install_root option for pkgsrc's rubygems support.
---- lib/rubygems/dependency_installer.rb.orig 2013-09-09 23:41:27.000000000 +0000
+--- lib/rubygems/dependency_installer.rb.orig 2014-09-10 04:23:57.000000000 +0000
+++ lib/rubygems/dependency_installer.rb
-@@ -50,6 +50,7 @@ class Gem::DependencyInstaller
+@@ -63,6 +63,7 @@ class Gem::DependencyInstaller
# :format_executable:: See Gem::Installer#initialize.
# :ignore_dependencies:: Don't install any dependencies.
# :install_dir:: See Gem::Installer#install.
@@ -12,23 +12,7 @@
# :prerelease:: Allow prerelease versions. See #install.
# :security_policy:: See Gem::Installer::new and Gem::Security.
# :user_install:: See Gem::Installer.new
-@@ -57,12 +58,13 @@ class Gem::DependencyInstaller
Home |
Main Index |
Thread Index |
Old Index