Unmask USE=libav revbumps. Replace libav-10 p.u.masks with plain p.mask of version bumps to get less insane results.

3 files changed, 12 insertions, 29 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index fd095828e7f3..48fd938e7b85 100644
--- 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.9753 2015/02/03 15:05:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.9754 2015/02/03 21:31:06 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!
 
+  03 Feb 2015; Michał Górny <mgorny@gentoo.org> base/package.use.mask,
+  package.mask:
+  Unmask USE=libav revbumps. Replace libav-10 p.u.masks with plain p.mask of
+  version bumps to get less insane results.
+
   03 Feb 2015; Pacho Ramos <pacho@gentoo.org> package.mask:
   Cleanup obsolete entries
 
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index a444a459c7f5..801e474aa801 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.640 2015/02/03 17:47:39 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.641 2015/02/03 21:31:07 mgorny Exp $
 
 # This file requires >=portage-2.1.1
 # New entries go on top.
@@ -13,12 +13,6 @@ app-office/akonadi-server qt5
 # Masked for dev-php/PEAR-MDB2_Driver_sqlite last rites Bug 538584
 dev-php/PHPonTrax sqlite
 
-# Michał Górny <mgorny@gentoo.org> (01 Feb 2015)
-# The required libav version is masked.
-app-text/unpaper libav
-media-tv/xbmc libav
-net-misc/mediatomb libav
-
 # Brian Evans <grknight@gentoo.org> (22 Jan 2015)
 # PHP module split into dev-php/ming-php which is still ~arch
 <media-libs/ming-0.4.5 php
diff --git a/profiles/package.mask b/profiles/package.mask
index f19fd7102dd8..f81149daef8c 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,5 +1,5 @@
 ####################################################################
-# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16326 2015/02/03 15:05:59 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/package.mask,v 1.16327 2015/02/03 21:31:06 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
@@ -46,25 +46,6 @@ x11-plugins/wmauda
 # In preparation of dev-lang/php:5.3 removal, Removal in 30 days
 dev-php/PEAR-MDB2_Driver_sqlite
 
-# Michał Górny <mgorny@gentoo.org> (02 Feb 2015)
-# Temporarily mask updated ffmpeg reverse deps to improve
-# the solution used.
-=app-text/unpaper-6.1-r1
-=media-gfx/blender-2.72b-r3
-=media-libs/xine-lib-1.2.6-r1
-=media-tv/xbmc-13.2-r1
-=media-video/ffmpeg2theora-0.29-r2
-=media-video/handbrake-0.10.0-r1
-=media-video/makemkv-1.8.13-r1
-=media-video/mplayer2-2.0_p20131009-r1
-=media-video/mpv-0.3.11-r1
-=media-video/mpv-0.7.2-r1
-=media-video/vlc-2.1.5-r1
-=net-misc/mediatomb-0.12.2_pre20150118-r1
-=virtual/ffmpeg-0.10.3-r1
-=virtual/ffmpeg-9-r2
-=x11-wm/xpra-0.14.12-r1
-
 # Eray Aslan <eras@gentoo.org> (31 Jan 2015)
 # Mask experimental software
 =mail-mta/postfix-3.0*
@@ -311,10 +292,13 @@ www-apps/trac-downloads
 #
 # Developers: Please DO NOT REMOVE this mask, which was discussed and
 # agreed on #gentoo-dev by mgorny, patrick and others
->=media-video/handbrake-0.10.0
+=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
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (03 Sep 2014)
 # Temporary mask until it is verified to work