mgorny 14/03/12 11:50:34 Modified: ChangeLog package.mask Log: Re-unite multilib mask to avoid comments in the middle as that breaks app-portage/diffmask.
Revision Changes Path 1.8693 profiles/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.8693&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?rev=1.8693&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/ChangeLog?r1=1.8692&r2=1.8693 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v retrieving revision 1.8692 retrieving revision 1.8693 diff -u -r1.8692 -r1.8693 --- ChangeLog 12 Mar 2014 09:21:34 -0000 1.8692 +++ ChangeLog 12 Mar 2014 11:50:34 -0000 1.8693 @@ -1,12 +1,16 @@ # ChangeLog for profile directory # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8692 2014/03/12 09:21:34 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8693 2014/03/12 11:50:34 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! 12 Mar 2014; Michał Górny <mgo...@gentoo.org> package.mask: + Re-unite multilib mask to avoid comments in the middle as that breaks + app-portage/diffmask. + + 12 Mar 2014; Michał Górny <mgo...@gentoo.org> package.mask: Update the mask for fixed ebuild and virtual. 12 Mar 2014; Michał Górny <mgo...@gentoo.org> package.mask: 1.15469 profiles/package.mask file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.15469&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?rev=1.15469&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/profiles/package.mask?r1=1.15468&r2=1.15469 Index: package.mask =================================================================== RCS file: /var/cvsroot/gentoo-x86/profiles/package.mask,v retrieving revision 1.15468 retrieving revision 1.15469 diff -u -r1.15468 -r1.15469 --- package.mask 12 Mar 2014 09:21:35 -0000 1.15468 +++ package.mask 12 Mar 2014 11:50:34 -0000 1.15469 @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15468 2014/03/12 09:21:35 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15469 2014/03/12 11:50:34 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 @@ -106,7 +106,10 @@ # emul-linux bumps. Please unmask in order, after getting ACK from # package maintainer. # -# Note: yngwin explicitly requested 30 days + 1 version bump for cairo. +# Notes: +# - yngwin explicitly requested 30 days + 1 version bump for cairo. +# - always unmask in order, with emul-linux of choice and *all* packages +# preceding it >=dev-libs/libgcrypt-1.6.1-r1 dev-libs/libgcrypt:11 >=dev-libs/lzo-2.06-r1 @@ -119,7 +122,6 @@ >=app-emulation/emul-linux-x86-gtklibs-20131008-r3 >=media-gfx/graphite2-1.2.4-r1 >=media-libs/harfbuzz-0.9.26-r1 -# libass needs multilib harfbuzz, unmask at the same time (aballier@g.o) >=media-libs/libass-0.11 >=x11-libs/pango-1.36.2-r1 >=x11-libs/pangox-compat-0.0.2-r1