From: Ruud Koolen <redlizard@gentoo.org>
Date: Mon, 15 Dec 2014 20:37:31 +0000 (+0000)
Subject: Undid amd64 and x86 standalone profiles.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e73513d68cf2ebd2821c4843d5826addee805c30;p=gentoo.git

Undid amd64 and x86 standalone profiles.
---

diff --git a/profiles/features/prefix/Changelog b/profiles/features/prefix/Changelog
index 16d4bb5a8111..15dff508dd17 100644
--- a/profiles/features/prefix/Changelog
+++ b/profiles/features/prefix/Changelog
@@ -1,14 +1,6 @@
 # ChangeLog for profiles/features/prefix
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/Changelog,v 1.4 2014/12/15 18:41:32 redlizard Exp $
-
-  15 Dec 2014; Ruud Koolen <redlizard@gentoo.org>
-  standalong/linux-amd64-no-multilib/eapi,
-  standalong/linux-amd64-no-multilib/make.defaults,
-  standalong/linux-amd64-no-multilib/parent,
-  standalong/linux-x86/eapi, standalong/linux-x86/make.defaults,
-  standalong/linux-x86/parent:
-  Added amd64 and x86 standalone profiles.
+# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/Changelog,v 1.5 2014/12/15 20:37:31 redlizard Exp $
 
   15 Dec 2014; Ruud Koolen <redlizard@gentoo.org> rpath/use.force,
   rpath/use.mask, standalone/eapi, standalone/parent:
diff --git a/profiles/features/prefix/standalone/linux-amd64-no-multilib/eapi b/profiles/features/prefix/standalone/linux-amd64-no-multilib/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/features/prefix/standalone/linux-amd64-no-multilib/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/prefix/standalone/linux-amd64-no-multilib/make.defaults b/profiles/features/prefix/standalone/linux-amd64-no-multilib/make.defaults
deleted file mode 100644
index 47d15f608220..000000000000
--- a/profiles/features/prefix/standalone/linux-amd64-no-multilib/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/standalone/linux-amd64-no-multilib/make.defaults,v 1.1 2014/12/15 18:41:32 redlizard Exp $
-
-ARCH="amd64"
-CHOST="x86_64-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=amd64 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-amd64 ~amd64-linux"
-
-# multilib build stuff, single ABI (no multilib)
-MULTILIB_ABIS="amd64"
-DEFAULT_ABI="amd64"
-ABI="amd64"
-IUSE_IMPLICIT="abi_x86_64"
-LIBDIR_amd64="lib"
diff --git a/profiles/features/prefix/standalone/linux-amd64-no-multilib/parent b/profiles/features/prefix/standalone/linux-amd64-no-multilib/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/features/prefix/standalone/linux-amd64-no-multilib/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/features/prefix/standalone/linux-x86/eapi b/profiles/features/prefix/standalone/linux-x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/features/prefix/standalone/linux-x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/prefix/standalone/linux-x86/make.defaults b/profiles/features/prefix/standalone/linux-x86/make.defaults
deleted file mode 100644
index 1fface95dcd8..000000000000
--- a/profiles/features/prefix/standalone/linux-x86/make.defaults
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/features/prefix/standalone/linux-x86/make.defaults,v 1.1 2014/12/15 18:41:32 redlizard Exp $
-
-ARCH="x86"
-CHOST="i686-pc-linux-gnu"
-# The base profile sets ACCEPT_KEYWORDS=x86 and we don't have that in prefix.
-ACCEPT_KEYWORDS="-x86 ~x86-linux"
-
-# multilib build stuff, single ABI (no multilib)
-MULTILIB_ABIS="x86"
-DEFAULT_ABI="x86"
-ABI="x86"
-IUSE_IMPLICIT="abi_x86_32"
-LIBDIR_x86="lib"
diff --git a/profiles/features/prefix/standalone/linux-x86/parent b/profiles/features/prefix/standalone/linux-x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/features/prefix/standalone/linux-x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..