summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask18
2 files changed, 5 insertions, 18 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 2b01cf00cef9..55f52780005e 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9435 2014/10/09 20:07:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9436 2014/10/10 09:07:39 graaff Exp $
#
# This ChangeLog should include records for all changes in profiles directory.
# Only typo fixes which don't affect portage/repoman behaviour could be avoided
# here. If in doubt put a record here!
+ 10 Oct 2014; Hans de Graaff <graaff@gentoo.org> base/use.mask, package.mask:
+ Remove jruby 1.6 mask now that the packages are removed.
+
09 Oct 2014; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
Mask sys-devel/libperl for removal
diff --git a/profiles/package.mask b/profiles/package.mask
index 380a31d14a96..317004d65bc5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16082 2014/10/09 20:07:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16083 2014/10/10 09:07:39 graaff Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -219,22 +219,6 @@ x11-themes/amsn-skins
# tool is useless. See bug 504734
app-admin/hwreport
-# Hans de Graaff <graaff@gentoo.org> (1 Sep 2014)
-# Mask jruby 1.6.x for removal in 30 days. This version is still based
-# on ruby 1.8. Many packages are no longer compatible with its
-# syntax, and security support for ruby 1.8 has stopped. This
-# incompatibility now has reached central packages like rubygems so we
-# have decided to remove jruby 1.6 now. jruby upstream has released
-# the 1.7.x series some time ago, but unfortunately we only have a
-# masked version that has too many issues to unmask. Please let us
-# know if you know java and ruby and want to help out here:
-# http://moving-innovations.com/blog/2014/04/23/the-precarious-state-of-jruby-in-gentoo
-=dev-java/jruby-1.6*
-virtual/rubygems:jruby
-virtual/ruby-rdoc:jruby
-virtual/ruby-ssl:jruby
-virtual/ruby-threads:jruby
-
# Pawel Hajdan jr <phajdan.jr@gentoo.org> (29 Aug 2014)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.