gentoo resync : 16.01.2018

6 files changed, 21 insertions, 27 deletions

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index caf8d15af3f0..c875bee78cda 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -6,6 +6,12 @@
 
 # SECTION: Unmask
 
+# Michael Orlitzky <mjo@gentoo.org> (07 Jan 2018)
+# Oracle database stuff should work on amd64.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -96,11 +102,6 @@
 # Lilo works on amd64, so ...
 -lilo
 
-# 2007/08/19 - Christoph Mende <angelos@gentoo.org>
-# Unmask support for dev-db/oracle-instantclient-basic
--oci8-instant-client
--oracle
-
 # 2007/03/10 - Mike Frysinger <vapier@gentoo.org>
 # NVRAM works on x86/amd64 hosts
 -nvram
@@ -125,10 +126,6 @@
 -video_cards_vmware
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86/amd64
--oci8
-
 # Feb 16th 2007; Simon Stelling <blubb@gentoo.org>
 # Since this profile forces >=portage-2.1.2, we can unmask all
 # SIMD assembler flags
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index bf23c16f576b..19cc5e875db6 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -18,7 +18,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-12 frei0r
-<=media-video/ffmpeg-3.3.5 frei0r sofalizer
+<=media-video/ffmpeg-3.3.6 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (26 May 2017)
 # toolame not stable yet
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 752b4918b135..a97dce3a8c01 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -8,13 +8,6 @@
 # dev-libs/libressl not marked stable yet
 libressl
 
-# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
-# Mask python targets until dev-lang/python is stable.
-python_single_target_python3_6
-python_targets_python3_6
-python_single_target_python3_5
-python_targets_python3_5
-
 # Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
 # Temporary mask to support stable bug 615818
 ruby_targets_ruby22
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 6c23a4598d8b..730688845f01 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# app-arch/snappy is not tested
+dev-db/mariadb innodb-snappy
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires dependency flags that are masked in this profile.
 media-libs/sdl-mixer midi
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 60ea7770845a..384fdee257c2 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask tcmalloc as dev-util/google-perftools is unavailable
+tcmalloc
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 58f2fc383b66..61982cc07f41 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -4,6 +4,12 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Michael Orlitzky <mjo@gentoo.org> (13 Jan 2018)
+# Oracle database stuff should work on x86.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -120,10 +126,6 @@
 # Unmask nvidia XvMC support
 -nvidia
 
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
--oracle
-
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics
 -input_devices_vmmouse
@@ -140,12 +142,6 @@
 -video_cards_virtualbox
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86
-#
-# Shared with amd64
--oci8
-
 # Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
 # Unmask as it works on x86
 -lcd_devices_svga