summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Popov <pinkbyte@gentoo.org>2013-04-16 07:21:22 +0000
committerSergey Popov <pinkbyte@gentoo.org>2013-04-16 07:21:22 +0000
commitb4be9985a513cd294f85202c60443dece4100203 (patch)
tree1b507cdb4fa00ff7c09b9e6a50c0f8d08da90d97 /profiles
parentdrop old -3.2.0, migration -> distutils-r1 (diff)
downloadgentoo-2-b4be9985a513cd294f85202c60443dece4100203.tar.gz
gentoo-2-b4be9985a513cd294f85202c60443dece4100203.tar.bz2
gentoo-2-b4be9985a513cd294f85202c60443dece4100203.zip
Mask live ebuild of mplayer2
Diffstat (limited to 'profiles')
-rw-r--r--profiles/ChangeLog5
-rw-r--r--profiles/package.mask6
2 files changed, 9 insertions, 2 deletions
diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d52495683438..e53de38631f7 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,14 @@
# ChangeLog for profile directory
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7732 2013/04/16 05:15:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.7733 2013/04/16 07:21:22 pinkbyte 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!
+ 16 Apr 2013; Sergey Popov <pinkbyte@gentoo.org> package.mask:
+ Mask live ebuild of mplayer2
+
16 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> updates/2Q-2013:
Move alsa-firmware from media-sound category to sys-firmware category.
diff --git a/profiles/package.mask b/profiles/package.mask
index ac6de6a90d79..e5e86cf67173 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14662 2013/04/16 02:27:30 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.14663 2013/04/16 07:21:22 pinkbyte 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
@@ -31,6 +31,10 @@
#--- END OF EXAMPLES ---
+# Sergey Popov <pinkbyte@gentoo.org> (16 Apr 2013)
+# Depends on masked ffmpeg
+=media-video/mplayer2-9999
+
# Christoph Junghans <ottxor@gentoo.org> (15 Apr 2013)
# needs a network interface named eth* or wlan* (bug #455896)
# collides with predictable network interface names of udev