Remove various masks related to emul-linux* from subprofiles.

24 files changed, 51 insertions, 154 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 1211fd4131dd..49ebeeb3a4b8 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,24 @@
 # ChangeLog for profile directory
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10028 2015/06/02 08:46:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.10029 2015/06/02 09:15:35 ulm Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  02 Jun 2015; Ulrich Müller <ulm@gentoo.org>
+  arch/amd64/no-multilib/package.mask, arch/amd64/use.mask,
+  base/package.use.force, default/linux/uclibc/amd64/package.mask,
+  default/linux/uclibc/use.mask, default/linux/use.mask, embedded/use.mask,
+  features/64bit-native/package.mask, features/selinux/use.mask,
+  hardened/linux/amd64/no-multilib/package.mask,
+  hardened/linux/musl/amd64/package.mask, hardened/linux/musl/use.mask,
+  hardened/linux/use.mask, prefix/aix/use.mask, prefix/bsd/use.mask,
+  prefix/darwin/use.mask, prefix/hpux/use.mask, prefix/mint/use.mask,
+  prefix/sunos/use.mask, prefix/windows/interix/use.mask,
+  prefix/windows/winnt/use.mask, targets/desktop/package.use, uclibc/use.mask:
+  Remove various masks related to emul-linux* from subprofiles.
+
   02 Jun 2015; Ulrich Müller <ulm@gentoo.org> package.mask:
   Drop mask for dev-tex/mh after package removal.
 
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index f006a68dc88a..3968e3dc2787 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.141 2015/04/19 01:36:16 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.142 2015/06/02 09:15:35 ulm Exp $
 
 # AMD64 Team <amd64@gentoo.org>
 # Mask packages that rely on amd64 multilib
@@ -17,21 +17,6 @@ app-emulation/q4wine
 app-emulation/vmware-player
 >=app-i18n/atokx3-3.0.0
 app-office/ooextras
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-cpplibs
-app-emulation/emul-linux-x86-db
-app-emulation/emul-linux-x86-gstplugins
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-gtkmmlibs
-app-emulation/emul-linux-x86-jna
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-motif
-app-emulation/emul-linux-x86-opengl
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
-app-emulation/emul-linux-x86-java
 app-emulation/winetricks
 app-emulation/wine-doors
 app-text/acroread
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index 532221867b34..c2f846ea7832 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.69 2015/04/27 08:09:28 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.70 2015/06/02 09:15:35 ulm Exp $
 
 # Unmask the flag which corresponds to ARCH.
 -amd64
@@ -108,10 +108,6 @@
 # NVRAM works on x86/amd64 hosts
 -nvram
 
-# 2006/06/07 - Danny van Dyk <kugelfang@gentoo.org>
-# Profile cleanup: Unmask emul-linux-x86
--emul-linux-x86
-
 # 2005/09/14 - Diego Pettenò <flameeyes@gentoo.org>
 # nVidia XvMC support works on amd64
 -nvidia
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index ee9438f71c41..1814d2c796d7 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.54 2014/11/09 08:02:26 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.55 2015/06/02 09:15:35 ulm Exp $
 
 # Alexnader Vershilov <qnikst@gentoo.org) (04 Nov 2014)
 # Due to bug #490604: version without oracle is not supported
@@ -16,11 +16,6 @@
 # i.e. this use flag has no effect on them.
 www-client/chromium pic
 
-# Michał Gorny <mgorny@gentoo.org> (26 Feb 2013)
-# Meta-packages which use multilib ebuilds always install development
-# headers. The flag is there to satisfy deps only.
->=app-emulation/emul-linux-x86-xlibs-20130224-r1 development
-
 # Zac Medico <zmedico@gentoo.org> (4 Dec 2012)
 # Force app-shells/bash[readline] in stage1 builds, so that compgen is
 # available for sys-apps/portage (see bug #445576).
diff --git a/profiles/default/linux/uclibc/amd64/package.mask b/profiles/default/linux/uclibc/amd64/package.mask
index 6fa1232598f4..12e387ae70c2 100644
--- a/profiles/default/linux/uclibc/amd64/package.mask
+++ b/profiles/default/linux/uclibc/amd64/package.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/uclibc/amd64/package.mask,v 1.7 2015/05/08 22:26:25 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/uclibc/amd64/package.mask,v 1.8 2015/06/02 09:15:35 ulm Exp $
 
 # Mask e2fsprogs-1.42.12 because of
 # possible data corruption.  Bug #548950.
