8 files changed, 8 insertions, 330 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index bdef4cf19059..bffc9d0ab2d3 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 656d7fcae3b9..51414842ead2 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -2,8 +2,8 @@ DIST diffoscope-238.tar.gz 3287285 BLAKE2B d745c0b279ce6e29cbe9c6655c48d2fb4c8d2
 DIST diffoscope-240.tar.gz 3167743 BLAKE2B e6eb9f7499ea7d82d9a98de175f61c044051c987061d740599f490361099ecc568d8e557f9473404ca1002c4b91939b768dd7577ba45705e9880a3e17e3729ac SHA512 3d31e19762e9f5adfe12c16fc52bc0156f3036541de01cbc260c07ebbcab54eaa23b4b9f9c2afc3c791137f7e6cc375de06528f64e0771cbebd9e23f310a6e2b
 DIST diffoscope-241.tar.gz 3167718 BLAKE2B eb69f65a63e764db886c6057a19746a5ae7f4f5cd760c8a568412084dbf03da368a584d7d5b1f637e1d2e39b6fc430d077be526fd3199d5583e3f9026f897490 SHA512 82526a4bf3885b58fef74143bc75193fc9af2692def097835cc3c820e5055b22544872c0e1a8f13fb1434172cf1cc2b3664b2d2776590195b0580c5c0b3f4d57
 DIST diffoscope-242.tar.gz 3167814 BLAKE2B d6f63f94e312cd9bb48858dd82e50bcae065cd25f332a08940b22d36df75993cd43614ae44cbae3360c38ae30b7910a062ece294680b58b2a654ca3ead078795 SHA512 3d724a2349d2040d7072b81b8a77bae75aabe3f39c661c1d68a9f6e76b75048225262b8a9932c39e56429ec4937a398ca45e9f9abd23505aa511a7a8a81f3ab6
-EBUILD diffoscope-238.ebuild 3575 BLAKE2B 73da8bb1fefaf3b4386b7f85ca3579cdd19ce296eb67603eb5106b85be0d5eaa729c6e63c4b2a962787dca210f934d99383c10c2e50a6be74bf66851799d65b3 SHA512 6e04cd441cb9021b094061a7e217c27bf005d954dac711438e52411df676468847edda78800b63c32261b0dc45c119c36b2eac4864b57639cb029eef89447221
-EBUILD diffoscope-240.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
-EBUILD diffoscope-241.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
-EBUILD diffoscope-242.ebuild 3577 BLAKE2B 24f34c7c52e646308106a841f1f3b5ef0795386d1bd514f93ea40ed03b752d328a4884219f88818486853f9f3f52433d32cb4d8f8744842ac01018ddc28308c8 SHA512 cece2cffa44e55eb15d025f44c624c1439a509adccee82e0754b43b4dc3b61e9e580a7c0b556b899f032a76c1df4083e76dccaa82474cb1518f31e2d6a6acf32
+EBUILD diffoscope-238-r1.ebuild 3574 BLAKE2B 799326aa1c446368fcb0d4374a54c1cf8b4a010ccf9379ce62a8dfb9dfd5c634f1427a9eb3ff37e5fd13fa6d914c6186d2977571824f8e2c80de1738933f2105 SHA512 1dc6559cb5d140b629bc22373f318e305e3daa03d550268a84bc99e43826067338cc82a81923e2bf823dc048b6289f24196f57df984df1a21685820739493965
+EBUILD diffoscope-240-r1.ebuild 3576 BLAKE2B 9ca0b96b676968af02315e7fed3c1f636adc0c529c6491a8a1d91726af515d02ff9d5972669a370773ef6510972fe602533d9db5ba4417fa0d8944fb6a849f38 SHA512 c131de19ec67bf7de1a636ffdc0ac97c41c5888574f3b168a7f64ea50fb896fa8d1fe3af21aba8ab3933ae6140aecdff152abb411e59054c6dff5277ef97c784
+EBUILD diffoscope-241-r1.ebuild 3576 BLAKE2B 9ca0b96b676968af02315e7fed3c1f636adc0c529c6491a8a1d91726af515d02ff9d5972669a370773ef6510972fe602533d9db5ba4417fa0d8944fb6a849f38 SHA512 c131de19ec67bf7de1a636ffdc0ac97c41c5888574f3b168a7f64ea50fb896fa8d1fe3af21aba8ab3933ae6140aecdff152abb411e59054c6dff5277ef97c784
+EBUILD diffoscope-242-r1.ebuild 3576 BLAKE2B 9ca0b96b676968af02315e7fed3c1f636adc0c529c6491a8a1d91726af515d02ff9d5972669a370773ef6510972fe602533d9db5ba4417fa0d8944fb6a849f38 SHA512 c131de19ec67bf7de1a636ffdc0ac97c41c5888574f3b168a7f64ea50fb896fa8d1fe3af21aba8ab3933ae6140aecdff152abb411e59054c6dff5277ef97c784
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-238.ebuild b/dev-util/diffoscope/diffoscope-238-r1.ebuild
index aed6066b3722..f4934e958eda 100644
--- a/dev-util/diffoscope/diffoscope-238.ebuild
+++ b/dev-util/diffoscope/diffoscope-238-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
 	rpm? ( app-arch/rpm )
 	sqlite? ( dev-db/sqlite:3 )
 	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
