gentoo resync : 11.05.2018

23 files changed, 39 insertions, 32 deletions

diff --git a/profiles/arch/alpha/make.defaults b/profiles/arch/alpha/make.defaults
index c57fc9bfb4ad..2b07bcf07856 100644
--- a/profiles/arch/alpha/make.defaults
+++ b/profiles/arch/alpha/make.defaults
@@ -21,7 +21,7 @@ LIBDIR_alpha="lib"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 
 # 2007/02/05 - Chris Gianelloni <wolf31o2@gentoo.org>
 # Defaults for audio drivers. These are copied from x86 (minus modems), since
diff --git a/profiles/arch/alpha/use.mask b/profiles/arch/alpha/use.mask
index b9851f4fbe6a..a1b7280cd611 100644
--- a/profiles/arch/alpha/use.mask
+++ b/profiles/arch/alpha/use.mask
@@ -121,9 +121,6 @@ vpopmail
 # We don't have any virtual/mpi (bug 111807)
 mpi
 
-# Modular X: mask non-alpha cards
-video_cards_vesa
-
 # Matt Turner <mattst88@gentoo.org>
 # llvm is not keyworded
 video_cards_amdgpu
diff --git a/profiles/arch/amd64-fbsd/make.defaults b/profiles/arch/amd64-fbsd/make.defaults
index 6d49239ef0e1..f512d12af10d 100644
--- a/profiles/arch/amd64-fbsd/make.defaults
+++ b/profiles/arch/amd64-fbsd/make.defaults
@@ -21,9 +21,7 @@ LDFLAGS_x86_fbsd="-m elf_i386_fbsd -L/usr/lib32"
 
 CPU_FLAGS_X86="mmx mmxext sse sse2"
 
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
-	nv r128 radeon rendition s3 s3virge savage siliconmotion sis \
-	sisusb tga trident tseng via vmware"
+VIDEO_CARDS="dummy intel mga nv r128 radeon siliconmotion via vmware"
 
 # Vanilla FreeBSD has: lib for native 64 bits libs, lib32 for 32-bits emulation.
 # Let's do this too as this also happens to be more standard among other linux
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index f344a7da1c55..307f4ea24127 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -121,6 +121,7 @@
 -video_cards_intel
 -video_cards_nvidia
 -video_cards_siliconmotion
+-video_cards_vesa
 -video_cards_via
 -video_cards_virtualbox
 -video_cards_vmware
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index 351716712a48..7efb190bb3b6 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -2,6 +2,20 @@
 # Distributed under the terms of the GNU General Public License v2
 
 # Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires unstable dev-python/PyQt4
+media-sound/pulseaudio qt4
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires not stabilised dev-python/restkit
+dev-python/wsgiproxy2 test
+dev-python/pyquery test
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
+# Requires not stabilised Qt5
+app-i18n/ibus kde
+dev-qt/qtchooser test
+
+# Andreas Sturmlechner <asturm@gentoo.org> (07 May 2018)
 # Requires not stabilised dev-python/matplotlib
 dev-python/numpydoc test
 dev-python/ipython matplotlib
diff --git a/profiles/arch/arm/use.mask b/profiles/arch/arm/use.mask
index ab0c94fb997e..b5359fbb5015 100644
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -110,8 +110,6 @@ video_cards_nv
 video_cards_r128
 video_cards_radeon
 video_cards_tdfx
-video_cards_vesa
-video_cards_via
 video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 478086fd0fa0..91c3f277d6b7 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
 
+# Andreas Sturmlechner <asturm@gentoo.org> (06 May 2018)
+# Not stable, bug #642822
+qt5
+
 # Brian Evans <grknight@gentoo.org> (16 Dec 2017)
 # Needs dev-lang/php:7.1 stable
 php_targets_php7-1
diff --git a/profiles/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index d296ac03f110..701fa0507204 100644
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -211,8 +211,6 @@ video_cards_nv
 video_cards_r128
 video_cards_radeon
 video_cards_tdfx
-video_cards_vesa
-video_cards_via
 video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 7545b9fc9f77..7b56f996c3ac 100644
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -129,6 +129,7 @@ video_cards_i915
 video_cards_i965
 video_cards_intel
 video_cards_nvidia
+video_cards_vesa
 video_cards_via
 video_cards_vmware
 video_cards_virtualbox
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index 3639d4ee5d8b..157329615fb7 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -234,7 +234,6 @@ video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
 video_cards_tdfx
-video_cards_vesa
 video_cards_voodoo
 
 # 25 Jul 2005 Guy Martin <gmsoft@gentoo.org>
diff --git a/profiles/arch/ia64/make.defaults b/profiles/arch/ia64/make.defaults
index 476c229a5a63..dbfa5efa2134 100644
--- a/profiles/arch/ia64/make.defaults
+++ b/profiles/arch/ia64/make.defaults
@@ -21,7 +21,7 @@ CHOST_ia64="${CHOST}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx vesa voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 
 # 2006/12/23 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for audio drivers - Took from x86 profile
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index de834a719094..16cf105d8adf 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -152,10 +152,6 @@ video_cards_r300
 video_cards_r600
 video_cards_radeonsi
 
-# 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_vesa
-
 # Diego Pettenò <flameeyes@gentoo.org>
 # Until xine-lib's keywording can be maintained, please leave it masked.
 xine
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 57c5d7770ef5..418e2b908510 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -15,7 +15,7 @@ FCFLAGS="${CFLAGS}"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga nv r128 radeon savage tdfx trident voodoo"
+VIDEO_CARDS="fbdev glint mga nv r128 radeon tdfx voodoo"
 
 # 2006/12/06 - Diego Pettenò <flameeyes@gentoo.org>
 # Defaults for PowerPC sound driver
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index fe54e02e4ef5..7f43ef6c4888 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -35,7 +35,7 @@ IUSE_IMPLICIT="abi_ppc_64"
 
 # 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev mach64 mga nv r128 radeon vesa"
