diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2014-10-09 12:26:08 +0000 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-10-09 12:26:08 +0000 |
| commit | 728534810bc38b01baf56ed0694e49bd246cad25 (patch) | |
| tree | 21816ff68917419a743a7e98e04e63b8b0a3e022 /profiles/base | |
| parent | Version bump (diff) | |
| download | gentoo-2-728534810bc38b01baf56ed0694e49bd246cad25.tar.gz gentoo-2-728534810bc38b01baf56ed0694e49bd246cad25.tar.bz2 gentoo-2-728534810bc38b01baf56ed0694e49bd246cad25.zip | |
Move kde-base/kopete[otr] from regular mask to stable mask.
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/ChangeLog | 5 | ||||
| -rw-r--r-- | profiles/base/package.use.mask | 7 | ||||
| -rw-r--r-- | profiles/base/package.use.stable.mask | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog index d56badd1af60..a9de7a8c8f7d 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.730 2014/10/01 14:12:37 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.731 2014/10/09 12:26:08 kensington Exp $ + + 09 Oct 2014; Michael Palimaka <kensington@gentoo.org> package.use.stable.mask: + Move kde-base/kopete[otr] from regular mask to stable mask. 01 Oct 2014; Sergey Popov <pinkbyte@gentoo.org> package.use.mask: Mask USE='multislot' in sys-devel/binutils as well, bug #507808 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index b4fb7bbee127..1fbb59c914e3 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.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/package.use.mask,v 1.611 2014/10/05 08:49:36 jauhien Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.612 2014/10/09 12:26:08 kensington Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -203,11 +203,6 @@ dev-libs/boost context # with upstream if there is something that can be done to fix the issue. media-libs/cogl gstreamer -# Johannes Huber <johu@gentoo.org> (18 Dec 2013) -# net-libs/libotr-4.0.0 is masked. Please remove the use mask if package mask -# is lifted. ->=kde-base/kopete-4.12.0 otr - # Alexandre Rostovtsev <tetromino@gentoo.org> (15 Dec 2013) # pulseaudio patchset breaks too often on live wine ebuild =app-emulation/wine-9999 pulseaudio diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask index 76d6d258ea12..29ee91416738 100644 --- a/profiles/base/package.use.stable.mask +++ b/profiles/base/package.use.stable.mask @@ -1,10 +1,15 @@ # 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.stable.mask,v 1.24 2014/08/29 12:53:35 hasufell Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.stable.mask,v 1.25 2014/10/09 12:26:08 kensington Exp $ # This file requires eapi 5 or later. New entries go on top. # Please use the same syntax as in package.use.mask +# Michael Palimaka <kensington@gentoo.org> (09 Oct 2014) +# Requires net-libs/libotr-4.0.0 which just came out of +# hard mask. +>=kde-base/kopete-4.12.0 otr + # Mikle Kolyada <zlogene@gentoo.org> (16 Aug 2014) # Not yet stabilized dependency, need more testing >=dev-perl/PDL-2.4.11 pdl2 pgplot plplot |