diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2014-06-12 19:01:01 +0000 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2014-06-12 19:01:01 +0000 |
| commit | 6f20adcd98de36d47a312e537540bb169b8e7339 (patch) | |
| tree | d2d6bb3a062d3e41fc3d791c2dd3ac1b6df61a4f /profiles | |
| parent | Include udev rules needed for Plymouth 0.9.0. Rels bug #512436. (diff) | |
| download | gentoo-2-6f20adcd98de36d47a312e537540bb169b8e7339.tar.gz gentoo-2-6f20adcd98de36d47a312e537540bb169b8e7339.tar.bz2 gentoo-2-6f20adcd98de36d47a312e537540bb169b8e7339.zip | |
Unmask cppunit since it does not collide with emul-linux-x86 and is required for dev-python/subunit which is needed to fix dev-libs/check (bug #510892).
Diffstat (limited to 'profiles')
| -rw-r--r-- | profiles/ChangeLog | 6 | ||||
| -rw-r--r-- | profiles/package.mask | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog index b53ef647d3d6..d9d588077eb7 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.9071 2014/06/12 06:29:46 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9072 2014/06/12 19:01: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! + 12 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask: + Unmask cppunit since it does not collide with emul-linux-x86 and is required + for dev-python/subunit which is needed to fix dev-libs/check (bug #510892). + 12 Jun 2014; Pawel Hajdan jr <phajdan.jr@gentoo.org> +arch/x86/package.use.force, base/package.use.force: Add profile entries for www-client/chromium's new pic USE flag. diff --git a/profiles/package.mask b/profiles/package.mask index 373e4d734afe..7652434f6ef1 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -1,5 +1,5 @@ #################################################################### -# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15784 2014/06/11 21:24:55 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15785 2014/06/12 19:01: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 @@ -97,7 +97,6 @@ dev-java/ibm-jdk-bin:1.5 # Michał Górny <mgorny@gentoo.org> (29 May 2014) # New multilib conversions. Unmask along with corresponding # emul-linux-x86 packages, and make sure they're committed first :). ->=dev-util/cppunit-1.13.2-r1 >=media-libs/taglib-1.9.1-r1 >=media-libs/libofa-0.9.3-r1 >=app-emulation/emul-linux-x86-medialibs-20140508-r3 |