diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-09-12 13:37:39 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2013-09-12 13:37:39 +0000 |
| commit | be3af5f71764658a255d270a2faa236db7927297 (patch) | |
| tree | 038dd9dafcf29f569f24e541d7ba3014a84f5d0d /profiles/base | |
| parent | x86 stable wrt bug #449614 (diff) | |
| download | historical-be3af5f71764658a255d270a2faa236db7927297.tar.gz historical-be3af5f71764658a255d270a2faa236db7927297.tar.bz2 historical-be3af5f71764658a255d270a2faa236db7927297.zip | |
Enable ruby20 by default, do not force it.
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/base/package.use | 14 | ||||
| -rw-r--r-- | profiles/base/package.use.force | 12 |
3 files changed, 18 insertions, 14 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index d0af041d9677..09a4cde2d991 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.600 2013/09/07 14:50:08 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.601 2013/09/12 13:37:39 flameeyes Exp $ + + 12 Sep 2013; Diego E. Pettenò <flameeyes@gentoo.org> package.use, + package.use.force: + Enable ruby20 by default, do not force it. 07 Sep 2013; Tom Wijsman <TomWij@gentoo.org> package.use.mask: net-proxy/swiftiply: Dependency (www-servers/mongrel) currently only works diff --git a/profiles/base/package.use b/profiles/base/package.use index 64f5c907dad4..f3a0ec3d91a4 100644 --- a/profiles/base/package.use +++ b/profiles/base/package.use @@ -1,6 +1,16 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use,v 1.29 2012/07/27 20:23:42 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use,v 1.30 2013/09/12 13:37:39 flameeyes Exp $ + +# Hans de Graaff <graaff@gentoo.org> (3 Sep 2013) +# Enable ruby20 on the core ruby packages so we don't +# need to include ruby20 in RUBY_TARGETS right now. +# bug 483254 +>=dev-ruby/rubygems-2.0.3 ruby_targets_ruby20 +>=dev-ruby/rake-0.9.6 ruby_targets_ruby20 +>=dev-ruby/json-1.8.0 ruby_targets_ruby20 +>=dev-ruby/racc-1.4.9 ruby_targets_ruby20 +>=dev-ruby/rdoc-4.0.1-r1 ruby_targets_ruby20 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (27 Jul 2012) # Modular X: Build the Xorg X server by default diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 630d09959ddc..d9fe4aca6eb5 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.40 2013/09/05 10:09:05 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.41 2013/09/12 13:37:39 flameeyes Exp $ # Michał Gorny <mgorny@gentoo.org> (26 Feb 2013) # Meta-packages which use multilib ebuilds always install development @@ -74,13 +74,3 @@ dev-ruby/jruby-openssl ruby_targets_jruby ~virtual/rubygems-4 ruby_targets_ruby19 ~virtual/rubygems-5 ruby_targets_rbx ~virtual/rubygems-6 ruby_targets_ruby20 - -# Hans de Graaff <graaff@gentoo.org> (3 Sep 2013) -# Force ruby20 on the core ruby packages so we don't -# need to include ruby20 in RUBY_TARGETS right now. -# bug 483254 ->=dev-ruby/rubygems-2.0.3 ruby_targets_ruby20 ->=dev-ruby/rake-0.9.6 ruby_targets_ruby20 ->=dev-ruby/json-1.8.0 ruby_targets_ruby20 ->=dev-ruby/racc-1.4.9 ruby_targets_ruby20 ->=dev-ruby/rdoc-4.0.1-r1 ruby_targets_ruby20 |