diff options
| author |   Davide Pesavento <pesa@gentoo.org> | 2014-05-30 18:19:26 +0000 |
|---|---|---|
| committer | Davide Pesavento <pesa@gentoo.org> | 2014-05-30 18:19:26 +0000 |
| commit | ea3ab9a7756dd821f383e73cf85c778915d66c60 (patch) | |
| tree | 85ae70400fd69ea61120449bf822b55611135efc /profiles | |
| parent | Restore stable keywords from 20140406, bug #511878. (diff) | |
| download | gentoo-2-ea3ab9a7756dd821f383e73cf85c778915d66c60.tar.gz gentoo-2-ea3ab9a7756dd821f383e73cf85c778915d66c60.tar.bz2 gentoo-2-ea3ab9a7756dd821f383e73cf85c778915d66c60.zip | |
dev-python/sip: p.mask later versions and dependent packages too.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/package.mask | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 78a27e9393db..2801f3d46326 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.9020 2014/05/30 14:19:19 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9021 2014/05/30 18:19:26 pesa 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! + 30 May 2014; Davide Pesavento <pesa@gentoo.org> package.mask: + dev-python/sip: p.mask later versions and dependent packages too. + 30 May 2014; Michał Górny <mgorny@gentoo.org> package.mask: Mask the upcoming PAM multilib package set. diff --git a/profiles/package.mask b/profiles/package.mask index fbce3e1a28ce..5c2897cf70ad 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15743 2014/05/30 14:19:20 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15744 2014/05/30 18:19:26 pesa 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 @@ -425,7 +425,8 @@ sys-fs/rdiff-backup-fs # Patrick Lauer <patrick@gentoo.org> (02 Apr 2014) # Broken release, see #506452 -=dev-python/sip-4.15.5 +>=dev-python/sip-4.15.5 +>=dev-python/PyQt4-4.11 # Tom Wijsman <TomWij@gentoo.org> (31 Mar 2014) # Prevent users from switching JDK / JRE implementation. |