summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2010-02-02 06:04:54 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2010-02-02 06:04:54 +0000
commit68b9d3deebe436382b252819d51d150673eeb24a (patch)
tree014430ef9620bf44704063a8b00ffcbccecac9fd /profiles
parentAdd dev-perl/XML-Simple dep (bug #303106) (diff)
downloadgentoo-2-68b9d3deebe436382b252819d51d150673eeb24a.tar.gz
gentoo-2-68b9d3deebe436382b252819d51d150673eeb24a.tar.bz2
gentoo-2-68b9d3deebe436382b252819d51d150673eeb24a.zip
Add a seperate mask for MySQL5.4/5.5/6.0 since 5.1 will be unmasked at the end of the week.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask10
2 files changed, 14 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index c986354adf55..1d1274c72c5d 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.3850 2010/02/01 18:39:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.3851 2010/02/02 06:04:54 robbat2 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!
+ 02 Feb 2010; Robin H. Johnson <robbat2@gentoo.org> package.mask:
+ Add a seperate mask for MySQL5.4/5.5/6.0 since 5.1 will be unmasked at the
+ end of the week.
+
01 Feb 2010; Jeroen Roovers <jer@gentoo.org> package.mask:
Tweak www-client/opera mask again.
diff --git a/profiles/package.mask b/profiles/package.mask
index a96132bc2224..16e94ab9e917 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11171 2010/02/01 18:39:41 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.11172 2010/02/02 06:04:54 robbat2 Exp $
#
# When you add an entry to the top of this file, add your name, the date, and
# an explanation of why something is getting masked. Please be extremely
@@ -31,6 +31,14 @@
#--- END OF EXAMPLES ---
+# Robin H. Johnson <robbat2@gentoo.org> (01 Feb 2010)
+# Mask 5.4 series that is nearly a release candidate upstream (expected within the next 6 months)
+# Mask 5.5/6.0 series that are alpha and and crazy experimental.
+=dev-db/mysql-5.4*
+=virtual/mysql-5.4*
+>=dev-db/mysql-5.5
+>=virtual/mysql-5.5
+
# Rémi Cardona <remi@gentoo.org> (27 Jan 2010)
# dev package with fatal asserts(), see bug #301892
=x11-libs/pixman-0.17.4