gentoo resync : 16.04.2018

4 files changed, 13 insertions, 16 deletions

diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 1b915704d01c..3992c3053e61 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -183,10 +183,6 @@ net-libs/gnutls -dane
 # dependency keyworded here, masked in base
 media-libs/freetype -infinality
 
-# Mike Gilbert <floppym@gentoo.org> (29 Jun 2012)
-# sys-fs/zfs is not available everywhere.
-sys-boot/grub -libzfs
-
 # Alexandre Rostovtsev <tetromino@gentoo.org> (12 Apr 2012)
 # Temporary mask-in-base, unmask-in-arch for dev-python/mako keywording for
 # gobject-introspection[doctool], bug #411761
@@ -222,10 +218,6 @@ dev-qt/qtwebkit -jit
 # PPS should work on all arches, but only keyworded on amd64/x86
 >=net-misc/ntp-4.2.6_p3-r1 -parse-clocks
 
-# Alexey Shvetsov <alexxy@gentoo.org> (1 Jul 2011)
-# Use mask infiniband for stable corosync
-=sys-cluster/corosync-1.3.0 infiniband
-
 # Tim Harder <radhermit@gentoo.org> (13 Feb 2011)
 # Masked in base, unmask for amd64/x86
 >=media-video/mplayer-1.0_rc4_p20101219 -bluray
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask
index b170fe6ef3b7..6bc0e5760b78 100644
--- a/profiles/arch/amd64/package.use.stable.mask
+++ b/profiles/arch/amd64/package.use.stable.mask
@@ -52,10 +52,6 @@ dev-db/mariadb mroonga
 # and additional unstable dependencies
 gnustep-base/gnustep-make libobjc2
 
-# Yixun Lan <dlan@gentoo.org> (02 Apr 2015)
-# sys-fs/zfs is not stable.
-sys-cluster/ceph zfs
-
 # Pacho Ramos <pacho@gentoo.org> (08 Mar 2015)
 # mayavi is broken, bug #500104
 dev-python/apptools test
@@ -66,10 +62,6 @@ dev-python/apptools test
 dev-lang/python-exec -python_targets_pypy
 dev-lang/python-exec -python_targets_pypy3
 
-# Mike Gilbert <floppym@gentoo.org> (22 Mar 2014)
-# sys-fs/zfs is not stable.
-sys-boot/grub libzfs
-
 # Tom Wijsman <TomWij@gentoo.org> (06 Feb 2014)
 # [QA] Masked jit USE flag on www-apps/cgit as dev-lang/luajit is not stable.
 www-apps/cgit jit
diff --git a/profiles/arch/amd64/x32/package.mask b/profiles/arch/amd64/x32/package.mask
index b3ccb65fb06a..144142b62ad7 100644
--- a/profiles/arch/amd64/x32/package.mask
+++ b/profiles/arch/amd64/x32/package.mask
@@ -1,11 +1,19 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (15 Apr 2018)
+# Broken multilib dependencies.
+net-im/mattermost-desktop-bin
+net-im/skypeforlinux
+net-im/slack-bin
+
 # Pawel Hajdan jr <phajdan.jr@gentoo.org> (07 Oct 2012)
 # V8 upstream said they won't support x32, bug #423815
 # Masked packages containing V8.
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # ...and their reverse dependencies.
+app-editors/atom
+dev-lang/coffee-script
 dev-python/bokeh
 dev-python/blaze
 <dev-python/dask-0.15.1
@@ -15,5 +23,9 @@ dev-ruby/coffee-script
 dev-ruby/execjs
 dev-ruby/turbolinks
 dev-ruby/uglifier
+dev-util/electron
 net-libs/nodejs
+sys-apps/yarn
+www-apps/jekyll-coffeescript
+www-apps/kibana-bin
 www-client/chromium
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index b3650b38dd63..330359f60bb5 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -12,6 +12,7 @@ dev-ruby/tilt test
 media-libs/elementary javascript
 net-analyzer/netdata nodejs
 dev-lang/nim test
+www-apps/jekyll test
 
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # The QML (V4) and JSC JITs do not work on x32.