diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-14 07:57:47 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-14 07:57:47 +0000 |
| commit | 9c95bd31730dd19aee38aabf3948e8441bc3c383 (patch) | |
| tree | d8f0be574f8756b7d932e8bb40d8b5acb2797951 /profiles | |
| parent | bump 5.1.0, upstream add amd format map implementation (diff) | |
| download | gentoo-2-9c95bd31730dd19aee38aabf3948e8441bc3c383.tar.gz gentoo-2-9c95bd31730dd19aee38aabf3948e8441bc3c383.tar.bz2 gentoo-2-9c95bd31730dd19aee38aabf3948e8441bc3c383.zip | |
Move nspr to the common multilib mask, and mask nss & baselibs before committing.
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/package.mask | 10 |
2 files changed, 9 insertions, 7 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index b1af5e289a2c..2a8e994a072a 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +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.9081 2014/06/13 19:15:54 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9082 2014/06/14 07:57:47 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 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask: + Move nspr to the common multilib mask, and mask nss & baselibs before + committing. + 13 Jun 2014; Hanno Boeck <hanno@gentoo.org> package.mask: Restrict pymsn-t mask to old version without pillow fix. diff --git a/profiles/package.mask b/profiles/package.mask index 4639b95805a2..cf829131f7d0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15794 2014/06/13 19:15:54 hanno Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15795 2014/06/14 07:57:47 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,11 +30,6 @@ #--- END OF EXAMPLES --- -# Ian Stakenvicius <axs@gentoo.org> (13 Jun 2014) -# New multilib conversions. Will unmask after some testing and appropriate -# de-integration from emul-linux-x86 packages -=dev-libs/nspr-4.10.6-r1 - # Mike Gilbert <floppym@gentoo.org> (13 Jun 2014) # Masked due to security bug 499870. # Please migrate to net-misc/libreswan. @@ -242,6 +237,9 @@ dev-java/ibm-jdk-bin:1.5 >=media-plugins/gst-plugins-xvid-0.10.23-r1:0.10 >=media-plugins/gst-plugins-xvideo-0.10.36-r1:0.10 >=app-emulation/emul-linux-x86-gstplugins-20140508-r1 +>=dev-libs/nspr-4.10.6-r1 +>=dev-libs/nss-3.16-r1 +>=app-emulation/emul-linux-x86-baselibs-20140508-r10 # Vladimir Smirnov <civil@gentoo.org> (27 May 2014) # Masked for testing, will defenitely cause major breakage |