gentoo resync : 06.08.2019

5 files changed, 45 insertions, 30 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 678b493f8670..298897cef62c 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU"
 
 # Env vars to expand into USE vars.  Modifying this requires prior
 # discussion on gentoo-dev@lists.gentoo.org.
-USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
+USE_EXPAND="ABI_MIPS ABI_PPC ABI_RISCV ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS MONKEYD_PLUGINS NETBEANS_MODULES NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS"
 
 # USE_EXPAND variables whose contents are not shown in package manager
 # output. Changes need discussion on gentoo-dev.
@@ -175,3 +175,8 @@ POSTGRES_TARGETS="postgres10 postgres11"
 # of PHP, to avoid pulling in an unstable PHP on stable systems.
 #
 PHP_TARGETS="php7-2"
+
+# Alfredo Tupone <tupone@gentoo.org> (2019-09-03)
+#
+# Default ADA target
+ADA_TARGET="gnat_2018"
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 081b86bcd413..d8f5108cb0fb 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,10 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# <dev-scheme/guile-2 is package.mask'd, so force USE=guile2
+media-sound/lilypond guile2
+
 # Sergei Trofimovich <slyfox@gentoo.org> (2019-08-17)
 # USE=-cxx us a sure way to break native install as modern gcc
 # requires C++ to bootstrap. But in rare cases it's useful
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 42b7549742bd..82413ef6a620 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,26 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Thomas Deutschmann <whissi88@gentoo.org> (2019-09-02)
+# PGO not yet supported for comm-central, #693160
+>=mail-client/thunderbird-68 pgo
+
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# <dev-scheme/guile-2 is package.mask'd
+www-client/elinks guile
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# sci-libs/grib_api is slated for removal.
+dev-lang/gdl grib
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-27)
+# net-misc/tokyotyrant is slated for removal.
+app-metrics/collectd collectd_plugins_tokyotyrant
+
+# Michał Górny <mgorny@gentoo.org> (2019-08-25)
+# sys-cluster/open-mx is masked for removal.
+sys-cluster/openmpi openmpi_fabrics_open-mx
+
 # Kent Fredric <kentnl@gentoo.org> (2019-08-07)
 # Newer versions of nqp need newer versions of jdk to run on the jvm,
 # but these currently don't exist in gentoo. The USE flags have to be
@@ -62,12 +82,6 @@ games-emulation/vbam ffmpeg
 # bug #318841#c20.
 sys-kernel/linux-firmware unknown-license
 
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2019-05-11)
-# app-accessibility/festival:
-# Outdated, EAPI=2, unmaintained, segfaults immediately.
-# See bug 634928 and bug 612980. Removal in 30 days.
-media-radio/xastir festival
-
 # Virgil Dupras <vdupras@gentoo.org> (2019-04-29)
 # Docs are temporarily broken. See bug #680014
 dev-python/pandas doc
@@ -84,10 +98,6 @@ app-text/ghostscript-gpl l10n_ja
 dev-java/openjdk-jre-bin:8 gentoo-vm
 dev-java/openjdk-jre-bin:11 gentoo-vm
 
-# Michał Górny <mgorny@gentoo.org> (2019-04-13)
-# net-libs/ftplib is slated for removal.
-app-cdr/xbiso ftp
-
 # Michał Górny <mgorny@gentoo.org> (2019-04-10)
 # media-sound/aacplusenc is slated for removal.
 media-video/h264enc aac
@@ -109,7 +119,6 @@ dev-python/construct python_targets_python2_7
 # Has multiple issues including symlinks and threading.
 # Packages should use and access libmariadb.so instead
 dev-db/mariadb-connector-c mysqlcompat
-~media-tv/kodi-17.6 mariadb
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-03-05)
 # Not keyworded on non-x86 arches
@@ -117,17 +126,16 @@ app-admin/conserver freeipmi
 
 # Matt Turner <mattst88@gentoo.org> (2019-03-03)
 # Mask for testing. Bug 606924
