commit: 3eb80e9d59d2bfbe950692a9826d23ed0ede4a4d
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 1 09:10:29 2019 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Mon Jul 1 09:20:19 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb80e9d
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 <AT> gentoo.org>
profiles/prefix/windows/winnt/3.5/eapi | 1 -
profiles/prefix/windows/winnt/3.5/parent | 1 -
profiles/prefix/windows/winnt/3.5/x86/eapi | 1 -
profiles/prefix/windows/winnt/3.5/x86/make.defaults | 6 ------
profiles/prefix/windows/winnt/3.5/x86/parent | 1 -
profiles/prefix/windows/winnt/5.2/eapi | 1 -
profiles/prefix/windows/winnt/5.2/parent | 1 -
profiles/prefix/windows/winnt/5.2/x86/eapi | 1 -
profiles/prefix/windows/winnt/5.2/x86/make.defaults | 6 ------
profiles/prefix/windows/winnt/5.2/x86/parent | 1 -
profiles/prefix/windows/winnt/6.0/eapi | 1 -
profiles/prefix/windows/winnt/6.0/parent | 1 -
profiles/prefix/windows/winnt/6.0/x86/eapi | 1 -
profiles/prefix/windows/winnt/6.0/x86/make.defaults | 6 ------
profiles/prefix/windows/winnt/6.0/x86/parent | 1 -
profiles/prefix/windows/winnt/6.1/eapi | 1 -
profiles/prefix/windows/winnt/6.1/parent | 1 -
profiles/prefix/windows/winnt/6.1/x86/eapi | 1 -
profiles/prefix/windows/winnt/6.1/x86/make.defaults | 6 ------
profiles/prefix/windows/winnt/6.1/x86/parent | 1 -
profiles/profiles.desc | 5 +----
21 files changed, 1 insertion(+), 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 7ed6ff82de6..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 21cc6becd40..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 6196da2d7a5..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 c28e2132020..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 f3229c5b987..00000000000
--- 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 7ed6ff82de6..00000000000
--- 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 9dcc06845d9..00000000000
--- 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 f3229c5b987..00000000000
--- 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 4b490671c21..8e7df113611 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
