summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-05-03 08:17:06 +0000
committerMichał Górny <mgorny@gentoo.org>2014-05-03 08:17:06 +0000
commitfa749099ddac6ec53eeda97a3ce0cb8f6dc40d57 (patch)
treee8c0630d96c37343b470602cfe4c21c2efee6219 /profiles
parentBump (diff)
downloadgentoo-2-fa749099ddac6ec53eeda97a3ce0cb8f6dc40d57.tar.gz
gentoo-2-fa749099ddac6ec53eeda97a3ce0cb8f6dc40d57.tar.bz2
gentoo-2-fa749099ddac6ec53eeda97a3ce0cb8f6dc40d57.zip
Mask multilib media-sound/lash before committing.
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask3
2 files changed, 6 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index cf0bde2e46d9..605b5b26c236 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,12 +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.8912 2014/05/03 07:33:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.8913 2014/05/03 08:17:06 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!
03 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask multilib media-sound/lash before committing.
+
+ 03 May 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Mask new libSM with proper dependency on multilib util-linux.
02 May 2014; Tom Wijsman <TomWij@gentoo.org> base/package.use.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index 72f222adeaab..2ec08b737cdb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15642 2014/05/03 07:33:08 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15643 2014/05/03 08:17:06 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
@@ -549,6 +549,7 @@ lxde-base/lxpolkit
>=sys-devel/libtool-2.4.2-r1
>=virtual/acl-0-r2
>=app-emulation/emul-linux-x86-baselibs-20140406-r3
+>=media-sound/lash-0.5.4-r2
>=x11-libs/libSM-1.2.2-r1
# Tom Wijsman <TomWij@gentoo.org> (21 Feb 2014)