summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2010-05-19 11:28:53 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2010-05-19 11:28:53 +0000
commit2cd2d98602b1aecd3b913453d12db71c6810e051 (patch)
treeb9e5429e9d13d8e13f215745e691ee313858e40b
parentFix building with "static" USE flag (bug #316065). (diff)
downloadhistorical-2cd2d98602b1aecd3b913453d12db71c6810e051.tar.gz
historical-2cd2d98602b1aecd3b913453d12db71c6810e051.tar.bz2
historical-2cd2d98602b1aecd3b913453d12db71c6810e051.zip
Move test-unit-2 to its own slot and only force Ruby 1.9 on 1.x series.
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/base/package.use.force4
-rw-r--r--profiles/updates/2Q-20101
3 files changed, 8 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d7e059ac0b3b..25a9966498e8 100644
--- 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 64aebd0ed634..48255a505f99 100644
--- 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 4ce073191922..d5f6db3ac98b 100644
--- 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