gentoo resync : 24.02.2018

3 files changed, 26 insertions, 3 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 35d69ea012aa..39aabbf24977 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -6,6 +6,7 @@ AUX cmake-3.0.0-prefix-dirs.patch 4279 BLAKE2B 86f5b3a0f79c4126aa105eb27887b7bc4
 AUX cmake-3.0.2-FindLAPACK.patch 1369 BLAKE2B dea4b1299253ae61a24794de0168e869b7ae2f97392229905f47974deab148ba77eac04a6f77574be8a161eb673fd88b28187597bb9d47efd772a3b3177eafad SHA512 4f20c4475841201c28ad49539fe896345add626dad5615357ff01817e10f7315ffe39e3a8d4bd0270179d7c58e5679a5bd9ae2accc1019ecee91db380ba48577
 AUX cmake-3.1.0-FindPythonInterp.patch 1045 BLAKE2B 5421ea6600f6b47a654d7dbd5571d284eb2b2c505cb57c0d5862c859f9e6d61fa39ccd19467dffdf8f7200b469ec9e058e0e5bd8d608ff98dc02cedc18f5f85e SHA512 ec89a5589b70427c5d8d7a7b23ee87e3b437973081595f6387b5e7d902014b089f85b3634a906c5aa688726ff0f7588c7fb06161009e044813553c03409cabc0
 AUX cmake-3.1.0-darwin-isysroot.patch 1926 BLAKE2B 4e8dfc78db33e62a6234a91210f0136312dcd0fec065ba76fa0b6a9f1f3e4ae0139af700494951d999bdf2eee57a5c22db5516b8b8276f4d8be4395f2c4cb675 SHA512 0cbb55f8f5458e72b1e465577809287dcc270636aef192f039eb1e48ef78b933a7290f81c6fefb0dd1f5eb8f9d209766687ffcb4f37c702b8317f8d2e36236ad
+AUX cmake-3.11.0_rc1-add_missing_pthread.patch 777 BLAKE2B 5df8d28912320849cfb82d0fea841ed3bec4b7d89c7c036c9ac2a5f942ccf2231754c51fee352418945f57a716bc0354685274dd94b7dbb8c9feb8d94d35d3e9 SHA512 1825eb9f673ad6ca151515258f6948c2d0c12ba0bfd3703afb5c3ff510bd29020c70db58327ab4305b5789bca54bbf4094995e70796bf8abc7191478477b800a
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
 AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b656eb7f58d61c7d9e30db9dac36e934f2a529b4ea20d69c5f8a653c727bae34374ebcb7f5017fd70df41abd538164 SHA512 bab8960bfea3c29416bdc8f39c7dee59b89bd7951752401f24eeb9161ac7bc2c6dd200cb62c6b9f964d763b5d257a94d8b04dc7090d6fa947a04f2d0c2e8c479
 AUX cmake-3.8.0_rc2-FindBoost-python.patch 6575 BLAKE2B 4a169862e81b053ea8077ed61001434ba2619230ab4a4d75a11e2ea2c18ad704792d6d37a3cfa78cb54a6bf6cd71bc9b0d6a7a1bba004a92212746001874f385 SHA512 bb156cc2b47f9928f2e6bae909e90866f4442e42d7357744aa2b00903a02a27cf8af4a788a74858bc51874c442c40788717c86e77690b91def80abaa38b90163
@@ -13,12 +14,12 @@ AUX cmake-3.9.0_rc2-FindImageMagick.patch 2407 BLAKE2B e9390cac784eef6d3b83b88f9
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b529d79d84c71663054d45d32c42003c0914003ea55edaece22ac6ca29561b6740be477b0accb71f673969c910eec2d58c5a6 SHA512 116073dd2d63861cb33b7b92d07adbdfe74e05864f488be8df3a6f5b92bee76c518770ad31972323e0ed5d8c07505c7fe18105573e7f5ebeb79b193297dd2ca0
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
-DIST cmake-3.10.1.tar.gz 7824043 BLAKE2B 004149841b128288845c2a3987b38e6d90b3dcc5ccb2002bc2915f9d8f30496ebf43d9a70fa6e26c7b64c0f41d85c753bd1bac8c1b5d7148b1d592dc98de189a SHA512 14e9a7f01747b369cad3c4e4e83bc777c0c98ce69209456f60d086d2471302f66dc1c1d22fd04e11dcb64de4bfc7dacd9aca70ee0e5f006abd1df79ef642eeed
 DIST cmake-3.10.2.tar.gz 7824452 BLAKE2B cc579f27d7d5668d1f375e7263e0b62212be1191735189d34b1f0aa921861ead5d3872388eebbb5136a72e3dec3920f1ebfb0bf45b642cf92eef02e4c8665d49 SHA512 f58fdd025285c9ff5396c0bd0d9573fc8a498fcbe5c11b336cb8ad6154ca6bc875c1a5e22d6654ba98596791ecf89ae8adffb83450839fa1275756b0af5bf82b
