Move test-unit-2 to its own slot and only force Ruby 1.9 on 1.x series.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d7e059ac0b3b218cb9ac2e3a5f78bae8ea2216a9..25a9966498e833c2f5d80c6e304cb5ede364baac 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,15 @@
 # ChangeLog for profile directory
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4185 2010/05/18 17:28:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.4186 2010/05/19 11:28:52 flameeyes 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!
 
+  19 May 2010; Diego E. Pettenò <flameeyes@gentoo.org> updates/2Q-2010,
+  base/package.use.force:
+  Move test-unit-2 to its own slot and only force Ruby 1.9 on 1.x series.
+
   18 May 2010; Samuli Suominen <ssuominen@gentoo.org> updates/2Q-2010:
   Move kradioripper to kstreamripper.
 

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 64aebd0ed6340514f2251c04bb5e687cc9cd7da0..48255a505f99263b6c59286093bac7f90d5cb0b9 100644 (file)
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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.15 2010/02/19 14:26:40 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.16 2010/05/19 11:28:52 flameeyes Exp $
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
 # Python should use wide Unicode implementation by default.
@@ -20,4 +20,4 @@ dev-ruby/bitescript ruby_targets_jruby
 dev-ruby/duby ruby_targets_jruby
 dev-ruby/jruby-debug-base ruby_targets_jruby
 dev-ruby/jruby-openssl ruby_targets_jruby
-dev-ruby/test-unit ruby_targets_ruby19
+=dev-ruby/test-unit-1* ruby_targets_ruby19

diff --git a/profiles/updates/2Q-2010 b/profiles/updates/2Q-2010
index 4ce073191922e6b392c297842443c1fe47144f9b..d5f6db3ac98b5bfba664296699d2244526a0062b 100644 (file)
--- a/profiles/updates/2Q-2010
+++ b/profiles/updates/2Q-2010
@@ -11,3 +11,4 @@ move kde-base/automoc dev-util/automoc
 move kde-base/qimageblitz media-libs/qimageblitz
 move mail-client/mozilla-thunderbird-bin mail-client/thunderbird-bin
 move media-sound/kradioripper media-sound/kstreamripper
+slotmove =dev-ruby/test-unit-2* 0 2