summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2011-07-28 11:48:35 +0000
committerJorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>2011-07-28 11:48:35 +0000
commit75e8f8d69abef590698fb245feaf6d61ceaa6465 (patch)
tree098a350ee83f5c5ebf791d1b1ba639dab3ede908 /profiles
parent[virtual/mysql] Added missing virtual for 5.2 from the overlay. (diff)
downloadgentoo-2-75e8f8d69abef590698fb245feaf6d61ceaa6465.tar.gz
gentoo-2-75e8f8d69abef590698fb245feaf6d61ceaa6465.tar.bz2
gentoo-2-75e8f8d69abef590698fb245feaf6d61ceaa6465.zip
[package.mask] Update the mysql/mariadb mask.
Dropped 5.4 from the mask as it's no longer in the tree. Added virtual/mysql-5.3 now that mariadb did it's first beta release of 5.3.0.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog9
-rw-r--r--profiles/package.mask27
2 files changed, 21 insertions, 15 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index e3e869eab413..a2980e9db9cb 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,18 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5582 2011/07/28 07:13:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5583 2011/07/28 11:48:35 jmbsvicetto 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!
+ 28 Jul 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
+ package.mask:
+ [package.mask] Update the mysql/mariadb mask.
+ Dropped 5.4 from the mask as it's no longer in the tree.
+ Added virtual/mysql-5.3 now that mariadb did it's first beta release of
+ 5.3.0.
+
28 Jul 2011; Peter Volkov <pva@gentoo.org> package.mask:
Unmask =net-analyzer/httping-1.5.1* - it is released and 1.5.1_beta1 dropped
from the tree.
diff --git a/profiles/package.mask b/profiles/package.mask
index b2fdced5b3a3..4c82bb9c4cb2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12946 2011/07/28 07:13:44 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12947 2011/07/28 11:48:35 jmbsvicetto 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,18 @@
#--- END OF EXAMPLES ---
+# 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.5/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/mysql-5.5
+>=virtual/mysql-5.5
+=dev-db/mariadb-5.2*
+=virtual/mysql-5.2*
+=dev-db/mariadb-5.3*
+=virtual/mysql-5.3*
+
# Alexis Ballier <aballier@gentoo.org> (28 Jul 2011)
# Mask TeX Live 2011 for testing
>=app-text/texlive-core-2011
@@ -342,19 +354,6 @@ sci-chemistry/webmo
# Mask cups-1.5, too new and still needs a lot of testing
>=net-print/cups-1.4.9999
-# Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org> (18 Jun 2011)
-# Add mariadb mask to Robin's earlier mask
-# 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.
-# Mask 5.2 virtual that exists in the overlay as well (it is MariaDB only)
-=dev-db/mysql-5.4*
-=virtual/mysql-5.4*
->=dev-db/mysql-5.5
->=virtual/mysql-5.5
-=dev-db/mariadb-5.2*
-=virtual/mysql-5.2*
-
# Torsten Veller <tove@gentoo.org> (18 Jun 2011)
# Mask perl-5.14. See tracker bug #356171
=dev-lang/perl-5.14*