commit:     253f96ea8550c427850b50f2d87e2bd65991a080
Author:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
AuthorDate: Sun Apr  5 13:04:54 2020 +0000
Commit:     Hans de Graaff <graaff <AT> gentoo <DOT> org>
CommitDate: Sun Jun 14 06:44:11 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=253f96ea

profiles: mask ruby 2.4 for removal

Mask ruby24-only packages for removal.
Remove ruby24 from the default RUBY_TARGETS.
Mask USE flag for ruby24.

Closes: https://bugs.gentoo.org/716316

Signed-off-by: Hans de Graaff <graaff <AT> gentoo.org>

 profiles/base/make.defaults | 3 +--
 profiles/base/use.mask      | 4 ++++
 profiles/package.mask       | 7 +++++++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 214abc198c5..c8b3fcdddc1 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -98,9 +98,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 
lcdm001 mtxorb ncurses te
 
 # Manuel RĂ¼ger <mr...@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
-# Updated to include ruby24 on 2018-11-12
 # Updated to include ruby25 on 2019-07-17
-RUBY_TARGETS="ruby24 ruby25"
+RUBY_TARGETS="ruby25"
 
 # Enable extended filesystem attribute support by default.
 # 
https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0

diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 388ed4586aa..4c51769639f 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Hans de Graaff <gra...@gentoo.org> (2020-06-13)
+# Mask Ruby 2.4 as EOL
+ruby_targets_ruby24
+
 # Ben Kohler <bkoh...@gentoo.org> (2020-05-15)
 # Mask 9.4 target to match <9.5 package.mask entry
 postgres_targets_postgres9_4

diff --git a/profiles/package.mask b/profiles/package.mask
index 2c0bb43a5a0..85a5ed34ac6 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -32,6 +32,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <gra...@gentoo.org> (2020-06-14)
+# Ruby 2.4 is no longer supported by upstream and no longer gets
+# security updates since the 2.4.10 release. Use ruby 2.5 or later
+# instead.
+dev-lang/ruby:2.4
+dev-ruby/did_you_mean:2.4
+
 # Mikle Kolyada <zlog...@gentoo.org> (2020-06-13)
 # multiple forks.
 # Merged into the app-text/texlive-core package

Reply via email to