profiles/*/amd64/*/no-multilib: stop using features/64bit-native

diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
index 7ff4d5f149a4109fb7aed2bd0d464f14db9ee487..c32c1ba43a85fbda13b4f1c6987afbf3403b7c83 100644 (file)
--- a/profiles/arch/amd64/no-multilib/use.mask
+++ b/profiles/arch/amd64/no-multilib/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -12,6 +12,10 @@ mbrola
 # Xen HVM support requires building 32-bit binaries.
 hvm
 
+# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
+# Mask multilib, since we cannot use it.
+multilib
+
 # 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
 # Mask 32bit since this will always require emulation packages
 32bit

diff --git a/profiles/default/linux/amd64/13.0/no-multilib/parent b/profiles/default/linux/amd64/13.0/no-multilib/parent
index 521b28aab857bbafbfff1abcf5dd2a7087ef440c..7f1f3bc017ee884236777af9f0000605731e59ba 100644 (file)
--- a/profiles/default/linux/amd64/13.0/no-multilib/parent
+++ b/profiles/default/linux/amd64/13.0/no-multilib/parent
@@ -1,3 +1,2 @@
 ..
 ../../../../../arch/amd64/no-multilib
-../../../../../features/64bit-native

diff --git a/profiles/hardened/linux/amd64/no-multilib/parent b/profiles/hardened/linux/amd64/no-multilib/parent
index 0defac31415da96350038788801d04d5729e33aa..2909df6d3ca68c18027fc6d50dce0ce49978c3a2 100644 (file)
--- a/profiles/hardened/linux/amd64/no-multilib/parent
+++ b/profiles/hardened/linux/amd64/no-multilib/parent
@@ -1,3 +1,2 @@
 ../../../../arch/amd64/no-multilib
 ..
-../../../../features/64bit-native

diff --git a/profiles/hardened/linux/amd64/no-multilib/use.mask b/profiles/hardened/linux/amd64/no-multilib/use.mask
index da6756de2671d2c8b9fd09bb1cf39fc1d10cd58b..2e9b62f8070896733c90a6a4934d42821509a701 100644 (file)
--- a/profiles/hardened/linux/amd64/no-multilib/use.mask
+++ b/profiles/hardened/linux/amd64/no-multilib/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,6 +15,10 @@ mbrola
 # Xen HVM support requires building 32-bit binaries.
 hvm
 
+# 2008/02/13 - Chris Gianelloni <wolf31o2@gentoo.org>
+# Mask multilib, since we cannot use it.
+multilib
+
 # 2009/05/11 Doug Goldstein <cardoe@gentoo.org>
 # Mask 32bit since this will always require emulation packages
 32bit