gentoo resync : 10.11.2017

3 files changed, 152 insertions, 0 deletions

diff --git a/dev-util/mingw64-runtime/Manifest b/dev-util/mingw64-runtime/Manifest
index 7a36a8d2278c..ec9c83a0aa20 100644
--- a/dev-util/mingw64-runtime/Manifest
+++ b/dev-util/mingw64-runtime/Manifest
@@ -2,6 +2,7 @@ AUX mingw64-runtime-4.0.1-build.patch 2981 SHA256 35e3dcd14c23241a1eedcaaad25f99
 AUX mingw64-runtime-4.0.1-winpthreads.patch 3142 SHA256 fd9039cb2ff117a661c15a70868af66c44e38206acd158cffa3ed6767939aad8 SHA512 5a4e34257f0eb9f3f9b51677459111b08b389dbebf3f29d30d99dcccd06e41bf1b82d6d0a1ce01fbfa5c0833bff205679203a0146d77b5416ef277c4c047a492 WHIRLPOOL 4dfdc48f45f122869734f22acd75549af9815e472184cb0cb3f87fc8b0f4389f9799af17702c0add54ef93a50e58e3a37141e6f0636ca29a7ceb78a49bc12df5
 AUX mingw64-runtime-5.0.2-implicit-fallthrough.patch 1329 SHA256 4413a9bb9a1d29523f431afdb2f1e22eb5b51673315391dceef1fe93075106a4 SHA512 9de46f074d42fd7dcc7b9ce01343eae22d803a8f20662b57e309aad5c7f349552048fe2ab39983b5f7e4b7b703617e6e884ef2714c9a67ea47129d4ae6dd1f8b WHIRLPOOL 3bedd399bfe152801133fdebd72c09bad5fc86d1314fce7cc34433479e7df86b01920f5d774ea598170fe2c9e80ecf6efc2591a2ddbd6a6235e27146d5f8e2b9
 AUX mingw64-runtime-5.0.2-locale.patch 595 SHA256 450f0ae42d30a66ae5aaa356227f43467a646d241fd7f3978368ba6b782e5136 SHA512 82d1fc293be628f8e967a108001d0e04c53e6c4581be2aa954e05c07e52473a6ffb4cedffc1f27202ea607316e6d38e64997ccc8d3eaee44125ec795d9a30553 WHIRLPOOL c9d151e39c688ffdc520e218229d3ffb3759f2fdfe718e66680506d2ffc2a4580004cf72a43fe8e50b0956a35f3fd55a9cf2559225019310f80b5da2577b0993
+AUX mingw64-runtime-5.0.3-build.patch 1116 SHA256 79352f2e9870a2bf002132067b2880b13d0f81ce4e3681ed4f0005ebdc4453ba SHA512 5f3cebbb246e831617e020e240b8c700be0c31e7fe85a0da30ee36b2e5184fff4061ea205e4e7afa6105d8fcc79b8a956238a6342c314b8c3b38d2da6a8cc0ec WHIRLPOOL 6f011701bb80cbe25169b8387868ef9c4576cc8fb4b99bc1d9c2126231dfb196f1bbaf11993dbe4e1c3c559ad64e9a1844a67337b2a803f0310ba1ac5ac8b6c0
 DIST mingw-w64-v3.0.0.tar.bz2 7012419 SHA256 ffd381a53cb774843667ccdaeb3a23f86be77b0344355e1a5947b3ceb8343c67 SHA512 7fc438908328ae4429f79dfaaae92bc7e88bc0f46517bdebdc3c45b3e8062ff6c27f166eb51103c2d49aae01851d82f33e0b031c8d98198baaeb119e19221989 WHIRLPOOL ea2820ab24dcd6f35fab0404b2bd26273b117731bb25e2e3ef753e9a3a9b6661564605cdae7ed5e6e4f9fc6b3c3d000761fa44afa19f79b5d6deaebca44f709c
 DIST mingw-w64-v3.1.0.tar.bz2 7021162 SHA256 ece7a7e7e1ab5e25d5ce469f8e4de7223696146fffa71c16e2a9b017d0e017d2 SHA512 9f418694aa0f072e2f08766fcee8929ac3022187750028781336243e050495b9709bb9ae87b4a83a8e9d3856478c525d8636277a4c219e282421b269dafa68d8 WHIRLPOOL 90a3a7056df7c4da2e605da1578e65b16e0f831370d8b1d399fed48945828604a94f9402b2d53bc4ca26623f1d34e6c45c862bf1f7590ddf9325fd4a053a18fb
 DIST mingw-w64-v3.2.0.tar.bz2 7053254 SHA256 78a0de610829a1145ae12c4a29603344963a0b8156ba39a9a31a0e79c3b29142 SHA512 dd483bcf7ba0e698a33a0b02a811b181e601cd344b87dafd0f6c477f68efb9a617a4109046fd06735242623f87833cf97688f057583e1378d6d84e7818927593 WHIRLPOOL 99ba5ddaa99c40309d12d75d3953deaf9cc31280ad2446793d1525702963edd1b33e91053e99bdfd06d37980049d30b7fb4e9f3a5358f8277c2fabe587c56037
