Gentoo Archives: gentoo-commits

From: Alon Bar-Lev <alonbl@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-util/mingw64-runtime/, dev-util/mingw64-runtime/files/
Date: Mon, 17 Sep 2018 22:05:30
Message-Id: 1537221912.83c83c10f1863ed7fd3b350e24ede3224175ed2a.alonbl@gentoo
1 commit: 83c83c10f1863ed7fd3b350e24ede3224175ed2a
2 Author: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 17 22:04:24 2018 +0000
4 Commit: Alon Bar-Lev <alonbl <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 17 22:05:12 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83c83c10
7
8 dev-util/mingw64-runtime: cleanup old
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 dev-util/mingw64-runtime/Manifest | 9 --
13 .../files/mingw64-runtime-4.0.1-build.patch | 88 ----------------
14 .../files/mingw64-runtime-4.0.1-winpthreads.patch | 86 ---------------
15 ...ingw64-runtime-5.0.2-implicit-fallthrough.patch | 41 --------
16 .../files/mingw64-runtime-5.0.2-locale.patch | 36 -------
17 .../files/mingw64-runtime-5.0.3-build.patch | 37 -------
18 .../mingw64-runtime/mingw64-runtime-3.0.0.ebuild | 78 --------------
19 .../mingw64-runtime/mingw64-runtime-3.1.0.ebuild | 78 --------------
20 .../mingw64-runtime-3.2.0-r1.ebuild | 78 --------------
21 .../mingw64-runtime/mingw64-runtime-4.0.1.ebuild | 112 --------------------
22 .../mingw64-runtime/mingw64-runtime-4.0.4.ebuild | 112 --------------------
23 .../mingw64-runtime/mingw64-runtime-4.0.6.ebuild | 108 -------------------
24 .../mingw64-runtime/mingw64-runtime-5.0.1.ebuild | 112 --------------------
25 .../mingw64-runtime-5.0.2-r1.ebuild | 114 --------------------
26 .../mingw64-runtime-5.0.2-r2.ebuild | 115 --------------------
27 .../mingw64-runtime/mingw64-runtime-5.0.2.ebuild | 112 --------------------
28 .../mingw64-runtime-5.0.3-r1.ebuild | 115 --------------------
29 .../mingw64-runtime-5.0.3-r2.ebuild | 117 ---------------------
30 .../mingw64-runtime/mingw64-runtime-5.0.3.ebuild | 112 --------------------
31 19 files changed, 1660 deletions(-)
32
33 diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
34 index f589f7a41b3..479515f06b9 100644
35 --- a/dev-util/mingw64-runtime/Manifest
36 +++ b/dev-util/mingw64-runtime/Manifest
37 @@ -1,11 +1,2 @@
38 -DIST mingw-w64-v3.0.0.tar.bz2 7012419 BLAKE2B a1c7f4cb1b25bfb8e44ae782895a7f6fd9deb17bcdfae3a6184a8da562fc2f371df693b2a423a58c626a327b3b70b20ae9ba10db0936dbfcc1236d6cc4f2af0e SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989
39 -DIST mingw-w64-v3.1.0.tar.bz2 7021162 BLAKE2B d7e757911ebedb57c7ad9d4a7926e6fbadc171caad1ad9c3e6117538bffff65e07e3e732a697abc0925293079d863240efbae3d58180052dc33e2eb6346dfbd7 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8
40 -DIST mingw-w64-v3.2.0.tar.bz2 7053254 BLAKE2B 29ba4837f8bf970a76a1a7159f58fba1058d805d4a6c033ba5d13eebb506dd5ef3d4a8dc11a253fc7b10350a813012194c0fcea9eb234d556e6577fd3197f4cc SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593
41 -DIST mingw-w64-v4.0.1.tar.bz2 10803072 BLAKE2B 7863b388a9cb011e9ff6e4adec9ef0b3842c7bfabca8812287dc5dff7ba9f2cf35a097322ec8e117fd41a36b7b05d305abd8e7c45747b76ea8fda85f037c276e SHA512 a216a09a460c56c29208aee1e1cdb428e856f9c8d59dd399723ccf6d549368f0a13a6aacb046d211ddec7c0a1f1c227d5dd599e4f0c33ba4b6d9c92bd0a7fa1b
42 -DIST mingw-w64-v4.0.4.tar.bz2 10812375 BLAKE2B 59180d741e0b4325a4c02690a21f8a04304e46744c5a986ef79a13fe1d68a1d25a7ff7866232e4f09937a3cb8442cb2497c781dd5cab42e11a1bbe2c5b76ddfd SHA512 06de6b592f776676184a9c50c63eb105c82a912965dee5d8217f9b5b325e0258c188f5d7d5e28aaeacf7bad44ce5d36bd837b9f1cbb91358754787738fb15146
43 -DIST mingw-w64-v4.0.6.tar.bz2 10853871 BLAKE2B a166692d4ddbf740f566abc844d577d38b9cfe436f4d0a55c7e8bca2708bd92c6cfe1be072fae428d88c682215d390ec1ff15b38485540adb2b77dd8724f1837 SHA512 c9ec75b10fe40d80e620b569ca8f452b1f78e9e4dd45ad087a2b69297dc661d06aa30255ea310786f28c042256c35a1d3e709ff7ea8bc19e7f4ea914c120f020
44 -DIST mingw-w64-v5.0.1.tar.bz2 9160780 BLAKE2B 52964e7ae113d8886648cb0395514067fa054840d153e86407317ccd2f299fccb6d21f76c773e1e2ef22b2c00b53728c18065091125a000750395e96fb601f05 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa
45 -DIST mingw-w64-v5.0.2.tar.bz2 9107077 BLAKE2B b8e3e614fe4a1ea6a4770efdd029300e923e3b7b39b71731692281da44f468b235d487d38d7e1b4396e1b44a4c60fcc7a67a6c1331fb46e339c13c86bf7de7bd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060
46 -DIST mingw-w64-v5.0.3.tar.bz2 9160627 BLAKE2B 941b40c426548564e8b2da0af8e917dad34bdbf0b05c63ea2127e39139bcce5d86e80433817483c64cd2a6ef6140a7818a76564ff5d9408614ecaa58f17b41e7 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9
47 DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
48 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
49
50 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
51 deleted file mode 100644
52 index 6461b98e504..00000000000
53 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
54 +++ /dev/null
55 @@ -1,88 +0,0 @@
56 -From 67434f57cbb5aba791e9ca973a86859e0736f829 Mon Sep 17 00:00:00 2001
57 -From: Alon Bar-Lev <alon.barlev@×××××.com>
58 -Date: Mon, 4 May 2015 21:31:10 +0300
59 -Subject: [PATCH 2/2] build: autoconf: enable multiple tools and libs
60 -
61 -this somewhat reduces the error checking, but makes code and usage nicer.
62 -
63 -Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
64 ----
65 - configure.ac | 55 ++++++++++++-------------------------------------------
66 - 1 file changed, 12 insertions(+), 43 deletions(-)
67 -
68 -diff --git a/configure.ac b/configure.ac
69 -index 468d1b1..1b59821 100644
70 ---- a/configure.ac
71 -+++ b/configure.ac
72 -@@ -56,32 +56,12 @@ AC_ARG_WITH([libraries],
73 - [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
74 - [],
75 - [with_libraries=no])
76 --AS_CASE([$with_libraries],
77 -- [yes|all],[
78 -- with_libraries="libmangle,pseh,winpthreads"
79 -- with_libraries_winpthreads=yes
80 -- with_libraries_mangle=yes
81 -- with_libraries_pseh=yes],
82 -- [libmangle],[
83 -- with_libraries="libmangle"
84 -- with_libraries_winpthreads=no
85 -- with_libraries_mangle=yes
86 -- with_libraries_pseh=no],
87 -- [pseh],[
88 -- with_libraries="pseh"
89 -- with_libraries_winpthreads=no
90 -- with_libraries_mangle=no
91 -- with_libraries_pseh=yes],
92 -- [winpthreads],[
93 -- with_libraries="winpthreads"
94 -- with_libraries_winpthreads=yes
95 -- with_libraries_mangle=no
96 -- with_libraries_pseh=no],
97 -- [no],[
98 -- with_libraries_winpthreads=no
99 -- with_libraries_mangle=no
100 -- with_libraries_pseh=no],
101 -- [MW64_OPTION_ERROR([with-libraries])])
102 -+for l in winpthreads mangle pseh; do
103 -+ res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
104 -+ AS_CASE([$with_libraries],
105 -+ [all|yes],[res=yes])
106 -+ AS_VAR_COPY([with_libraries_$l], [res])
107 -+done
108 - AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
109 - AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
110 - AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
111 -@@ -96,23 +76,12 @@ AC_ARG_WITH([tools],
112 - [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
113 - [],
114 - [with_tools=no])
115 --AS_CASE([$with_tools],
116 -- [yes|all],[
117 -- with_tools="gendef,genidl"
118 -- with_tools_gendef=yes
119 -- with_tools_genidl=yes],
120 -- [gendef],[
121 -- with_tools="gendef"
122 -- with_tools_gendef=yes
123 -- with_tools_genidl=no],
124 -- [genidl],[
125 -- with_tools="genidl"
126 -- with_tools_gendef=no
127 -- with_tools_genidl=yes],
128 -- [no],[
129 -- with_tools_gendef=no
130 -- with_tools_genidl=no],
131 -- [MW64_OPTION_ERROR([with-tools])])
132 -+for t in gendef genidl; do
133 -+ res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
134 -+ AS_CASE([$with_tools],
135 -+ [all|yes],[res=yes])
136 -+ AS_VAR_COPY([with_tools_$t], [res])
137 -+done
138 - AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
139 - AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
140 - AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
141 ---
142 -2.3.6
143 -
144
145 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
146 deleted file mode 100644
147 index 0d3e59dc9dd..00000000000
148 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
149 +++ /dev/null
150 @@ -1,86 +0,0 @@
151 -From 0adec5d0e1c65fc4ce4f84f3d4bb6738e923e1de Mon Sep 17 00:00:00 2001
152 -From: Alon Bar-Lev <alon.barlev@×××××.com>
153 -Date: Mon, 4 May 2015 20:39:52 +0300
154 -Subject: [PATCH 1/2] build: autoconf: support winpthreads library
155 -
156 -Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
157 ----
158 - Makefile.am | 6 +++++-
159 - configure.ac | 15 +++++++++++++--
160 - 2 files changed, 18 insertions(+), 3 deletions(-)
161 -
162 -diff --git a/Makefile.am b/Makefile.am
163 -index 26a7606..308b6fd 100644
164 ---- a/Makefile.am
165 -+++ b/Makefile.am
166 -@@ -14,6 +14,10 @@ if LIBRARIES_PSEH
167 - MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
168 - endif
169 -
170 -+if LIBRARIES_WINPTHREADS
171 -+ MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
172 -+endif
173 -+
174 - if TOOLS_GENDEF
175 - MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
176 - endif
177 -@@ -22,7 +26,7 @@ if TOOLS_GENIDL
178 - MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
179 - endif
180 -
181 --SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
182 -+SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
183 -
184 - DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
185 -
186 -diff --git a/configure.ac b/configure.ac
187 -index 4bb3926..468d1b1 100644
188 ---- a/configure.ac
189 -+++ b/configure.ac
190 -@@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
191 - AC_MSG_CHECKING([whether to build the optional libraries])
192 - AC_ARG_WITH([libraries],
193 - [AS_HELP_STRING([--with-libraries=ARG],
194 -- [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])],
195 -+ [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
196 - [],
197 - [with_libraries=no])
198 - AS_CASE([$with_libraries],
199 - [yes|all],[
200 -- with_libraries="libmangle,pseh"
201 -+ with_libraries="libmangle,pseh,winpthreads"
202 -+ with_libraries_winpthreads=yes
203 - with_libraries_mangle=yes
204 - with_libraries_pseh=yes],
205 - [libmangle],[
206 - with_libraries="libmangle"
207 -+ with_libraries_winpthreads=no
208 - with_libraries_mangle=yes
209 - with_libraries_pseh=no],
210 - [pseh],[
211 - with_libraries="pseh"
212 -+ with_libraries_winpthreads=no
213 - with_libraries_mangle=no
214 - with_libraries_pseh=yes],
215 -+ [winpthreads],[
216 -+ with_libraries="winpthreads"
217 -+ with_libraries_winpthreads=yes
218 -+ with_libraries_mangle=no
219 -+ with_libraries_pseh=no],
220 - [no],[
221 -+ with_libraries_winpthreads=no
222 - with_libraries_mangle=no
223 - with_libraries_pseh=no],
224 - [MW64_OPTION_ERROR([with-libraries])])
225 - AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
226 - AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
227 -+AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
228 - AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
229 - AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
230 -+AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
231 - AC_MSG_RESULT([$with_libraries])
232 -
233 - AC_MSG_CHECKING([whether to build the optional tools])
234 ---
235 -2.3.6
236 -
237
238 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
239 deleted file mode 100644
240 index 859e00243d3..00000000000
241 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
242 +++ /dev/null
243 @@ -1,41 +0,0 @@
244 -diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
245 -index a935abfe..cefdd8cb 100644
246 ---- a/mingw-w64-tools/gendef/src/gendef.c
247 -+++ b/mingw-w64-tools/gendef/src/gendef.c
248 -@@ -1031,13 +1031,16 @@ redo_switch:
249 - PRDEBUG(" 0x%x illegal ", (unsigned int) b);
250 - #endif
251 - *aCode=c_ill; return 0;
252 -- case c_4: sz++;
253 -- case c_3: sz++;
254 -- case c_lb:
255 -- case c_2: sz++;
256 -- case c_retn: case c_retf:
257 -- case c_iret: case c_int3:
258 -- case c_ad: case c_op:
259 -+ case c_4: sz++; // fallthrough
260 -+ case c_3: sz++; // fallthrough
261 -+ case c_lb: // fallthrough
262 -+ case c_2: sz++; // fallthrough
263 -+ case c_retn: // fallthrough
264 -+ case c_retf: // fallthrough
265 -+ case c_iret: // fallthrough
266 -+ case c_int3: // fallthrough
267 -+ case c_ad: // fallthrough
268 -+ case c_op: // fallthrough
269 - case c_1: *aCode=tb1; return sz;
270 - case c_lv:
271 - if (oper_mode) sz+=4;
272 -diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
273 -index b2430bbc..6a37b1a0 100644
274 ---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
275 -+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
276 -@@ -203,7 +203,7 @@ pass_args (int argc, char **argv)
277 - goto error_point;
278 - case 'h':
279 - if (h[2] == 0)
280 -- show_usage ();
281 -+ show_usage (); // fallthrough
282 - default:
283 - error_point:
284 - fprintf (stderr, "Unknown option ,%s'\n", h);
285
286 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
287 deleted file mode 100644
288 index a7a0a09dc16..00000000000
289 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
290 +++ /dev/null
291 @@ -1,36 +0,0 @@
292 ---- a/mingw-w64-crt/lib32/msvcrt.def.in
293 -+++ b/mingw-w64-crt/lib32/msvcrt.def.in
294 -@@ -138,6 +138,7 @@ _copysign
295 - _cprintf
296 - _cputs
297 - _creat
298 -+_create_locale
299 - _cscanf
300 - _ctype DATA
301 - _cwait
302 -@@ -192,6 +193,7 @@ _fpieee_flt
303 - _fpreset DATA
304 - _fputchar
305 - _fputwchar
306 -+_free_locale
307 - _fsopen
308 - _fstat
309 - _fstat32 == _fstat
310 ---- a/mingw-w64-crt/lib64/msvcrt.def.in
311 -+++ b/mingw-w64-crt/lib64/msvcrt.def.in
312 -@@ -240,6 +240,7 @@ _cprintf_p_l
313 - _cputs
314 - _cputws
315 - _creat
316 -+_create_locale
317 - _cscanf
318 - _cscanf_l
319 - _cscanf_s
320 -@@ -315,6 +316,7 @@ _fputchar
321 - _fputwchar
322 - _fscanf_l
323 - _fscanf_s_l
324 -+_free_locale
325 - _fsopen
326 - _fstat
327 - _fstat64
328
329 diff --git a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
330 deleted file mode 100644
331 index 624a492338e..00000000000
332 --- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
333 +++ /dev/null
334 @@ -1,37 +0,0 @@
335 -From cb860ab6fba86f646bcd3bff6cadcc2bdd3c6964 Mon Sep 17 00:00:00 2001
336 -From: Alon Bar-Lev <alon.barlev@×××××.com>
337 -Date: Sat, 4 Nov 2017 21:58:10 +0200
338 -Subject: [PATCH] build: enable pseh only in x86
339 -
340 -pseh supports only x86, no point in enabling it when libraries are
341 -enabled. This enables downstream to enable libraries without failing.
342 -
343 -Signed-off-by: Alon Bar-Lev <alon.barlev@×××××.com>
344 ----
345 - configure.ac | 8 ++++++--
346 - 1 file changed, 6 insertions(+), 2 deletions(-)
347 -
348 -diff --git a/configure.ac b/configure.ac
349 -index 468d1b19..cfb07362 100644
350 ---- a/configure.ac
351 -+++ b/configure.ac
352 -@@ -58,10 +58,14 @@ AC_ARG_WITH([libraries],
353 - [with_libraries=no])
354 - AS_CASE([$with_libraries],
355 - [yes|all],[
356 -- with_libraries="libmangle,pseh,winpthreads"
357 -+ with_libraries="libmangle,winpthreads"
358 - with_libraries_winpthreads=yes
359 - with_libraries_mangle=yes
360 -- with_libraries_pseh=yes],
361 -+ AS_CASE([$host_cpu],
362 -+ [i?86], [
363 -+ with_libraries="$with_libraries,pseh"
364 -+ with_libraries_pseh=yes
365 -+ ])],
366 - [libmangle],[
367 - with_libraries="libmangle"
368 - with_libraries_winpthreads=no
369 ---
370 -2.13.6
371 -
372
373 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
374 deleted file mode 100644
375 index 4397725c87a..00000000000
376 --- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
377 +++ /dev/null
378 @@ -1,78 +0,0 @@
379 -# Copyright 1999-2018 Gentoo Foundation
380 -# Distributed under the terms of the GNU General Public License v2
381 -
382 -EAPI=5
383 -
384 -export CBUILD=${CBUILD:-${CHOST}}
385 -export CTARGET=${CTARGET:-${CHOST}}
386 -if [[ ${CTARGET} == ${CHOST} ]] ; then
387 - if [[ ${CATEGORY} == cross-* ]] ; then
388 - export CTARGET=${CATEGORY#cross-}
389 - fi
390 -fi
391 -
392 -inherit flag-o-matic eutils
393 -
394 -DESCRIPTION="Free Win64 runtime and import library definitions"
395 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
396 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
397 -
398 -LICENSE="BSD"
399 -SLOT="0"
400 -KEYWORDS="~amd64 ~x86"
401 -IUSE="headers-only idl"
402 -RESTRICT="strip"
403 -
404 -S="${WORKDIR}/mingw-w64-v${PV}"
405 -
406 -is_crosscompile() {
407 - [[ ${CHOST} != ${CTARGET} ]]
408 -}
409 -just_headers() {
410 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
411 -}
412 -
413 -pkg_setup() {
414 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
415 - die "Invalid configuration"
416 - fi
417 -}
418 -
419 -src_configure() {
420 - local extra_conf=()
421 -
422 - if just_headers; then
423 - extra_conf+=( --without-crt )
424 - else
425 - extra_conf+=( --with-crt )
426 - fi
427 -
428 - case ${CTARGET} in
429 - x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
430 - i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
431 - *) die "Unsupported ${CTARGET}" ;;
432 - esac
433 -
434 - CHOST=${CTARGET} strip-unsupported-flags
435 - CHOST=${CTARGET} econf \
436 - --prefix=/usr/${CTARGET} \
437 - --includedir=/usr/${CTARGET}/usr/include \
438 - --with-headers \
439 - --enable-sdk \
440 - $(use_enable idl) \
441 - "${extra_conf[@]}"
442 -}
443 -
444 -src_install() {
445 - default
446 -
447 - if is_crosscompile ; then
448 - # gcc is configured to look at specific hard-coded paths for mingw #419601
449 - dosym usr /usr/${CTARGET}/mingw
450 - dosym usr /usr/${CTARGET}/${CTARGET}
451 - dosym usr/include /usr/${CTARGET}/sys-include
452 - fi
453 -
454 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
455 - rm -rf "${ED}/usr/share"
456 -}
457
458 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
459 deleted file mode 100644
460 index 4397725c87a..00000000000
461 --- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
462 +++ /dev/null
463 @@ -1,78 +0,0 @@
464 -# Copyright 1999-2018 Gentoo Foundation
465 -# Distributed under the terms of the GNU General Public License v2
466 -
467 -EAPI=5
468 -
469 -export CBUILD=${CBUILD:-${CHOST}}
470 -export CTARGET=${CTARGET:-${CHOST}}
471 -if [[ ${CTARGET} == ${CHOST} ]] ; then
472 - if [[ ${CATEGORY} == cross-* ]] ; then
473 - export CTARGET=${CATEGORY#cross-}
474 - fi
475 -fi
476 -
477 -inherit flag-o-matic eutils
478 -
479 -DESCRIPTION="Free Win64 runtime and import library definitions"
480 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
481 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
482 -
483 -LICENSE="BSD"
484 -SLOT="0"
485 -KEYWORDS="~amd64 ~x86"
486 -IUSE="headers-only idl"
487 -RESTRICT="strip"
488 -
489 -S="${WORKDIR}/mingw-w64-v${PV}"
490 -
491 -is_crosscompile() {
492 - [[ ${CHOST} != ${CTARGET} ]]
493 -}
494 -just_headers() {
495 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
496 -}
497 -
498 -pkg_setup() {
499 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
500 - die "Invalid configuration"
501 - fi
502 -}
503 -
504 -src_configure() {
505 - local extra_conf=()
506 -
507 - if just_headers; then
508 - extra_conf+=( --without-crt )
509 - else
510 - extra_conf+=( --with-crt )
511 - fi
512 -
513 - case ${CTARGET} in
514 - x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
515 - i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
516 - *) die "Unsupported ${CTARGET}" ;;
517 - esac
518 -
519 - CHOST=${CTARGET} strip-unsupported-flags
520 - CHOST=${CTARGET} econf \
521 - --prefix=/usr/${CTARGET} \
522 - --includedir=/usr/${CTARGET}/usr/include \
523 - --with-headers \
524 - --enable-sdk \
525 - $(use_enable idl) \
526 - "${extra_conf[@]}"
527 -}
528 -
529 -src_install() {
530 - default
531 -
532 - if is_crosscompile ; then
533 - # gcc is configured to look at specific hard-coded paths for mingw #419601
534 - dosym usr /usr/${CTARGET}/mingw
535 - dosym usr /usr/${CTARGET}/${CTARGET}
536 - dosym usr/include /usr/${CTARGET}/sys-include
537 - fi
538 -
539 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
540 - rm -rf "${ED}/usr/share"
541 -}
542
543 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
544 deleted file mode 100644
545 index 4397725c87a..00000000000
546 --- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
547 +++ /dev/null
548 @@ -1,78 +0,0 @@
549 -# Copyright 1999-2018 Gentoo Foundation
550 -# Distributed under the terms of the GNU General Public License v2
551 -
552 -EAPI=5
553 -
554 -export CBUILD=${CBUILD:-${CHOST}}
555 -export CTARGET=${CTARGET:-${CHOST}}
556 -if [[ ${CTARGET} == ${CHOST} ]] ; then
557 - if [[ ${CATEGORY} == cross-* ]] ; then
558 - export CTARGET=${CATEGORY#cross-}
559 - fi
560 -fi
561 -
562 -inherit flag-o-matic eutils
563 -
564 -DESCRIPTION="Free Win64 runtime and import library definitions"
565 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
566 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
567 -
568 -LICENSE="BSD"
569 -SLOT="0"
570 -KEYWORDS="~amd64 ~x86"
571 -IUSE="headers-only idl"
572 -RESTRICT="strip"
573 -
574 -S="${WORKDIR}/mingw-w64-v${PV}"
575 -
576 -is_crosscompile() {
577 - [[ ${CHOST} != ${CTARGET} ]]
578 -}
579 -just_headers() {
580 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
581 -}
582 -
583 -pkg_setup() {
584 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
585 - die "Invalid configuration"
586 - fi
587 -}
588 -
589 -src_configure() {
590 - local extra_conf=()
591 -
592 - if just_headers; then
593 - extra_conf+=( --without-crt )
594 - else
595 - extra_conf+=( --with-crt )
596 - fi
597 -
598 - case ${CTARGET} in
599 - x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
600 - i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
601 - *) die "Unsupported ${CTARGET}" ;;
602 - esac
603 -
604 - CHOST=${CTARGET} strip-unsupported-flags
605 - CHOST=${CTARGET} econf \
606 - --prefix=/usr/${CTARGET} \
607 - --includedir=/usr/${CTARGET}/usr/include \
608 - --with-headers \
609 - --enable-sdk \
610 - $(use_enable idl) \
611 - "${extra_conf[@]}"
612 -}
613 -
614 -src_install() {
615 - default
616 -
617 - if is_crosscompile ; then
618 - # gcc is configured to look at specific hard-coded paths for mingw #419601
619 - dosym usr /usr/${CTARGET}/mingw
620 - dosym usr /usr/${CTARGET}/${CTARGET}
621 - dosym usr/include /usr/${CTARGET}/sys-include
622 - fi
623 -
624 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
625 - rm -rf "${ED}/usr/share"
626 -}
627
628 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
629 deleted file mode 100644
630 index 3bb7305cf0f..00000000000
631 --- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
632 +++ /dev/null
633 @@ -1,112 +0,0 @@
634 -# Copyright 1999-2018 Gentoo Foundation
635 -# Distributed under the terms of the GNU General Public License v2
636 -
637 -EAPI=5
638 -
639 -export CBUILD=${CBUILD:-${CHOST}}
640 -export CTARGET=${CTARGET:-${CHOST}}
641 -if [[ ${CTARGET} == ${CHOST} ]] ; then
642 - if [[ ${CATEGORY} == cross-* ]] ; then
643 - export CTARGET=${CATEGORY#cross-}
644 - fi
645 -fi
646 -
647 -WANT_AUTOMAKE="1.15"
648 -
649 -inherit autotools flag-o-matic eutils
650 -
651 -DESCRIPTION="Free Win64 runtime and import library definitions"
652 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
653 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
654 -
655 -LICENSE="BSD"
656 -SLOT="0"
657 -KEYWORDS="~amd64 ~x86"
658 -IUSE="headers-only idl libraries tools"
659 -RESTRICT="strip"
660 -
661 -S="${WORKDIR}/mingw-w64-v${PV}"
662 -
663 -is_crosscompile() {
664 - [[ ${CHOST} != ${CTARGET} ]]
665 -}
666 -just_headers() {
667 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
668 -}
669 -crt_with() {
670 - just_headers && echo --without-$1 || echo --with-$1
671 -}
672 -crt_use_enable() {
673 - just_headers && echo --without-$2 || use_enable "$@"
674 -}
675 -crt_use_with() {
676 - just_headers && echo --without-$2 || use_with "$@"
677 -}
678 -
679 -pkg_setup() {
680 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
681 - die "Invalid configuration"
682 - fi
683 -}
684 -
685 -src_prepare() {
686 - epatch "${FILESDIR}/${P}-winpthreads.patch"
687 - epatch "${FILESDIR}/${P}-build.patch"
688 - eautoreconf
689 -}
690 -
691 -src_configure() {
692 - CHOST=${CTARGET} strip-unsupported-flags
693 -
694 - if ! just_headers; then
695 - mkdir "${WORKDIR}/headers"
696 - pushd "${WORKDIR}/headers" > /dev/null
697 - CHOST=${CTARGET} "${S}/configure" \
698 - --prefix="${T}/tmproot" \
699 - --with-headers \
700 - --without-crt \
701 - || die
702 - popd > /dev/null
703 - append-cppflags "-I${T}/tmproot/include"
704 - fi
705 -
706 - local extra_conf=()
707 -
708 - case ${CTARGET} in
709 - x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
710 - i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
711 - *) die "Unsupported ${CTARGET}" ;;
712 - esac
713 -
714 - CHOST=${CTARGET} econf \
715 - --prefix=/usr/${CTARGET} \
716 - --includedir=/usr/${CTARGET}/usr/include \
717 - --with-headers \
718 - --enable-sdk \
719 - $(crt_with crt) \
720 - $(crt_use_enable idl) \
721 - $(crt_use_with libraries libraries winpthreads,libmangle) \
722 - $(crt_use_with tools) \
723 - "${extra_conf[@]}"
724 -}
725 -
726 -src_compile() {
727 - if ! just_headers; then
728 - emake -C "${WORKDIR}/headers" install
729 - fi
730 - default
731 -}
732 -
733 -src_install() {
734 - default
735 -
736 - if is_crosscompile ; then
737 - # gcc is configured to look at specific hard-coded paths for mingw #419601
738 - dosym usr /usr/${CTARGET}/mingw
739 - dosym usr /usr/${CTARGET}/${CTARGET}
740 - dosym usr/include /usr/${CTARGET}/sys-include
741 - fi
742 -
743 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
744 - rm -rf "${ED}/usr/share"
745 -}
746
747 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
748 deleted file mode 100644
749 index f279453e0e4..00000000000
750 --- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
751 +++ /dev/null
752 @@ -1,112 +0,0 @@
753 -# Copyright 1999-2018 Gentoo Foundation
754 -# Distributed under the terms of the GNU General Public License v2
755 -
756 -EAPI=5
757 -
758 -export CBUILD=${CBUILD:-${CHOST}}
759 -export CTARGET=${CTARGET:-${CHOST}}
760 -if [[ ${CTARGET} == ${CHOST} ]] ; then
761 - if [[ ${CATEGORY} == cross-* ]] ; then
762 - export CTARGET=${CATEGORY#cross-}
763 - fi
764 -fi
765 -
766 -WANT_AUTOMAKE="1.15"
767 -
768 -inherit autotools flag-o-matic eutils
769 -
770 -DESCRIPTION="Free Win64 runtime and import library definitions"
771 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
772 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
773 -
774 -LICENSE="BSD"
775 -SLOT="0"
776 -KEYWORDS="~amd64 ~x86"
777 -IUSE="headers-only idl libraries tools"
778 -RESTRICT="strip"
779 -
780 -S="${WORKDIR}/mingw-w64-v${PV}"
781 -
782 -is_crosscompile() {
783 - [[ ${CHOST} != ${CTARGET} ]]
784 -}
785 -just_headers() {
786 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
787 -}
788 -crt_with() {
789 - just_headers && echo --without-$1 || echo --with-$1
790 -}
791 -crt_use_enable() {
792 - just_headers && echo --without-$2 || use_enable "$@"
793 -}
794 -crt_use_with() {
795 - just_headers && echo --without-$2 || use_with "$@"
796 -}
797 -
798 -pkg_setup() {
799 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
800 - die "Invalid configuration"
801 - fi
802 -}
803 -
804 -src_prepare() {
805 - epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
806 - epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
807 - eautoreconf
808 -}
809 -
810 -src_configure() {
811 - CHOST=${CTARGET} strip-unsupported-flags
812 -
813 - if ! just_headers; then
814 - mkdir "${WORKDIR}/headers"
815 - pushd "${WORKDIR}/headers" > /dev/null
816 - CHOST=${CTARGET} "${S}/configure" \
817 - --prefix="${T}/tmproot" \
818 - --with-headers \
819 - --without-crt \
820 - || die
821 - popd > /dev/null
822 - append-cppflags "-I${T}/tmproot/include"
823 - fi
824 -
825 - local extra_conf=()
826 -
827 - case ${CTARGET} in
828 - x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
829 - i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
830 - *) die "Unsupported ${CTARGET}" ;;
831 - esac
832 -
833 - CHOST=${CTARGET} econf \
834 - --prefix=/usr/${CTARGET} \
835 - --includedir=/usr/${CTARGET}/usr/include \
836 - --with-headers \
837 - --enable-sdk \
838 - $(crt_with crt) \
839 - $(crt_use_enable idl) \
840 - $(crt_use_with libraries libraries winpthreads,libmangle) \
841 - $(crt_use_with tools) \
842 - "${extra_conf[@]}"
843 -}
844 -
845 -src_compile() {
846 - if ! just_headers; then
847 - emake -C "${WORKDIR}/headers" install
848 - fi
849 - default
850 -}
851 -
852 -src_install() {
853 - default
854 -
855 - if is_crosscompile ; then
856 - # gcc is configured to look at specific hard-coded paths for mingw #419601
857 - dosym usr /usr/${CTARGET}/mingw
858 - dosym usr /usr/${CTARGET}/${CTARGET}
859 - dosym usr/include /usr/${CTARGET}/sys-include
860 - fi
861 -
862 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
863 - rm -rf "${ED}/usr/share"
864 -}
865
866 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
867 deleted file mode 100644
868 index 2a652328142..00000000000
869 --- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
870 +++ /dev/null
871 @@ -1,108 +0,0 @@
872 -# Copyright 1999-2018 Gentoo Foundation
873 -# Distributed under the terms of the GNU General Public License v2
874 -
875 -EAPI=5
876 -
877 -export CBUILD=${CBUILD:-${CHOST}}
878 -export CTARGET=${CTARGET:-${CHOST}}
879 -if [[ ${CTARGET} == ${CHOST} ]] ; then
880 - if [[ ${CATEGORY} == cross-* ]] ; then
881 - export CTARGET=${CATEGORY#cross-}
882 - fi
883 -fi
884 -
885 -WANT_AUTOMAKE="1.15"
886 -
887 -inherit autotools flag-o-matic eutils
888 -
889 -DESCRIPTION="Free Win64 runtime and import library definitions"
890 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
891 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
892 -
893 -LICENSE="BSD"
894 -SLOT="0"
895 -KEYWORDS="~amd64 ~x86"
896 -IUSE="headers-only idl libraries tools"
897 -RESTRICT="strip"
898 -
899 -S="${WORKDIR}/mingw-w64-v${PV}"
900 -
901 -is_crosscompile() {
902 - [[ ${CHOST} != ${CTARGET} ]]
903 -}
904 -just_headers() {
905 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
906 -}
907 -crt_with() {
908 - just_headers && echo --without-$1 || echo --with-$1
909 -}
910 -crt_use_enable() {
911 - just_headers && echo --without-$2 || use_enable "$@"
912 -}
913 -crt_use_with() {
914 - just_headers && echo --without-$2 || use_with "$@"
915 -}
916 -
917 -pkg_setup() {
918 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
919 - die "Invalid configuration"
920 - fi
921 -}
922 -
923 -src_prepare() {
924 - epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
925 - epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
926 - eautoreconf
927 -}
928 -
929 -src_configure() {
930 - CHOST=${CTARGET} strip-unsupported-flags
931 -
932 - if ! just_headers; then
933 - mkdir "${WORKDIR}/headers"
934 - pushd "${WORKDIR}/headers" > /dev/null
935 - CHOST=${CTARGET} "${S}/configure" \
936 - --prefix="${T}/tmproot" \
937 - --with-headers \
938 - --without-crt \
939 - || die
940 - popd > /dev/null
941 - append-cppflags "-I${T}/tmproot/include"
942 - fi
943 -
944 - CHOST=${CTARGET} econf \
945 - --prefix=/usr/${CTARGET} \
946 - --includedir=/usr/${CTARGET}/usr/include \
947 - --with-headers \
948 - --enable-sdk \
949 - $(crt_with crt) \
950 - $(crt_use_enable idl) \
951 - $(crt_use_with libraries libraries winpthreads,libmangle) \
952 - $(crt_use_with tools) \
953 - $(
954 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
955 - && echo --disable-lib32 --enable-lib64 \
956 - || echo --enable-lib32 --disable-lib64
957 - )
958 -}
959 -
960 -src_compile() {
961 - if ! just_headers; then
962 - emake -C "${WORKDIR}/headers" install
963 - fi
964 - default
965 -}
966 -
967 -src_install() {
968 - default
969 -
970 - if is_crosscompile ; then
971 - # gcc is configured to look at specific hard-coded paths for mingw #419601
972 - dosym usr /usr/${CTARGET}/mingw
973 - dosym usr /usr/${CTARGET}/${CTARGET}
974 - dosym usr/include /usr/${CTARGET}/sys-include
975 - fi
976 -
977 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
978 - rm -rf "${ED}/usr/share"
979 -}
980
981 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
982 deleted file mode 100644
983 index d013a17c428..00000000000
984 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
985 +++ /dev/null
986 @@ -1,112 +0,0 @@
987 -# Copyright 1999-2018 Gentoo Foundation
988 -# Distributed under the terms of the GNU General Public License v2
989 -
990 -EAPI=6
991 -
992 -export CBUILD=${CBUILD:-${CHOST}}
993 -export CTARGET=${CTARGET:-${CHOST}}
994 -if [[ ${CTARGET} == ${CHOST} ]] ; then
995 - if [[ ${CATEGORY} == cross-* ]] ; then
996 - export CTARGET=${CATEGORY#cross-}
997 - fi
998 -fi
999 -
1000 -WANT_AUTOMAKE="1.15"
1001 -
1002 -inherit autotools flag-o-matic eutils
1003 -
1004 -DESCRIPTION="Free Win64 runtime and import library definitions"
1005 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1006 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1007 -
1008 -LICENSE="BSD"
1009 -SLOT="0"
1010 -KEYWORDS="~amd64 ~x86"
1011 -IUSE="headers-only idl libraries tools"
1012 -RESTRICT="strip"
1013 -
1014 -S="${WORKDIR}/mingw-w64-v${PV}"
1015 -
1016 -PATCHES=(
1017 - "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
1018 - "${FILESDIR}/${PN}-4.0.1-build.patch"
1019 -)
1020 -
1021 -is_crosscompile() {
1022 - [[ ${CHOST} != ${CTARGET} ]]
1023 -}
1024 -just_headers() {
1025 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
1026 -}
1027 -crt_with() {
1028 - just_headers && echo --without-$1 || echo --with-$1
1029 -}
1030 -crt_use_enable() {
1031 - just_headers && echo --without-$2 || use_enable "$@"
1032 -}
1033 -crt_use_with() {
1034 - just_headers && echo --without-$2 || use_with "$@"
1035 -}
1036 -
1037 -pkg_setup() {
1038 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1039 - die "Invalid configuration"
1040 - fi
1041 -}
1042 -
1043 -src_prepare() {
1044 - default
1045 - eautoreconf
1046 -}
1047 -
1048 -src_configure() {
1049 - CHOST=${CTARGET} strip-unsupported-flags
1050 -
1051 - if ! just_headers; then
1052 - mkdir "${WORKDIR}/headers"
1053 - pushd "${WORKDIR}/headers" > /dev/null
1054 - CHOST=${CTARGET} "${S}/configure" \
1055 - --prefix="${T}/tmproot" \
1056 - --with-headers \
1057 - --without-crt \
1058 - || die
1059 - popd > /dev/null
1060 - append-cppflags "-I${T}/tmproot/include"
1061 - fi
1062 -
1063 - CHOST=${CTARGET} econf \
1064 - --prefix=/usr/${CTARGET} \
1065 - --includedir=/usr/${CTARGET}/usr/include \
1066 - --with-headers \
1067 - --enable-sdk \
1068 - $(crt_with crt) \
1069 - $(crt_use_enable idl) \
1070 - $(crt_use_with libraries libraries winpthreads,libmangle) \
1071 - $(crt_use_with tools) \
1072 - $(
1073 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1074 - && echo --disable-lib32 --enable-lib64 \
1075 - || echo --enable-lib32 --disable-lib64
1076 - )
1077 -}
1078 -
1079 -src_compile() {
1080 - if ! just_headers; then
1081 - emake -C "${WORKDIR}/headers" install
1082 - fi
1083 - default
1084 -}
1085 -
1086 -src_install() {
1087 - default
1088 -
1089 - if is_crosscompile ; then
1090 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1091 - dosym usr /usr/${CTARGET}/mingw
1092 - dosym usr /usr/${CTARGET}/${CTARGET}
1093 - dosym usr/include /usr/${CTARGET}/sys-include
1094 - fi
1095 -
1096 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1097 - rm -rf "${ED}/usr/share"
1098 -}
1099
1100 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
1101 deleted file mode 100644
1102 index 25df5eae738..00000000000
1103 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
1104 +++ /dev/null
1105 @@ -1,114 +0,0 @@
1106 -# Copyright 1999-2018 Gentoo Foundation
1107 -# Distributed under the terms of the GNU General Public License v2
1108 -
1109 -EAPI=6
1110 -
1111 -export CBUILD=${CBUILD:-${CHOST}}
1112 -export CTARGET=${CTARGET:-${CHOST}}
1113 -if [[ ${CTARGET} == ${CHOST} ]] ; then
1114 - if [[ ${CATEGORY} == cross-* ]] ; then
1115 - export CTARGET=${CATEGORY#cross-}
1116 - fi
1117 -fi
1118 -
1119 -WANT_AUTOMAKE="1.15"
1120 -
1121 -inherit autotools flag-o-matic eutils
1122 -
1123 -DESCRIPTION="Free Win64 runtime and import library definitions"
1124 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1125 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1126 -
1127 -LICENSE="BSD"
1128 -SLOT="0"
1129 -KEYWORDS="~amd64 ~x86"
1130 -IUSE="headers-only idl libraries tools"
1131 -RESTRICT="strip"
1132 -
1133 -S="${WORKDIR}/mingw-w64-v${PV}"
1134 -
1135 -PATCHES=(
1136 - "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
1137 - "${FILESDIR}/${PN}-4.0.1-build.patch"
1138 - "${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
1139 -)
1140 -
1141 -is_crosscompile() {
1142 - [[ ${CHOST} != ${CTARGET} ]]
1143 -}
1144 -just_headers() {
1145 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
1146 -}
1147 -crt_with() {
1148 - just_headers && echo --without-$1 || echo --with-$1
1149 -}
1150 -crt_use_enable() {
1151 - just_headers && echo --without-$2 || use_enable "$@"
1152 -}
1153 -crt_use_with() {
1154 - just_headers && echo --without-$2 || use_with "$@"
1155 -}
1156 -
1157 -pkg_setup() {
1158 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1159 - die "Invalid configuration"
1160 - fi
1161 -}
1162 -
1163 -src_prepare() {
1164 - default
1165 - eautoreconf
1166 -}
1167 -
1168 -src_configure() {
1169 - CHOST=${CTARGET} strip-unsupported-flags
1170 -
1171 - if ! just_headers; then
1172 - mkdir "${WORKDIR}/headers"
1173 - pushd "${WORKDIR}/headers" > /dev/null
1174 - CHOST=${CTARGET} "${S}/configure" \
1175 - --prefix="${T}/tmproot" \
1176 - --with-headers \
1177 - --without-crt \
1178 - || die
1179 - popd > /dev/null
1180 - append-cppflags "-I${T}/tmproot/include"
1181 - fi
1182 -
1183 - CHOST=${CTARGET} econf \
1184 - --prefix=/usr/${CTARGET} \
1185 - --includedir=/usr/${CTARGET}/usr/include \
1186 - --libdir=/usr/${CTARGET}/usr/lib \
1187 - --with-headers \
1188 - --enable-sdk \
1189 - $(crt_with crt) \
1190 - $(crt_use_enable idl) \
1191 - $(crt_use_with libraries libraries winpthreads,libmangle) \
1192 - $(crt_use_with tools) \
1193 - $(
1194 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1195 - && echo --disable-lib32 --enable-lib64 \
1196 - || echo --enable-lib32 --disable-lib64
1197 - )
1198 -}
1199 -
1200 -src_compile() {
1201 - if ! just_headers; then
1202 - emake -C "${WORKDIR}/headers" install
1203 - fi
1204 - default
1205 -}
1206 -
1207 -src_install() {
1208 - default
1209 -
1210 - if is_crosscompile ; then
1211 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1212 - dosym usr /usr/${CTARGET}/mingw
1213 - dosym usr /usr/${CTARGET}/${CTARGET}
1214 - dosym usr/include /usr/${CTARGET}/sys-include
1215 - fi
1216 -
1217 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1218 - rm -rf "${ED}/usr/share"
1219 -}
1220
1221 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
1222 deleted file mode 100644
1223 index 5141174deb4..00000000000
1224 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
1225 +++ /dev/null
1226 @@ -1,115 +0,0 @@
1227 -# Copyright 1999-2018 Gentoo Foundation
1228 -# Distributed under the terms of the GNU General Public License v2
1229 -
1230 -EAPI=6
1231 -
1232 -export CBUILD=${CBUILD:-${CHOST}}
1233 -export CTARGET=${CTARGET:-${CHOST}}
1234 -if [[ ${CTARGET} == ${CHOST} ]] ; then
1235 - if [[ ${CATEGORY} == cross-* ]] ; then
1236 - export CTARGET=${CATEGORY#cross-}
1237 - fi
1238 -fi
1239 -
1240 -WANT_AUTOMAKE="1.15"
1241 -
1242 -inherit autotools flag-o-matic eutils
1243 -
1244 -DESCRIPTION="Free Win64 runtime and import library definitions"
1245 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1246 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1247 -
1248 -LICENSE="BSD"
1249 -SLOT="0"
1250 -KEYWORDS="~amd64 ~x86"
1251 -IUSE="headers-only idl libraries tools"
1252 -RESTRICT="strip"
1253 -
1254 -S="${WORKDIR}/mingw-w64-v${PV}"
1255 -
1256 -PATCHES=(
1257 - "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
1258 - "${FILESDIR}/${PN}-4.0.1-build.patch"
1259 - "${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
1260 - "${FILESDIR}/${PN}-5.0.2-locale.patch"
1261 -)
1262 -
1263 -is_crosscompile() {
1264 - [[ ${CHOST} != ${CTARGET} ]]
1265 -}
1266 -just_headers() {
1267 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
1268 -}
1269 -crt_with() {
1270 - just_headers && echo --without-$1 || echo --with-$1
1271 -}
1272 -crt_use_enable() {
1273 - just_headers && echo --without-$2 || use_enable "$@"
1274 -}
1275 -crt_use_with() {
1276 - just_headers && echo --without-$2 || use_with "$@"
1277 -}
1278 -
1279 -pkg_setup() {
1280 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1281 - die "Invalid configuration"
1282 - fi
1283 -}
1284 -
1285 -src_prepare() {
1286 - default
1287 - eautoreconf
1288 -}
1289 -
1290 -src_configure() {
1291 - CHOST=${CTARGET} strip-unsupported-flags
1292 -
1293 - if ! just_headers; then
1294 - mkdir "${WORKDIR}/headers"
1295 - pushd "${WORKDIR}/headers" > /dev/null
1296 - CHOST=${CTARGET} "${S}/configure" \
1297 - --prefix="${T}/tmproot" \
1298 - --with-headers \
1299 - --without-crt \
1300 - || die
1301 - popd > /dev/null
1302 - append-cppflags "-I${T}/tmproot/include"
1303 - fi
1304 -
1305 - CHOST=${CTARGET} econf \
1306 - --prefix=/usr/${CTARGET} \
1307 - --includedir=/usr/${CTARGET}/usr/include \
1308 - --libdir=/usr/${CTARGET}/usr/lib \
1309 - --with-headers \
1310 - --enable-sdk \
1311 - $(crt_with crt) \
1312 - $(crt_use_enable idl) \
1313 - $(crt_use_with libraries libraries winpthreads,libmangle) \
1314 - $(crt_use_with tools) \
1315 - $(
1316 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1317 - && echo --disable-lib32 --enable-lib64 \
1318 - || echo --enable-lib32 --disable-lib64
1319 - )
1320 -}
1321 -
1322 -src_compile() {
1323 - if ! just_headers; then
1324 - emake -C "${WORKDIR}/headers" install
1325 - fi
1326 - default
1327 -}
1328 -
1329 -src_install() {
1330 - default
1331 -
1332 - if is_crosscompile ; then
1333 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1334 - dosym usr /usr/${CTARGET}/mingw
1335 - dosym usr /usr/${CTARGET}/${CTARGET}
1336 - dosym usr/include /usr/${CTARGET}/sys-include
1337 - fi
1338 -
1339 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1340 - rm -rf "${ED}/usr/share"
1341 -}
1342
1343 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
1344 deleted file mode 100644
1345 index d013a17c428..00000000000
1346 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
1347 +++ /dev/null
1348 @@ -1,112 +0,0 @@
1349 -# Copyright 1999-2018 Gentoo Foundation
1350 -# Distributed under the terms of the GNU General Public License v2
1351 -
1352 -EAPI=6
1353 -
1354 -export CBUILD=${CBUILD:-${CHOST}}
1355 -export CTARGET=${CTARGET:-${CHOST}}
1356 -if [[ ${CTARGET} == ${CHOST} ]] ; then
1357 - if [[ ${CATEGORY} == cross-* ]] ; then
1358 - export CTARGET=${CATEGORY#cross-}
1359 - fi
1360 -fi
1361 -
1362 -WANT_AUTOMAKE="1.15"
1363 -
1364 -inherit autotools flag-o-matic eutils
1365 -
1366 -DESCRIPTION="Free Win64 runtime and import library definitions"
1367 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1368 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1369 -
1370 -LICENSE="BSD"
1371 -SLOT="0"
1372 -KEYWORDS="~amd64 ~x86"
1373 -IUSE="headers-only idl libraries tools"
1374 -RESTRICT="strip"
1375 -
1376 -S="${WORKDIR}/mingw-w64-v${PV}"
1377 -
1378 -PATCHES=(
1379 - "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
1380 - "${FILESDIR}/${PN}-4.0.1-build.patch"
1381 -)
1382 -
1383 -is_crosscompile() {
1384 - [[ ${CHOST} != ${CTARGET} ]]
1385 -}
1386 -just_headers() {
1387 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
1388 -}
1389 -crt_with() {
1390 - just_headers && echo --without-$1 || echo --with-$1
1391 -}
1392 -crt_use_enable() {
1393 - just_headers && echo --without-$2 || use_enable "$@"
1394 -}
1395 -crt_use_with() {
1396 - just_headers && echo --without-$2 || use_with "$@"
1397 -}
1398 -
1399 -pkg_setup() {
1400 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1401 - die "Invalid configuration"
1402 - fi
1403 -}
1404 -
1405 -src_prepare() {
1406 - default
1407 - eautoreconf
1408 -}
1409 -
1410 -src_configure() {
1411 - CHOST=${CTARGET} strip-unsupported-flags
1412 -
1413 - if ! just_headers; then
1414 - mkdir "${WORKDIR}/headers"
1415 - pushd "${WORKDIR}/headers" > /dev/null
1416 - CHOST=${CTARGET} "${S}/configure" \
1417 - --prefix="${T}/tmproot" \
1418 - --with-headers \
1419 - --without-crt \
1420 - || die
1421 - popd > /dev/null
1422 - append-cppflags "-I${T}/tmproot/include"
1423 - fi
1424 -
1425 - CHOST=${CTARGET} econf \
1426 - --prefix=/usr/${CTARGET} \
1427 - --includedir=/usr/${CTARGET}/usr/include \
1428 - --with-headers \
1429 - --enable-sdk \
1430 - $(crt_with crt) \
1431 - $(crt_use_enable idl) \
1432 - $(crt_use_with libraries libraries winpthreads,libmangle) \
1433 - $(crt_use_with tools) \
1434 - $(
1435 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1436 - && echo --disable-lib32 --enable-lib64 \
1437 - || echo --enable-lib32 --disable-lib64
1438 - )
1439 -}
1440 -
1441 -src_compile() {
1442 - if ! just_headers; then
1443 - emake -C "${WORKDIR}/headers" install
1444 - fi
1445 - default
1446 -}
1447 -
1448 -src_install() {
1449 - default
1450 -
1451 - if is_crosscompile ; then
1452 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1453 - dosym usr /usr/${CTARGET}/mingw
1454 - dosym usr /usr/${CTARGET}/${CTARGET}
1455 - dosym usr/include /usr/${CTARGET}/sys-include
1456 - fi
1457 -
1458 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1459 - rm -rf "${ED}/usr/share"
1460 -}
1461
1462 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
1463 deleted file mode 100644
1464 index 68655a1ed3a..00000000000
1465 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
1466 +++ /dev/null
1467 @@ -1,115 +0,0 @@
1468 -# Copyright 1999-2018 Gentoo Foundation
1469 -# Distributed under the terms of the GNU General Public License v2
1470 -
1471 -EAPI=6
1472 -
1473 -export CBUILD=${CBUILD:-${CHOST}}
1474 -export CTARGET=${CTARGET:-${CHOST}}
1475 -if [[ ${CTARGET} == ${CHOST} ]] ; then
1476 - if [[ ${CATEGORY} == cross-* ]] ; then
1477 - export CTARGET=${CATEGORY#cross-}
1478 - fi
1479 -fi
1480 -
1481 -WANT_AUTOMAKE="1.15"
1482 -
1483 -inherit autotools flag-o-matic eutils
1484 -
1485 -DESCRIPTION="Free Win64 runtime and import library definitions"
1486 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1487 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1488 -
1489 -LICENSE="BSD"
1490 -SLOT="0"
1491 -KEYWORDS="~amd64 ~x86"
1492 -IUSE="headers-only idl libraries tools"
1493 -RESTRICT="strip"
1494 -
1495 -S="${WORKDIR}/mingw-w64-v${PV}"
1496 -
1497 -PATCHES=(
1498 - "${FILESDIR}/${P}-build.patch"
1499 -)
1500 -
1501 -is_crosscompile() {
1502 - [[ ${CHOST} != ${CTARGET} ]]
1503 -}
1504 -just_headers() {
1505 - is_crosscompile && use headers-only
1506 -}
1507 -alt_prefix() {
1508 - is_crosscompile && echo /usr/${CTARGET}
1509 -}
1510 -crt_with() {
1511 - just_headers && echo --without-$1 || echo --with-$1
1512 -}
1513 -crt_use_enable() {
1514 - just_headers && echo --without-$2 || use_enable "$@"
1515 -}
1516 -crt_use_with() {
1517 - just_headers && echo --without-$2 || use_with "$@"
1518 -}
1519 -
1520 -pkg_setup() {
1521 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1522 - die "Invalid configuration"
1523 - fi
1524 -}
1525 -
1526 -src_prepare() {
1527 - default
1528 - eautoreconf
1529 -}
1530 -
1531 -src_configure() {
1532 - CHOST=${CTARGET} strip-unsupported-flags
1533 -
1534 - if ! just_headers; then
1535 - mkdir "${WORKDIR}/headers"
1536 - pushd "${WORKDIR}/headers" > /dev/null
1537 - CHOST=${CTARGET} "${S}/configure" \
1538 - --prefix="${T}/tmproot" \
1539 - --with-headers \
1540 - --without-crt \
1541 - || die
1542 - popd > /dev/null
1543 - append-cppflags "-I${T}/tmproot/include"
1544 - fi
1545 -
1546 - CHOST=${CTARGET} econf \
1547 - --prefix="${EPREFIX}"$(alt_prefix) \
1548 - --includedir="${EPREFIX}"$(alt_prefix)/usr/include \
1549 - --libdir="${EPREFIX}"$(alt_prefix)/usr/lib \
1550 - --with-headers \
1551 - --enable-sdk \
1552 - $(crt_with crt) \
1553 - $(crt_use_enable idl idl) \
1554 - $(crt_use_with libraries libraries) \
1555 - $(crt_use_with tools tools) \
1556 - $(
1557 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1558 - && echo --disable-lib32 --enable-lib64 \
1559 - || echo --enable-lib32 --disable-lib64
1560 - )
1561 -}
1562 -
1563 -src_compile() {
1564 - if ! just_headers; then
1565 - emake -C "${WORKDIR}/headers" install
1566 - fi
1567 - default
1568 -}
1569 -
1570 -src_install() {
1571 - default
1572 -
1573 - if is_crosscompile ; then
1574 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1575 - dosym usr /usr/${CTARGET}/mingw
1576 - dosym usr /usr/${CTARGET}/${CTARGET}
1577 - dosym usr/include /usr/${CTARGET}/sys-include
1578 - fi
1579 -
1580 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1581 - rm -rf "${ED}/usr/share"
1582 -}
1583
1584 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
1585 deleted file mode 100644
1586 index e52536087f3..00000000000
1587 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
1588 +++ /dev/null
1589 @@ -1,117 +0,0 @@
1590 -# Copyright 1999-2018 Gentoo Foundation
1591 -# Distributed under the terms of the GNU General Public License v2
1592 -
1593 -EAPI=6
1594 -
1595 -export CBUILD=${CBUILD:-${CHOST}}
1596 -export CTARGET=${CTARGET:-${CHOST}}
1597 -if [[ ${CTARGET} == ${CHOST} ]] ; then
1598 - if [[ ${CATEGORY} == cross-* ]] ; then
1599 - export CTARGET=${CATEGORY#cross-}
1600 - fi
1601 -fi
1602 -
1603 -WANT_AUTOMAKE="1.15"
1604 -
1605 -inherit autotools flag-o-matic eutils
1606 -
1607 -DESCRIPTION="Free Win64 runtime and import library definitions"
1608 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1609 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1610 -
1611 -LICENSE="BSD"
1612 -SLOT="0"
1613 -KEYWORDS="~amd64 ~x86"
1614 -IUSE="headers-only idl libraries tools"
1615 -RESTRICT="strip"
1616 -
1617 -S="${WORKDIR}/mingw-w64-v${PV}"
1618 -
1619 -PATCHES=(
1620 - "${FILESDIR}/${P}-build.patch"
1621 -)
1622 -
1623 -is_crosscompile() {
1624 - [[ ${CHOST} != ${CTARGET} ]]
1625 -}
1626 -just_headers() {
1627 - use headers-only
1628 -}
1629 -alt_prefix() {
1630 - is_crosscompile && echo /usr/${CTARGET}
1631 -}
1632 -crt_with() {
1633 - just_headers && echo --without-$1 || echo --with-$1
1634 -}
1635 -crt_use_enable() {
1636 - just_headers && echo --without-$2 || use_enable "$@"
1637 -}
1638 -crt_use_with() {
1639 - just_headers && echo --without-$2 || use_with "$@"
1640 -}
1641 -
1642 -pkg_setup() {
1643 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1644 - die "Invalid configuration"
1645 - fi
1646 -}
1647 -
1648 -src_prepare() {
1649 - default
1650 - eautoreconf
1651 -}
1652 -
1653 -src_configure() {
1654 - CHOST=${CTARGET} strip-unsupported-flags
1655 -
1656 - if ! just_headers; then
1657 - mkdir "${WORKDIR}/headers"
1658 - pushd "${WORKDIR}/headers" > /dev/null
1659 - CHOST=${CTARGET} "${S}/configure" \
1660 - --prefix="${T}/tmproot" \
1661 - --with-headers \
1662 - --without-crt \
1663 - || die
1664 - popd > /dev/null
1665 - append-cppflags "-I${T}/tmproot/include"
1666 - fi
1667 -
1668 - # By default configure tries to set --sysroot=${prefix}. We disable
1669 - # this behaviour with --with-sysroot=no to use gcc's sysroot default.
1670 - # That way we can cross-build mingw64-runtime with cross-emerge.
1671 - CHOST=${CTARGET} econf \
1672 - --with-sysroot=no \
1673 - --prefix="${EPREFIX}"$(alt_prefix)/usr \
1674 - --with-headers \
1675 - --enable-sdk \
1676 - $(crt_with crt) \
1677 - $(crt_use_enable idl idl) \
1678 - $(crt_use_with libraries libraries) \
1679 - $(crt_use_with tools tools) \
1680 - $(
1681 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1682 - && echo --disable-lib32 --enable-lib64 \
1683 - || echo --enable-lib32 --disable-lib64
1684 - )
1685 -}
1686 -
1687 -src_compile() {
1688 - if ! just_headers; then
1689 - emake -C "${WORKDIR}/headers" install
1690 - fi
1691 - default
1692 -}
1693 -
1694 -src_install() {
1695 - default
1696 -
1697 - if is_crosscompile ; then
1698 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1699 - dosym usr /usr/${CTARGET}/mingw
1700 - dosym usr /usr/${CTARGET}/${CTARGET}
1701 - dosym usr/include /usr/${CTARGET}/sys-include
1702 - fi
1703 -
1704 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1705 - rm -rf "${ED}/usr/share"
1706 -}
1707
1708 diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
1709 deleted file mode 100644
1710 index 225bba7d732..00000000000
1711 --- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
1712 +++ /dev/null
1713 @@ -1,112 +0,0 @@
1714 -# Copyright 1999-2018 Gentoo Foundation
1715 -# Distributed under the terms of the GNU General Public License v2
1716 -
1717 -EAPI=6
1718 -
1719 -export CBUILD=${CBUILD:-${CHOST}}
1720 -export CTARGET=${CTARGET:-${CHOST}}
1721 -if [[ ${CTARGET} == ${CHOST} ]] ; then
1722 - if [[ ${CATEGORY} == cross-* ]] ; then
1723 - export CTARGET=${CATEGORY#cross-}
1724 - fi
1725 -fi
1726 -
1727 -WANT_AUTOMAKE="1.15"
1728 -
1729 -inherit autotools flag-o-matic eutils
1730 -
1731 -DESCRIPTION="Free Win64 runtime and import library definitions"
1732 -HOMEPAGE="http://mingw-w64.sourceforge.net/"
1733 -SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
1734 -
1735 -LICENSE="BSD"
1736 -SLOT="0"
1737 -KEYWORDS="~amd64 ~x86"
1738 -IUSE="headers-only idl libraries tools"
1739 -RESTRICT="strip"
1740 -
1741 -S="${WORKDIR}/mingw-w64-v${PV}"
1742 -
1743 -PATCHES=(
1744 - "${FILESDIR}/${P}-build.patch"
1745 -)
1746 -
1747 -is_crosscompile() {
1748 - [[ ${CHOST} != ${CTARGET} ]]
1749 -}
1750 -just_headers() {
1751 - use headers-only && [[ ${CHOST} != ${CTARGET} ]]
1752 -}
1753 -crt_with() {
1754 - just_headers && echo --without-$1 || echo --with-$1
1755 -}
1756 -crt_use_enable() {
1757 - just_headers && echo --without-$2 || use_enable "$@"
1758 -}
1759 -crt_use_with() {
1760 - just_headers && echo --without-$2 || use_with "$@"
1761 -}
1762 -
1763 -pkg_setup() {
1764 - if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
1765 - die "Invalid configuration"
1766 - fi
1767 -}
1768 -
1769 -src_prepare() {
1770 - default
1771 - eautoreconf
1772 -}
1773 -
1774 -src_configure() {
1775 - CHOST=${CTARGET} strip-unsupported-flags
1776 -
1777 - if ! just_headers; then
1778 - mkdir "${WORKDIR}/headers"
1779 - pushd "${WORKDIR}/headers" > /dev/null
1780 - CHOST=${CTARGET} "${S}/configure" \
1781 - --prefix="${T}/tmproot" \
1782 - --with-headers \
1783 - --without-crt \
1784 - || die
1785 - popd > /dev/null
1786 - append-cppflags "-I${T}/tmproot/include"
1787 - fi
1788 -
1789 - CHOST=${CTARGET} econf \
1790 - --prefix=/usr/${CTARGET} \
1791 - --includedir=/usr/${CTARGET}/usr/include \
1792 - --libdir=/usr/${CTARGET}/usr/lib \
1793 - --with-headers \
1794 - --enable-sdk \
1795 - $(crt_with crt) \
1796 - $(crt_use_enable idl idl) \
1797 - $(crt_use_with libraries libraries) \
1798 - $(crt_use_with tools tools) \
1799 - $(
1800 - $(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
1801 - && echo --disable-lib32 --enable-lib64 \
1802 - || echo --enable-lib32 --disable-lib64
1803 - )
1804 -}
1805 -
1806 -src_compile() {
1807 - if ! just_headers; then
1808 - emake -C "${WORKDIR}/headers" install
1809 - fi
1810 - default
1811 -}
1812 -
1813 -src_install() {
1814 - default
1815 -
1816 - if is_crosscompile ; then
1817 - # gcc is configured to look at specific hard-coded paths for mingw #419601
1818 - dosym usr /usr/${CTARGET}/mingw
1819 - dosym usr /usr/${CTARGET}/${CTARGET}
1820 - dosym usr/include /usr/${CTARGET}/sys-include
1821 - fi
1822 -
1823 - env -uRESTRICT CHOST=${CTARGET} prepallstrip
1824 - rm -rf "${ED}/usr/share"
1825 -}