summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-05-02 10:03:14 +0000
committerMichał Górny <mgorny@gentoo.org>2014-05-02 10:03:14 +0000
commite50218aa860acd8b212ce99a7aee2137cdbedd6f (patch)
treedc9c1a677be2a6e174625b544ca28884019d8f94 /profiles
parentRevert previous commit, multilib_is_native_abi now includes multilib_build_bi... (diff)
downloadgentoo-2-e50218aa860acd8b212ce99a7aee2137cdbedd6f.tar.gz
gentoo-2-e50218aa860acd8b212ce99a7aee2137cdbedd6f.tar.bz2
gentoo-2-e50218aa860acd8b212ce99a7aee2137cdbedd6f.zip
Mask multilib util-linux and future baselibs before committing.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask4
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index b2d7fbd409cd..5d8b8d7fc53d 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.8906 2014/05/01 08:19:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8907 2014/05/02 10:03:14 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!
+ 02 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask multilib util-linux and future baselibs before committing.
+
01 May 2014; Sergei Trofimovich <slyfox@gentoo.org> package.mask:
Drop mask of '=net-im/openfire-3.9.2', restored 'security.xml' file.
diff --git a/profiles/package.mask b/profiles/package.mask
index 0f2ab610dad5..bb64979e03af 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15637 2014/05/01 08:19:18 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15638 2014/05/02 10:03:14 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
@@ -533,6 +533,8 @@ lxde-base/lxpolkit
>=media-libs/sdl-sound-1.0.3-r1
>=media-libs/sdl-gfx-2.0.24-r1
>=app-emulation/emul-linux-x86-sdl-20140406-r1
+>=sys-apps/util-linux-2.24.1-r3
+>=app-emulation/emul-linux-x86-baselibs-20140406-r3
# Tom Wijsman <TomWij@gentoo.org> (21 Feb 2014)
# MATE Desktop Environment >=1.7 introduction mask: