diff options
author | Michał Górny <mgorny@gentoo.org> | 2014-05-14 13:34:50 +0000 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2014-05-14 13:34:50 +0000 |
commit | c1f0fbae6ba05ee8486a0e2caa677ee734b8d539 (patch) | |
tree | 87ec64679a72e4c8765ff29fe599308f0c96907e /profiles | |
parent | Fixes compilation in case if emacs is not present and prevents infinite loops (diff) | |
download | gentoo-2-c1f0fbae6ba05ee8486a0e2caa677ee734b8d539.tar.gz gentoo-2-c1f0fbae6ba05ee8486a0e2caa677ee734b8d539.tar.bz2 gentoo-2-c1f0fbae6ba05ee8486a0e2caa677ee734b8d539.zip |
Mask new set of multilib additions.
Diffstat (limited to 'profiles')
-rw-r--r-- | profiles/ChangeLog | 5 | ||||
-rw-r--r-- | profiles/package.mask | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 39e40b3760a7..41302378574d 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,12 +1,15 @@ # ChangeLog for profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8959 2014/05/14 08:46:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8960 2014/05/14 13:34:50 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! 14 May 2014; Michał Górny <mgorny@gentoo.org> package.mask: + Mask new set of multilib additions. + + 14 May 2014; Michał Górny <mgorny@gentoo.org> package.mask: Mask multilib cups. 14 May 2014; Hans de Graaff <graaff@gentoo.org> +updates/2Q-2014: diff --git a/profiles/package.mask b/profiles/package.mask index 544df299c9fc..01bb05bb83e9 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15686 2014/05/14 08:46:15 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15687 2014/05/14 13:34:50 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 @@ -455,6 +455,13 @@ lxde-base/lxpolkit >=net-libs/gnutls-3.3.1-r1 >=net-print/cups-1.7.1-r2 >=app-emulation/emul-linux-x86-baselibs-20140508-r1 +=dev-libs/atk-2.10.0-r1 +>=dev-libs/atk-2.12.0-r1 +>=x11-libs/gtk+-2.24.23-r1:2 +>=x11-themes/gtk-engines-2.20.2-r1 +>=x11-themes/gtk-engines-murrine-0.98.2-r1 +>=x11-themes/gtk-engines-xfce-3.0.1-r201:0 +>=app-emulation/emul-linux-x86-gtklibs-20140508-r1 # Luca Barbato <lu_zero@gentoo.org> (20 Feb 2014) # Beta ebuild, unmask to test the tree. |