+	ssh? ( virtual/openssh )
 	tar? ( app-arch/tar )
 	tcpdump? ( net-analyzer/tcpdump )
 	zip? ( app-arch/unzip )
diff --git a/dev-util/diffoscope/diffoscope-240.ebuild b/dev-util/diffoscope/diffoscope-240-r1.ebuild
index d598e5340b57..d201f2eeaae5 100644
--- a/dev-util/diffoscope/diffoscope-240.ebuild
+++ b/dev-util/diffoscope/diffoscope-240-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
 	rpm? ( app-arch/rpm )
 	sqlite? ( dev-db/sqlite:3 )
 	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
+	ssh? ( virtual/openssh )
 	tar? ( app-arch/tar )
 	tcpdump? ( net-analyzer/tcpdump )
 	zip? ( app-arch/unzip )
diff --git a/dev-util/diffoscope/diffoscope-241.ebuild b/dev-util/diffoscope/diffoscope-241-r1.ebuild
index d598e5340b57..d201f2eeaae5 100644
--- a/dev-util/diffoscope/diffoscope-241.ebuild
+++ b/dev-util/diffoscope/diffoscope-241-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
 	rpm? ( app-arch/rpm )
 	sqlite? ( dev-db/sqlite:3 )
 	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
+	ssh? ( virtual/openssh )
 	tar? ( app-arch/tar )
 	tcpdump? ( net-analyzer/tcpdump )
 	zip? ( app-arch/unzip )
diff --git a/dev-util/diffoscope/diffoscope-242.ebuild b/dev-util/diffoscope/diffoscope-242-r1.ebuild
index d598e5340b57..d201f2eeaae5 100644
--- a/dev-util/diffoscope/diffoscope-242.ebuild
+++ b/dev-util/diffoscope/diffoscope-242-r1.ebuild
@@ -61,7 +61,7 @@ RDEPEND="
 	rpm? ( app-arch/rpm )
 	sqlite? ( dev-db/sqlite:3 )
 	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
