Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1497966105111410"
MIME-Version: 1.0
Date: Tue, 20 Jun 2017 13:41:45 +0000
From: "Takahiro Kambe" <taca@netbsd.org>
Subject: CVS commit: pkgsrc/lang/ruby
To: pkgsrc-changes@NetBSD.org
Reply-To: taca@netbsd.org
Message-Id: <20170620134145.94DBBFAE8@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1497966105111410
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	taca
Date:		Tue Jun 20 13:41:45 UTC 2017

Modified Files:
	pkgsrc/lang/ruby: rubyversion.mk

Log Message:
Remove Ruby 2.1 support.


To generate a diff of this commit:
cvs rdiff -u -r1.179 -r1.180 pkgsrc/lang/ruby/rubyversion.mk

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


--_----------=_1497966105111410
Content-Disposition: inline
Content-Length: 3052
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/ruby/rubyversion.mk
diff -u pkgsrc/lang/ruby/rubyversion.mk:1.179 pkgsrc/lang/ruby/rubyversion.mk:1.180
--- pkgsrc/lang/ruby/rubyversion.mk:1.179	Sun Jun 18 13:44:38 2017
+++ pkgsrc/lang/ruby/rubyversion.mk	Tue Jun 20 13:41:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: rubyversion.mk,v 1.179 2017/06/18 13:44:38 taca Exp $
+# $NetBSD: rubyversion.mk,v 1.180 2017/06/20 13:41:45 taca Exp $
 #
 
 # This file determines which Ruby version is used as a dependency for
@@ -10,7 +10,7 @@
 # RUBY_VERSION_DEFAULT
 #	The preferered Ruby version to use.
 #
-#		Possible values: 21 22 23 24
+#		Possible values: 22 23 24
 #		Default: 23
 #
 # RUBY_BUILD_RDOC
@@ -41,8 +41,8 @@
 # RUBY_VERSIONS_ACCEPTED
 #	The Ruby versions that are acceptable for the package.
 #
-#		Possible values: 21 22 23 24
-#		Default: 23 22 21 24
+#		Possible values: 22 23 24
+#		Default: 23 22 24
 #
 # RUBY_NOVERSION
 #	If "Yes", the package dosen't depend on any version of Ruby, such
@@ -69,7 +69,7 @@
 # RUBY_VER
 #	Really selected version of ruby.
 #
-#		Possible values: 21 22 23
+#		Possible values: 22 23
 #
 #	Use this variable in pkgsrc's Makefile
 #
@@ -78,7 +78,7 @@
 #	use RUBY_PKGPREFIX with ruby related packages since you can supply
 #	different binary packages as each version of Ruby.
 #
-#		Example values: ruby21 ruby22 ruby23 ruby24
+#		Example values: ruby22 ruby23 ruby24
 #
 # RUBY_ABI_VERSION
 #	Ruby's ABI version.
@@ -107,7 +107,7 @@
 # RUBY_SUFFIX
 #	Extra string for each ruby commands; ruby, irb and so on.
 #
-#		Possible values: 21 22 23 24
+#		Possible values: 22 23 24
 #
 # RUBY_VERSION
 #	Version of Ruby's version.
@@ -214,13 +214,11 @@ RUBY_VERSION_REQD?= ${PKGNAME_REQD:C/rub
 .endif
 
 # current supported Ruby's version
-RUBY21_VERSION=		2.1.10
 RUBY22_VERSION=		2.2.7
 RUBY23_VERSION=		2.3.4
 RUBY24_VERSION=		2.4.1
 
 # current API compatible version; used for version of shared library
-RUBY21_API_VERSION=	2.1.0
 RUBY22_API_VERSION=	2.2.0
 RUBY23_API_VERSION=	2.3.0
 RUBY24_API_VERSION=	2.4.0
@@ -229,9 +227,9 @@ RUBY24_API_VERSION=	2.4.0
 RUBY_VERSION_DEFAULT?=	23
 
 # supported Ruby's version
-RUBY_VERSIONS_SUPPORTED= 23 22 21 24
+RUBY_VERSIONS_SUPPORTED= 23 22 24
 
-RUBY_VERSIONS_ACCEPTED?= 23 22 21 24
+RUBY_VERSIONS_ACCEPTED?= 23 22 24
 RUBY_VERSIONS_INCOMPATIBLE?=
 
 .if empty(RUBY_VERSIONS_SUPPORTED:M${RUBY_VERSION_DEFAULT})
@@ -270,24 +268,7 @@ RUBY_VER:=	${RUBY_VER_MAP.${RUBY_VER}:U$
 
 RUBY_SUFFIX?=	${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}${_RUBY_VER_TEENY}
 
-.if ${RUBY_VER} == "21"
-RUBY_VERSION=		${RUBY21_VERSION}
-RUBY_ABI_VERSION=	${RUBY_VERSION}
-
-RUBY_GEMS_VERSION=	2.2.2
-RUBY_RDOC_VERSION=	4.1.0
-RUBY_RAKE_VERSION=	10.1.0
-RUBY_JSON_VERSION=	1.8.1
-
-RUBY_BIGDECIMAL_VERSION=	1.2.4
-RUBY_IO_CONSOLE_VERSION=	0.4.3
-RUBY_PSYCH_VERSION=		2.0.5
-RUBY_MINITEST_VERSION=		4.7.5
-RUBY_TEST_UNIT_VERSION=		2.1.8.0
-
-RUBY_SUFFIX=	${_RUBY_VER_MAJOR}${_RUBY_VER_MINOR}
-
-.elif ${RUBY_VER} == "22"
+.if ${RUBY_VER} == "22"
 RUBY_VERSION=		${RUBY22_VERSION}
 RUBY_ABI_VERSION=	${RUBY_VERSION}
 

--_----------=_1497966105111410--