[gentoo-commits] repo/gentoo:master commit in: dev-util/cmake/files/, dev-util/cmake/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     4f0c647821840622bc6461cef29935ef609eb9d5
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 28 09:05:32 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 28 09:28:47 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0c6478

dev-util/cmake: Bump to version 3.11.0_rc2. Removed old.

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 dev-util/cmake/Manifest                            |  2 +-
 ...e-3.11.0_rc1.ebuild => cmake-3.11.0_rc2.ebuild} |  1 -
 .../files/cmake-3.11.0_rc1-system_thread.patch     | 44 ----------------------
 3 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index caa381b5c4d..34bb5f2785a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,4 @@
 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.11.0-rc2.tar.gz 7946761 BLAKE2B 7ef3df8bd1e356a43f71e806f4b63bf3d2ed9363782a1224846ad8c710ff01695ae2391db400d0f2d29ec12e20ee36da2e8019300bcb6e14d051b2e21c83d663 SHA512 4b91455f787c04e4b792129d6168d9c45d74b50582eaf3f738a9a0ddd690c0e359bbd3ad218470c2acbdfd09f4465dd9084433b0a20c033c3177abfb8af381ef
 DIST cmake-3.8.2.tar.gz 7504706 BLAKE2B a2ba30370a41dabcba40a967aa58eb7a4ed4151371394eff436866b09fd040b5483d2dcc2dc588a75288a65aff979806d15016a5395db2b25db844b9e942cac1 SHA512 49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c

diff --git a/dev-util/cmake/cmake-3.11.0_rc1.ebuild b/dev-util/cmake/cmake-3.11.0_rc2.ebuild
similarity index 99%
rename from dev-util/cmake/cmake-3.11.0_rc1.ebuild
rename to dev-util/cmake/cmake-3.11.0_rc2.ebuild
index 85d191ee0dc..e6c5395608b 100644
--- a/dev-util/cmake/cmake-3.11.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.11.0_rc2.ebuild
@@ -62,7 +62,6 @@ PATCHES=(
 
 
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${PN}-3.11.0_rc1-system_thread.patch
 )
 
 cmake_src_bootstrap() {

diff --git a/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch b/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch
deleted file mode 100644
index b2ac2be99d4..00000000000
--- a/dev-util/cmake/files/cmake-3.11.0_rc1-system_thread.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 94eee5e683b80e0ffd8e0c4fd3a45b03f0f37b18 Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Thu, 22 Feb 2018 12:57:29 -0500
-Subject: [PATCH] CMakeLib: Link to system thread libraries to support std::thread
-
-Some environments require linking to thread libraries for `std::thread`.
-Express this direct dependency of CMakeLib explicitly.  Previously this
-was done indirectly through our bundled libuv, but that does not work
-when using a system libuv.
-
-Fixes: #17757
----
- CMakeLists.txt        | 2 ++
- Source/CMakeLists.txt | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e4d2a9a..6623959 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -310,6 +310,8 @@ endmacro()
- # Simply to improve readability of the main script.
- #-----------------------------------------------------------------------
- macro (CMAKE_BUILD_UTILITIES)
-+  find_package(Threads)
-+
-   #---------------------------------------------------------------------
-   # Create the kwsys library for CMake.
-   set(KWSYS_NAMESPACE cmsys)
-diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
-index e7c0732..a0010a2 100644
---- a/Source/CMakeLists.txt
-+++ b/Source/CMakeLists.txt
-@@ -765,6 +765,7 @@ target_link_libraries(CMakeLib cmsys
-   ${CMAKE_LIBUV_LIBRARIES}
-   ${CMAKE_LIBRHASH_LIBRARIES}
-   ${CMake_KWIML_LIBRARIES}
-+  ${CMAKE_THREAD_LIBS_INIT}
-   )
- 
- if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES "sparc")
---
-libgit2 0.26.0
-