gentoo resync : 21.05.2019

4 files changed, 10 insertions, 19 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 04fc8f63c525..02cab1459945 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -81,7 +81,6 @@ dev-lang/python-exec python_targets_pypy3
 # bug #315615, and makes subshell die support more robust
 # (so that repoman's ebuild.nesteddie check is irrelevant).
 sys-apps/portage ipc
-sys-apps/portage-mgorny ipc
 
 # Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
 # Python should use wide Unicode implementation by default.
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index abf268d48588..03f8e8c920bd 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,14 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Ulrich Müller <ulm@gentoo.org> (18 May 2019)
+# Firmware images without a known license. Most likely, upstream
+# redistribution may conflict with the licenses or lack thereof
+# on the images. Check the WHENCE file in the package for specific
+# terms. Masked to prevent accidental installation of these files,
+# bug #318841#c20.
+sys-kernel/linux-firmware unknown-license
+
 # Andreas K. Hüttel <dilfridge@gentoo.org> (11 May 2019)
 # app-accessibility/festival:
 # Outdated, EAPI=2, unmaintained, segfaults immediately.
@@ -37,10 +45,6 @@ app-cdr/xbiso ftp
 # media-sound/aacplusenc is slated for removal.
 media-video/h264enc aac
 
-# Michał Górny <mgorny@gentoo.org> (31 Mar 2019)
-# dev-libs/grok is slated for removal.
-app-admin/rsyslog grok
-
 # Michał Górny <mgorny@gentoo.org> (21 Mar 2019)
 # x11-wm/afterstep is slated for removal.
 x11-terms/aterm background
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index ceaca7eb8ee2..0879dc3bdde3 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -46,8 +46,8 @@ sys-devel/clang-runtime crt
 net-analyzer/wireshark doc
 
 # Andreas Sturmlechner <asturm@gentoo.org> (29 May 2018)
-# Depends on unstable media-libs/libaom, net-libs/srt
-media-video/vlc aom srt
+# Depends on unstable media-libs/libaom
+media-video/vlc aom
 
 # Andreas Sturmlechner <asturm@gentoo.org> (21 May 2018)
 # Depends on lots of unstable dependencies
@@ -57,10 +57,6 @@ dev-python/s3fs test
 # sci-geosciences/grass is not stable
 sci-geosciences/qgis grass
 
-# Thomas Beierlein <tomjbe@gentoo.org> (21 Mar 2018)
-# ~app-backup/bacula-9.0.6 does not compile with USE=libressl (bug #641492)
-~app-backup/bacula-9.0.6 libressl
-
 # Matthias Maier <tamiko@gentoo.org> (18 Mar 2018)
 # dev-libs/capstone hasn't been stabilized yet
 app-emulation/qemu capstone
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 06cbcf1c91aa..8af3c7384873 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -96,11 +96,3 @@ prelude
 # Diego Elio Pettenò <flameeyes@gentoo.org> (27 Aug 2012)
 # netlink is a Linux-specific interface
 netlink
-
-# Pacho Ramos <pacho@gentoo.org> (28 Sep 2013)
-# This USE flag is available after long dicussion in
-# http://www.gossamer-threads.com/lists/gentoo/dev/276077
-# to let some prople not able to run systemd to skip the dep (#480336).
-# Enabling this you will get a fully unsupported Gnome setup that
-# could suffer unexpected problem, don't expect support for it then.
-openrc-force