@@ -26,21 +26,6 @@ app-emulation/vmware-player
 >=app-i18n/atokx3-3.0.0
 app-office/lotus-notes
 app-office/ooextras
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-cpplibs
-app-emulation/emul-linux-x86-db
-app-emulation/emul-linux-x86-gstplugins
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-gtkmmlibs
-app-emulation/emul-linux-x86-jna
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-motif
-app-emulation/emul-linux-x86-opengl
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
-app-emulation/emul-linux-x86-java
 app-emulation/winetricks
 app-emulation/wine-doors
 app-text/acroread
diff --git a/profiles/default/linux/uclibc/use.mask b/profiles/default/linux/uclibc/use.mask
index f8360ba585b6..a7675412b925 100644
--- a/profiles/default/linux/uclibc/use.mask
+++ b/profiles/default/linux/uclibc/use.mask
@@ -1,11 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/uclibc/use.mask,v 1.1 2014/08/16 20:43:28 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/uclibc/use.mask,v 1.2 2015/06/02 09:15:35 ulm Exp $
 
 nls
 pam
 
-emul-linux-x86
 -uclibc
 
 -elibc_uclibc
diff --git a/profiles/default/linux/use.mask b/profiles/default/linux/use.mask
index b48fc8bf7276..bdfe38360d80 100644
--- a/profiles/default/linux/use.mask
+++ b/profiles/default/linux/use.mask
@@ -1,15 +1,12 @@
-# Copyright 1999-2013 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/use.mask,v 1.5 2013/04/19 15:26:02 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/use.mask,v 1.6 2015/06/02 09:15:35 ulm Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
 # profile (such as the selinux profiles) have a USE flag associated with
 # them.
 
-# amd64 only:
-emul-linux-x86
-
 # ppc and x86/amd64
 x264
 
diff --git a/profiles/embedded/use.mask b/profiles/embedded/use.mask
index 41d28d0c4c16..e8facd1c579e 100644
--- a/profiles/embedded/use.mask
+++ b/profiles/embedded/use.mask
@@ -5,5 +5,3 @@ prefix
 # Chris PeBenito <pebenito@gentoo.org>
 # must use a SELinux profile
 selinux
-
-emul-linux-x86
diff --git a/profiles/features/64bit-native/package.mask b/profiles/features/64bit-native/package.mask
index 9dadb62487af..ef4a9986468e 100644
--- a/profiles/features/64bit-native/package.mask
+++ b/profiles/features/64bit-native/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.103 2015/04/03 21:09:53 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/64bit-native/package.mask,v 1.104 2015/06/02 09:15:35 ulm Exp $
 
 # Andreas K. Huettel <dilfridge@gentoo.org>
 # Novell Groupwise Client sadly needs a 32bit java vm (bundled)
@@ -25,21 +25,6 @@ app-emulation/vmware-player
 >=app-i18n/atokx3-3.0.0
 app-office/lotus-notes
 app-office/ooextras
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-cpplibs
-app-emulation/emul-linux-x86-db
-app-emulation/emul-linux-x86-gstplugins
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-gtkmmlibs
-app-emulation/emul-linux-x86-jna
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-motif
-app-emulation/emul-linux-x86-opengl
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
-app-emulation/emul-linux-x86-java
 app-emulation/winetricks
 app-emulation/wine-doors
 app-text/acroread
diff --git a/profiles/features/selinux/use.mask b/profiles/features/selinux/use.mask
index d1ee8c03a544..6e6bf8233743 100644
--- a/profiles/features/selinux/use.mask
+++ b/profiles/features/selinux/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/use.mask,v 1.3 2011/07/17 19:35:56 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/selinux/use.mask,v 1.4 2015/06/02 09:15:36 ulm Exp $
 
 # This file masks out USE flags that are simply NOT allowed in the default
 # profile for any architecture.  This works, for example, if a non-default
@@ -10,8 +10,5 @@
 -hardened
 -selinux
 
-# amd64 only:
-emul-linux-x86
-
 # tcc is x86-only
 tcc
diff --git a/profiles/hardened/linux/amd64/no-multilib/package.mask b/profiles/hardened/linux/amd64/no-multilib/package.mask
index 3aef695b492f..7280bea973e8 100644
--- a/profiles/hardened/linux/amd64/no-multilib/package.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/package.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.42 2015/04/19 01:30:47 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/amd64/no-multilib/package.mask,v 1.43 2015/06/02 09:15:36 ulm Exp $
 
 # These are broken as reported by Halcy0n, Aug, 23, 2011
 net-misc/teamviewer
