From: Michał Górny Date: Sun, 1 Feb 2015 23:25:57 +0000 (+0000) Subject: Mask net-misc/mediatomb[libav] since it requires masked libav. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2b311ceaf02db96a7052cf015b4f52e1e1a2eba;p=gentoo.git Mask net-misc/mediatomb[libav] since it requires masked libav. --- diff --git a/profiles/ChangeLog b/profiles/ChangeLog index 31920c645c90..c7040397173b 100644 --- a/profiles/ChangeLog +++ b/profiles/ChangeLog @@ -1,11 +1,14 @@ # ChangeLog for profile directory # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9745 2015/02/01 23:14:40 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9746 2015/02/01 23:25:57 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! + 01 Feb 2015; Michał Górny base/package.use.mask: + Mask net-misc/mediatomb[libav] since it requires masked libav. + 01 Feb 2015; Michał Górny package.mask: Mask >=media-video/handbrake-0.10 since it requires libav or ffmpeg versions that are both masked. diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask index 259c09ed943b..801fe88c5b56 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.637 2015/02/01 22:58:57 mgorny Exp $ +# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.638 2015/02/01 23:25:57 mgorny Exp $ # This file requires >=portage-2.1.1 # New entries go on top. @@ -9,6 +9,7 @@ # The required libav version is masked. app-text/unpaper libav media-tv/xbmc libav +net-misc/mediatomb libav # Brian Evans (22 Jan 2015) # PHP module split into dev-php/ming-php which is still ~arch