+DIST cmake-3.11.0-rc1.tar.gz 7945667 BLAKE2B d2f36d20105eda2eddadcc0cc93d3de081fa7e41dfe3c9ecbc1d15ef658cd713894abdb300e34f5055ea37848339c0f1bce5952654fdd2525ed7a0405d7fb825 SHA512 0baa40a04184c33a04735e70ff782c76d0453baa00087480640c6e28c1461032b96bd3a3fa07bedc2855eea83349ef50ee2652ec810ad3314b86e80df8df62fb
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
-EBUILD cmake-3.10.1.ebuild 5914 BLAKE2B 7320e10ee6fb27623f18227a688e87f17b909fdc75e43e30c5ce49f13378c27f5241a030c6caca6b773150f41a1340fe1053337447a98da6610f303e0596d08b SHA512 38914325ded6bb2885220e61f77b1e79a26b5fc8ceec6a972109c8d2a1db907cfdb62f48c5fdcfbeea045720c9ef85124bff794b6c61604b35f5c8260f5a4582
 EBUILD cmake-3.10.2.ebuild 5914 BLAKE2B 7320e10ee6fb27623f18227a688e87f17b909fdc75e43e30c5ce49f13378c27f5241a030c6caca6b773150f41a1340fe1053337447a98da6610f303e0596d08b SHA512 38914325ded6bb2885220e61f77b1e79a26b5fc8ceec6a972109c8d2a1db907cfdb62f48c5fdcfbeea045720c9ef85124bff794b6c61604b35f5c8260f5a4582
+EBUILD cmake-3.11.0_rc1.ebuild 5920 BLAKE2B 61c25bb8dd93610036a2cfcf07b83db57a333f1eabffed37566e72c554c9bc723d01edd782e90d4bd504b290cfd1120f31f2084849d59f6edd7db4d8c7c4894a SHA512 bd289c1aa58f08849b2d357d2610acc2260fc8e901c3db53a6242fba1142c7f0a1aad61a97c1ae8385bfa6631fb7f3850dbc9c7be7014e724654b44ff0333ff1
 EBUILD cmake-3.8.2.ebuild 5702 BLAKE2B 41a2b56a1666d4f2375b7e0d2ba473b889c215340b57ef5ca4297eb10f71870bc83db16d803a85eea0204f2d931901af2484fbd19269ccd52d2b07b436a04981 SHA512 ffe83e85988895e7bacdad4db796f112a1f8888a7f9df580c1c0fce6c8b959dd568079b73dbe8f9ff605388f64de9c4a9a1e61950876f7d5b7ea3444bc6ce62f
 EBUILD cmake-3.9.6.ebuild 5955 BLAKE2B 239073bc7c7aaea4422893f51bbd0c8151acd128ae1857100d74564dda786a3d8aa0e68234cc52d0ddd93352d7d8077ace1400aa452bcecea3f158413046e37f SHA512 9afd703b46784f6c225f355c7c3402abddfa0548eb031f23974d39de0130e04011bda6d15f49e998348084ced2649c8f192c472fcb741c6995443162c1828fcc
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.10.1.ebuild b/dev-util/cmake/cmake-3.11.0_rc1.ebuild
index af381f00bde4..a1fdde41672d 100644
--- a/dev-util/cmake/cmake-3.10.1.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc1.ebuild
@@ -51,7 +51,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
 	# handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindImageMagick.patch
 	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
 	"${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.patch
 	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
@@ -61,6 +60,8 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
+	"${FILESDIR}"/${PN}-3.11.0_rc1-add_missing_pthread.patch
+
 	# upstream fixes (can usually be removed with a version bump)
 )
 
diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch b/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch
new file mode 100644
index 000000000000..3a4c4352c6ff
--- /dev/null
+++ b/dev-util/cmake/files/cmake-3.11.0_rc1-add_missing_pthread.patch
@@ -0,0 +1,21 @@
+--- cmake-3.11.0-rc1/Source/CMakeLists.txt
++++ cmake-3.11.0-rc1/Source/CMakeLists.txt
+@@ -765,6 +765,7 @@
+   ${CMAKE_LIBUV_LIBRARIES}
+   ${CMAKE_LIBRHASH_LIBRARIES}
+   ${CMake_KWIML_LIBRARIES}
++  pthread
+   )
+ 
+ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
+--- cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt
++++ cmake-3.11.0-rc1/Tests/CMakeLib/CMakeLists.txt
+@@ -30,7 +30,7 @@
+ 
+ create_test_sourcelist(CMakeLib_TEST_SRCS CMakeLibTests.cxx ${CMakeLib_TESTS})
+ add_executable(CMakeLibTests ${CMakeLib_TEST_SRCS})
+-target_link_libraries(CMakeLibTests CMakeLib)
++target_link_libraries(CMakeLibTests CMakeLib pthread)
+ 
+ set_property(TARGET CMakeLibTests PROPERTY C_CLANG_TIDY "")
+ set_property(TARGET CMakeLibTests PROPERTY CXX_CLANG_TIDY "")