diff options
| author |   Alex Legler <a3li@gentoo.org> | 2009-11-30 19:09:02 +0000 |
|---|---|---|
| committer | Alex Legler <a3li@gentoo.org> | 2009-11-30 19:09:02 +0000 |
| commit | 9e7b167144f09301185f0cdbb38805a1e4c2c430 (patch) | |
| tree | 0fd417152f8043d59ec3489b940bfc2804a71603 /profiles | |
| parent | Version bump. Per bug #278506. Acked by Mr_Bones_ (diff) | |
| download | gentoo-2-9e7b167144f09301185f0cdbb38805a1e4c2c430.tar.gz gentoo-2-9e7b167144f09301185f0cdbb38805a1e4c2c430.tar.bz2 gentoo-2-9e7b167144f09301185f0cdbb38805a1e4c2c430.zip | |
Add RUBY_TARGETS to USE_EXPAND, defaults to "ruby18".
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/make.defaults | 8 | ||||
| -rw-r--r-- | profiles/desc/ruby_targets.desc | 10 |
3 files changed, 20 insertions, 3 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 3d03c5256da7..88a46176f44c 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.113 2009/11/29 18:29:19 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.114 2009/11/30 19:09:02 a3li Exp $ + + 30 Nov 2009; Alex Legler <a3li@gentoo.org> make.defaults: + Add RUBY_TARGETS to USE_EXPAND as discussed on -dev starting Oct 6, 2009 29 Nov 2009; Samuli Suominen <ssuominen@gentoo.org> package.use.mask: Remove obsolete kde-base/kopete[jingle] mask for KDE 3.5.10. diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 187d3dd6aec7..62f41d857b69 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -1,13 +1,13 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.46 2009/09/21 09:39:09 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.47 2009/11/30 19:09:02 a3li Exp $ # # System-wide defaults for the Portage system # See portage(5) manpage # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@gentoo.org. -USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS" +USE_EXPAND="APACHE2_MODULES APACHE2_MPMS FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. @@ -56,3 +56,7 @@ NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb p # http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml # Build kernel modules from linux-mod by default: USE="${USE} modules" + +# Alex Legler <a3li@gentoo.org> (30 Nov 2009) +# Default Ruby build targets +RUBY_TARGETS="ruby18" diff --git a/profiles/desc/ruby_targets.desc b/profiles/desc/ruby_targets.desc new file mode 100644 index 000000000000..72f17c57b25a --- /dev/null +++ b/profiles/desc/ruby_targets.desc @@ -0,0 +1,10 @@ +# Copyright 2009 Gentoo Foundation. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/profiles/desc/ruby_targets.desc,v 1.1 2009/11/30 19:09:02 a3li Exp $ + +# This file contains descriptions of RUBY_TARGETS USE_EXPAND flags. + +jruby - Build with JRuby +ree18 - Build with Ruby Enterprise Edition 1.8.x +ruby18 - Build with MRI Ruby 1.8.x +ruby19 - Build with MRI Ruby 1.9.x |