CVS commit: pkgsrc

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Thu Apr  1 14:10:53 UTC 2021

Modified Files:
        pkgsrc/misc/ruby-ohai: Makefile
        pkgsrc/sysutils/ruby-chef: Makefile
        pkgsrc/sysutils/ruby-chef-config: Makefile
        pkgsrc/sysutils/ruby-chef-telemetry: Makefile
        pkgsrc/sysutils/ruby-chef-utils: Makefile
        pkgsrc/sysutils/ruby-chef-zero: Makefile
        pkgsrc/sysutils/ruby-inspec-core: Makefile

Log Message:
Remove ruby25 related code fragments.


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/misc/ruby-ohai/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/ruby-chef/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/ruby-chef-config/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/sysutils/ruby-chef-telemetry/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/ruby-chef-utils/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/sysutils/ruby-chef-zero/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/sysutils/ruby-inspec-core/Makefile

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

Modified files:

Index: pkgsrc/misc/ruby-ohai/Makefile
diff -u pkgsrc/misc/ruby-ohai/Makefile:1.32 pkgsrc/misc/ruby-ohai/Makefile:1.33
--- pkgsrc/misc/ruby-ohai/Makefile:1.32 Sun Mar 21 13:31:36 2021
+++ pkgsrc/misc/ruby-ohai/Makefile      Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2021/03/21 13:31:36 taca Exp $
+# $NetBSD: Makefile,v 1.33 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      ohai-16.10.7
 CATEGORIES=    misc
@@ -26,7 +26,5 @@ USE_LANGUAGES=        # none
 
 RUBYGEM_OPTIONS+=      --format-executable
 
-RUBY_VERSIONS_INCOMPATIBLE=    25 # ruby-chef-utils
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/ruby-chef/Makefile
diff -u pkgsrc/sysutils/ruby-chef/Makefile:1.22 pkgsrc/sysutils/ruby-chef/Makefile:1.23
--- pkgsrc/sysutils/ruby-chef/Makefile:1.22     Sun Mar 21 13:28:35 2021
+++ pkgsrc/sysutils/ruby-chef/Makefile  Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2021/03/21 13:28:35 taca Exp $
+# $NetBSD: Makefile,v 1.23 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      chef-16.11.7
 CATEGORIES=    sysutils
@@ -50,8 +50,6 @@ USE_LANGUAGES=        # none
 OVERRIDE_GEMSPEC+=     uuidtools>=2.1.5
 RUBYGEM_OPTIONS+=      --format-executable
 
-RUBY_VERSIONS_INCOMPATIBLE=    25      # ruby-chef-zero
-
 pre-configure:
        cd ${WRKSRC}/bin && ${FIND} . -type f -exec ${CHMOD} ${BINMODE} {} \;
 

Index: pkgsrc/sysutils/ruby-chef-config/Makefile
diff -u pkgsrc/sysutils/ruby-chef-config/Makefile:1.13 pkgsrc/sysutils/ruby-chef-config/Makefile:1.14
--- pkgsrc/sysutils/ruby-chef-config/Makefile:1.13      Sun Mar 21 13:28:35 2021
+++ pkgsrc/sysutils/ruby-chef-config/Makefile   Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/03/21 13:28:35 taca Exp $
+# $NetBSD: Makefile,v 1.14 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      chef-config-16.11.7
 CATEGORIES=    sysutils
@@ -17,7 +17,5 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-tomlrb>=1.2<
 
 USE_LANGUAGES= # none
 
-RUBY_VERSIONS_INCOMPATIBLE=    25 # ruby-chef-utils
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/ruby-chef-telemetry/Makefile
diff -u pkgsrc/sysutils/ruby-chef-telemetry/Makefile:1.3 pkgsrc/sysutils/ruby-chef-telemetry/Makefile:1.4
--- pkgsrc/sysutils/ruby-chef-telemetry/Makefile:1.3    Tue Mar  9 08:58:23 2021
+++ pkgsrc/sysutils/ruby-chef-telemetry/Makefile        Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2021/03/09 08:58:23 nia Exp $
+# $NetBSD: Makefile,v 1.4 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      chef-telemetry-1.0.29
 CATEGORIES=    sysutils
@@ -15,7 +15,5 @@ RUBYGEM_OPTIONS+=     --format-executable
 
 USE_LANGUAGES= # none
 
-RUBY_VERSIONS_INCOMPATIBLE=    25 # ruby-chef-utils
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/ruby-chef-utils/Makefile
diff -u pkgsrc/sysutils/ruby-chef-utils/Makefile:1.8 pkgsrc/sysutils/ruby-chef-utils/Makefile:1.9
--- pkgsrc/sysutils/ruby-chef-utils/Makefile:1.8        Sun Mar 21 13:28:35 2021
+++ pkgsrc/sysutils/ruby-chef-utils/Makefile    Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2021/03/21 13:28:35 taca Exp $
+# $NetBSD: Makefile,v 1.9 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      chef-utils-16.11.7
 CATEGORIES=    sysutils
@@ -10,8 +10,5 @@ LICENSE=      apache-2.0
 
 USE_LANGUAGES= # none
 
-# "chef-utils requires Ruby version >= 2.6.0."
-RUBY_VERSIONS_INCOMPATIBLE=    25
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/sysutils/ruby-chef-zero/Makefile
diff -u pkgsrc/sysutils/ruby-chef-zero/Makefile:1.15 pkgsrc/sysutils/ruby-chef-zero/Makefile:1.16
--- pkgsrc/sysutils/ruby-chef-zero/Makefile:1.15        Mon Jan 18 15:16:21 2021
+++ pkgsrc/sysutils/ruby-chef-zero/Makefile     Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2021/01/18 15:16:21 taca Exp $
+# $NetBSD: Makefile,v 1.16 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      chef-zero-15.0.4
 CATEGORIES=    sysutils
@@ -17,8 +17,6 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-rack>=2.0.6<
 USE_LANGUAGES=         # none
 RUBYGEM_OPTIONS+=      --format-executable
 
-RUBY_VERSIONS_INCOMPATIBLE=    25
-
 pre-configure:
        cd ${WRKSRC}/bin && ${CHMOD} ${BINMODE} chef-zero
 

Index: pkgsrc/sysutils/ruby-inspec-core/Makefile
diff -u pkgsrc/sysutils/ruby-inspec-core/Makefile:1.5 pkgsrc/sysutils/ruby-inspec-core/Makefile:1.6
--- pkgsrc/sysutils/ruby-inspec-core/Makefile:1.5       Sun Mar 21 13:33:31 2021
+++ pkgsrc/sysutils/ruby-inspec-core/Makefile   Thu Apr  1 14:10:53 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2021/03/21 13:33:31 taca Exp $
+# $NetBSD: Makefile,v 1.6 2021/04/01 14:10:53 taca Exp $
 
 DISTNAME=      inspec-core-4.28.0
 CATEGORIES=    sysutils
@@ -32,7 +32,5 @@ DEPENDS+=     ${RUBY_PKGPREFIX}-train-core>=
 
 USE_LANGUAGES= # none
 
-RUBY_VERSIONS_INCOMPATIBLE=    25 # ruby-chef-utils
-
 .include "../../lang/ruby/gem.mk"
 .include "../../mk/bsd.pkg.mk"