gentoo resync : 01.12.2017

7 files changed, 77 insertions, 3 deletions

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index d0afee32466d..29fc57a47c26 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtcore/Manifest b/dev-qt/qtcore/Manifest
index 59ebab75303e..e7488450cd60 100644
--- a/dev-qt/qtcore/Manifest
+++ b/dev-qt/qtcore/Manifest
@@ -7,6 +7,7 @@ AUX qtcore-5.6.2-plugins.patch 3264 BLAKE2B 232cbd215d8c93475c08f614c74ce0227d23
 AUX qtcore-5.7.1-qipm.patch 5915 BLAKE2B 7b1c6550d39f55b91462e8139e8a0d662b28b6fe2648a860fc8c72d4b0cbbdfd117ceb8c15c63a87a46958a316692a6127afbaf95314b257c15d09a1310df21f SHA512 807c030c2059cddcd159cb537ba2e4be68d6f612f45e1e7b844fc045f661739aea7bc35743735cee364d692d51774e17edced1aac8d444abaa4e4435117a5b3d
 AUX qtcore-5.7.1-qsfpm-1.patch 8922 BLAKE2B 8f5003cbd4bce102219856c310eb79a84752c2405a155eab33e6988958e5c79f69f04fbcda481c54eb19283f90f3a7873fd3d1a816ad73e7f2d0bdfe2a3115f4 SHA512 3854fffa1181cebe4683c54d5e774301a8710bf784dcc18367d04d193a7ce76fc6f634096b6986af41c3f5e4432b702873181a8900fd18e7617ea472d23d6d92
 AUX qtcore-5.7.1-qsfpm-2.patch 7812 BLAKE2B d2cafac754d28cb7a13a15cf75dcb323a5de84400ce1b586ddd7c129c4b32db133f5828c4407144d3d10d3a01bb885819339836792639103be25e59408a88e13 SHA512 38b141aa7d30011d71ed9044c69f79b56698320600a64ed3cc37e8dd9d22bb9ec2f33f8348d074552a5046c2855e948e325d5421384cb4c66c0bbd566500174d
+AUX qtcore-5.9.3-avx.patch 2740 BLAKE2B 9af6d58583e9bb49217b76e54c139b7c13dd7ddfbab2a7c88bbcc46b5ade4a52fb1790722476d68a785aa4d7a24707049d14be86e056900599b40e30489f7b11 SHA512 44ee123b4634c1b613cf5fef82f01ae35fb8b55679355e10032f52d55d72529d00283c94514515d311590cf09cd33a59335d2d35d4e821e3deaacf3390a58eb4
 DIST qt-everywhere-opensource-src-4.8.7.tar.gz 241075567 BLAKE2B 6e9b8870692c36e894dc401b65fa38961cf7d033cd712770c273fd45b3221720648087c53787eae7d455c417d64e09f716da48377837fb5f2b52b901d06b1cf3 SHA512 f9f81a2e7205e1fd05c8d923dc73244f29aa33f951fa6b7c5c8193449328b37084796b9b71ad0c317e4e6fd00017c10ea5d67b1b2032551cde00548522218125
 DIST qtbase-opensource-src-5.7.1.tar.xz 44992616 BLAKE2B d845ff8316f6f91089e23b74c025ad8e6160eb7ba75017cba34c2ad2f7b475fc4e36d337b945935bc2850bd140d743b9a5e3d23399b6d3151b85109da9f56ba8 SHA512 0506a3a856f76e5ba182e3382a515282b6096f3900fbdc14cd5aec425105ab61922e0ada0361234387335ceb80b3c69e39cd34d75476c2946c4371e7b8c0827f
 DIST qtbase-opensource-src-5.9.2.tar.xz 45148744 BLAKE2B 311f9fd5bea4b59988d90fad55bbaf46cbb5a77ed705f2f14d6d65ce1cd6e8c950fbcb6b6f06aad4aa3abb58892e9665cdab0a4716ac3a7f9c651dac239f04b6 SHA512 a2f965871645256f3d019f71f3febb875455a29d03fccc7a3371ddfeb193b0af12394e779df05adf69fd10fe7b0d966f3915a24528ec7eb3bc36c2db6af2b6e7
