[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/13.0/no-multilib/, profiles/arch/amd64/no-multilib/, ...

[gentoo-commits] repo/gentoo:master commit in: profiles/default/linux/amd64/13.0/no-multilib/, profiles/arch/amd64/no-multilib/, ...

[Michał Górny]

commit:     35bc8d2526f7f50d74c06b93b49d460bc3fa06a5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 09:54:44 2017 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb  1 12:27:05 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35bc8d25

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

 profiles/arch/amd64/no-multilib/use.mask             | 6 +++++-
 profiles/default/linux/amd64/13.0/no-multilib/parent | 1 -
 profiles/hardened/linux/amd64/no-multilib/parent     | 1 -
 profiles/hardened/linux/amd64/no-multilib/use.mask   | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/profiles/arch/amd64/no-multilib/use.mask b/profiles/arch/amd64/no-multilib/use.mask
index 7ff4d5f..c32c1ba 100644
--- 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 521b28a..7f1f3bc 100644
--- 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 0defac3..2909df6 100644
--- 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 da6756d..2e9b62f 100644
--- 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