dev-util/mingw64-runtime: cleanup old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

19 files changed, 0 insertions, 1660 deletions

diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index f589f7a41b38..479515f06b9d 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -1,11 +1,2 @@
-DIST mingw-w64-v3.0.0.tar.bz2 7012419 BLAKE2B a1c7f4cb1b25bfb8e44ae782895a7f6fd9deb17bcdfae3a6184a8da562fc2f371df693b2a423a58c626a327b3b70b20ae9ba10db0936dbfcc1236d6cc4f2af0e SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989
-DIST mingw-w64-v3.1.0.tar.bz2 7021162 BLAKE2B d7e757911ebedb57c7ad9d4a7926e6fbadc171caad1ad9c3e6117538bffff65e07e3e732a697abc0925293079d863240efbae3d58180052dc33e2eb6346dfbd7 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8
-DIST mingw-w64-v3.2.0.tar.bz2 7053254 BLAKE2B 29ba4837f8bf970a76a1a7159f58fba1058d805d4a6c033ba5d13eebb506dd5ef3d4a8dc11a253fc7b10350a813012194c0fcea9eb234d556e6577fd3197f4cc SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593
-DIST mingw-w64-v4.0.1.tar.bz2 10803072 BLAKE2B 7863b388a9cb011e9ff6e4adec9ef0b3842c7bfabca8812287dc5dff7ba9f2cf35a097322ec8e117fd41a36b7b05d305abd8e7c45747b76ea8fda85f037c276e SHA512 a216a09a460c56c29208aee1e1cdb428e856f9c8d59dd399723ccf6d549368f0a13a6aacb046d211ddec7c0a1f1c227d5dd599e4f0c33ba4b6d9c92bd0a7fa1b
-DIST mingw-w64-v4.0.4.tar.bz2 10812375 BLAKE2B 59180d741e0b4325a4c02690a21f8a04304e46744c5a986ef79a13fe1d68a1d25a7ff7866232e4f09937a3cb8442cb2497c781dd5cab42e11a1bbe2c5b76ddfd SHA512 06de6b592f776676184a9c50c63eb105c82a912965dee5d8217f9b5b325e0258c188f5d7d5e28aaeacf7bad44ce5d36bd837b9f1cbb91358754787738fb15146
-DIST mingw-w64-v4.0.6.tar.bz2 10853871 BLAKE2B a166692d4ddbf740f566abc844d577d38b9cfe436f4d0a55c7e8bca2708bd92c6cfe1be072fae428d88c682215d390ec1ff15b38485540adb2b77dd8724f1837 SHA512 c9ec75b10fe40d80e620b569ca8f452b1f78e9e4dd45ad087a2b69297dc661d06aa30255ea310786f28c042256c35a1d3e709ff7ea8bc19e7f4ea914c120f020
-DIST mingw-w64-v5.0.1.tar.bz2 9160780 BLAKE2B 52964e7ae113d8886648cb0395514067fa054840d153e86407317ccd2f299fccb6d21f76c773e1e2ef22b2c00b53728c18065091125a000750395e96fb601f05 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa
-DIST mingw-w64-v5.0.2.tar.bz2 9107077 BLAKE2B b8e3e614fe4a1ea6a4770efdd029300e923e3b7b39b71731692281da44f468b235d487d38d7e1b4396e1b44a4c60fcc7a67a6c1331fb46e339c13c86bf7de7bd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060
-DIST mingw-w64-v5.0.3.tar.bz2 9160627 BLAKE2B 941b40c426548564e8b2da0af8e917dad34bdbf0b05c63ea2127e39139bcce5d86e80433817483c64cd2a6ef6140a7818a76564ff5d9408614ecaa58f17b41e7 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9
 DIST mingw-w64-v5.0.4.tar.bz2 9163093 BLAKE2B fd039995c73690c12ddf1612d42edefbb572386b2ca8508fd5a5edd9e715ced41c05c62efec8eda07b9ec7a1e9e658bf3b3dedeb18695a076b5bc2067e86d68d SHA512 5b279222e86475a982e2aeb9fc14853f4fac0ca0c5a2d56f303584d1b348726afd99b0292a5ed050d326e7cb1434e5ad5b5dfdfb37c73fd08f13e7f4f4bcc046
 DIST mingw-w64-v6.0.0.tar.bz2 9045653 BLAKE2B 8a54dca2d06c92ab968a93240996d07ab3b1ed4652555a48b7581c477856d5784ed192c578d78186e171e400bd18b4de3c6cafbdd96109367ad13c37792015c1 SHA512 e3d3663e0cb33a16f90b1a33e81b5a30d26f7e34270b14e865c10068f2a2d32da9ef8cbbb0c3fed9c71429ae11c82152ff3b87d81558929b2a4993dc99cfc11e
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
deleted file mode 100644
index 6461b98e5044..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 67434f57cbb5aba791e9ca973a86859e0736f829 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 21:31:10 +0300
-Subject: [PATCH 2/2] build: autoconf: enable multiple tools and libs
-
-this somewhat reduces the error checking, but makes code and usage nicer.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 55 ++++++++++++-------------------------------------------
- 1 file changed, 12 insertions(+), 43 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b1..1b59821 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -56,32 +56,12 @@ AC_ARG_WITH([libraries],
-     [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
-   [],
-   [with_libraries=no])
--AS_CASE([$with_libraries],
--  [yes|all],[
--    with_libraries="libmangle,pseh,winpthreads"
--    with_libraries_winpthreads=yes
--    with_libraries_mangle=yes
--    with_libraries_pseh=yes],
--  [libmangle],[
--    with_libraries="libmangle"
--    with_libraries_winpthreads=no
--    with_libraries_mangle=yes
--    with_libraries_pseh=no],
--  [pseh],[
--    with_libraries="pseh"
--    with_libraries_winpthreads=no
--    with_libraries_mangle=no
--    with_libraries_pseh=yes],
--  [winpthreads],[
--    with_libraries="winpthreads"
--    with_libraries_winpthreads=yes
--    with_libraries_mangle=no
--    with_libraries_pseh=no],
--  [no],[
--    with_libraries_winpthreads=no
--    with_libraries_mangle=no
--    with_libraries_pseh=no],
--  [MW64_OPTION_ERROR([with-libraries])])
-+for l in winpthreads mangle pseh; do
-+  res=`echo "${with_libraries}" | grep $l > /dev/null && echo yes || echo no`
-+  AS_CASE([$with_libraries],
-+    [all|yes],[res=yes])
-+    AS_VAR_COPY([with_libraries_$l], [res])
-+done
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
- AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
-@@ -96,23 +76,12 @@ AC_ARG_WITH([tools],
-     [Build the extra mingw-w64 tools, where ARG is one of gendef, genidl, or all])],
-   [],
-   [with_tools=no])
--AS_CASE([$with_tools],
--  [yes|all],[
--    with_tools="gendef,genidl"
--    with_tools_gendef=yes
--    with_tools_genidl=yes],
--  [gendef],[
--    with_tools="gendef"
--    with_tools_gendef=yes
--    with_tools_genidl=no],
--  [genidl],[
--    with_tools="genidl"
--    with_tools_gendef=no
--    with_tools_genidl=yes],
--  [no],[
--    with_tools_gendef=no
--    with_tools_genidl=no],
--  [MW64_OPTION_ERROR([with-tools])])
-+for t in gendef genidl; do
-+  res=`echo "${with_tools}" | grep $t > /dev/null && echo yes || echo no`
-+  AS_CASE([$with_tools],
-+    [all|yes],[res=yes])
-+    AS_VAR_COPY([with_tools_$t], [res])
-+done
- AM_CONDITIONAL([TOOLS_GENDEF],[test "x$with_tools_gendef" = xyes])
- AM_CONDITIONAL([TOOLS_GENIDL],[test "x$with_tools_genidl" = xyes])
- AM_COND_IF([TOOLS_GENDEF],[AC_CONFIG_SUBDIRS([mingw-w64-tools/gendef])])
--- 
-2.3.6
-
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
deleted file mode 100644
index 0d3e59dc9dd5..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-4.0.1-winpthreads.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 0adec5d0e1c65fc4ce4f84f3d4bb6738e923e1de Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Mon, 4 May 2015 20:39:52 +0300
-Subject: [PATCH 1/2] build: autoconf: support winpthreads library
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- Makefile.am  |  6 +++++-
- configure.ac | 15 +++++++++++++--
- 2 files changed, 18 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 26a7606..308b6fd 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -14,6 +14,10 @@ if LIBRARIES_PSEH
-   MAYBE_LIBRARIES_PSEH = mingw-w64-libraries/pseh
- endif
- 
-+if LIBRARIES_WINPTHREADS
-+  MAYBE_LIBRARIES_WINPTHREADS = mingw-w64-libraries/winpthreads
-+endif
-+
- if TOOLS_GENDEF
-   MAYBE_TOOLS_GENDEF = mingw-w64-tools/gendef
- endif
-@@ -22,7 +26,7 @@ if TOOLS_GENIDL
-   MAYBE_TOOLS_GENIDL = mingw-w64-tools/genidl
- endif
- 
--SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
-+SUBDIRS = $(MAYBE_HEADER) $(MAYBE_CRT) $(MAYBE_LIBRARIES_MANGLE) $(MAYBE_LIBRARIES_PSEH) $(MAYBE_LIBRARIES_WINPTHREADS) $(MAYBE_TOOLS_GENDEF) $(MAYBE_TOOLS_GENIDL)
- 
- DISTCHECK_CONFIGURE_FLAGS = --with-headers --with-crt --with-libraries=all --with-tools=all
- 
-diff --git a/configure.ac b/configure.ac
-index 4bb3926..468d1b1 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -53,30 +53,41 @@ AC_MSG_RESULT([$with_crt])
- AC_MSG_CHECKING([whether to build the optional libraries])
- AC_ARG_WITH([libraries],
-   [AS_HELP_STRING([--with-libraries=ARG],
--    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, or all])],
-+    [Build the extra mingw-w64 libs, where ARG is one of libmangle, pseh, winpthreads, or all])],
-   [],
-   [with_libraries=no])
- AS_CASE([$with_libraries],
-   [yes|all],[
--    with_libraries="libmangle,pseh"
-+    with_libraries="libmangle,pseh,winpthreads"
-+    with_libraries_winpthreads=yes
-     with_libraries_mangle=yes
-     with_libraries_pseh=yes],
-   [libmangle],[
-     with_libraries="libmangle"
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=yes
-     with_libraries_pseh=no],
-   [pseh],[
-     with_libraries="pseh"
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=no
-     with_libraries_pseh=yes],
-+  [winpthreads],[
-+    with_libraries="winpthreads"
-+    with_libraries_winpthreads=yes
-+    with_libraries_mangle=no
-+    with_libraries_pseh=no],
-   [no],[
-+    with_libraries_winpthreads=no
-     with_libraries_mangle=no
-     with_libraries_pseh=no],
-   [MW64_OPTION_ERROR([with-libraries])])
- AM_CONDITIONAL([LIBRARIES_MANGLE],[test "x$with_libraries_mangle" = xyes])
- AM_CONDITIONAL([LIBRARIES_PSEH],[test "x$with_libraries_pseh" = xyes])
-+AM_CONDITIONAL([LIBRARIES_WINPTHREADS],[test "x$with_libraries_winpthreads" = xyes])
- AM_COND_IF([LIBRARIES_MANGLE],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/libmangle])])
- AM_COND_IF([LIBRARIES_PSEH],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/pseh])])
-+AM_COND_IF([LIBRARIES_WINPTHREADS],[AC_CONFIG_SUBDIRS([mingw-w64-libraries/winpthreads])])
- AC_MSG_RESULT([$with_libraries])
- 
- AC_MSG_CHECKING([whether to build the optional tools])
--- 
-2.3.6
-
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
deleted file mode 100644
index 859e00243d33..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-implicit-fallthrough.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/mingw-w64-tools/gendef/src/gendef.c b/mingw-w64-tools/gendef/src/gendef.c
-index a935abfe..cefdd8cb 100644
---- a/mingw-w64-tools/gendef/src/gendef.c
-+++ b/mingw-w64-tools/gendef/src/gendef.c
-@@ -1031,13 +1031,16 @@ redo_switch:
-     PRDEBUG(" 0x%x illegal ", (unsigned int) b);
- #endif
-     *aCode=c_ill; return 0;
--  case c_4: sz++;
--  case c_3: sz++;
--  case c_lb:
--  case c_2: sz++;
--  case c_retn: case c_retf:
--  case c_iret: case c_int3:
--  case c_ad: case c_op:
-+  case c_4: sz++; // fallthrough
-+  case c_3: sz++; // fallthrough
-+  case c_lb: // fallthrough
-+  case c_2: sz++; // fallthrough
-+  case c_retn: // fallthrough
-+  case c_retf: // fallthrough
-+  case c_iret: // fallthrough
-+  case c_int3: // fallthrough
-+  case c_ad: // fallthrough
-+  case c_op: // fallthrough
-   case c_1: *aCode=tb1; return sz;
-   case c_lv:
-     if (oper_mode) sz+=4;
-diff --git a/mingw-w64-tools/genpeimg/src/genpeimg.c b/mingw-w64-tools/genpeimg/src/genpeimg.c
-index b2430bbc..6a37b1a0 100644
---- a/mingw-w64-tools/genpeimg/src/genpeimg.c
-+++ b/mingw-w64-tools/genpeimg/src/genpeimg.c
-@@ -203,7 +203,7 @@ pass_args (int argc, char **argv)
- 	  goto error_point;
- 	case 'h':
- 	  if (h[2] == 0)
--	    show_usage ();
-+	    show_usage (); // fallthrough
- 	default:
- error_point:
- 	  fprintf (stderr, "Unknown option ,%s'\n", h);
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
deleted file mode 100644
index a7a0a09dc162..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.2-locale.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/mingw-w64-crt/lib32/msvcrt.def.in
-+++ b/mingw-w64-crt/lib32/msvcrt.def.in
-@@ -138,6 +138,7 @@ _copysign
- _cprintf
- _cputs
- _creat
-+_create_locale
- _cscanf
- _ctype DATA
- _cwait
-@@ -192,6 +193,7 @@ _fpieee_flt
- _fpreset DATA
- _fputchar
- _fputwchar
-+_free_locale
- _fsopen
- _fstat
- _fstat32 == _fstat
---- a/mingw-w64-crt/lib64/msvcrt.def.in
-+++ b/mingw-w64-crt/lib64/msvcrt.def.in
-@@ -240,6 +240,7 @@ _cprintf_p_l
- _cputs
- _cputws
- _creat
-+_create_locale
- _cscanf
- _cscanf_l
- _cscanf_s
-@@ -315,6 +316,7 @@ _fputchar
- _fputwchar
- _fscanf_l
- _fscanf_s_l
-+_free_locale
- _fsopen
- _fstat
- _fstat64
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
deleted file mode 100644
index 624a492338e3..000000000000
--- a/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cb860ab6fba86f646bcd3bff6cadcc2bdd3c6964 Mon Sep 17 00:00:00 2001
-From: Alon Bar-Lev <alon.barlev@gmail.com>
-Date: Sat, 4 Nov 2017 21:58:10 +0200
-Subject: [PATCH] build: enable pseh only in x86
-
-pseh supports only x86, no point in enabling it when libraries are
-enabled. This enables downstream to enable libraries without failing.
-
-Signed-off-by: Alon Bar-Lev <alon.barlev@gmail.com>
----
- configure.ac | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 468d1b19..cfb07362 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,10 +58,14 @@ AC_ARG_WITH([libraries],
-   [with_libraries=no])
- AS_CASE([$with_libraries],
-   [yes|all],[
--    with_libraries="libmangle,pseh,winpthreads"
-+    with_libraries="libmangle,winpthreads"
-     with_libraries_winpthreads=yes
-     with_libraries_mangle=yes
--    with_libraries_pseh=yes],
-+    AS_CASE([$host_cpu],
-+      [i?86], [
-+        with_libraries="$with_libraries,pseh"
-+        with_libraries_pseh=yes
-+      ])],
-   [libmangle],[
-     with_libraries="libmangle"
-     with_libraries_winpthreads=no
--- 
-2.13.6
-
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.0.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.1.0.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
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
deleted file mode 100644
index 4397725c87a9..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-3.2.0-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_configure() {
-	local extra_conf=()
-
-	if just_headers; then
-		extra_conf+=( --without-crt )
-	else
-		extra_conf+=( --with-crt )
-	fi
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} strip-unsupported-flags
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(use_enable idl) \
-		"${extra_conf[@]}"
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
deleted file mode 100644
index 3bb7305cf0f7..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-winpthreads.patch"
-	epatch "${FILESDIR}/${P}-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	local extra_conf=()
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		"${extra_conf[@]}"
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
deleted file mode 100644
index f279453e0e46..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	local extra_conf=()
-
-	case ${CTARGET} in
-	x86_64*) extra_conf+=( --disable-lib32 --enable-lib64 ) ;;
-	i?86*) extra_conf+=( --enable-lib32 --disable-lib64 ) ;;
-	*) die "Unsupported ${CTARGET}" ;;
-	esac
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		"${extra_conf[@]}"
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
deleted file mode 100644
index 2a6523281428..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-4.0.6.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	epatch "${FILESDIR}/${PN}-4.0.1-build.patch"
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
deleted file mode 100644
index d013a17c428a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
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
deleted file mode 100644
index 25df5eae738c..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-	"${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
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
deleted file mode 100644
index 5141174deb44..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-	"${FILESDIR}/${PN}-5.0.2-implicit-fallthrough.patch"
-	"${FILESDIR}/${PN}-5.0.2-locale.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
deleted file mode 100644
index d013a17c428a..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.2.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-winpthreads.patch"
-	"${FILESDIR}/${PN}-4.0.1-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl) \
-		$(crt_use_with libraries libraries winpthreads,libmangle) \
-		$(crt_use_with tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
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
deleted file mode 100644
index 68655a1ed3a5..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	is_crosscompile && use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix="${EPREFIX}"$(alt_prefix) \
-		--includedir="${EPREFIX}"$(alt_prefix)/usr/include \
-		--libdir="${EPREFIX}"$(alt_prefix)/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
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
deleted file mode 100644
index e52536087f3e..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3-r2.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only
-}
-alt_prefix() {
-	is_crosscompile && echo /usr/${CTARGET}
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	# By default configure tries to set --sysroot=${prefix}. We disable
-	# this behaviour with --with-sysroot=no to use gcc's sysroot default.
-	# That way we can cross-build mingw64-runtime with cross-emerge.
-	CHOST=${CTARGET} econf \
-		--with-sysroot=no \
-		--prefix="${EPREFIX}"$(alt_prefix)/usr \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}
diff --git a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
deleted file mode 100644
index 225bba7d7322..000000000000
--- a/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY} == cross-* ]] ; then
-		export CTARGET=${CATEGORY#cross-}
-	fi
-fi
-
-WANT_AUTOMAKE="1.15"
-
-inherit autotools flag-o-matic eutils
-
-DESCRIPTION="Free Win64 runtime and import library definitions"
-HOMEPAGE="http://mingw-w64.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${PV}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="headers-only idl libraries tools"
-RESTRICT="strip"
-
-S="${WORKDIR}/mingw-w64-v${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-build.patch"
-)
-
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-just_headers() {
-	use headers-only && [[ ${CHOST} != ${CTARGET} ]]
-}
-crt_with() {
-	just_headers && echo --without-$1 || echo --with-$1
-}
-crt_use_enable() {
-	just_headers && echo --without-$2 || use_enable "$@"
-}
-crt_use_with() {
-	just_headers && echo --without-$2 || use_with "$@"
-}
-
-pkg_setup() {
-	if [[ ${CBUILD} == ${CHOST} ]] && [[ ${CHOST} == ${CTARGET} ]] ; then
-		die "Invalid configuration"
-	fi
-}
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	CHOST=${CTARGET} strip-unsupported-flags
-
-	if ! just_headers; then
-		mkdir "${WORKDIR}/headers"
-		pushd "${WORKDIR}/headers" > /dev/null
-		CHOST=${CTARGET} "${S}/configure" \
-			--prefix="${T}/tmproot" \
-			--with-headers \
-			--without-crt \
-			|| die
-		popd > /dev/null
-		append-cppflags "-I${T}/tmproot/include"
-	fi
-
-	CHOST=${CTARGET} econf \
-		--prefix=/usr/${CTARGET} \
-		--includedir=/usr/${CTARGET}/usr/include \
-		--libdir=/usr/${CTARGET}/usr/lib \
-		--with-headers \
-		--enable-sdk \
-		$(crt_with crt) \
-		$(crt_use_enable idl idl) \
-		$(crt_use_with libraries libraries) \
-		$(crt_use_with tools tools) \
-		$(
-			$(tc-getCPP ${CTARGET}) ${CPPFLAGS} -dM - < /dev/null | grep -q __MINGW64__ \
-				&& echo --disable-lib32 --enable-lib64 \
-				|| echo --enable-lib32 --disable-lib64
-		)
-}
-
-src_compile() {
-	if ! just_headers; then
-		emake -C "${WORKDIR}/headers" install
-	fi
-	default
-}
-
-src_install() {
-	default
-
-	if is_crosscompile ; then
-		# gcc is configured to look at specific hard-coded paths for mingw #419601
-		dosym usr /usr/${CTARGET}/mingw
-		dosym usr /usr/${CTARGET}/${CTARGET}
-		dosym usr/include /usr/${CTARGET}/sys-include
-	fi
-
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	rm -rf "${ED}/usr/share"
-}