@@ -37,21 +37,6 @@ app-emulation/virtualbox-guest-additions
 app-emulation/vmware-player
 >=app-i18n/atokx3-3.0.0
 app-office/ooextras
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-cpplibs
-app-emulation/emul-linux-x86-db
-app-emulation/emul-linux-x86-gstplugins
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-gtkmmlibs
-app-emulation/emul-linux-x86-jna
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-motif
-app-emulation/emul-linux-x86-opengl
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
-app-emulation/emul-linux-x86-java
 app-emulation/winetricks
 app-emulation/wine-doors
 app-text/acroread
diff --git a/profiles/hardened/linux/musl/amd64/package.mask b/profiles/hardened/linux/musl/amd64/package.mask
index a33493e0328f..6737e2c779ce 100644
--- a/profiles/hardened/linux/musl/amd64/package.mask
+++ b/profiles/hardened/linux/musl/amd64/package.mask
@@ -1,26 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/package.mask,v 1.4 2014/10/02 10:29:31 ulm Exp $
-
-#
-# Anthony G. Basile <blueness@gentoo.org> (07 Oct 2012)
-# profile hardened/linux/uclibc/amd64 is not mutlilib
-#
-app-emulation/emul-linux-x86-baselibs
-app-emulation/emul-linux-x86-cpplibs
-app-emulation/emul-linux-x86-db
-app-emulation/emul-linux-x86-gstplugins
-app-emulation/emul-linux-x86-gtklibs
-app-emulation/emul-linux-x86-gtkmmlibs
-app-emulation/emul-linux-x86-java
-app-emulation/emul-linux-x86-jna
-app-emulation/emul-linux-x86-medialibs
-app-emulation/emul-linux-x86-motif
-app-emulation/emul-linux-x86-opengl
-app-emulation/emul-linux-x86-qtlibs
-app-emulation/emul-linux-x86-sdl
-app-emulation/emul-linux-x86-soundlibs
-app-emulation/emul-linux-x86-xlibs
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/amd64/package.mask,v 1.5 2015/06/02 09:15:36 ulm Exp $
 
 #
 # Alfredo Tupone <tupone@gentoo.org> (02 Feb 2013)
diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
index a00ad431f8d3..3b50f6785e90 100644
--- a/profiles/hardened/linux/musl/use.mask
+++ b/profiles/hardened/linux/musl/use.mask
@@ -1,11 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/use.mask,v 1.2 2014/01/27 16:12:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/musl/use.mask,v 1.3 2015/06/02 09:15:36 ulm Exp $
 
 pam
 
-emul-linux-x86
-
 -elibc_musl
 elibc_uclibc
 elibc_glibc
diff --git a/profiles/hardened/linux/use.mask b/profiles/hardened/linux/use.mask
index ada1a499327b..0213303ed1ad 100644
--- a/profiles/hardened/linux/use.mask
+++ b/profiles/hardened/linux/use.mask
@@ -1,11 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.18 2013/01/12 12:36:18 zorry Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/hardened/linux/use.mask,v 1.19 2015/06/02 09:15:36 ulm Exp $
 
 -hardened
 
-emul-linux-x86
-
 # tcc is x86-only
 tcc
 
diff --git a/profiles/prefix/aix/use.mask b/profiles/prefix/aix/use.mask
index b26f2c9b5605..6622008ffd93 100644
--- a/profiles/prefix/aix/use.mask
+++ b/profiles/prefix/aix/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/use.mask,v 1.4 2013/02/02 13:12:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/aix/use.mask,v 1.5 2015/06/02 09:15:36 ulm Exp $
 
 # Re-add AIX libc
 -elibc_AIX
@@ -20,7 +20,6 @@ clvm
 directfb
 divx4linux
 djbfft
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/prefix/bsd/use.mask b/profiles/prefix/bsd/use.mask
index b5f10006a9f5..f7a816c9a306 100644
--- a/profiles/prefix/bsd/use.mask
+++ b/profiles/prefix/bsd/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/use.mask,v 1.5 2013/02/02 13:12:27 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/bsd/use.mask,v 1.6 2015/06/02 09:15:36 ulm Exp $
 
 # these will more than likely never work on bsd
 3dfx
@@ -16,7 +16,6 @@ clvm
 directfb
 divx4linux
 djbfft
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/prefix/darwin/use.mask b/profiles/prefix/darwin/use.mask
index b6f7fa3b212b..a5c9a76a6889 100644
--- a/profiles/prefix/darwin/use.mask
+++ b/profiles/prefix/darwin/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/use.mask,v 1.4 2013/02/02 13:12:28 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/darwin/use.mask,v 1.5 2015/06/02 09:15:36 ulm Exp $
 
 #Add USE flags that don't work on Darwin/OpenDarwin/OS X here
 