+VIDEO_CARDS="fbdev mga nv r128 radeon"
 
 # Enable abi_ppc_64 for packages that don't have it forced.
 ABI_PPC="64"
diff --git a/profiles/arch/powerpc/use.mask b/profiles/arch/powerpc/use.mask
index fc28c68580d2..9500eba21f4a 100644
--- a/profiles/arch/powerpc/use.mask
+++ b/profiles/arch/powerpc/use.mask
@@ -112,10 +112,6 @@ lcd_devices_stv5730
 # Both
 lcd_devices_t6963
 
-# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
-# Modular X: mask for architectures on which they aren't available
-video_cards_vesa
-
 # Intel Integrated Primitive (sci-libs/ipp) support
 ipp
 
diff --git a/profiles/arch/s390/use.mask b/profiles/arch/s390/use.mask
index d539fc4b5686..bf9dbcfa2b33 100644
--- a/profiles/arch/s390/use.mask
+++ b/profiles/arch/s390/use.mask
@@ -106,7 +106,6 @@ video_cards_r600
 video_cards_radeon
 video_cards_radeonsi
 video_cards_tdfx
-video_cards_vesa
 
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (22 Aug 2013)
 # virtual/opencl is not keyworded
diff --git a/profiles/arch/sh/use.mask b/profiles/arch/sh/use.mask
index e95b7df40d7a..648703d97228 100644
--- a/profiles/arch/sh/use.mask
+++ b/profiles/arch/sh/use.mask
@@ -89,8 +89,6 @@ video_cards_nv
 video_cards_r128
 video_cards_radeon
 video_cards_tdfx
-video_cards_vesa
-video_cards_via
 video_cards_voodoo
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 0053c3734d92..daa11d4de6af 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -37,5 +37,4 @@ MULTILIB_STRICT_DIRS="/lib32 /usr/lib32 /usr/kde/*/lib32 /usr/qt/*/lib32 /usr/X1
 
 # 2006/10/05 - Gustavo Zacarias <gustavoz@gentoo.org>
 # Defaults for video drivers
-VIDEO_CARDS="fbdev glint mach64 mga r128 radeon sunbw2 suncg14 suncg3 \
-	suncg6 sunffb sunleo tdfx voodoo"
+VIDEO_CARDS="fbdev glint mga r128 radeon tdfx voodoo"
diff --git a/profiles/arch/sparc/package.use.mask b/profiles/arch/sparc/package.use.mask
index 0fbf87849226..aa67ba2a5f99 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Sergei Trofimovich <slyfox@gentoo.org> (08 May 2018)
+# Mask USE=games to avoid unkeyworded games-util/qstat.
+net-analyzer/monitoring-plugins game
+
 # Mart Raudsepp <leio@gentoo.org> (30 Mar 2018)
 # Mask USE=mp3 for media-plugins/gst-plugins-meta:1.0 since
 # media-plugins/gst-plugins-mpg123 is not keyworded (bug #635466)
diff --git a/profiles/arch/sparc/package.use.stable.mask b/profiles/arch/sparc/package.use.stable.mask
index d9033f513d31..55bb8b3a0bcf 100644
--- a/profiles/arch/sparc/package.use.stable.mask
+++ b/profiles/arch/sparc/package.use.stable.mask
@@ -17,6 +17,13 @@
 
 #--- END OF EXAMPLES ---
 
+# Andreas Sturmlechner <asturm@gentoo.org> (7 May 2018)
+# sci-visualization/gnuplot is not stable.
+app-admin/sysstat isag
+dev-util/ddd gnuplot
+sci-libs/libqalculate gnuplot
+sci-mathematics/octave gnuplot
+
 # Mart Raudsepp <leio@gentoo.org> (02 Sep 2017)
 # Drop stable gstreamer on sparc, can move to use.stable.mask
 # after gstreamer:0.10 is gone; #601354
diff --git a/profiles/arch/sparc/use.mask b/profiles/arch/sparc/use.mask
index df91e130720f..b67efceb34f9 100644
--- a/profiles/arch/sparc/use.mask
+++ b/profiles/arch/sparc/use.mask
@@ -184,7 +184,6 @@ hdf5
 # 2006/02/05 - Donnie Berkholz <dberkholz@gentoo.org>
 # Modular X: mask for architectures on which they aren't available
 video_cards_nv
-video_cards_vesa
 video_cards_nouveau
 
 # Matt Turner <mattst88@gentoo.org>
diff --git a/profiles/arch/x86-fbsd/make.defaults b/profiles/arch/x86-fbsd/make.defaults
index abf5cc1cad8a..85fb647de9b4 100644
--- a/profiles/arch/x86-fbsd/make.defaults
+++ b/profiles/arch/x86-fbsd/make.defaults
@@ -18,9 +18,7 @@ DEFAULT_ABI="x86_fbsd"
 ABI="x86_fbsd"
 LIBDIR_x86_fbsd="lib"
 
-VIDEO_CARDS="apm ark chips cirrus cyrix dummy i128 intel mach64 mga \
-	nv r128 radeon rendition s3 s3virge savage siliconmotion sis \
-	sisusb tga trident tseng via vmware"
+VIDEO_CARDS="dummy intel mga nv r128 radeon siliconmotion via vmware"
 
 # Unhide the CPU_FLAGS_X86 USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_X86"
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 61982cc07f41..348be1819f00 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -138,6 +138,7 @@
 -video_cards_siliconmotion
 -video_cards_vmware
 -video_cards_geode
+-video_cards_vesa
 -video_cards_via
 -video_cards_virtualbox
 -video_cards_qxl