gentoo resync : 08.01.2018

4 files changed, 8 insertions, 9 deletions

diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 1b7096875ce9..d399cb2abd5a 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Michał Górny <mgorny@gentoo.org> (07 Jan 2018)
+# Requires 32-bit libraries.
+net-misc/teamviewer
+
 # David Seifert <soap@gentoo.org> (03 Jan 2018)
 # Requires 32-bit multilib compatibility
 sys-block/megamgr
diff --git a/profiles/arch/amd64/no-multilib/package.use.mask b/profiles/arch/amd64/no-multilib/package.use.mask
index 5df0d7d46a82..5f73f3af51e5 100644
--- a/profiles/arch/amd64/no-multilib/package.use.mask
+++ b/profiles/arch/amd64/no-multilib/package.use.mask
@@ -8,7 +8,6 @@ app-emulation/xen-tools ovmf
 # NP-Hardass <NP-Hardass@gentoo.org> (11 Jul 2017)
 # GLEP 73 Immutability, USE=test requires
 # abi_x86_32 at this time.
-app-emulation/wine test
 app-emulation/wine-vanilla test
 app-emulation/wine-staging test
 app-emulation/wine-d3d9 test
@@ -18,10 +17,6 @@ app-emulation/wine-any test
 # Requires sys-boot/grub:0 which is masked here.
 sys-apps/memtest86+ floppy
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (24 Jun 2012)
-# Disable 32-bit parts of wine, bug #351436
-app-emulation/wine mono
-
 # Intel Integrated Primitive (sci-libs/ipp) support
 media-libs/opencv ipp
 
diff --git a/profiles/arch/amd64/x32/package.use.mask b/profiles/arch/amd64/x32/package.use.mask
index e34318af7887..0d9f33f624b8 100644
--- a/profiles/arch/amd64/x32/package.use.mask
+++ b/profiles/arch/amd64/x32/package.use.mask
@@ -3,10 +3,6 @@
 
 # This file requires >=portage-2.1.1
 
-# Alexandre Rostovtsev <tetromino@gentoo.org> (03 Mar 2013)
-# Wine is x86- and x64-only
-app-emulation/wine abi_x86_x32
-
 # Davide Pesavento <pesa@gentoo.org> (30 Nov 2011)
 # The QML (V4) and JSC JITs do not work on x32.
 dev-qt/qtdeclarative jit
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index e63ab33040a5..75e24af7a486 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Mart Raudsepp <leio@gentoo.org> (08 Jan 2018)
+# mail-client/evolution[ytnef] requires net-mail/ytnef which is not keyworded
+mail-client/evolution ytnef
+
 # Sergei Trofimovich <slyfox@gentoo.org> (25 Dec 2017)
 # net-firewall/nftables[doc] requires dblatex which is not keyworded
 net-firewall/nftables doc