+# Jeroen Roovers <jer@gentoo.org> (2019-09-02)
+# Bug 692170
 media-libs/mesa libglvnd
+x11-drivers/nvidia-drivers libglvnd
 
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2019-01-17)
 # Mask openjdk:8 for use as system java-vm until it's proven to work
 dev-java/openjdk:8 gentoo-vm
 dev-java/openjdk-bin:8 gentoo-vm
 
-# Sven Wegener <swegener@gentoo.org> (2019-01-18)
-# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
->=net-libs/libvncserver-0.9.12 libressl
-
 # William Hubbs <williamh@gentoo.org> (2019-01-13)
 # For memtest86+ mask the floppy use flag since it requires grub:0 which
 # is being removed
@@ -167,10 +175,6 @@ dev-cpp/eigen test
 kde-apps/cantor julia
 sci-libs/ceres-solver sparse
 
-# Alon Bar-Lev <alonbl@gentoo.org> (2018-11-08)
-# Waiting for >=dev-libs/libressl-2.7 to be unmasked.
->=app-crypt/xca-2.1.0 libressl
-
 # Alfredo Tupone <tupone@gentoo.org> (2018-10-24)
 # jit brokes build of gnat-gpl
 dev-lang/gnat-gpl jit
@@ -181,10 +185,6 @@ dev-lang/gnat-gpl jit
 # masked. bug #666619
 dev-python/paramiko server
 
-# Alon Bar-Lev <alonbl@gentoo.org> (2018-09-11)
-# Waiting for >=dev-libs/libressl-2.7 to be stablized.
->=dev-libs/opensc-0.18.0 libressl
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2018-08-03)
 # New and for Gentoo still quite experimental. You've been
 # warned. (Also, works only on x86_64 and with certain CPUs
@@ -203,10 +203,6 @@ sys-cluster/ceph static-libs
 # Depends on last-rited sci-libs/coinhsl.
 sci-libs/ipopt hsl
 
-# Mike Gilbert <floppym@gentoo.org> (2018-05-01)
-# Requires >=media-video/ffmpeg-4 (bug 654208).
->=www-client/chromium-67 system-ffmpeg
-
 # Göktürk Yüksek <gokturk@gentoo.org> (2018-04-04)
 # libewf is getting treecleaned (#547418).
 # Starting with sleuthkit-4.6.0, we statically link sleuthkit to a
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 21c108c9ec8d..0a00fc800bb7 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Kent Fredric <kentnl@gentoo.org> (2019-08-29)
+# Support for DBD-mysql to use mariadb is sketchy. Use DBD-MariaDB
+# instead if you can.
+dev-perl/DBD-mysql mariadb
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-08-16)
 # dev-libs/libical[glib] was not stable tested, bug #689434
 =dev-libs/libical-3.0.5 glib
@@ -56,9 +61,10 @@ media-gfx/alembic arnold maya
 media-plugins/grilo-plugins chromaprint
 
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
-# Unstable dependencies.
-media-gfx/digikam vkontakte
+# media-libs/opencv[contrib,contrib_dnn], net-libs/libmediawiki,
+# net-libs/libkvkontakte all not stable anywhere.
 kde-apps/kipi-plugins mediawiki vkontakte
+media-gfx/digikam dnn vkontakte
 
 # Brian Evans <grknight@gentoo.org> (2018-12-06)
 # Mask USE flag since argon2 dependency is not stable on most arches
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 7a2b7dbc5f55..fff8836e1fd9 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -4,6 +4,10 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Matt Turner <mattst88@gentoo.org> (2019-09-01)
+# app-office/texmacs is package.mask'd. Bug #436400
+texmacs
+
 # Brian Evans <grknight@gentoo.org> (2019-07-25)
 # Mask flag for early testing
 php_targets_php7-4