+	ssh? ( virtual/openssh )
 	tar? ( app-arch/tar )
 	tcpdump? ( net-analyzer/tcpdump )
 	zip? ( app-arch/unzip )
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 304d9d098848..efb01a8c0e80 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -10,6 +10,5 @@ DIST gcc-13.1.0.tar.xz 87451196 BLAKE2B b956a773cffe8b43bd6c9a99fe614f53f6654389
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
 DIST mingw-w64-v11.0.0.tar.bz2 10058657 BLAKE2B 3f7637bcc7c3f25b2141d35105ea086eab74e228d7275725ffb4f07e283fd75169dbe0900a9c29494fba9ddb2ea03bdd6ae26f06048311e9c93ae3e317c4c060 SHA512 bc1c9fd9d8593ead9375fcbe40950f06cf7616b94dc676db2793ac9b496fe3a6cc94b5793effda3b752942be0d7d01a1c37a8f221aaf178df0d4eeb0aa6d1f8d
 EBUILD mingw64-toolchain-10.0.0_p1-r2.ebuild 9715 BLAKE2B 42bb3caaee09901b0d0ab7e90f3f53fefd3d220e4a99305130c504c387661595789acffd6ef65cdfac549f037ebfaf17294bdea287646634dd34cdccf8c9bbee SHA512 79f4bb56176112f4e77b9d7b1c8a309d56ff261fb0805a65be0dea7629163fe7d9a93fb800ea006b4d71751cb6bddff929de5491e1e84e322874470d943a146d
