summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-06-07 21:30:10 +0000
committerMichał Górny <mgorny@gentoo.org>2014-06-07 21:30:10 +0000
commit272acd9ee3ca868df02f5103abc55b55df533bf7 (patch)
tree9c03f9e3ed939647905338a7a46b6db6bdf4ca89 /profiles
parentadding ~arm (diff)
downloadgentoo-2-272acd9ee3ca868df02f5103abc55b55df533bf7.tar.gz
gentoo-2-272acd9ee3ca868df02f5103abc55b55df533bf7.tar.bz2
gentoo-2-272acd9ee3ca868df02f5103abc55b55df533bf7.zip
Mask multilib libav & libpostproc.
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 bad94da0c5e9..0df16f81eea5 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.9051 2014/06/07 15:23:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9052 2014/06/07 21:30:10 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!
07 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
+ Mask multilib libav & libpostproc.
+
+ 07 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
Mask multilib libofa & respective medialibs bump.
07 Jun 2014; Michał Górny <mgorny@gentoo.org> package.mask:
diff --git a/profiles/package.mask b/profiles/package.mask
index c1793b773a9f..85c02ec9c2a7 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15767 2014/06/07 15:23:29 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.15768 2014/06/07 21:30:10 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
@@ -97,6 +97,10 @@ dev-java/ibm-jdk-bin:1.5
>=media-libs/taglib-1.9.1-r1
>=media-libs/libofa-0.9.3-r1
>=app-emulation/emul-linux-x86-medialibs-20140508-r3
+>=media-video/libav-9.13-r1
+>=virtual/ffmpeg-9-r1
+>=media-libs/libpostproc-10.20140517-r1
+>=app-emulation/emul-linux-x86-medialibs-20140508-r4
# Vladimir Smirnov <civil@gentoo.org> (27 May 2014)
# Masked for testing, will defenitely cause major breakage