@@ -10,6 +11,7 @@ DIST mingw-w64-v4.0.4.tar.bz2 10812375 SHA256 89356a0aa8cf9f8b9dc8d92bc8dd01a131
 DIST mingw-w64-v4.0.6.tar.bz2 10853871 SHA256 0c407394b0d8635553f4fbca674cdfe446aac223e90b4010603d863e4bdd015c SHA512 c9ec75b10fe40d80e620b569ca8f452b1f78e9e4dd45ad087a2b69297dc661d06aa30255ea310786f28c042256c35a1d3e709ff7ea8bc19e7f4ea914c120f020 WHIRLPOOL 69015094c14f66e1102d343b220eb17cc245f24a66c1a39ffced2f155cae84315eabb9a843bd9aa8e7874a12e34297a4f7cfff06447972a17beecf070bc70b08
 DIST mingw-w64-v5.0.1.tar.bz2 9160780 SHA256 9bb5cd7df78817377841a63555e73596dc0af4acbb71b09bd48de7cf24aeadd2 SHA512 73b746f227930597a97f117cf9f9aa19ddabb6090907cf6850864cf30089e5d6e1cd07e257b3b0b9ae0ac762cb24a6f5acf7336c9be48760c975ac038569dcfa WHIRLPOOL 26f3e52a5fb0a0332861a919d2b913dcb3e8dceb26bb174e85830282229823366918132c5db22a5d294167ba3c54c6fd461b663ff0ab92373f46519149817e98
 DIST mingw-w64-v5.0.2.tar.bz2 9107077 SHA256 5f46e80ff1a9102a37a3453743dae9df98262cba7c45306549ef7432cfd92cfd SHA512 430065a822afb9901219b1f86ea221ae70ef7820ea298f51828bf1689a014115dade967a806388b7ee3ed1ea1d6c53970514ec64d0185b5024523093d9e96060 WHIRLPOOL fdc7b1f647679b2761cdb306f5400fdcdbcdd64de4aeb6d3d3bd4b31aab81ad5f81c7485c377fa8100da0ebe7e0b53a83674443d61c986df27a616694bb512d6
+DIST mingw-w64-v5.0.3.tar.bz2 9160627 SHA256 2a601db99ef579b9be69c775218ad956a24a09d7dabc9ff6c5bd60da9ccc9cb4 SHA512 85bc0244cd30ef38262792d61502a012348b8220ef249352b68ddfa40663ca1cae5f81bed70caa9579469fad6ad16a95f02387c280effeda7ce8287b549f3fc9 WHIRLPOOL 395cef41bfd4b8adf87b00a5603971f27709a7e7aa920ad3431707ad6a09850ca7a29eed74a7c469a1a74d6080b765f80000e8d9213985ff8a96df8c7dd49d79
 EBUILD mingw64-runtime-3.0.0.ebuild 1813 SHA256 bc4b91670d4970aa1cd9a5a0feaf9a2b3f34064214d83c44898843fffc3c361c SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643 WHIRLPOOL e7352f6f9091703a49c6b508dc80112c416e9ba0c0dc5d2ddfa73968eafce510c03fb89f5b719520973e6f60fee00aed129b05f477ed74599e1b5bf5cc503ca3
 EBUILD mingw64-runtime-3.1.0.ebuild 1813 SHA256 bc4b91670d4970aa1cd9a5a0feaf9a2b3f34064214d83c44898843fffc3c361c SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643 WHIRLPOOL e7352f6f9091703a49c6b508dc80112c416e9ba0c0dc5d2ddfa73968eafce510c03fb89f5b719520973e6f60fee00aed129b05f477ed74599e1b5bf5cc503ca3
 EBUILD mingw64-runtime-3.2.0-r1.ebuild 1813 SHA256 bc4b91670d4970aa1cd9a5a0feaf9a2b3f34064214d83c44898843fffc3c361c SHA512 731699be6c251ab07e7e9f82ec0d477ae1b186c595eabbc9d9a7766e2fdecb8799475772d5e51fab134ec43f76e8da9b50fd3fdef68d90dda585223275bfb643 WHIRLPOOL e7352f6f9091703a49c6b508dc80112c416e9ba0c0dc5d2ddfa73968eafce510c03fb89f5b719520973e6f60fee00aed129b05f477ed74599e1b5bf5cc503ca3