-EBUILD mingw64-toolchain-10.0.0_p4.ebuild 9936 BLAKE2B 4a8b9b7d14b3421c75e2b7b2cbc2aa0eea576c02c60bd2f07ace8be45371d999c5041ae60020c35a86941491fcfe33d31de1b88e547e4f6a7ee69a1622ddceda SHA512 a5e05cba57d34d9f41b4939da950749cf192f5fcb84a4c4d7417c2afe80ffca018e80054e27002584c259e14d13c0edc98f7d2356e68ff09d94da3cc1d87de38
 EBUILD mingw64-toolchain-11.0.0.ebuild 9717 BLAKE2B f9b83c2162ce0bc13fff25fd9cb6d8335b8daf7ddcd92f422d2d16e72a9034e829c894bd9841573c9abcdada9b2c6e57f05e5602fe811dc128e66da10a6168d9 SHA512 e0db83744186966384953a601274593b5d3b75fc7c34692faae07542c5b8b37b0795cd23c8dcab9fad562310ace468b017568b3dc64f1f7ebd589c75ab538ff4
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild
deleted file mode 100644
index daed2fea783e..000000000000
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p4.ebuild
+++ /dev/null
@@ -1,321 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-MULTILIB_COMPAT=( abi_x86_{32,64} )
-inherit edo flag-o-matic multilib-build toolchain-funcs
-
-# Pick versions known to work for wine+dxvk, and avoid too frequent updates
-# due to slow rebuilds. Do _p1++ rather than revbump on changes (not using
-# Gentoo patchsets for simplicity, their changes are mostly unneeded here).
-BINUTILS_PV=2.40
-GCC_PV=13.1.0
-MINGW_PV=$(ver_cut 1-3)
-
-DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
-HOMEPAGE="
-	https://www.mingw-w64.org/
-	https://gcc.gnu.org/
-	https://sourceware.org/binutils/"
-SRC_URI="
-	mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
-	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz"
-if [[ ${GCC_PV} == *-* ]]; then
-	SRC_URI+=" mirror://gcc/snapshots/${GCC_PV}/gcc-${GCC_PV}.tar.xz"
-else
-	SRC_URI+="
-		mirror://gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
-		mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz"
-fi
-S="${WORKDIR}"
-
-# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
-LICENSE="
-	GPL-3+
-	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
-	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+abi_x86_32 custom-cflags debug"
-
-RDEPEND="
-	dev-libs/gmp:=
-	dev-libs/mpc:=
-	dev-libs/mpfr:=
-	sys-libs/zlib:=
-	virtual/libiconv"
-DEPEND="${RDEPEND}"
-
-QA_CONFIG_IMPL_DECL_SKIP=(
-	strerror_r # libstdc++ test using -Wimplicit+error
-)
-
-PATCHES=(
-	"${FILESDIR}"/mingw64-runtime-10.0.0-msvcr-extra-race.patch
-	"${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch
-	"${FILESDIR}"/binutils-2.40-import-lib.patch
-	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} == binary ]] && return
-
-	tc-is-cross-compiler &&
-		die "cross-compilation of the toolchain itself is unsupported"
-}
-
-src_prepare() {
-	# rename directories to simplify both patching and the ebuild
-	mv binutils{-${BINUTILS_PV},} || die
-	mv gcc{-${GCC_PV},} || die
-	mv mingw-w64-v${MINGW_PV} mingw64 || die
-
-	default
-}
-
-src_compile() {
-	# not great but do everything in src_compile given bootstrapping
-	# process needs to be done in steps of configure+compile+install
-	# (done modular to have most package-specific things in one place)
-
-	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
-
-	MWT_D=${T}/root # moved to ${D} in src_install
-	local mwtdir=/usr/lib/${PN}
-	local prefix=${EPREFIX}${mwtdir}
-	local sysroot=${MWT_D}${prefix}
-	local -x PATH=${sysroot}/bin:${PATH}
-
-	filter-lto # requires setting up, and may be messy with mingw static libs
-	use custom-cflags || strip-flags # fancy flags are not realistic here
-
-	local multilib=false
-	use abi_x86_32 && use abi_x86_64 && multilib=true
-
-	# global configure flags
-	local conf=(
-		--build=${CBUILD:-${CHOST}}
-		--target=${CTARGET}
-		--{doc,info,man}dir=/.skip # let individual packages handle docs
-	)
-
-	# binutils
-	local conf_binutils=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-cet
-		--disable-default-execstack
-		--disable-nls
-		--disable-shared
-		--with-system-zlib
-		--without-debuginfod
-		--without-msgpack
-		--without-zstd
-	)
-	mwt-binutils() {
-		# symlink gcc's lto plugin for AR (bug #854516)
-		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%[.-]*}/liblto_plugin.so \
-			"${sysroot}"/lib/bfd-plugins || die
-	}
-
-	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
-	local conf_gcc=(
-		--prefix="${prefix}"
-		--host=${CHOST}
-		--disable-bootstrap
-		--disable-cet
-		--disable-gcov #843989
-		--disable-gomp
-		--disable-libquadmath
-		--disable-libsanitizer
-		--disable-libssp
-		--disable-libvtv
-		--disable-shared
-		--disable-werror
-		--with-gcc-major-version-only
-		--with-system-zlib
-		--without-isl
-		--without-zstd
-	)
-	${multilib} || conf_gcc+=( --disable-multilib )
-
-	local conf_gcc_stage1=(
-		--enable-languages=c
-		--disable-libatomic
-		--with-sysroot="${sysroot}"
-	)
-	local -n conf_gcc_stage2=conf_gcc_stage1
-
-	local conf_gcc_stage3=(
-		--enable-languages=c,c++
-		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
-		--with-sysroot="${prefix}"
-		--with-build-sysroot="${sysroot}"
-	)
-
-	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
-	local conf_mingw64=(
-		--prefix="${prefix}"/${CTARGET}
-		--host=${CTARGET}
-		--with-sysroot=no
-		--without-{crt,headers}
-
-		# mingw .dll aren't used by wine and packages wouldn't find them
-		# at runtime, use crossdev if need dll and proper search paths
-		--disable-shared
-	)
-
-	local conf_mingw64_headers=(
-		--enable-idl
-		--with-headers
-	)
-	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
-
-	local conf_mingw64_runtime=( --with-crt )
-	${multilib} ||
-		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
-
-	local conf_mingw64_libraries=( --with-libraries )
-	local conf_mingw64_libraries32=(
-		--libdir="${prefix}"/${CTARGET}/lib32
-		--with-libraries
-		CC="${CTARGET}-gcc -m32"
-		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
-	)
-
-	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
-	local conf_widl=( --prefix="${prefix}" )
-
-	# mwt-build [-x] <path/package-name> [stage-name]
-	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
-	# passes conf, conf_package, and conf_package_stage arrays to configure, and
-	# users can add options through environment with e.g.
-	#	MWT_BINUTILS_CONF="--some-option"
-	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
-	#	MWT_WIDL_CONF="--some-other-option"
-	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
-	mwt-build() {
-		if [[ ${1} == -x ]]; then
-			(
-				# cross-compiling, cleanup and let ./configure handle it
-				unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
-				CHOST=${CTARGET}
-				filter-flags '-fstack-clash-protection' #758914
-				filter-flags '-fstack-protector*' #870136
-				filter-flags '-fuse-ld=*'
-				filter-flags '-mfunction-return=thunk*' #878849
-				strip-unsupported-flags
-				mwt-build "${@:2}"
-			)
-			return
-		fi
-
-		local id=${1##*/}
-		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
-
-		# econf is not allowed in src_compile and its defaults are
-		# mostly unused here, so use configure directly
-		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
-
-		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
-		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
-		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
-
-		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
-		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
-
-		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
-
-		mkdir -p "${build_dir}" || die
-		pushd "${build_dir}" >/dev/null || die
-
-		edo "${conf[@]}"
-		emake
-		emake DESTDIR="${MWT_D}" install
-
-		declare -f mwt-${id} >/dev/null && edo mwt-${id}
-		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
-
-		popd >/dev/null || die
-	}
-
-	# workaround race condition with out-of-source crt build (bug #879537)
-	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
-
-	# build with same ordering that crossdev would do + stage3 for pthreads
-	mwt-build binutils
-	mwt-build mingw64 headers
-	mwt-build gcc stage1
-	mwt-build -x mingw64 runtime
-	mwt-build gcc stage2
-	${multilib} && mwt-build -x mingw64 libraries32
-	mwt-build -x mingw64 libraries
-	mwt-build gcc stage3
-	mwt-build mingw64/mingw-w64-tools/widl
-	# note: /could/ system-bootstrap if already installed, but gcc and
-	# libraries will use the system's older mingw64 headers/static-libs
-	# and make this potentially fragile without more workarounds/stages
-
-	if ${multilib}; then
-		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
-		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
-		# just without 64bit support and would rather not build the toolchain
-		# twice. Dirty but wrap to allow simple interoperability with crossdev.
-		mwt-i686_wrapper() {
-			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
-				> ${bin32} || die
-			chmod +x ${bin32} || die
-		}
-		pushd "${sysroot}"/bin >/dev/null || die
-		local bin bin32
-		for bin in ${CTARGET}-*; do
-			bin32=${bin/x86_64-w64/i686-w64}
-			case ${bin#${CTARGET}-} in
-				as) mwt-i686_wrapper --32;;
-				cpp|gcc|gcc-${GCC_PV%%[.-]*}|g++|widl) mwt-i686_wrapper -m32;;
-				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
-				windres) mwt-i686_wrapper --target=pe-i386;;
-				*) ln -s ${bin} ${bin32} || die;;
-			esac
-		done
-		popd >/dev/null || die
-	fi
-
-	# portage doesn't know the right strip executable to use for CTARGET
-	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
-	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
-
-	# ... and instead do it here given this saves ~60MB
-	if use !debug; then
-		einfo "Stripping ${CTARGET} static libraries ..."
-		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
-			-exec ${CTARGET}-strip --strip-unneeded {} + || die
-	fi
-}
-
-src_install() {
-	mv "${MWT_D}${EPREFIX}"/* "${ED}" || die
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog "Note that this package is primarily intended for Wine and related"
-		elog "packages to depend on without needing a manual crossdev setup."
-		elog
-		elog "Settings are oriented only for what these need and simplicity."
-		elog "Use sys-devel/crossdev if need full toolchain/customization:"
-		elog "    https://wiki.gentoo.org/wiki/Mingw"
-		elog "    https://wiki.gentoo.org/wiki/Crossdev"
-	fi
-
-	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
-	if has_version ${cross_gcc}; then
-		# encourage cleanup given users may not realize if switch by default
-		ewarn "${cross_gcc} is installed, note that ${PN}"
-		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
-		ewarn "packages and optionally only one needs to be kept."
-	fi
-}