diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2014-09-16 01:53:43 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2014-09-16 01:53:43 +0000 |
| commit | 03941c4cbd46bf12fb84f43aec66769012dcd5eb (patch) | |
| tree | 252c6de0d77be2f637ae5c1f18c27e169b7b9a49 /profiles/base | |
| parent | media-gfx/optipng: et_EE locale fix (bug #522446) (diff) | |
| download | gentoo-2-03941c4cbd46bf12fb84f43aec66769012dcd5eb.tar.gz gentoo-2-03941c4cbd46bf12fb84f43aec66769012dcd5eb.tar.bz2 gentoo-2-03941c4cbd46bf12fb84f43aec66769012dcd5eb.zip | |
Move mgorny's last mask from use.mask to package.use.mask.
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 8 | ||||
| -rw-r--r-- | profiles/base/use.mask | 8 |
3 files changed, 12 insertions, 9 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index 9b338bcb913b..eced0a987fb5 100644 --- a/profiles/base/ChangeLog +++ b/profiles/base/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for Gentoo base-profile # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.723 2014/09/15 21:10:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.724 2014/09/16 01:53:43 floppym Exp $ + + 16 Sep 2014; Mike Gilbert <floppym@gentoo.org> package.use.mask, use.mask: + Move mgorny's last mask from use.mask to package.use.mask. 15 Sep 2014; Michał Górny <mgorny@gentoo.org> use.mask: Mask USE=zrtp on net-libs/ortp since it is screwed up. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 6ae13c4d8f62..08cadfcec318 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,11 +1,17 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.599 2014/09/14 11:41:23 johu Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.600 2014/09/16 01:53:43 floppym Exp $ # This file requires >=portage-2.1.1 # New entries go on top. # +# Michał Górny <mgorny@gentoo.org> (15 Sep 2014) +# # Unsuccessful version bump of net-libs/libzrtpcpp, seems to cause +# # undefined references few layers deeper. Need further investigation, +# # if anybody cares. +net-libs/ortp zrtp + # Johannes Huber <johu@gentoo.org> (14 Sep 2014) # Masked until dev-libs/extra-cmake-modules is in tree. dev-libs/libattica qt5 diff --git a/profiles/base/use.mask b/profiles/base/use.mask index f7cc33e5e65a..655a1f3c54c4 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.210 2014/09/15 21:10:33 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.211 2014/09/16 01:53:43 floppym Exp $ # CURL_SSL=winssl is for prefix/windows/winnt only curl_ssl_winssl @@ -385,9 +385,3 @@ openrc-force # in 30 days. python_targets_python3_2 python_single_target_python3_2 - -# Michał Górny <mgorny@gentoo.org> (15 Sep 2014) -# Unsuccessful version bump of net-libs/libzrtpcpp, seems to cause -# undefined references few layers deeper. Need further investigation, -# if anybody cares. -net-libs/ortp zrtp |