@@ -24,7 +24,6 @@ cman
 clvm
 directfb
 djbfft
-emul-linux-x86
 fbcon
 fmod
 ggi
diff --git a/profiles/prefix/hpux/use.mask b/profiles/prefix/hpux/use.mask
index 74febca5103a..b7fe2703bd94 100644
--- a/profiles/prefix/hpux/use.mask
+++ b/profiles/prefix/hpux/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/use.mask,v 1.4 2013/02/02 13:12:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/hpux/use.mask,v 1.5 2015/06/02 09:15:36 ulm Exp $
 
 # Re-add HPUX libc
 -elibc_HPUX
@@ -20,7 +20,6 @@ clvm
 directfb
 divx4linux
 djbfft
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/prefix/mint/use.mask b/profiles/prefix/mint/use.mask
index b78006cdeb48..b7514260a0ad 100644
--- a/profiles/prefix/mint/use.mask
+++ b/profiles/prefix/mint/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/use.mask,v 1.6 2013/02/02 13:12:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/mint/use.mask,v 1.7 2015/06/02 09:15:36 ulm Exp $
 
 # Re-add MiNT libc
 -elibc_mintlib
@@ -20,7 +20,6 @@ clvm
 directfb
 divx4linux
 djbfft
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index bc066bfbc6da..a7e09ba91058 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/use.mask,v 1.4 2013/02/02 13:12:29 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/sunos/use.mask,v 1.5 2015/06/02 09:15:36 ulm Exp $
 
 # Re-add SunOS libc
 -elibc_SunOS
@@ -20,7 +20,6 @@ clvm
 directfb
 divx4linux
 djbfft
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/prefix/windows/interix/use.mask b/profiles/prefix/windows/interix/use.mask
index cf99ea16ccb2..e75ea505e95a 100644
--- a/profiles/prefix/windows/interix/use.mask
+++ b/profiles/prefix/windows/interix/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/use.mask,v 1.12 2014/04/30 22:30:21 redlizard Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/interix/use.mask,v 1.13 2015/06/02 09:15:36 ulm Exp $
 
 # Re-add Interix libc
 -elibc_Interix
@@ -25,7 +25,6 @@ dvdr
 # missing implementation for unexec()
 emacs
 xemacs
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 043b276c8833..14d4de4c72b5 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/use.mask,v 1.10 2014/06/16 15:08:32 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/prefix/windows/winnt/use.mask,v 1.11 2015/06/02 09:15:36 ulm Exp $
 
 # Re-add Winnt libc
 -elibc_Winnt
@@ -28,7 +28,6 @@ dri
 dvdr
 # emacs USE flag is masked because of missing implementation for unexec()
 emacs
-emul-linux-x86
 fbcon
 fdftk
 fmod
diff --git a/profiles/targets/desktop/package.use b/profiles/targets/desktop/package.use
index c64df0d32f8e..55e0bfa91af5 100644
--- a/profiles/targets/desktop/package.use
+++ b/profiles/targets/desktop/package.use
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.43 2015/02/19 02:58:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/targets/desktop/package.use,v 1.44 2015/06/02 09:15:36 ulm Exp $
 
 # Alexandre Rostovtsev <tetromino@gentoo.org> (19 Feb 2015)
 # Set reasonable default toolkit for all desktops to prevent emerge error
@@ -26,11 +26,6 @@ net-libs/libpcap -bluetooth
 # gtk3 the default until 1.11.x or higher is stabilized
 <net-analyzer/wireshark-1.11.0 -qt4
 
-# Michał Górny <mgorny@gentoo.org> (27 May 2014)
-# Disable mng support by default since it is seldom used, and it
-# requires old libmng-1.
-app-emulation/emul-linux-x86-qtlibs -mng
-
 # Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> (08 May 2014)
 # Enable x11-libs/libxcb[xkb] as it is needed by x11-libs/libxkbcommon[X]
 # and the X flag is enabled by default in the desktop profile
diff --git a/profiles/uclibc/use.mask b/profiles/uclibc/use.mask
index 33a34e4d3dd3..a8a38bf0b10f 100644
--- a/profiles/uclibc/use.mask
+++ b/profiles/uclibc/use.mask
@@ -2,7 +2,6 @@ iconv
 nls
 nis
 
-emul-linux-x86
 -uclibc
 
 -elibc_uclibc