@@ -15,5 +16,5 @@ EBUILD qtcore-4.8.7-r2.ebuild 2865 BLAKE2B 2e667c581efaa6ea2ff6ec6fb218c4a059ffb
 EBUILD qtcore-4.8.7-r3.ebuild 2863 BLAKE2B e34ce8d0405fdc420de45432430d6d9bbe7292271e2ae1d820632bc297449aebd14260fce1975ebb71c2c7fad61a35af977aaaf187c1454521ea6e358d7cdfc2 SHA512 05cfed6cf8cf8303cd56e3aad7c3c02b41b33516245767dbb709b881ffe7a6c477b97ea43c13e1c9f1829bc087670e0bf1731c216e733729f8e209bfd237674e
 EBUILD qtcore-5.7.1-r3.ebuild 896 BLAKE2B 5d6c21f0a1de4db39fb89d34c2112fbb4f88130f884d5dc2b9bb8b4d4ceec7d265c68a210689b3ca7ac48c726954846e6512bacc0e4707fa51cdd7a3a8c12791 SHA512 bd5fd8e6a9a189773f4c5473d0073709f034b661a28296a8f4d3cac4d26eaf63f04e4b0d08028810b77ca10bfe8c67aaf6c4cf2da7a436e2b29f9b04024cb158
 EBUILD qtcore-5.9.2.ebuild 1389 BLAKE2B ff5e67ff6dd058d8a96735c37940fc84164b14a780580df2965fb92de3216e53a15b31de0f77445505e2f96715c8db38dc9b7d5c40af60a91fc5f8bc0a2f256b SHA512 b51328052f28e8cb5f48ae59834553fb995099245a0e6b3390fa0006b89620a889c45b36baf5f028ef1111b87597380c940c6df0a69a14aac07ca6824d795fc0
-EBUILD qtcore-5.9.3.ebuild 1389 BLAKE2B ff5e67ff6dd058d8a96735c37940fc84164b14a780580df2965fb92de3216e53a15b31de0f77445505e2f96715c8db38dc9b7d5c40af60a91fc5f8bc0a2f256b SHA512 b51328052f28e8cb5f48ae59834553fb995099245a0e6b3390fa0006b89620a889c45b36baf5f028ef1111b87597380c940c6df0a69a14aac07ca6824d795fc0
+EBUILD qtcore-5.9.3.ebuild 1431 BLAKE2B 31e75dd8b0faab83f94e367b53562d49ae5f54d674420d025f5538978263924dcb3316175c8148556e49e9ab0f2869f99d9c5b33da66c153e4a6a89d70e0c762 SHA512 df1750e83202647e21abae00b5e01eaf206d8c3a98005fa81f7ea48db1d91a8451a48de6b2085990ed944d87c944620efc3ed982ca85fe5c4c2828a1300fd541
 MISC metadata.xml 924 BLAKE2B 6be074e378d4e63efe0c6ff55cb99c3ab1318c1d05d8208f4deb8a54a3cc9ded99b63e788336d83633b03eb5d857394e189472a374184d852d3c5851e27555b6 SHA512 c9786a997109a6156ed4879cd94e3e368b7ce095fc43fced168bdc5fbc846411c145318020d0eab7024aa64003403435a6cad222ab3569d838b9450c526c8ddb
