gentoo resync : 19.04.2018

2 files changed, 6 insertions, 30 deletions

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 0a8dd471109c..cb48137d09c9 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -37,10 +37,6 @@ 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
-
-# Pacho Ramos <pacho@gentoo.org> (17 Mar 2018)
 # app-misc/cwiid will be removed (#608780)
 media-sound/supercollider wiimote
 
@@ -90,10 +86,6 @@ dev-qt/qtdemo:4 phonon
 dev-python/PyQt4 phonon
 dev-python/pyside:0 phonon
 
-# Brian Evans <grknight@gentoo.org> (22 Feb 2018)
-# Depends on vulnerable dev-php/ZendFramework which is masked for removal
-www-apps/postfixadmin xmlrpc
-
 # Andreas Sturmlechner <asturm@gentoo.org> (10 Feb 2018)
 # Depends on unreleased media-libs/libaom, and 9999 is currently broken
 media-video/vlc aom
@@ -120,18 +112,11 @@ net-analyzer/nagios-plugin-check_raid i2o
 media-video/ffmpeg appkit
 
 # Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
-# The whole zeitgeist stuck is dead (#629180)
+# The whole zeitgeist stack is dead (#629180)
 gnome-extra/synapse zeitgeist
-www-client/midori zeitgeist
 app-editors/gedit-plugins zeitgeist
-app-misc/bijiben zeitgeist
 dev-libs/folks zeitgeist
-media-sound/rhythmbox zeitgeist
-media-video/totem zeitgeist
-
-# Pacho Ramos <pacho@gentoo.org> (27 Dec 2017)
-# We will remove ptlib, its support was broken anyway (#624578).
-net-voip/yate h323
+www-client/midori zeitgeist
 
 # James Le Cuirot <chewi@gentoo.org> (17 Dec 2017)
 # Java 9 is not yet fully supported on Gentoo. Having a masked
@@ -393,14 +378,8 @@ dev-java/icedtea cacao jamvm
 
 # Lars Wendler <polynomial-c@gentoo.org> (20 Mar 2016)
 # Need vulnerable libotr version (see bug #576914).
-net-im/centerim otr
 =net-im/climm-0.7.1 otr
 
-# James Le Cuirot <chewi@gentoo.org> (14 Mar 2016)
-# jtds:1.2 needs removing because it depends on Java 6. Unfortunately
-# we can't stabilise the latest sqldeveloper yet because of Java 8.
-<dev-db/sqldeveloper-4.1.3.20.78-r1 mssql sybase
-
 # Patrice Clement <monsieurp@gentoo.org> (27 Nov 2015)
 # Unsastified dependencies are upsetting repoman. Needs investigation.
 app-arch/cfv bittorrent
@@ -675,7 +654,6 @@ media-sound/pulseaudio system-wide
 
 # These are for BSD only
 net-proxy/squid ipf-transparent pf-transparent
-app-admin/sshguard ipfilter
 
 # Alexis Ballier <aballier@gentoo.org> <16 Feb 2011>
 # Win32 specific useflags for vlc. Can be used for cross-compiling.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 9d0606481eeb..789c8b522a4d 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -93,6 +93,10 @@ media-plugins/kipi-plugins mediawiki vkontakte
 # Requires testing version of media-libs/opencv
 media-libs/mlt opencv
 
+# Matthias Maier <tamiko@gentoo.org> (22 Jan 2017)
+# sys-fs/zfs isn't going to be marked stable anytime soon
+app-emulation/libvirt zfs
+
 # Michael Palimaka <kensington@gentoo.org (18 Jan 2017)
 # www-client/weboob is horribly outdated and not stable
 app-office/kmymoney weboob
@@ -105,8 +109,6 @@ sci-libs/vtk mpi
 # Doug Goldstein <cardoe@gentoo.org> (04 Jan 2017)
 # libcxx is not stable so we can't let users use it
 dev-lang/rust libcxx
-# llvm 3.8.x is not stable so we can't let users use it
-dev-lang/rust system-llvm
 
 # Alon Bar-Lev <alonbl@gentoo.org> (01 Jan 2017)
 # Will always require unstable packages.
@@ -150,10 +152,6 @@ net-analyzer/pmacct mongodb
 # See bug #541012
 sci-libs/openfoam paraview
 
-# Pacho Ramos <pacho@gentoo.org>
-# dev-libs/libappindicator isn't going to be stabilized
-x11-misc/redshift appindicator
-
 # Ben de Groot <yngwin@gentoo.org>
 # Mask experimental feature on stable. This also needs not yet stable mupdf.
 app-text/qpdfview fitz