diff options
| author | taca <taca@pkgsrc.org> | 2014-03-26 13:22:44 +0000 |
|---|---|---|
| committer | taca <taca@pkgsrc.org> | 2014-03-26 13:22:44 +0000 |
| commit | 6d3bc8db614be2aa8f600f8f12aed0d13877b737 (patch) | |
| tree | bfc797d1c0f2324d8e55a67368e28cba75a30c36 /lang | |
| parent | c9d6a884b4314f6834b8f7d329593b60780f1849 (diff) | |
| download | pkgsrc-6d3bc8db614be2aa8f600f8f12aed0d13877b737.tar.gz | |
Allow duplicated dependencies in gemspec since many existing rubygems have
wrong duplicated dependencies.
Bump PKGREVISION.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/ruby21-base/Makefile | 3 | ||||
| -rw-r--r-- | lang/ruby21-base/distinfo | 4 | ||||
| -rw-r--r-- | lang/ruby21-base/patches/patch-lib_rubygems_specification.rb | 18 |
3 files changed, 18 insertions, 7 deletions
diff --git a/lang/ruby21-base/Makefile b/lang/ruby21-base/Makefile index d60bc4fd734..a9da22efe7d 100644 --- a/lang/ruby21-base/Makefile +++ b/lang/ruby21-base/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1 2014/03/14 19:40:47 taca Exp $ +# $NetBSD: Makefile,v 1.2 2014/03/26 13:22:44 taca Exp $ # DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-base-${RUBY_VERSION_FULL} +PKGREVISION= 1 CATEGORIES= lang ruby MASTER_SITES= ${MASTER_SITE_RUBY} diff --git a/lang/ruby21-base/distinfo b/lang/ruby21-base/distinfo index c4e77caabb3..e3bff231ae8 100644 --- a/lang/ruby21-base/distinfo +++ b/lang/ruby21-base/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1 2014/03/14 19:40:47 taca Exp $ +$NetBSD: distinfo,v 1.2 2014/03/26 13:22:44 taca Exp $ SHA1 (ruby-2.1.1.tar.bz2) = a7fd539f64864bc00fc64444d2d814df6c19fd4a RMD160 (ruby-2.1.1.tar.bz2) = b200bb8d1542f79306c5cd0760781ec9dc759998 @@ -16,7 +16,7 @@ SHA1 (patch-lib_rubygems_dependency__installer.rb) = 840626e388dae2e2059b38ef300 SHA1 (patch-lib_rubygems_install__update__options.rb) = 9a15d509928aa0440691bef8ad43bbfd2688542f SHA1 (patch-lib_rubygems_installer.rb) = b9f5f83db56e89e0996acd9677a090cf0856bf75 SHA1 (patch-lib_rubygems_platform.rb) = 5150a27be7d637dc2ffa44c1d053a39d5f8c9059 -SHA1 (patch-lib_rubygems_specification.rb) = ee53b1982c665bef63e60eb72f3c2d0ec8f02bdc +SHA1 (patch-lib_rubygems_specification.rb) = 034ad0404e8cdfed42def4cfb5c1f98a1597b0c0 SHA1 (patch-lib_rubygems_uninstaller.rb) = 87fdddc435440aab57a6d44aba64abd0b2de6907 SHA1 (patch-man_erb.1) = 1fe6ce4f4fe6418bfabb5e132a63596562030116 SHA1 (patch-man_irb.1) = 2bf807b4c1b1c68d1f518caa054cfd900e0fedb7 diff --git a/lang/ruby21-base/patches/patch-lib_rubygems_specification.rb b/lang/ruby21-base/patches/patch-lib_rubygems_specification.rb index 721f876fa57..bffe4f34ea4 100644 --- a/lang/ruby21-base/patches/patch-lib_rubygems_specification.rb +++ b/lang/ruby21-base/patches/patch-lib_rubygems_specification.rb @@ -1,14 +1,15 @@ -$NetBSD: patch-lib_rubygems_specification.rb,v 1.1 2014/03/14 19:40:47 taca Exp $ +$NetBSD: patch-lib_rubygems_specification.rb,v 1.2 2014/03/26 13:22:44 taca Exp $ * Changes for pkgsrc environment: - - Allow some attributes to nil. - - Relax date/time format. + - Allow some attributes to nil. + - Relax date/time format. + - Allow duplicated dependencies for now. And allow multiple conditions for requirement from Ruby 2.0.0 and Rubygem 1.8.25. ---- lib/rubygems/specification.rb.orig 2013-12-19 22:09:19.000000000 +0000 +--- lib/rubygems/specification.rb.orig 2014-02-06 02:59:36.000000000 +0000 +++ lib/rubygems/specification.rb @@ -178,6 +178,12 @@ class Gem::Specification < Gem::BasicSpe @@default_value[k].nil? @@ -69,3 +70,12 @@ Rubygem 1.8.25. end # Warnings +@@ -2605,7 +2633,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 |