gentoo resync : 13.10.2019

6 files changed, 34 insertions, 32 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 2eeffdf3ff59..b4b872168f11 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -80,7 +80,7 @@ COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog"
 
 # Tomáš Chvátal <scarabeus@gentoo.org> (2010-10-26)
 # By default enable all protocols for average GPS user
-GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx"
+GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock greis isync itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf skytraq superstar2 timing tsip tripmate tnt ublox ubx"
 
 # Benedikt Böhm <hollow@gentoo.org> (2007-11-27)
 # Sane defaults for built-in apache modules
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index d8f5108cb0fb..e64b86353b9d 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -16,13 +16,14 @@ sys-devel/gcc cxx
 # them is an experimental feature and needs testing.
 sys-libs/glibc static-libs
 
-# Michał Górny <mgorny@gentoo.org> (22 Mar 2019)
+# Michał Górny <mgorny@gentoo.org> (2019-03-22)
 # Force building separate tinfo to maintain stable library API.  This
 # is backwards-compatible with packages linked to -lncurses, so neither
 # installed packages nor pre-built software should be negatively
 # affected.  On the other hand, disabling USE=tinfo is capable of
 # breaking installed packages.
 sys-libs/ncurses tinfo
+sys-libs/ncurses-compat tinfo
 
 # Mart Raudsepp <leio@gentoo.org> (2018-12-14)
 # Security is not optional if available for the architecture/kernel.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 14940369710f..040b6ea8fd55 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,29 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Michał Górny <mgorny@gentoo.org> (2019-10-05)
+# net-libs/openslp is being removed.
+net-nds/openldap slp
+sys-block/open-iscsi slp
+sys-block/open-isns slp
+
+# Ben Kohler <bkohler@gentoo.org> (2019-10-03)
+# iwd backend for connman hasn't kept up with iwd releases/API, mask 
+# until it catches up.
+net-misc/connman iwd
+
+# Brian Evans <grknight@gentoo.org> (2019-10-01)
+# PHP support is broken with current version
+# Mask USE until they are fixed
+=dev-libs/xapian-bindings-1.2.25 php
+media-gfx/exact-image php
+sci-geosciences/mapserver php
+www-servers/nginx-unit php5-6
+
+# Michał Górny <mgorny@gentoo.org> (2019-09-28)
+# media-fonts/hkscs-ming is slated for removal.
+app-i18n/xcin unicode
+
 # Craig Andrews <candrews@gentoo.org> (2019-09-12)
 # OpenSSL (as of version 1.1.1) doesn't have APIs for QUIC support
 # see https://github.com/openssl/openssl/pull/8797
@@ -55,27 +78,6 @@ sys-kernel/linux-firmware initramfs
 # Requires dev-libs/gumbo which is only keyworded for amd64 and x86
 mail-client/claws-mail litehtml
 
-# David Seifert <soap@gentoo.org> (2019-07-14)
-# media-libs/jasper will be removed in 30 days, bug #689784
-dev-games/openscenegraph jpeg2k
-dev-python/weasyprint jpeg2k
-dev-qt/qtimageformats jpeg2k
-media-gfx/dcraw jpeg2k
-media-gfx/digikam jpeg2k
-media-gfx/exact-image jpeg2k
-media-gfx/fim jpeg2k
-<media-gfx/gimp-2.10 jpeg2k
-media-gfx/graphicsmagick jpeg2k
-media-gfx/ufraw jpeg2k
-media-libs/devil jpeg2k
-media-libs/gegl jpeg2k
-media-libs/libraw jpeg2k
-media-libs/netpbm jpeg2k
-media-libs/opencv jpeg2k
-media-libs/simage jpeg2k
-net-proxy/ziproxy jpeg2k
-x11-libs/gdk-pixbuf jpeg2k
-
 # James Le Cuirot <chewi@gentoo.org> (2019-05-21)
 # Doesn't support ffmpeg-4. Portage takes a long time to report the
 # conflict and the feature is half broken anyway. See
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 0a00fc800bb7..2ce5b0ecd480 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -21,7 +21,6 @@ dev-python/aiohttp-socks test
 # Kent Fredric <kentnl@gentoo.org> (2019-07-30)
 # These features require dev-perl/GD, which currently can't be
 # considered stable due to serious defects upstream. Bug #661634
-app-admin/yaala gd
 app-misc/gcstar stats
 app-misc/g15daemon perl
 dev-lang/php coverage
@@ -66,10 +65,6 @@ media-plugins/grilo-plugins chromaprint
 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
-dev-lang/php argon2
-
 # Mikle Kolyada <zlogene@gentoo.org> (2018-11-07)
 # sssd is only stable for amd64 and x86
 app-admin/sudo sssd
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index fe8254ba5b7c..6e981e94a6e9 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.
 
+# Brian Evans <grknight@gentoo.org> (2019-10-01)
+# Mask PHP 5.6 target for EOL
+php_targets_php5-6
+
 # Matt Turner <mattst88@gentoo.org> (2019-03-03)
 # Mask for testing. Bug 606924
 libglvnd
@@ -28,10 +32,6 @@ php_targets_php7-0
 # d3d9 only works on amd64/x86.
 d3d9
 
-# Aaron W. Swenson <titanofold@gentoo.org> (2018-09-09)
-# Mask PostgreSQL 12 while in (pre-)alpha.
-postgres_targets_postgres12
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2017-11-04)
 # Unkeyworded on most arches, unmasked in supported arch profiles.
 audacious
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 645eae301301..9ddc19ed3b00 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/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
 
+# Patrick Lauer <patrick@gentoo.org> (2019-10-04)
+# No postgres-12 stable yet
+postgres_targets_postgres12
+
 # Zac Medico <zmedico@gentoo.org> (2016-09-01)
 # Needs virtual/pypy* stable
 python_targets_pypy