gentoo resync : 19.07.2019

5 files changed, 41 insertions, 10 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 3fdd2e453a46..678b493f8670 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -103,7 +103,8 @@ NETBEANS_MODULES="apisupport cnd groovy gsf harness ide identity j2ee java mobil
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
 # Updated to include ruby24 on 2018-11-12
-RUBY_TARGETS="ruby24"
+# Updated to include ruby25 on 2019-07-17
+RUBY_TARGETS="ruby24 ruby25"
 
 # Samuli Suominen <ssuominen@gentoo.org> (2009-12-03)
 # Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx
@@ -115,6 +116,10 @@ USE="${USE} cxx"
 # https://archives.gentoo.org/gentoo-dev/message/ba0e3457e4b807e79816f0df03566af0
 USE="${USE} xattr"
 
+# Mike Gilbert <floppym@gentoo.org> (2019-07-14)
+# Enable split-usr by default to keep existing installs as-is.
+USE="${USE} split-usr"
+
 # Tiziano Müller <dev-zero@gentoo.org> (2010-01-24)
 # We usually don't want python to (re)write .py[co] files during phase runs
 # since it could cause sandbox violations
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index dce695a7b775..c68f65c9bc60 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -6,6 +6,14 @@
 # them is an experimental feature and needs testing.
 sys-libs/glibc static-libs
 
+# Michał Górny <mgorny@gentoo.org> (22 Mar 2019)
+# 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
+
 # Mart Raudsepp <leio@gentoo.org> (2018-12-14)
 # Security is not optional if available for the architecture/kernel.
 gnome-base/gnome-desktop seccomp
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index be6c86f70fab..2546aaa9521b 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,28 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# 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
+sci-libs/grib_api jasper jpeg2k
+x11-libs/gdk-pixbuf jpeg2k
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-07-07)
 # media-video/pipewire is masked for now
 sys-apps/xdg-desktop-portal screencast
@@ -148,11 +170,6 @@ dev-lang/gnat-gpl jit
 # address user visible breakage due to circular dependency #665008
 =media-fonts/encodings-1.0.4-r3 X
 
-# Dirkjan Ochtman <djc@gentoo.org> (2018-09-29)
-# Clippy is broken for now, can't find libraries (bug 667286)
-<dev-lang/rust-1.29.2 clippy
-<dev-lang/rust-bin-1.34.1 clippy
-
 # Virgil Dupras <vdupras@gentoo.org> (2018-09-26)
 # Server feature in paramiko is patched out for security reasons. It can
 # be re-enabled with the 'server' USE flag, but this flag is hard
@@ -218,7 +235,6 @@ dev-perl/DBD-mysql embedded
 # Brian Evans <grknight@gentoo.org> (2018-02-28)
 # Mask client-libs USE to force users to install alternative standard pacakges
 dev-db/mariadb client-libs
-dev-db/mariadb-galera client-libs
 dev-db/mysql client-libs
 dev-db/percona-server client-libs
 
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 3066fadcb2cd..aaea4f233caf 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.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 package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (2019-07-16)
+# sci-libs/dcmtk is not stable
+media-libs/openimageio dicom
+
 # Bernd Waibel <waebbl@gmail.com> (2019-05-22)
 # Marked experimental, needs build and runtime testing. Due to non-
 # available licenses for arnold and maya I can not test these addons.
@@ -29,7 +33,7 @@ media-plugins/grilo-plugins chromaprint
 # Andreas Sturmlechner <asturm@gentoo.org> (2019-02-16)
 # Unstable dependencies.
 media-gfx/digikam vkontakte
-media-plugins/kipi-plugins mediawiki vkontakte
+kde-apps/kipi-plugins mediawiki vkontakte
 
 # Brian Evans <grknight@gentoo.org> (2018-12-06)
 # Mask USE flag since argon2 dependency is not stable on most arches
@@ -157,7 +161,6 @@ app-admin/packagekit-base entropy
 # flag until a source based version that doesn't depend
 # on a vulnerable libgcrypt version is in tree
 dev-db/mariadb sst-xtrabackup
-dev-db/mariadb-galera sst-xtrabackup
 
 # Sergey Popov <pinkbyte@gentoo.org> (2016-02-15)
 # Mask monitoring capabilities of Ganeti on stable branches
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index bd286e3389ec..bc7a936405e3 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -13,7 +13,6 @@ python_single_target_pypy3
 
 # Hans de Graaff <graaff@gentoo.org> (2018-12-25)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby25
 ruby_targets_ruby26
 
 # Patrick Lauer <patrick@gentoo.org> (2015-04-28)