profiles/prefix/winnt/x86: kill versioned profiles, for generic one

Having the windows version in profile does not make so much sense,
instead the MSVC version would.  But as the profile is identical for any
MSVC version except for CHOST, the profile does not set CHOST but relies
on the user to choose CHOST as argument to prefix-stack-setup, one out
of the list from (sys-devel/parity) 'parity-setup --list-available'.
The generic profile was added earlier, without the profiles.desc entry.

Signed-off-by: Michael Haubenwallner <haubi@gentoo.org>

21 files changed, 1 insertions, 44 deletions

diff --git a/profiles/prefix/windows/winnt/3.5/eapi b/profiles/prefix/windows/winnt/3.5/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/3.5/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/3.5/parent b/profiles/prefix/windows/winnt/3.5/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/3.5/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/3.5/x86/eapi b/profiles/prefix/windows/winnt/3.5/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/3.5/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/3.5/x86/make.defaults b/profiles/prefix/windows/winnt/3.5/x86/make.defaults
deleted file mode 100644
index 21cc6becd407..000000000000
--- a/profiles/prefix/windows/winnt/3.5/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt3.5"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/3.5/x86/parent b/profiles/prefix/windows/winnt/3.5/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/3.5/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/5.2/eapi b/profiles/prefix/windows/winnt/5.2/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/5.2/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/5.2/parent b/profiles/prefix/windows/winnt/5.2/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/5.2/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/5.2/x86/eapi b/profiles/prefix/windows/winnt/5.2/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/5.2/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/5.2/x86/make.defaults b/profiles/prefix/windows/winnt/5.2/x86/make.defaults
deleted file mode 100644
index 6196da2d7a5c..000000000000
--- a/profiles/prefix/windows/winnt/5.2/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt5.2"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/5.2/x86/parent b/profiles/prefix/windows/winnt/5.2/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/5.2/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.0/eapi b/profiles/prefix/windows/winnt/6.0/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/6.0/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/6.0/parent b/profiles/prefix/windows/winnt/6.0/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/6.0/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.0/x86/eapi b/profiles/prefix/windows/winnt/6.0/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/6.0/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/6.0/x86/make.defaults b/profiles/prefix/windows/winnt/6.0/x86/make.defaults
deleted file mode 100644
index c28e21320203..000000000000
--- a/profiles/prefix/windows/winnt/6.0/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt6.0"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/6.0/x86/parent b/profiles/prefix/windows/winnt/6.0/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/6.0/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.1/eapi b/profiles/prefix/windows/winnt/6.1/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/6.1/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/6.1/parent b/profiles/prefix/windows/winnt/6.1/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/6.1/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/prefix/windows/winnt/6.1/x86/eapi b/profiles/prefix/windows/winnt/6.1/x86/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/prefix/windows/winnt/6.1/x86/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/prefix/windows/winnt/6.1/x86/make.defaults b/profiles/prefix/windows/winnt/6.1/x86/make.defaults
deleted file mode 100644
index 9dcc06845d96..000000000000
--- a/profiles/prefix/windows/winnt/6.1/x86/make.defaults
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="x86-winnt"
-CHOST="i586-pc-winnt6.1"
-ACCEPT_KEYWORDS="~x86-winnt"
diff --git a/profiles/prefix/windows/winnt/6.1/x86/parent b/profiles/prefix/windows/winnt/6.1/x86/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/prefix/windows/winnt/6.1/x86/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 4b490671c213..8e7df1136113 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -304,10 +304,7 @@ ppc-aix			prefix/aix/7.1.0.0/ppc				exp
 ppc-aix			prefix/aix/7.2.0.0/ppc				exp
 
 # Windows Profiles
-x86-winnt		prefix/windows/winnt/3.5/x86			exp
-x86-winnt		prefix/windows/winnt/5.2/x86			exp
-x86-winnt		prefix/windows/winnt/6.0/x86			exp
-x86-winnt		prefix/windows/winnt/6.1/x86			exp
+x86-winnt		prefix/windows/winnt/x86			exp
 
 # Cygwin Profiles
 x86-cygwin		prefix/windows/cygwin/x86			exp