summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--profiles/ChangeLog6
-rw-r--r--profiles/package.mask3
2 files changed, 7 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 8bf85525e5a8..5c9096cdbb52 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.9265 2014/07/27 13:26:11 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9266 2014/07/28 08:04:30 ssuominen 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!
+ 28 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> package.mask:
+ Mask also media-video/em8300-modules because media-video/em8300-libraries was
+ masked earlier.
+
27 Jul 2014; Mikle Kolyada <zlogene@gentoo.org> package.mask:
Update media-video/mpv mask.
diff --git a/profiles/package.mask b/profiles/package.mask
index b2c9af19baec..7e0f788c7256 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15933 2014/07/27 13:26:11 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15934 2014/07/28 08:04:30 ssuominen 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
@@ -50,6 +50,7 @@ net-dialup/gnome-ppp
media-plugins/vdr-dxr3
media-video/dxr3config
media-video/em8300-libraries
+media-video/em8300-modules
# Pacho Ramos <pacho@gentoo.org> (27 Jul 2014)
# Not building since 2012 (#423799). Removal in a