gentoo resync : 23.03.2018

3 files changed, 27 insertions, 5 deletions

diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 62ac82a8a191..8f8cd8ba059c 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -67,6 +67,7 @@ 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 496bddbb6abb..9faa2ef0cd01 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -7,6 +7,24 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
+# app-backup/holland-lib-mysql will be removed (#643502)
+app-backup/holland mysql
+
+# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
+# media-sound/mp3gain and media-sound/aacgain will be removed (#630954).
+media-sound/abcde lame
+media-sound/split2flac mp3 mp4
+
+# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
+# dev-python/visual will be removed (#630252)
+net-analyzer/scapy visual
+
+# Pacho Ramos <pacho@gentoo.org> (18 Mar 2018)
+# net-dns/hesiod will be removed (#606652)
+net-mail/fetchmail hesiod
+sys-freebsd/freebsd-lib hesiod
+
 # Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # dev-java/jad-bin will be removed (#619770)
 dev-lisp/abcl jad
@@ -163,11 +181,6 @@ app-emulation/libvirt openvz
 # until upstream fixes it properly.
 sys-devel/clang z3
 
-# Ulrich Müller <ulm@gentoo.org> (26 Jul 2017)
-# Disable hesiod support due to security vulnerability, bug #626242.
-app-editors/emacs hesiod
-app-editors/emacs-vcs hesiod
-
 # Brian Evans <grknight@gentoo.org> (21 Jul 2017)
 # Mask USE flag which has limited keywords for app-crypt/argon2
 dev-lang/php argon2
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index c7f85959a7b2..540df5750cd6 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,14 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# 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
+
 # Zac Medico <zmedico@gentoo.org> (9 Mar 2018)
 # The rsync-verify support is not really stable yet.
 # Bugs #649276, #647964