summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-02-28 19:52:01 +0000
committerMichał Górny <mgorny@gentoo.org>2014-02-28 19:52:01 +0000
commit2f31c7c5f6669090225ea80a92167de4fe3317b3 (patch)
treede3f1b1d984f2a46947c5bd7224c827ad41ad666 /profiles
parentDo not override CC, but rather append what we need in 64-bits mode (diff)
downloadgentoo-2-2f31c7c5f6669090225ea80a92167de4fe3317b3.tar.gz
gentoo-2-2f31c7c5f6669090225ea80a92167de4fe3317b3.tar.bz2
gentoo-2-2f31c7c5f6669090225ea80a92167de4fe3317b3.zip
Mask new multilib packages before committing.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask11
2 files changed, 14 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 6f45be8e0eb7..842e682fb772 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8647 2014/02/28 14:59:36 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8648 2014/02/28 19:52:01 mgorny 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 Feb 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask new multilib packages before committing.
+
28 Feb 2014; Tom Wijsman <TomWij@gentoo.org> package.mask:
Expand MATE mask messages to be more verbose, include more details, give
advice to early installers and help overlay users.
diff --git a/profiles/package.mask b/profiles/package.mask
index 4d3015a54d35..f615df6e83eb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15429 2014/02/28 14:59:37 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15430 2014/02/28 19:52:01 mgorny 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
@@ -30,6 +30,15 @@
#--- END OF EXAMPLES ---
+# Michał Górny <mgorny@gentoo.org> (28 Feb 2014)
+# New multilib conversions waiting for emul-linux update and some
+# testing. Note: yngwin requested cairo being masked for 30 days
+# and at least one version bump.
+>=dev-libs/libgcrypt-1.6.1-r1
+dev-libs/libgcrypt:11
+>=dev-libs/lzo-2.06-r1
+>=x11-libs/cairo-1.12.16-r1
+
# Pawel Hajdan jr <phajdan.jr@gentoo.org> (27 Feb 2014)
# Dev channel releases are only for people who are developers or want more
# experimental features and accept a more unstable release.