gentoo resync : 10.03.2018

5 files changed, 12 insertions, 7 deletions

diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 6af18e9da764..7ac60b8e76ef 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64-fbsd/package.use.force b/profiles/arch/amd64-fbsd/package.use.force
index b3a9e1d3fe1b..6c7737109a3a 100644
--- a/profiles/arch/amd64-fbsd/package.use.force
+++ b/profiles/arch/amd64-fbsd/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (09 Mar 2018)
+# Using stdlibc++ is broken on FreeBSD, so just force libcxx.
+sys-devel/clang default-libcxx
+
 # Michał Górny <mgorny@gentoo.org> (08 Apr 2017)
 # Require sandbox to be multilib-capable to avoid failures when building
 # multilib packages, #611292.
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 25385e4e0250..c7f85959a7b2 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -4,6 +4,11 @@
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in package.use.mask
 
+# Zac Medico <zmedico@gentoo.org> (9 Mar 2018)
+# The rsync-verify support is not really stable yet.
+# Bugs #649276, #647964
+sys-apps/portage rsync-verify
+
 # Kent Fredric <kentnl@gentoo.org> (3 Mar 2018)
 # Not an officially supported configuration, as it causes unpredictable
 # fragility and/or dependency headaches due to the very narrow interop window
diff --git a/profiles/package.mask b/profiles/package.mask
index 7c2cce1a3dec..4c36d030ff44 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -68,11 +68,6 @@ dev-db/maxscale
 # Masked for removal in 30 days. Bug 598651, 635192, 644396
 media-gfx/photivo
 
-# Patrice Clement <monsieurp@gentoo.org> (05 Mar 2018)
-# Package name change from msgpack-python to msgpack breaks dependencies.
->=dev-python/msgpack-0.5.6
->=dev-python/neovim-python-client-0.2.1
-
 # Andreas Sturmlechner <asturm@gentoo.org> (05 Mar 2018)
 # Dead upstream, depends on deprecated Qt4.
 # Masked for removal in 30 days. Bug 644404
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 41b594c49055..c5f3c3110be6 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -2073,6 +2073,7 @@ dev-libs/gmime:smime - Enable experimental S/MIME support
 dev-libs/gmp:asm - Enable use of hand optimized assembly routines (faster execution)
 dev-libs/gmp:pgo - After building gmp, run some tests against to produce faster libraries -- this option will double the compile time
 dev-libs/gobject-introspection:doctool - Install g-ir-doc-tool for generating documentation from introspected data
+dev-libs/granite:demo - Build the Granite demo application (to present all available UI features provided by the library)
 dev-libs/hidapi:fox - Build a x11-libs/fox GUI
 dev-libs/input-pad:eekboard - Enable support for dev-libs/eekboard
 dev-libs/input-pad:xtest - Enable support for x11-libs/libXtst
@@ -2560,7 +2561,6 @@ dev-python/py-amqp:extras - Install extra tools to generate initial Python mod f
 dev-python/pygame:midi - Enable midi support using media-libs/portmidi
 dev-python/pygpu:cuda - Enable NVIDIA CUDA toolkit support
 dev-python/pygpu:opencl - Enable OpenCL support
-dev-python/pyhamcrest:numpy - Enable optional dependence on dev-python/numpy
 dev-python/pyilmbase:numpy - Add bindings for dev-python/numpy use.
 dev-python/pyocr:cuneiform - Enable support for the app-text/cuneiform OCR engine
 dev-python/pyocr:tesseract - Enable support for the app-text/tesseract OCR engine
@@ -7936,6 +7936,7 @@ sys-cluster/glusterfs:fuse - Add FUSE mount helper
 sys-cluster/glusterfs:georeplication - Enable support for georeplication (requires dev-lang/python)
 sys-cluster/glusterfs:glupy - Enable support for translators written in Python
 sys-cluster/glusterfs:infiniband - Add support for Infiniband ibverbs transport. Libraries can be found in science overlay
+sys-cluster/glusterfs:ipv6 - Use IPv6 by default, requires libtirpc
 sys-cluster/glusterfs:libtirpc - Build against net-libs/libtirpc for RPC support
 sys-cluster/glusterfs:qemu-block - Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.
 sys-cluster/glusterfs:rsyslog - Install configuration snippet for app-admin/rsyslog