gentoo resync : 21.01.2018

21 files changed, 108 insertions, 9 deletions

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index 25c2ed44634f..c57fc9bfb4ad 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -27,3 +27,7 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx voodoo"
 # Defaults for audio drivers. These are copied from x86 (minus modems), since
 # Alpha supports the same busses.
 ALSA_CARDS="ali5451 als4000 bt87x ca0106 cmipci emu10k1 ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 maestro3 trident usb-audio via82xx ymfpci"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/alpha/use.stable.mask b/profiles/arch/alpha/use.stable.mask
index 7ef77fce94be..aec25237e086 100644
--- a/profiles/arch/alpha/use.stable.mask
+++ b/profiles/arch/alpha/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Brian Evans <grknight@gentoo.org> (16 Dec 2017)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index ada83da9f358..93fc2f9b460f 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
+# Needs sys-libs/libomp which is not keyworded. Leaving the decision
+# whether sys-libs/libomp should eventually be keyworded to when new
+# LLVM is going to be keyworded.
+<sys-devel/clang-runtime-4 openmp
+
+# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
+# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
+# no longer have the flag, so no point in keywording it for old.
+sys-devel/llvm ocaml
+
 # Ulrich Müller <ulm@gentoo.org> (23 Oct 2017)
 # Needs net-mail/mailutils which is not keyworded, bug #635216.
 app-editors/emacs-vcs mailutils
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index c0a917b65d74..410843f5d636 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -23,3 +23,6 @@ VIDEO_CARDS="exynos fbdev omap"
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 7b7ae26d1c3e..c06510394fc2 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Amy Liffey <amynka@gentoo.org (21 Jan 2018)
+# dev-libs/cereal not keyworded for arm
+media-libs/opencv contrib_dnn
+
 # Michał Górny <mgorny@gentoo.org> (30 Dec 2017)
 # Moved from use.mask since they are flags local to one package.
 dev-cpp/xsd ace
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 71be5d31fbc5..34affefc969d 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Brian Evans <grknight@gentoo.org> (16 Dec 2017)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 0a3820884b6c..3939be39232a 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -24,3 +24,7 @@ CHOST_hppa="${CHOST}"
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/hppa/package.use.stable.mask b/profiles/arch/hppa/package.use.stable.mask
index 95136a965411..175acfb2e8c5 100644
--- a/profiles/arch/hppa/package.use.stable.mask
+++ b/profiles/arch/hppa/package.use.stable.mask
@@ -17,6 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
+# revdeps on dev-libs/boost which is no longer stable.
+dev-db/mariadb oqgraph
+dev-libs/libsigc++ test
+media-libs/chromaprint test
+media-libs/gegl raw
+
 # Hans de Graaff <graaff@gentoo.org> (26 Nov 2017)
 # Several packages no longer have stable keywords due
 # to bug 626682
@@ -42,11 +49,6 @@ net-print/cups-filters pdf
 # MPI does not have stable keywords on hppa
 sci-libs/fftw mpi
 
-# Andreas Sturmlechner <asturm@gentoo.org> (03 Sep 2017)
-# Mask mpi support so Boost stabilization can go ahead
-# Boost 1.63 (bug 624662), Boost 1.62 (bug 590244)
-dev-libs/boost mpi
-
 # Andreas Sturmlechner <asturm@gentoo.org> (19 Aug 2017)
 # Mask net-libs/libssh rdeps for stabilisation timeout
 # (bug 618916)
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index 772a91e9951a..10be280ba22a 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -1,9 +1,17 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
+# Andreas Sturmlechner <asturm@gentoo.org> (20 Jan 2018)
+# Mask boost for stabilisation timeout, bug #624662
+boost
+
 # Andreas Sturmlechner <asturm@gentoo.org> (29 Oct 2017)
 # Mask qt4, qt5 for stabilisation timeout, bug #620334
 qt5
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 476c229a5a63..c1552b0f8c8a 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -26,3 +26,7 @@ VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx vesa voodoo"
 # 2006/12/23 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for audio drivers - Took from x86 profile
 ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/ia64/use.stable.mask b/profiles/arch/ia64/use.stable.mask
index 88f33d5ae7be..3b65e3358e32 100644
--- a/profiles/arch/ia64/use.stable.mask
+++ b/profiles/arch/ia64/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Not stable
 mkl
 
diff --git a/profiles/arch/powerpc/package.use.mask b/profiles/arch/powerpc/package.use.mask
index c2540acd7a43..caca20667638 100644
--- a/profiles/arch/powerpc/package.use.mask
+++ b/profiles/arch/powerpc/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Amy Liffey <amynka@gentoo.org (21 Jan 2018)
+# dev-libs/cereal not keyworded for ppc
+media-libs/opencv contrib_dnn
+
 # Robin H. Johnson <robbat2@gentoo.org> (10 Nov 2017)
 # Masked for dependencies:
 # - bug #438780: sys-firmware/ipxe not buildable on PPC without cross-compiler
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 57c5d7770ef5..80789f6ad543 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -35,3 +35,7 @@ IUSE_IMPLICIT="abi_ppc_32"
 
 # Enable abi_ppc_32 for packages that don't have it forced.
 ABI_PPC="32"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index ab73cb222f1a..8508553c1a8e 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,3 +1,7 @@
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Andrey Grozin <grozin@gentoo.org> (25 Jun 2014)
 # no stable versions on ppc
 clisp
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index fe54e02e4ef5..6ea718796307 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mach64 mga nv r128 radeon vesa"
 
 # Enable abi_ppc_64 for packages that don't have it forced.
 ABI_PPC="64"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index e797af411b72..fe877c3e26a2 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -3,3 +3,7 @@
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d92..acad3dcea1ea 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -39,3 +39,7 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 # Defaults for video drivers
 VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
 	suncg6 sunffb sunleo tdfx voodoo"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index a381058c68d3..33c7089f46f4 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Hans de Graaff <graaff@gentoo.org> (13 Aug 2017)
 # Drop stable ruby on sparc
 ruby
diff --git a/profiles/arch/x86-fbsd/package.use.mask b/profiles/arch/x86-fbsd/package.use.mask
index c68b05ffdbbd..479c2b6b7c3c 100644
--- a/profiles/arch/x86-fbsd/package.use.mask
+++ b/profiles/arch/x86-fbsd/package.use.mask
@@ -1,6 +1,17 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
+# Needs sys-libs/libomp which is not keyworded. Leaving the decision
+# whether sys-libs/libomp should eventually be keyworded to when new
+# LLVM is going to be keyworded.
+<sys-devel/clang-runtime-4 openmp
+
+# Michał Górny <mgorny@gentoo.org> (20 Jan 2018)
+# Needs dev-ml/ocaml-ctypes which is not keyworded. Newer versions
+# no longer have the flag, so no point in keywording it for old.
+sys-devel/llvm ocaml
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires USE=qt5 that is masked in this profile.
 media-video/vlc skins
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index f3347ce31a71..2e9b5fa264c6 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -42,3 +42,7 @@ IUSE_IMPLICIT="abi_x86_32"
 # Michał Górny <mgorny@gentoo.org> (01 Jul 2014)
 # Default to abi_x86_32 for packages that don't have it forced.
 ABI_X86="32"
+
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary entry to support stable bug 639476
+RUBY_TARGETS="ruby22"
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 118c3436da94..6639125e6f26 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,6 +4,10 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (21 Jan 2018)
+# Temporary mask to support stable bug 639476
+ruby_targets_ruby23
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Not yet stable.
 elogind