| 1 |
commit: 3eb80e9d59d2bfbe950692a9826d23ed0ede4a4d |
| 2 |
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 1 09:10:29 2019 +0000 |
| 4 |
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 1 09:20:19 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eb80e9d |
| 7 |
|
| 8 |
profiles/prefix/winnt/x86: kill versioned profiles, for generic one |
| 9 |
|
| 10 |
Having the windows version in profile does not make so much sense, |
| 11 |
instead the MSVC version would. But as the profile is identical for any |
| 12 |
MSVC version except for CHOST, the profile does not set CHOST but relies |
| 13 |
on the user to choose CHOST as argument to prefix-stack-setup, one out |
| 14 |
of the list from (sys-devel/parity) 'parity-setup --list-available'. |
| 15 |
The generic profile was added earlier, without the profiles.desc entry. |
| 16 |
|
| 17 |
Signed-off-by: Michael Haubenwallner <haubi <AT> gentoo.org> |
| 18 |
|
| 19 |
profiles/prefix/windows/winnt/3.5/eapi | 1 - |
| 20 |
profiles/prefix/windows/winnt/3.5/parent | 1 - |
| 21 |
profiles/prefix/windows/winnt/3.5/x86/eapi | 1 - |
| 22 |
profiles/prefix/windows/winnt/3.5/x86/make.defaults | 6 ------ |
| 23 |
profiles/prefix/windows/winnt/3.5/x86/parent | 1 - |
| 24 |
profiles/prefix/windows/winnt/5.2/eapi | 1 - |
| 25 |
profiles/prefix/windows/winnt/5.2/parent | 1 - |
| 26 |
profiles/prefix/windows/winnt/5.2/x86/eapi | 1 - |
| 27 |
profiles/prefix/windows/winnt/5.2/x86/make.defaults | 6 ------ |
| 28 |
profiles/prefix/windows/winnt/5.2/x86/parent | 1 - |
| 29 |
profiles/prefix/windows/winnt/6.0/eapi | 1 - |
| 30 |
profiles/prefix/windows/winnt/6.0/parent | 1 - |
| 31 |
profiles/prefix/windows/winnt/6.0/x86/eapi | 1 - |
| 32 |
profiles/prefix/windows/winnt/6.0/x86/make.defaults | 6 ------ |
| 33 |
profiles/prefix/windows/winnt/6.0/x86/parent | 1 - |
| 34 |
profiles/prefix/windows/winnt/6.1/eapi | 1 - |
| 35 |
profiles/prefix/windows/winnt/6.1/parent | 1 - |
| 36 |
profiles/prefix/windows/winnt/6.1/x86/eapi | 1 - |
| 37 |
profiles/prefix/windows/winnt/6.1/x86/make.defaults | 6 ------ |
| 38 |
profiles/prefix/windows/winnt/6.1/x86/parent | 1 - |
| 39 |
profiles/profiles.desc | 5 +---- |
| 40 |
21 files changed, 1 insertion(+), 44 deletions(-) |
| 41 |
|
| 42 |
diff --git a/profiles/prefix/windows/winnt/3.5/eapi b/profiles/prefix/windows/winnt/3.5/eapi |
| 43 |
deleted file mode 100644 |
| 44 |
index 7ed6ff82de6..00000000000 |
| 45 |
--- a/profiles/prefix/windows/winnt/3.5/eapi |
| 46 |
+++ /dev/null |
| 47 |
@@ -1 +0,0 @@ |
| 48 |
-5 |
| 49 |
|
| 50 |
diff --git a/profiles/prefix/windows/winnt/3.5/parent b/profiles/prefix/windows/winnt/3.5/parent |
| 51 |
deleted file mode 100644 |
| 52 |
index f3229c5b987..00000000000 |
| 53 |
--- a/profiles/prefix/windows/winnt/3.5/parent |
| 54 |
+++ /dev/null |
| 55 |
@@ -1 +0,0 @@ |
| 56 |
-.. |
| 57 |
|
| 58 |
diff --git a/profiles/prefix/windows/winnt/3.5/x86/eapi b/profiles/prefix/windows/winnt/3.5/x86/eapi |
| 59 |
deleted file mode 100644 |
| 60 |
index 7ed6ff82de6..00000000000 |
| 61 |
--- a/profiles/prefix/windows/winnt/3.5/x86/eapi |
| 62 |
+++ /dev/null |
| 63 |
@@ -1 +0,0 @@ |
| 64 |
-5 |
| 65 |
|
| 66 |
diff --git a/profiles/prefix/windows/winnt/3.5/x86/make.defaults b/profiles/prefix/windows/winnt/3.5/x86/make.defaults |
| 67 |
deleted file mode 100644 |
| 68 |
index 21cc6becd40..00000000000 |
| 69 |
--- a/profiles/prefix/windows/winnt/3.5/x86/make.defaults |
| 70 |
+++ /dev/null |
| 71 |
@@ -1,6 +0,0 @@ |
| 72 |
-# Copyright 1999-2009 Gentoo Foundation |
| 73 |
-# Distributed under the terms of the GNU General Public License v2 |
| 74 |
- |
| 75 |
-ARCH="x86-winnt" |
| 76 |
-CHOST="i586-pc-winnt3.5" |
| 77 |
-ACCEPT_KEYWORDS="~x86-winnt" |
| 78 |
|
| 79 |
diff --git a/profiles/prefix/windows/winnt/3.5/x86/parent b/profiles/prefix/windows/winnt/3.5/x86/parent |
| 80 |
deleted file mode 100644 |
| 81 |
index f3229c5b987..00000000000 |
| 82 |
--- a/profiles/prefix/windows/winnt/3.5/x86/parent |
| 83 |
+++ /dev/null |
| 84 |
@@ -1 +0,0 @@ |
| 85 |
-.. |
| 86 |
|
| 87 |
diff --git a/profiles/prefix/windows/winnt/5.2/eapi b/profiles/prefix/windows/winnt/5.2/eapi |
| 88 |
deleted file mode 100644 |
| 89 |
index 7ed6ff82de6..00000000000 |
| 90 |
--- a/profiles/prefix/windows/winnt/5.2/eapi |
| 91 |
+++ /dev/null |
| 92 |
@@ -1 +0,0 @@ |
| 93 |
-5 |
| 94 |
|
| 95 |
diff --git a/profiles/prefix/windows/winnt/5.2/parent b/profiles/prefix/windows/winnt/5.2/parent |
| 96 |
deleted file mode 100644 |
| 97 |
index f3229c5b987..00000000000 |
| 98 |
--- a/profiles/prefix/windows/winnt/5.2/parent |
| 99 |
+++ /dev/null |
| 100 |
@@ -1 +0,0 @@ |
| 101 |
-.. |
| 102 |
|
| 103 |
diff --git a/profiles/prefix/windows/winnt/5.2/x86/eapi b/profiles/prefix/windows/winnt/5.2/x86/eapi |
| 104 |
deleted file mode 100644 |
| 105 |
index 7ed6ff82de6..00000000000 |
| 106 |
--- a/profiles/prefix/windows/winnt/5.2/x86/eapi |
| 107 |
+++ /dev/null |
| 108 |
@@ -1 +0,0 @@ |
| 109 |
-5 |
| 110 |
|
| 111 |
diff --git a/profiles/prefix/windows/winnt/5.2/x86/make.defaults b/profiles/prefix/windows/winnt/5.2/x86/make.defaults |
| 112 |
deleted file mode 100644 |
| 113 |
index 6196da2d7a5..00000000000 |
| 114 |
--- a/profiles/prefix/windows/winnt/5.2/x86/make.defaults |
| 115 |
+++ /dev/null |
| 116 |
@@ -1,6 +0,0 @@ |
| 117 |
-# Copyright 1999-2009 Gentoo Foundation |
| 118 |
-# Distributed under the terms of the GNU General Public License v2 |
| 119 |
- |
| 120 |
-ARCH="x86-winnt" |
| 121 |
-CHOST="i586-pc-winnt5.2" |
| 122 |
-ACCEPT_KEYWORDS="~x86-winnt" |
| 123 |
|
| 124 |
diff --git a/profiles/prefix/windows/winnt/5.2/x86/parent b/profiles/prefix/windows/winnt/5.2/x86/parent |
| 125 |
deleted file mode 100644 |
| 126 |
index f3229c5b987..00000000000 |
| 127 |
--- a/profiles/prefix/windows/winnt/5.2/x86/parent |
| 128 |
+++ /dev/null |
| 129 |
@@ -1 +0,0 @@ |
| 130 |
-.. |
| 131 |
|
| 132 |
diff --git a/profiles/prefix/windows/winnt/6.0/eapi b/profiles/prefix/windows/winnt/6.0/eapi |
| 133 |
deleted file mode 100644 |
| 134 |
index 7ed6ff82de6..00000000000 |
| 135 |
--- a/profiles/prefix/windows/winnt/6.0/eapi |
| 136 |
+++ /dev/null |
| 137 |
@@ -1 +0,0 @@ |
| 138 |
-5 |
| 139 |
|
| 140 |
diff --git a/profiles/prefix/windows/winnt/6.0/parent b/profiles/prefix/windows/winnt/6.0/parent |
| 141 |
deleted file mode 100644 |
| 142 |
index f3229c5b987..00000000000 |
| 143 |
--- a/profiles/prefix/windows/winnt/6.0/parent |
| 144 |
+++ /dev/null |
| 145 |
@@ -1 +0,0 @@ |
| 146 |
-.. |
| 147 |
|
| 148 |
diff --git a/profiles/prefix/windows/winnt/6.0/x86/eapi b/profiles/prefix/windows/winnt/6.0/x86/eapi |
| 149 |
deleted file mode 100644 |
| 150 |
index 7ed6ff82de6..00000000000 |
| 151 |
--- a/profiles/prefix/windows/winnt/6.0/x86/eapi |
| 152 |
+++ /dev/null |
| 153 |
@@ -1 +0,0 @@ |
| 154 |
-5 |
| 155 |
|
| 156 |
diff --git a/profiles/prefix/windows/winnt/6.0/x86/make.defaults b/profiles/prefix/windows/winnt/6.0/x86/make.defaults |
| 157 |
deleted file mode 100644 |
| 158 |
index c28e2132020..00000000000 |
| 159 |
--- a/profiles/prefix/windows/winnt/6.0/x86/make.defaults |
| 160 |
+++ /dev/null |
| 161 |
@@ -1,6 +0,0 @@ |
| 162 |
-# Copyright 1999-2009 Gentoo Foundation |
| 163 |
-# Distributed under the terms of the GNU General Public License v2 |
| 164 |
- |
| 165 |
-ARCH="x86-winnt" |
| 166 |
-CHOST="i586-pc-winnt6.0" |
| 167 |
-ACCEPT_KEYWORDS="~x86-winnt" |
| 168 |
|
| 169 |
diff --git a/profiles/prefix/windows/winnt/6.0/x86/parent b/profiles/prefix/windows/winnt/6.0/x86/parent |
| 170 |
deleted file mode 100644 |
| 171 |
index f3229c5b987..00000000000 |
| 172 |
--- a/profiles/prefix/windows/winnt/6.0/x86/parent |
| 173 |
+++ /dev/null |
| 174 |
@@ -1 +0,0 @@ |
| 175 |
-.. |
| 176 |
|
| 177 |
diff --git a/profiles/prefix/windows/winnt/6.1/eapi b/profiles/prefix/windows/winnt/6.1/eapi |
| 178 |
deleted file mode 100644 |
| 179 |
index 7ed6ff82de6..00000000000 |
| 180 |
--- a/profiles/prefix/windows/winnt/6.1/eapi |
| 181 |
+++ /dev/null |
| 182 |
@@ -1 +0,0 @@ |
| 183 |
-5 |
| 184 |
|
| 185 |
diff --git a/profiles/prefix/windows/winnt/6.1/parent b/profiles/prefix/windows/winnt/6.1/parent |
| 186 |
deleted file mode 100644 |
| 187 |
index f3229c5b987..00000000000 |
| 188 |
--- a/profiles/prefix/windows/winnt/6.1/parent |
| 189 |
+++ /dev/null |
| 190 |
@@ -1 +0,0 @@ |
| 191 |
-.. |
| 192 |
|
| 193 |
diff --git a/profiles/prefix/windows/winnt/6.1/x86/eapi b/profiles/prefix/windows/winnt/6.1/x86/eapi |
| 194 |
deleted file mode 100644 |
| 195 |
index 7ed6ff82de6..00000000000 |
| 196 |
--- a/profiles/prefix/windows/winnt/6.1/x86/eapi |
| 197 |
+++ /dev/null |
| 198 |
@@ -1 +0,0 @@ |
| 199 |
-5 |
| 200 |
|
| 201 |
diff --git a/profiles/prefix/windows/winnt/6.1/x86/make.defaults b/profiles/prefix/windows/winnt/6.1/x86/make.defaults |
| 202 |
deleted file mode 100644 |
| 203 |
index 9dcc06845d9..00000000000 |
| 204 |
--- a/profiles/prefix/windows/winnt/6.1/x86/make.defaults |
| 205 |
+++ /dev/null |
| 206 |
@@ -1,6 +0,0 @@ |
| 207 |
-# Copyright 1999-2009 Gentoo Foundation |
| 208 |
-# Distributed under the terms of the GNU General Public License v2 |
| 209 |
- |
| 210 |
-ARCH="x86-winnt" |
| 211 |
-CHOST="i586-pc-winnt6.1" |
| 212 |
-ACCEPT_KEYWORDS="~x86-winnt" |
| 213 |
|
| 214 |
diff --git a/profiles/prefix/windows/winnt/6.1/x86/parent b/profiles/prefix/windows/winnt/6.1/x86/parent |
| 215 |
deleted file mode 100644 |
| 216 |
index f3229c5b987..00000000000 |
| 217 |
--- a/profiles/prefix/windows/winnt/6.1/x86/parent |
| 218 |
+++ /dev/null |
| 219 |
@@ -1 +0,0 @@ |
| 220 |
-.. |
| 221 |
|
| 222 |
diff --git a/profiles/profiles.desc b/profiles/profiles.desc |
| 223 |
index 4b490671c21..8e7df113611 100644 |
| 224 |
--- a/profiles/profiles.desc |
| 225 |
+++ b/profiles/profiles.desc |
| 226 |
@@ -304,10 +304,7 @@ ppc-aix prefix/aix/7.1.0.0/ppc exp |
| 227 |
ppc-aix prefix/aix/7.2.0.0/ppc exp |
| 228 |
|
| 229 |
# Windows Profiles |
| 230 |
-x86-winnt prefix/windows/winnt/3.5/x86 exp |
| 231 |
-x86-winnt prefix/windows/winnt/5.2/x86 exp |
| 232 |
-x86-winnt prefix/windows/winnt/6.0/x86 exp |
| 233 |
-x86-winnt prefix/windows/winnt/6.1/x86 exp |
| 234 |
+x86-winnt prefix/windows/winnt/x86 exp |
| 235 |
|
| 236 |
# Cygwin Profiles |
| 237 |
x86-cygwin prefix/windows/cygwin/x86 exp |
Archives