From owner-dev-commits-ports-all@freebsd.org Wed Jul 14 21:43:28 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 724F8656CAF; Wed, 14 Jul 2021 21:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GQ9ww2kV9z4dTn; Wed, 14 Jul 2021 21:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4611A1D952; Wed, 14 Jul 2021 21:43:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16ELhSuf053697; Wed, 14 Jul 2021 21:43:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16ELhS6n053696; Wed, 14 Jul 2021 21:43:28 GMT (envelope-from git) Date: Wed, 14 Jul 2021 21:43:28 GMT Message-Id: <202107142143.16ELhS6n053696@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Romain Tarti=C3=A8re?= Subject: git: 844ff65d25f5 - main - sysutils/rubygem-r10k: Unbreak MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: romain X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 844ff65d25f5a9ebd016114a3b7e60eef9390d66 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 14 Jul 2021 21:43:28 -0000 The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=844ff65d25f5a9ebd016114a3b7e60eef9390d66 commit 844ff65d25f5a9ebd016114a3b7e60eef9390d66 Author: Romain Tartière AuthorDate: 2021-07-14 21:15:51 +0000 Commit: Romain Tartière CommitDate: 2021-07-14 21:42:05 +0000 sysutils/rubygem-r10k: Unbreak The update of rubygem-cri in d4de7a6440ee109ff08ef116bf22d6779b7453cd make the dependency unmet, leading to execution error. With hat: puppet --- sysutils/rubygem-r10k/Makefile | 1 + sysutils/rubygem-r10k/files/patch-r10k.gemspec | 25 +++++++++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/sysutils/rubygem-r10k/Makefile b/sysutils/rubygem-r10k/Makefile index 7c1c0fadc429..6b04bfd95f46 100644 --- a/sysutils/rubygem-r10k/Makefile +++ b/sysutils/rubygem-r10k/Makefile @@ -1,5 +1,6 @@ PORTNAME= r10k PORTVERSION= 3.9.3 +PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG diff --git a/sysutils/rubygem-r10k/files/patch-r10k.gemspec b/sysutils/rubygem-r10k/files/patch-r10k.gemspec index 94479378fc88..5259c27bac10 100644 --- a/sysutils/rubygem-r10k/files/patch-r10k.gemspec +++ b/sysutils/rubygem-r10k/files/patch-r10k.gemspec @@ -1,6 +1,12 @@ ---- r10k.gemspec.orig 2021-04-30 19:31:50 UTC +--- r10k.gemspec.orig 2021-07-14 21:11:15 UTC +++ r10k.gemspec -@@ -29,8 +29,8 @@ Gem::Specification.new do |s| +@@ -24,26 +24,26 @@ Gem::Specification.new do |s| + + if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then + s.add_runtime_dependency(%q.freeze, ["= 3.1.2"]) +- s.add_runtime_dependency(%q.freeze, ["= 2.15.10"]) ++ s.add_runtime_dependency(%q.freeze, ["~> 2.15.10"]) + s.add_runtime_dependency(%q.freeze, ["= 1.1.10"]) s.add_runtime_dependency(%q.freeze, ["~> 1.10"]) s.add_runtime_dependency(%q.freeze, ["~> 2.3.0"]) s.add_runtime_dependency(%q.freeze, ["~> 0.24"]) @@ -11,7 +17,12 @@ s.add_development_dependency(%q.freeze, ["~> 3.1"]) s.add_development_dependency(%q.freeze, [">= 0"]) s.add_development_dependency(%q.freeze, ["~> 0.9.11"]) -@@ -42,8 +42,8 @@ Gem::Specification.new do |s| + s.add_development_dependency(%q.freeze, ["~> 0.9.0"]) + else + s.add_dependency(%q.freeze, ["= 3.1.2"]) +- s.add_dependency(%q.freeze, ["= 2.15.10"]) ++ s.add_dependency(%q.freeze, ["~> 2.15.10"]) + s.add_dependency(%q.freeze, ["= 1.1.10"]) s.add_dependency(%q.freeze, ["~> 1.10"]) s.add_dependency(%q.freeze, ["~> 2.3.0"]) s.add_dependency(%q.freeze, ["~> 0.24"]) @@ -22,7 +33,13 @@ s.add_dependency(%q.freeze, ["~> 3.1"]) s.add_dependency(%q.freeze, [">= 0"]) s.add_dependency(%q.freeze, ["~> 0.9.11"]) -@@ -56,8 +56,8 @@ Gem::Specification.new do |s| +@@ -51,13 +51,13 @@ Gem::Specification.new do |s| + end + else + s.add_dependency(%q.freeze, ["= 3.1.2"]) +- s.add_dependency(%q.freeze, ["= 2.15.10"]) ++ s.add_dependency(%q.freeze, ["~> 2.15.10"]) + s.add_dependency(%q.freeze, ["= 1.1.10"]) s.add_dependency(%q.freeze, ["~> 1.10"]) s.add_dependency(%q.freeze, ["~> 2.3.0"]) s.add_dependency(%q.freeze, ["~> 0.24"])