diff options
| author |   Hans de Graaff <graaff@gentoo.org> | 2014-09-02 05:30:24 +0000 |
|---|---|---|
| committer | Hans de Graaff <graaff@gentoo.org> | 2014-09-02 05:30:24 +0000 |
| commit | 784736c31b52b2d1d989e710c491ad1f4ae1d39a (patch) | |
| tree | 3285bf00139a0a14fff0beadce22d8600396113a /profiles | |
| parent | Whitespace (diff) | |
| download | gentoo-2-784736c31b52b2d1d989e710c491ad1f4ae1d39a.tar.gz gentoo-2-784736c31b52b2d1d989e710c491ad1f4ae1d39a.tar.bz2 gentoo-2-784736c31b52b2d1d989e710c491ad1f4ae1d39a.zip | |
Mask jruby 1.6 and its RUBY_TARGETS USE flag.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/use.mask | 3 | ||||
| -rw-r--r-- | profiles/package.mask | 17 |
3 files changed, 22 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index f7458a610eb1..47e7ff98dd14 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.9338 2014/09/02 00:30:44 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9339 2014/09/02 05:30:23 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! + 02 Sep 2014; Hans de Graaff <graaff@gentoo.org> base/use.mask, package.mask: + Mask jruby 1.6 and its RUBY_TARGETS USE flag. + 02 Sep 2014; Brian Dolbec <dolsen@gentoo.org> package.mask: Mask NON-MAINTAINER commit for testing and review diff --git a/profiles/base/use.mask b/profiles/base/use.mask index fe25bc511706..e56219c442f5 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.205 2014/08/29 12:12:46 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.206 2014/09/02 05:30:24 graaff Exp $ # Mask use-flag firebird and package dev-db/firebird for bug 460780 firebird @@ -13,6 +13,7 @@ cuda # on the way out ruby_targets_ruby18 +ruby_targets_jruby # masking here and unmasking in default/linux/ kmod diff --git a/profiles/package.mask b/profiles/package.mask index e4581d03621d..62c6fc09c4a9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15999 2014/09/02 00:30:44 dolsen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16000 2014/09/02 05:30:23 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 @@ -30,6 +30,21 @@ #--- END OF EXAMPLES --- +# 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/ruby-rdoc:2 +virtual/ruby-ssl:2 +virtual/ruby-threads:2 + # 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. |