summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2013-05-29 19:16:02 +0000
committerHans de Graaff <graaff@gentoo.org>2013-05-29 19:16:02 +0000
commit51a1ebbe77cbcf8c4ce18f9ccdc3f518a42a5cc9 (patch)
treefa306889c19396ab7e8948125951f7a2c68af3a6
parentRemove old. (diff)
downloadgentoo-2-51a1ebbe77cbcf8c4ce18f9ccdc3f518a42a5cc9.tar.gz
gentoo-2-51a1ebbe77cbcf8c4ce18f9ccdc3f518a42a5cc9.tar.bz2
gentoo-2-51a1ebbe77cbcf8c4ce18f9ccdc3f518a42a5cc9.zip
Change default order of RUBY_TARGETS so that ruby19 will be the default on new installs, bug 425138.
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/make.defaults4
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e9324f45f272..d8d9f37dd38c 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7888 2013/05/29 18:31:11 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7889 2013/05/29 19:16:02 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!
+ 29 May 2013; Hans de Graaff <graaff@gentoo.org> base/make.defaults:
+ Change default order of RUBY_TARGETS so that ruby19 will be the default on
+ new installs, bug 425138.
+
29 May 2013; Jeroen Roovers <jer@gentoo.org> package.mask:
Mask =net-analyzer/tcpreplay-3.5*.
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 56816c728884..279c8362e459 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -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/make.defaults,v 1.97 2013/05/28 20:27:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.98 2013/05/29 19:16:02 graaff Exp $
#
# System-wide defaults for the Portage system
# See portage(5) manpage
@@ -107,7 +107,7 @@ USE="${USE} modules"
# Alex Legler <a3li@gentoo.org> (30 Nov 2009)
# Default Ruby build targets
-RUBY_TARGETS="ruby18 ruby19"
+RUBY_TARGETS="ruby19 ruby18"
# Samuli Suominen <ssuominen@gentoo.org> (03 Dec 2009)
# Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx