Merge https://github.com/gentoo/gentoo.git

3 files changed, 37 insertions, 28 deletions

diff --git a/profiles/arch/alpha/package.mask b/profiles/arch/alpha/package.mask
index ec1e226632..579547f4d9 100644
--- a/profiles/arch/alpha/package.mask
+++ b/profiles/arch/alpha/package.mask
@@ -8,13 +8,6 @@
 # Gentoo bug: 562128
 >=sys-devel/gdb-7.10
 
-# Julian Ospald <hasufell@gentoo.org> (01 Sep 2014)
-# Needs either hardmasked >=media-video/libav-10 or
-# >=media-video/ffmpeg-2.1.4 which is not keyworded for
-# alpha. Also see bug #521808
-=media-video/mpv-0.4*
-=media-video/mpv-0.5*
-
 # Alexey Shvetsov <alexxy@gentoo.org> (21 May 2012)
 # Need deps pecl-apc and pecl-uploadprogress bug #416897
 >=www-apps/drupal-7.14
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 81945cc659..af5c6ff016 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,7 +1,29 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
+# James Le Cuirot <chewi@gentoo.org) (30 Jan 2016)
+# scrollview requires Java, which is unsupported on Alpha.
+app-text/tesseract scrollview
+
+# Michael Weber <xmw@gentoo.org> (09 Jan 2016)
+# no alpha support in media-libs/glfw
+app-text/mupdf opengl
+
+# Ian Delaney <idella4@gentoo.org> (05 Jan 2016)
+# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
+# dev-lang/luajit lacks alpha keyword. See bug #488318.
+media-video/mpv luajit
+
+# Ian Delaney <idella4@gentoo.org> (28 Dec 2015)
+# dep of testsuite dev-util/cmocka requires keywording for alpha
+# via Bug 569558, then this can be taken out
+media-video/mpv test
+
+# Mike Frysinger <vapier@gentoo.org> (22 Dec 2015)
+# Needs keywording. #569254
+net-firewall/iptables nftables
+
 # Justin Lecher <jlec@gentoo.org> (18 Nov 2015)
 # requires dev-python/restkit which requires
 # dev-python/socketpool which requires dev-python/gevent which requires
@@ -44,10 +66,6 @@ dev-db/percona-server tokudb tokudb-backup-plugin
 # version of sudo has the optional functionality.
 >=app-admin/sudo-1.8.6 sssd
 
-# Brian Evans <grknight@gentoo.org> (14 Sep 2015)
-# Mask new USE flags for mariadb which all arches do not yet have dependencies
->=dev-db/mariadb-10.1.0 innodb-snappy
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (10 Sep 2015)
 # Requires wifi USE flag, which is masked for this arch
 net-misc/networkmanager wext
@@ -154,10 +172,6 @@ media-video/ffmpeg x265
 # Missing keywords on dev-python/rst2pdf, bug #515222
 media-video/mpv doc-pdf
 
-# Julian Ospald <hasufell@gentoo.org> (20 Apr 2014)
-# Missing keywords, bug #508226
-media-video/mpv sdl
-
 # Pacho Ramos <pacho@gentoo.org> (15 Mar 2014)
 # Missing keywords, bug #504672
 >=net-misc/vinagre-3.10 rdp
@@ -185,10 +199,6 @@ net-im/telepathy-connection-managers sipe
 # template-haskell not yet available
 dev-haskell/dataenc test
 
-# Tom Wijsman <TomWij@gentoo.org> (16 Oct 2013)
-# Mask luajit on ~media-video/mpv-0.2.0 because it only has amd64 x86 keywords. See bug #488318.
->=media-video/mpv-0.2.0 luajit
-
 # Pacho Ramos <pacho@gentoo.org> (20 Jul 2013)
 # Keywords pending, bug #476710
 >=gnome-base/gnome-extra-apps-3.8 games
diff --git a/profiles/arch/alpha/package.use.stable.mask b/profiles/arch/alpha/package.use.stable.mask
index cfb2950f70..793eb08603 100644
--- a/profiles/arch/alpha/package.use.stable.mask
+++ b/profiles/arch/alpha/package.use.stable.mask
@@ -17,20 +17,25 @@
 #
 
 #--- END OF EXAMPLES ---
-#
+
+# Ian Delaney <idella4@gentoo.org> (04 Jan 2016)
+# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
+# Hopefully media-libs/rubberband goes stable before
+# the next stable version of mpv. See bug #570510.
+=media-video/mpv-0.9.2-r1 rubberband
+
+# Ian Delaney <idella4@gentoo.org> (04 Jan 2016)
+# on behalf of Ilya Tumaykin <itumaykin+gentoo@gmail.com>
+# media-libs/libsdl2 wasn't stabilized in the past, but now
+# it's ready for the next stable mpv release after the one below.
+=media-video/mpv-0.9.2-r1 sdl
+
 # Tobias Klausmann <klausman@gentoo.org> (17 Sep 2015)
 # Move this mask here (from package.use.mask) until net-fs/libnfs goes stable.
 # Gilles Dartiguelongue <eva@gentoo.org> (09 Jun 2015)
 # net-fs/libnfs lacks alpha keyword, bug #551576
 gnome-base/gvfs nfs
 
-# Tobias Klausmann <klausman@gentoo.org> (16 Sep 2015)
-# Move this mask here (from package.use.mask) until rubberband goes stable.
-# Also see commit 0ccb06790085936e2da1832e5bf1d1b637d6c54a
-# Ben de Groot <yngwin@gentoo.org> (03 May 2015)
-# media-libs/rubberband lacks alpha keyword, bug #548446
-media-video/mpv rubberband
-
 # Tobias Klausmann <klausman@gentoo.org> (29 Jul 2015)
 # Mask webkit so the dep can stay ~alpha forever
 >=x11-libs/wxGTK-3.0.2.0-r1 webkit
@@ -39,6 +44,7 @@ media-video/mpv rubberband
 # Mask due Gnome3 not going to be stabilized on this arch
 dev-util/geany-plugins devhelp markdown webkit
 >=gnome-base/gnome-desktop-2.32.1-r2 license-docs
+gnome-base/gvfs google
 mail-client/balsa webkit
 media-gfx/gimp webkit
 media-plugins/gst-plugins-meta modplug