gentoo resync : 20.02.2019

3 files changed, 14 insertions, 20 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 971fd3a1182e..729497e7a44a 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,7 +9,7 @@ AUX cmake-3.11.4-libuv-1.21.patch 1333 BLAKE2B 685edbc90e59ddf3f5d430d50edba0407
 AUX cmake-3.13.4-prefix-dirs.patch 4239 BLAKE2B 470de3626a9f6edf65e5ec597b1de36697e6c2038ec5f435dd5a89ec69ac32227663f0eb5f86c9d5d89a1c809e1092b5e901c52dcab9f2a7d3bc8f7bdca110a7 SHA512 b1801d0f0ec8963181460a8b939a26e791295d6a45fb78135dce5684507689cb44cab7a536d5f85c26f51deda19e95b40500aba026f43920fa7eee686ad3869c
 AUX cmake-3.14.0_rc1-FindBLAS.patch 1247 BLAKE2B ca3b9e1515569b1dcf4692480233aa149c4846f0767c872a25ab0f9fe411ab09348b441f17319abf1c06fd3275e3db7d8bb8f25eba83bab7fb800fff115d06a0 SHA512 425dffe59dc7ec6383579d2ad5bb7a7607e4446804ceb6c698c34ad4615fffd552051dbe6ab21450fa769cb7b25a0184ce9204841e2ab98a738b786c93bb90ae
 AUX cmake-3.14.0_rc1-FindLAPACK.patch 1798 BLAKE2B f372fd920abaf85ab3106385d45e193c2c0fba1ca9fb5c14cf53bdee9a29602b7db0078676c90f65f3f3eccddfbb1f6b9964d26f90aef38cbc0c197a4b243ac5 SHA512 dcc970561f54d862f2124512bfc28ab25e66b1fa5e6a7a6138faae7f1e3a4136320ad4d4942153ac9505035b74f3e8442dddb62af6fb1486fcfec08fcf3e3743
-AUX cmake-3.14.0_rc1-prefix-dirs.patch 4767 BLAKE2B ddc95ae9beb8dacc14bfdb54be2369564b81f054f406bc5207252ef98a8bd8b3c62f7c1191f8f08e4a348c9ab66152b90681032251d1a049136f79798c55b5f0 SHA512 5ed9d2d4e32075e5c52766a55209a3f6c5df089abfe6d2c07fedfdac2dc65e3552679b62d43988b2dc4b7ca0503d984b1f8a87539360a81a4d3b7806206bf5b0
+AUX cmake-3.14.0_rc2-prefix-dirs.patch 4609 BLAKE2B f90da7c47e2539047ab9c27c4e62f53634541690db171bf4f92e4e8b122d1ee1d856babf4b6e3650f892fb430a0a7f7cbdedf3d01fbdacd7c9d4a2f60d21a181 SHA512 bc47ac442f09f8717db3123bdc176bc9c4c53c54dca2d34f86032576c7f43ceaf8431c64629110003cce9531b31241060399a2455c93e58367193e7e376c0907
 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
@@ -21,12 +21,12 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b
 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290
 DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c
 DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
-DIST cmake-3.14.0-rc1.tar.gz 8844963 BLAKE2B 1bb600c4fda4da411d3897f55696025d0ff14f80154eeb968c67a1e8dbb308f55d38a4a5a9c420038a1aef1fc181778801f954178d3b625faedd3fc51a18b5c7 SHA512 a7f1881100e1c4ca4944fca1f87ed2caac450983fda4b930954f0d25bf39091e28080e49862060d87ec86e61251c712056d8accddaeedb71715cb9fb01aa4559
+DIST cmake-3.14.0-rc2.tar.gz 8846165 BLAKE2B 8b36ec26167e4bd83f0bf9b58a4ca2f0f9ee9994eeb3593279a03faae03c2fe6097fb0a7b6e8a83902afd5833c3f7bbd7602e78f052fb5c5d75f5b7a4db8aafe SHA512 941d6c562e620dcabd7d821a0eb96c05674d877c196a68cc9cb870a21de7c486f7ce848722892d9764c3826b7276f7fbe7afc36e3b8f784fccff2a8feda9de30
 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c
 EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f
 EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0
 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947
 EBUILD cmake-3.13.4.ebuild 6207 BLAKE2B a2a7aaac70aa184f7da025954664f2a6a688a6f90bedbce965187953c3b8fedf984dcc7bf467171170857f1d1e6d350fb3a5dff2a53c90904ba262bb0c38ec6f SHA512 748e7e64d4a3dd96afe5ffe2981a79e5d4f380559fc9ef48a232360989a5cb01bde48aa014888a176042474c9d53c0eab9bd35adb03c04e28bfc990736de86b8
