Date: Wed, 14 Jul 2021 21:43:28 GMT From: =?utf-8?Q?Romain Tarti=C3=A8re?= <romain@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 844ff65d25f5 - main - sysutils/rubygem-r10k: Unbreak Message-ID: <202107142143.16ELhS6n053696@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by romain: URL: https://cgit.FreeBSD.org/ports/commit/?id=844ff65d25f5a9ebd016114a3b7e60eef9390d66 commit 844ff65d25f5a9ebd016114a3b7e60eef9390d66 Author: Romain Tartière <romain@FreeBSD.org> AuthorDate: 2021-07-14 21:15:51 +0000 Commit: Romain Tartière <romain@FreeBSD.org> 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<colored2>.freeze, ["= 3.1.2"]) +- s.add_runtime_dependency(%q<cri>.freeze, ["= 2.15.10"]) ++ s.add_runtime_dependency(%q<cri>.freeze, ["~> 2.15.10"]) + s.add_runtime_dependency(%q<log4r>.freeze, ["= 1.1.10"]) s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.10"]) s.add_runtime_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"]) s.add_runtime_dependency(%q<gettext-setup>.freeze, ["~> 0.24"]) @@ -11,7 +17,12 @@ s.add_development_dependency(%q<rspec>.freeze, ["~> 3.1"]) s.add_development_dependency(%q<rake>.freeze, [">= 0"]) s.add_development_dependency(%q<yard>.freeze, ["~> 0.9.11"]) -@@ -42,8 +42,8 @@ Gem::Specification.new do |s| + s.add_development_dependency(%q<minitar>.freeze, ["~> 0.9.0"]) + else + s.add_dependency(%q<colored2>.freeze, ["= 3.1.2"]) +- s.add_dependency(%q<cri>.freeze, ["= 2.15.10"]) ++ s.add_dependency(%q<cri>.freeze, ["~> 2.15.10"]) + s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"]) s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"]) s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"]) s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"]) @@ -22,7 +33,13 @@ s.add_dependency(%q<rspec>.freeze, ["~> 3.1"]) s.add_dependency(%q<rake>.freeze, [">= 0"]) s.add_dependency(%q<yard>.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<colored2>.freeze, ["= 3.1.2"]) +- s.add_dependency(%q<cri>.freeze, ["= 2.15.10"]) ++ s.add_dependency(%q<cri>.freeze, ["~> 2.15.10"]) + s.add_dependency(%q<log4r>.freeze, ["= 1.1.10"]) s.add_dependency(%q<multi_json>.freeze, ["~> 1.10"]) s.add_dependency(%q<puppet_forge>.freeze, ["~> 2.3.0"]) s.add_dependency(%q<gettext-setup>.freeze, ["~> 0.24"])
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202107142143.16ELhS6n053696>