CVS commit: [pkgsrc-2018Q2] pkgsrc

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Sat Jul 14 09:22:39 UTC 2018

Modified Files:
        pkgsrc/devel/ruby-activesupport32 [pkgsrc-2018Q2]: Makefile
        pkgsrc/lang/ruby/files [pkgsrc-2018Q2]: update-gemspec.rb

Log Message:
Pullup ticket #5785 - requested by taca
devel/ruby-activesupport32: build fix

Revisions pulled up:
- devel/ruby-activesupport32/Makefile                           1.6
- lang/ruby/files/update-gemspec.rb                             1.10

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Jul  6 15:37:09 UTC 2018

   Modified Files:
        pkgsrc/lang/ruby/files: update-gemspec.rb

   Log Message:
   lang/ruby/files: improve update-gemspec.rb

   Improve update-gemspec.rb script which handles OVERRIDE_GEMSPEC.

   When overriding depending versions, clear completely old dependencies.
   Previously, it replace first dependency only and it cause incomplete
   ruby gem's dependency in a few case.

---
   Module Name: pkgsrc
   Committed By:        taca
   Date:                Fri Jul  6 15:38:55 UTC 2018

   Modified Files:
        pkgsrc/devel/ruby-activesupport32: Makefile

   Log Message:
   devel/ruby-activesupport32: dependencies change in gemspec

   By update of lang/ruby/files/update-gemspec.rb, dependencies changed in
   gemspec.

   Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.4.1 pkgsrc/devel/ruby-activesupport32/Makefile
cvs rdiff -u -r1.9 -r1.9.12.1 pkgsrc/lang/ruby/files/update-gemspec.rb

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ruby-activesupport32/Makefile
diff -u pkgsrc/devel/ruby-activesupport32/Makefile:1.5 pkgsrc/devel/ruby-activesupport32/Makefile:1.5.4.1
--- pkgsrc/devel/ruby-activesupport32/Makefile:1.5      Sun Mar 18 14:21:20 2018
+++ pkgsrc/devel/ruby-activesupport32/Makefile  Sat Jul 14 09:22:39 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2018/03/18 14:21:20 taca Exp $
+# $NetBSD: Makefile,v 1.5.4.1 2018/07/14 09:22:39 bsiegert Exp $
 
 DISTNAME=      activesupport-${RAILS_VERSION}
 PKGNAME=       ${RUBY_PKGPREFIX}-activesupport${RUBY_RAILS}-${RAILS_VERSION}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    devel
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/lang/ruby/files/update-gemspec.rb
diff -u pkgsrc/lang/ruby/files/update-gemspec.rb:1.9 pkgsrc/lang/ruby/files/update-gemspec.rb:1.9.12.1
--- pkgsrc/lang/ruby/files/update-gemspec.rb:1.9        Sun Apr  9 15:49:50 2017
+++ pkgsrc/lang/ruby/files/update-gemspec.rb    Sat Jul 14 09:22:39 2018
@@ -1,9 +1,10 @@
 #!/usr/pkg/bin/ruby
 # -*- coding: utf-8 -*-
 #
-# $NetBSD: update-gemspec.rb,v 1.9 2017/04/09 15:49:50 taca Exp $
+# $NetBSD: update-gemspec.rb,v 1.9.12.1 2018/07/14 09:22:39 bsiegert Exp $
 #
-# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016 The NetBSD Foundation, Inc.
+# Copyright (c) 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018
+# The NetBSD Foundation, Inc.
 # All rights reserved.
 #
 # This code is derived from software contributed to The NetBSD Foundation
@@ -106,8 +107,8 @@ class GemSpecUpdater
       update = @requirements[dep.name]
       if not update.nil? and update[:method] == :update
         r = dep.requirement.requirements
-        r[0][0] = update[:op]
-        r[0][1] = update[:version]
+        r.clear
+        r[0] = [update[:op], update[:version]]
         unless update[:name].nil?
           dep.name = update[:name]
         end