gentoo resync : 25.08.2018

3 files changed, 8 insertions, 4 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 58c01717f093..d23d8f51b19e 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -147,7 +147,6 @@ sci-biology/foldingathome
 sci-chemistry/cara-bin
 sci-chemistry/mars
 sci-electronics/eagle
-sci-libs/ipp
 sys-libs/lib-compat-loki
 
 
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 5f73f3af51e5..0d8a24f11979 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -17,9 +17,6 @@ app-emulation/wine-any test
 # Requires sys-boot/grub:0 which is masked here.
 sys-apps/memtest86+ floppy
 
-# Intel Integrated Primitive (sci-libs/ipp) support
-media-libs/opencv ipp
-
 # Alexis Ballier <aballier@gentoo.org> (13 Aug 2009)
 # Requires wine
 media-sound/lmms vst
diff --git a/profiles/arch/amd64/package.use.mask b/profiles/arch/amd64/package.use.mask
index 1d1a39a0266b..3de9fb1595e4 100644
--- a/profiles/arch/amd64/package.use.mask
+++ b/profiles/arch/amd64/package.use.mask
@@ -17,6 +17,14 @@
 
 #--- END OF EXAMPLES ---
 
+# Ben Kohler <bkohler@gentoo.org> (23 Aug 2018)
+# Unmask iwd support where net-wireless/iwd is keyworded
+net-misc/connman -iwd
+
+# Thomas Deutschmann <whissi@gentoo.org> (23 Aug 2018)
+# Dependency sys-cluster/ceph is keyworded for amd64
+net-fs/samba -ceph
+
 # Göktürk Yüksek <gokturk@gentoo.org> (6 Jul 2018)
 # Dependency app-crypt/jitterentropy is keyworded for amd64
 sys-apps/rng-tools -jitterentropy