summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 492dc7ee55c5..4524e37a58b7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5460 2011/06/18 17:52:47 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.5461 2011/06/18 19:53:17 dilfridge 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!
+ 18 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org> package.mask:
+ Mask cups-1.5, too new and still needs a lot of testing
+
18 Jun 2011; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
package.mask:
Update Robin's earlier mask of mysql-5.2 to add mask for mariadb-5.2*.
diff --git a/profiles/package.mask b/profiles/package.mask
index 311af73b16a6..4a1306c487a3 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12852 2011/06/18 17:52:47 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.12853 2011/06/18 19:53:17 dilfridge 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,10 @@
#--- END OF EXAMPLES ---
+# Andreas K. Huettel <dilfridge@gentoo.org> (18 Jun 2011)
+# 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)