Unmask mpv-0.7.3 and smplayer-14.9.0.6690 after masking libav useflag on newer mpv.

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index d2611ad7acf01d6410cedd02f5b8d0e7556e37f0..fc61c223c51d7110868abb347375136d6e2220db 100644 (file)
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9755 2015/02/03 21:37:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9756 2015/02/04 08:07:54 yngwin 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!
 
+  04 Feb 2015; Ben de Groot <yngwin@gentoo.org> base/package.use.mask,
+  package.mask:
+  Unmask mpv-0.7.3 and smplayer-14.9.0.6690 after masking libav useflag on
+  newer mpv.
+
   03 Feb 2015; Pacho Ramos <pacho@gentoo.org> package.mask:
   Prepare for gst-libav bump
 

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 801e474aa8017d999cd228778631311971dee9f6..0cbadb2caa6fa2cb1d2854bde2178c4bac417e15 100644 (file)
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -1,10 +1,16 @@
 # 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.641 2015/02/03 21:31:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.642 2015/02/04 08:07:55 yngwin Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
 
+# Ben de Groot <yngwin@gentoo.org> (04 Feb 2015)
+# Requires hard-masked version of libav.
+# Besides, upstream recommends using ffmpeg. See
+# https://github.com/mpv-player/mpv/wiki/FFmpeg-versus-Libav
+>=media-video/mpv-0.6.0 libav
+
 # Michael Palimaka <kensington@gentoo.org> (03 Feb 2015)
 # Requires unreleased version of dev-libs/soprano
 app-office/akonadi-server qt5

diff --git a/profiles/package.mask b/profiles/package.mask
index 69c37dd77b5fe7afd0d23ea9769fdedfeb3c9dda..0abefc6ff6c922e52b09b5d2e46693f002972297 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16328 2015/02/03 21:37:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16329 2015/02/04 08:07:54 yngwin 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
@@ -289,14 +289,8 @@ www-apps/trac-downloads
 # Requires masked libav-10
 # If you use media-video/ffmpeg, it's absolutely safe to unmask this package.
 # Sorry for the inconvenience!
-#
-# Developers: Please DO NOT REMOVE this mask, which was discussed and
-# agreed on #gentoo-dev by mgorny, patrick and others
 =app-text/unpaper-6.1-r1
 =media-tv/xbmc-13.2-r1
-=media-video/mpv-0.6*
-=media-video/mpv-0.7*
-=media-video/smplayer-14.9.0.6690*
 =net-misc/mediatomb-0.12.2_pre20150118-r1
 >=media-video/handbrake-0.10.0