diff --git a/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch
new file mode 100644
index 000000000000..be18433be209
--- /dev/null
+++ b/dev-qt/qtcore/files/qtcore-5.9.3-avx.patch
@@ -0,0 +1,69 @@
+From d813c66bfcfac1837814ec4d174d0389172f0d4c Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Tue, 25 Apr 2017 12:02:09 -0300
+Subject: Fix the build when AVX2 is enabled but __F16C__ isn't defined
+
+If -mavx2 is used, __AVX2__ is defined, which enables the F16C code
+after commit 280e321e52fd4e86545f3f0d4bd4e047786a897e, but that was
+wrong since we aren't allowed to use the F16C intrinsics with either
+Clang or GCC (we can only do that with GCC 4.9 and Clang 4.8, and only
+with an __attribute__ decoration).
+
+With ICC and MSVC, we are allowed to use the intrinsics, but the
+#include was missing.
+
+[ChangeLog][QtCore] Fixed a compilation issue with qfloat16 if AVX2
+support is enabled in the compiler. Since all processors that support
+AVX2 also support F16C, for GCC and Clang it is recommended to either
+add -mf16c to your build or to use the corresponding -march= switch.
+
+Task-number: QTBUG-64529
+Change-Id: I84e363d735b443cb9beefffd14b8ac1fd4baa978
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
+---
+ src/corelib/global/qfloat16.h | 15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+diff --git a/src/corelib/global/qfloat16.h b/src/corelib/global/qfloat16.h
+index 89a62a93db..a0aa9496b4 100644
+--- a/src/corelib/global/qfloat16.h
++++ b/src/corelib/global/qfloat16.h
+@@ -44,7 +44,16 @@
+ #include <QtCore/qmetatype.h>
+ #include <string.h>
+ 
+-#if defined __F16C__
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__AVX2__) && !defined(__F16C__)
++// All processors that support AVX2 do support F16C too. That doesn't mean
++// we're allowed to use the intrinsics directly, so we'll do it only for
++// the Intel and Microsoft's compilers.
++#  if defined(Q_CC_INTEL) || defined(Q_CC_MSVC)
++#    define __F16C__        1
++# endif
++#endif
++
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
+ #include <immintrin.h>
+ #endif
+ 
+@@ -116,7 +125,7 @@ QT_WARNING_DISABLE_CLANG("-Wc99-extensions")
+ QT_WARNING_DISABLE_GCC("-Wold-style-cast")
+ inline qfloat16::qfloat16(float f) Q_DECL_NOTHROW
+ {
+-#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__))
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
+     __m128 packsingle = _mm_set_ss(f);
+     __m128i packhalf = _mm_cvtps_ph(packsingle, 0);
+     b16 = _mm_extract_epi16(packhalf, 0);
+@@ -134,7 +143,7 @@ QT_WARNING_POP
+ 
+ inline qfloat16::operator float() const Q_DECL_NOTHROW
+ {
+-#if defined(QT_COMPILER_SUPPORTS_F16C) && (defined(__F16C__) || defined(__AVX2__))
++#if defined(QT_COMPILER_SUPPORTS_F16C) && defined(__F16C__)
+     __m128i packhalf = _mm_cvtsi32_si128(b16);
+     __m128 packsingle = _mm_cvtph_ps(packhalf);
+     return _mm_cvtss_f32(packsingle);
+-- 
+cgit v1.1-6-g87c4
+
diff --git a/dev-qt/qtcore/qtcore-5.9.3.ebuild b/dev-qt/qtcore/qtcore-5.9.3.ebuild
index 779bc30c7b90..5442d7c47bf9 100644
--- a/dev-qt/qtcore/qtcore-5.9.3.ebuild
+++ b/dev-qt/qtcore/qtcore-5.9.3.ebuild
@@ -24,6 +24,8 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-avx.patch" )
+
 QT5_TARGET_SUBDIRS=(
 	src/tools/bootstrap
 	src/tools/moc
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index c8651f4bc20f..27ea14da82df 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,6 +9,6 @@ DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed39
 DIST qtwebengine-opensource-src-5.9.2.tar.xz 217353592 BLAKE2B 978a13f11adcc09486764d08da53a38386b6f9b57a57a4e574c916c614a681b14f4a44b03ac4a728673688e4ee607d512215661363909729e8736e896804ec0e SHA512 9139533b8b384519cb49a909ed678344c94cdeeed40048d0cf8482506defaea0ea8f06396576fae9f51e4b073a04ee63d1b1b42b8cd82a6d4592bc0db983c715
 DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
 EBUILD qtwebengine-5.7.1-r2.ebuild 3106 BLAKE2B e3ce8d5155c0a82d413a9d61bbf29e66f44bff39e3287446045eb9af78860ca478687330e4dbe069bc38aa70a7712dc49d559c04ba06877c4251c1d9ffe53d24 SHA512 40e425233d99bf82a0595d4248597177516f4fccc7dcba1a607e4940c828b5e35de7c3b1a5ebc700d1d05e436ff885f445b1428dd6bc9f7d9395b088ada04b20
-EBUILD qtwebengine-5.9.2.ebuild 2972 BLAKE2B 657c980253b328a28fa949c0e80ebc5a6b482361e8d1951f1cadb628869890c3558e5404d65c972ec485f2d811723e8e6d14d1c48751db64d4599e94b7d58977 SHA512 17d370ed004253e4a8876ba2e1a1d5be0186283ae6c6b521cabdab23d5d112fa9a3940c66a876d9e194f9b6ec499a627b284acf5adea8b73a9d754075267b386
-EBUILD qtwebengine-5.9.3.ebuild 2972 BLAKE2B 657c980253b328a28fa949c0e80ebc5a6b482361e8d1951f1cadb628869890c3558e5404d65c972ec485f2d811723e8e6d14d1c48751db64d4599e94b7d58977 SHA512 17d370ed004253e4a8876ba2e1a1d5be0186283ae6c6b521cabdab23d5d112fa9a3940c66a876d9e194f9b6ec499a627b284acf5adea8b73a9d754075267b386
+EBUILD qtwebengine-5.9.2.ebuild 2993 BLAKE2B 97a45338fd7dfb72df8a3d6d23a8a699b43bcc5f121fb1521e3c23fcfa4d4149839fe0d725c18babefdf844f41163f14042be517be1fe69f4f5d33f48403deb8 SHA512 6400356d54109aead2a3766a939d2f31938eaee5df7025dccd8bf47a6e66bfcd0667e4ee5262ebabf4f3c11524b8d2511ce3df518874ba5ada2340ede4a78f65
+EBUILD qtwebengine-5.9.3.ebuild 2993 BLAKE2B 97a45338fd7dfb72df8a3d6d23a8a699b43bcc5f121fb1521e3c23fcfa4d4149839fe0d725c18babefdf844f41163f14042be517be1fe69f4f5d33f48403deb8 SHA512 6400356d54109aead2a3766a939d2f31938eaee5df7025dccd8bf47a6e66bfcd0667e4ee5262ebabf4f3c11524b8d2511ce3df518874ba5ada2340ede4a78f65
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
index ba128d2eddbc..2c0bd6388d55 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.2.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
 	dev-util/gperf
 	dev-util/ninja
 	dev-util/re2c
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index ba128d2eddbc..2c0bd6388d55 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -65,6 +65,7 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
+	>=app-arch/gzip-1.7
 	dev-util/gperf
 	dev-util/ninja
 	dev-util/re2c