-EBUILD cmake-3.14.0_rc1.ebuild 6268 BLAKE2B e578c06dd59640f8b97b6968beb26e026b3f3aea46b17370b02ab5e016afea4df55e07ba84ba818d3b1d4dfd516529cb391e8f294948567b9be9f9ff33b0a08f SHA512 85d052a18ef8e0fe2ff7fdcab242ec03838b929d5d11e8cf379b302e111a6652216e16f8aa31a7a276ffa9e9577ba467259f94af952ff59015c19d8c698d1396
+EBUILD cmake-3.14.0_rc2.ebuild 6268 BLAKE2B bd2c0fdbb4b73c132e52a0d049653d98293be703c72e940bfbb8836393a2b8854451b15e14f8aa4450953b80e808a287346a42801135652fe23130f5f341d6f1 SHA512 7284d9bc63545ffafafd77390e2467ad92f53a9c63984e287f5210057dd936320228ca80c7adb7106cb402a265cb7429af3fc79b1d3ac61375d103d58d0b895b
 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25
 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015
diff --git a/dev-util/cmake/cmake-3.14.0_rc1.ebuild b/dev-util/cmake/cmake-3.14.0_rc2.ebuild
index a35142fe0720..75999dc18497 100644
--- a/dev-util/cmake/cmake-3.14.0_rc1.ebuild
+++ b/dev-util/cmake/cmake-3.14.0_rc2.ebuild
@@ -50,7 +50,7 @@ SITEFILE="50${PN}-gentoo.el"
 PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-prefix-dirs.patch
+	"${FILESDIR}"/${PN}-3.14.0_rc2-prefix-dirs.patch
 	# Next patch requires new work from prefix people
 	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
 
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
index a4890ffbb2fa..8b539bf5babb 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc2-prefix-dirs.patch
@@ -1,6 +1,6 @@
-From c5d74cb5b1cf87ee933f7547f62dbbb96134964d Mon Sep 17 00:00:00 2001
+From 3c7467e2e841b9dcff7546c2b140a7e9f57525a6 Mon Sep 17 00:00:00 2001
 From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 22:40:33 +0100
+Date: Mon, 18 Feb 2019 10:13:45 +0100
 Subject: [PATCH] Set some proper paths to make cmake find our tools.
 
 The ebuild now adds an extra / at the end of $EPREFIX so that it is
@@ -16,13 +16,14 @@ Updated by Michael Palimaka (cmake-3.0.0)
 Updated by Lars Wendler (cmake-3.9.0_rc2)
 Updated by Benda Xu (cmake-3.13.4)
 Updated by Lars Wendler (cmake-3.14.0_rc1)
+Updated by Lars Wendler (cmake-3.14.0_rc2)
 ---
- Modules/Platform/Darwin.cmake    | 12 ++++++----
- Modules/Platform/UnixPaths.cmake | 38 ++++++++++++++++++++++++--------
- 2 files changed, 37 insertions(+), 13 deletions(-)
+ Modules/Platform/Darwin.cmake    | 12 +++++++----
+ Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
+ 2 files changed, 35 insertions(+), 12 deletions(-)
 
 diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
-index a73ffbae75..d00eac4ca4 100644
+index 5590433a3b..b04383e51d 100644
 --- a/Modules/Platform/Darwin.cmake
 +++ b/Modules/Platform/Darwin.cmake
 @@ -116,9 +116,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
@@ -65,7 +66,7 @@ index a73ffbae75..d00eac4ca4 100644
    "/Applications"
    "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
 diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
-index 4ae451472b..aa34bd9a31 100644
+index 46c24bbf9b..54210f6599 100644
 --- a/Modules/Platform/UnixPaths.cmake
 +++ b/Modules/Platform/UnixPaths.cmake
 @@ -23,7 +23,8 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
@@ -78,7 +79,7 @@ index 4ae451472b..aa34bd9a31 100644
  
    # CMake install location
    "${_CMAKE_INSTALL_DIR}"
-@@ -50,33 +51,52 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
+@@ -50,28 +51,46 @@ list(APPEND CMAKE_SYSTEM_PREFIX_PATH
  
  # List common include file locations not under the common prefixes.
  list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
@@ -116,13 +117,6 @@ index 4ae451472b..aa34bd9a31 100644
 +  @GENTOO_HOST@/lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
    )
  
- # Platform-wide directories to avoid adding via -I<dir>.
- list(APPEND CMAKE_PLATFORM_IMPLICIT_INCLUDE_DIRECTORIES
--  /usr/include
-+  @GENTOO_PORTAGE_EPREFIX@usr/include
-+  @GENTOO_HOST@/usr/include
-   )
- 
  # Default per-language values.  These may be later replaced after
  # parsing the implicit directory information from compiler output.
  set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
@@ -140,5 +134,5 @@ index 4ae451472b..aa34bd9a31 100644
  set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
    ${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
 -- 
-2.20.1
+2.21.0.rc1