summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2013-03-04 19:17:23 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2013-03-04 19:17:23 +0000
commitc239414b8798f2b034cfa9afe50d7e5c52c49a9a (patch)
tree830939a4c7eed9a6b3ce9c223d76834baf6963de /profiles
parentSwitch to EAPI 5. (diff)
downloadhistorical-c239414b8798f2b034cfa9afe50d7e5c52c49a9a.tar.gz
historical-c239414b8798f2b034cfa9afe50d7e5c52c49a9a.tar.bz2
historical-c239414b8798f2b034cfa9afe50d7e5c52c49a9a.zip
Update MySQL pmask.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask23
2 files changed, 11 insertions, 17 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 95c1623835f6..a2e7de8b4101 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7553 2013/03/04 15:55:26 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7554 2013/03/04 19:17:23 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!
+ 04 Mar 2013; Robin H. Johnson <robbat2@gentoo.org> package.mask:
+ Update MySQL pmask.
+
04 Mar 2013; Michael Pagano <mpagano@gentoo.org> package.mask:
Unmask portpeek
diff --git a/profiles/package.mask b/profiles/package.mask
index 501fa1d2844e..ae5f71a8ec14 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14524 2013/03/04 15:55:26 mpagano Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14525 2013/03/04 19:17:23 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,12 @@
#--- END OF EXAMPLES ---
+# Robin H. Johnson <robbat2@gentoo.org> (04 Mar 2013)
+# MySQL 5.6 is not yet GA.
+>=dev-db/mariadb-5.6
+>=dev-db/mysql-5.6
+>=virtual/mysql-5.6
+
# Davide Pesavento <pesa@gentoo.org> (02 Mar 2013)
# Depends on blender, which is masked.
media-gfx/yafaray
@@ -684,21 +690,6 @@ dev-perl/perl-PBS
# mask it for now, we'll see about removing it later.
dev-tex/pdftex
-# Robin H. Johnson <robbat2@gentoo.org> (01 Nov 2012)
-# Update of mask to 5.6 instead of 5.5
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (28 Jul 2011)
-# A new update of the mysql / mariadb mask
-# Robin H. Johnson <robbat2@gentoo.org> (01 Feb 2010)
-# Mask 5.6/6.0 series that are alpha and and crazy experimental.
-# Mask 5.2/5.3 virtual that exists in the overlay as well (it is MariaDB only)
->=dev-db/mariadb-5.6
->=dev-db/mysql-5.6
->=virtual/mysql-5.6
-=dev-db/mariadb-5.2*
-=virtual/mysql-5.2*
-=dev-db/mariadb-5.3*
-=virtual/mysql-5.3*
-
# Peter Volkov <pva@gentoo.org> (23 Jul 2011)
# Mask release candidates
=dev-libs/guiloader-2.99.0