@@ -20,6 +22,7 @@ EBUILD mingw64-runtime-5.0.1.ebuild 2560 SHA256 c68fc9b2a61683928eba791e8debf438
 EBUILD mingw64-runtime-5.0.2-r1.ebuild 2651 SHA256 a9b7e5f223757af9fe5dd6a4c3a99f174a38a60a84ad9568a4ee090e2be55796 SHA512 f8c0fd5cc01431016675bf3831488e5852c29d9a0621216842f72b2bef1bdc57585b98885913d7c859a4aa8de01d1294a65ff1f7bd3224c691db7208d96946fc WHIRLPOOL 4b3f116213d58b19765579ba2e4af1b71448166e03bb9aed9d9916b252af12b5c390855fc58a1955be15aa5b17b525461c92ba5970a89f1b95aa56369cf913ec
 EBUILD mingw64-runtime-5.0.2-r2.ebuild 2691 SHA256 08fae1bbb881fda9c284ce4e3644a91d297538f98f92bd48be3df8c3d46543f4 SHA512 33615d4db2e4fe13bc0a63e3b84445392133edbac907514dc41a0bc29f82be0ce54c837bd0dfd6c1872e74f89055cdc3d2b7989f6912f3d8f37e3ffcc72b3106 WHIRLPOOL aede15cb662746ab21535000647aee9f8a7ff66e4fc8c36f550127541e95dd5a2f84fe61dc138c14e65af2521c23838c4cc86b9c67ebe1a724ba8af18505a4a2
 EBUILD mingw64-runtime-5.0.2.ebuild 2560 SHA256 c68fc9b2a61683928eba791e8debf438ed4d35d4dd8030e04d86930e281f57fd SHA512 a701ebddba123544e6c1854beac891ec1104d5bc3c5dbf151d0ed3c1be7e05a13a18885d0c9f5f74cb8e5f615cf30d084692e28770a57bc749a8504a36328392 WHIRLPOOL c2ce5b060706a246946517b39dfac4e54812144d9041c84a0789b5e99e2d2d33c5efa33fe7997e354c82240ae57788d5a68fd907d4108a926f6540b30dcb9779
+EBUILD mingw64-runtime-5.0.3.ebuild 2533 SHA256 ba2140e634b0a16bce5c47c138d54e70cdccfc9ffe4ebdd34ba069475424c15e SHA512 ec22d9a4f4bf860e35167445d521d1e7d8a193b09e334ee17fa5fbb3b8313b565e0d474e18e1e47ddd60bd0dfffdde46a337aa12749502ae550f4d7e341688a5 WHIRLPOOL 276af51476eebbf16abe16e85e8f5a5dbf1bea9b2160dff2eafe218546d9685a8b859764daf7ca90134eeec0a21ecaa65d9e5c7eaeb09b1489ccb2fa49ba1d56
 MISC ChangeLog 3707 SHA256 9003c6e0efa68c344a559d5f47dde2ec8acd29f05fb70d91dd728fae37295f6b SHA512 3923841966d2653e0ddaec0be18a3f258757f1c2d759049536ec85292ab1e82673448b2633ed97a42e6668f30d589294c7dcd16e2c4d634b0ba933c836dc8f05 WHIRLPOOL 7725b8d74d5ea0ef06c1cb577f56609bdef2a6f8baf287473d753a895ab02642052f056df51a1e3efa9c2cf4f1c15fd70c97a905f6da5cce650f339414b75898
 MISC ChangeLog-2015 3670 SHA256 7cd9976de775f8d4c760e6860af327fd3ebf5e8a0e104d364c3ad62decf7a352 SHA512 d514d50ad706d755be69f4821cc092a8b73f614526d372437b95c34b71ce181e934b10c4d44ee1ad7727c3c68a0067ba2d3b956f66c16f3ae5602a50472181e8 WHIRLPOOL 55cf99587928e8fbba9ee6c79b70ded995b73fdd01174d95bb767c1de3381905da1bf3c344b4f6b583c53be1a512e594ab3a3c51c604137c9be5cee79258b172
 MISC metadata.xml 544 SHA256 f3da93654e01312e7805a426a62337a7bc1baa836f3ca4e2df127bb8e9867ca1 SHA512 297a90e704de81f41a4f29871f96bed47aa00c703e79fd825b3a06ab8850fe67896c66dee2603f86cd6596a0c5cbd533c87cb94c1c674714f65767954341a3c8 WHIRLPOOL 41f2a919c459fc2b7c6d0a3d0823ebb68faa846b69ae776a1aea912eadcc1511601a67d966a01a9dbc52f5ed6e0df7402be696706d0730050e4f93e88a68293c
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
new file mode 100644
index 000000000000..624a492338e3
--- /dev/null
+++ b/dev-util/mingw64-runtime/files/mingw64-runtime-5.0.3-build.patch
@@ -0,0 +1,37 @@
+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-5.0.3.ebuild b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
new file mode 100644
index 000000000000..a21054499a0c
--- /dev/null
+++ b/dev-util/mingw64-runtime/mingw64-runtime-5.0.3.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2017 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="crosscompile_opts_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 crosscompile_opts_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"
+}