gentoo resync : 03.03.2021

6 files changed, 42 insertions, 78 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index d1e821e646c5..7fbc645dd3cb 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,7 +9,6 @@ AUX cmake-3.14.0_rc3-prefix-dirs.patch 4791 BLAKE2B bd5dece28a5900c8dbd994701712
 AUX cmake-3.16.0_rc4-darwin-bundle.patch 1388 BLAKE2B bcb6c3d8e4f64ccc3e6ebf9ae906960075b3fb1f432925e07a711ac27321023033013e7a2e1d0ffc60dd464b775fa2537a49c73089861a2ce8f6316ddaa3d03e SHA512 7e0f598fe1cbb2c44b345091c102fb42ebff510ea7eeccdbe1fe0d65251127d823c37f2d37b073305679ed86fd48923566f1d62a7c9fb55df475d48891b4b861
 AUX cmake-3.17.0_rc1-FindBLAS.patch 1087 BLAKE2B 5e549db39f0e8c5f821a70121551ccea132e11dd8b468cfc7439e61763b5406860d952787d5957ea719dd48ec32ac8313d3209bed2a3423f5e40b8a2fcf04ae4 SHA512 1ea5e5e44c6a97cced30ef38424e24a3551d58c828d71d3b5994c265f099a3aa19174febfc2778eb688930432073e012557a79550d38b6b716e6b619d74a298c
 AUX cmake-3.17.0_rc1-FindLAPACK.patch 1973 BLAKE2B d4f10694b55fcea047f364f3dd383ba12fb5c3ce4369bd527c286e23260b551a915fa5257f0351bce00a4332c987c047c246812f2a713b0d1db312c7d03edee4 SHA512 20baafcda95ba219ae4e186a8878aa75e2e27f766ab3afaa14ce316cd2c2bc85debfc6be4ed1b6c17c3c1532b3a6868d0b4ee7cc47145cb788838f023b624303
-AUX cmake-3.17.4-uv-check-return.patch 1460 BLAKE2B 1cc26575dc1ad8ff9adea7ecf7f5ba0f4b2e16510c2ef3572baaf4f6bf771d6b4a1018000b78310b246e333c95e857851a40643609d997f2283486eddda8e8f3 SHA512 e79c6b34d433804f549b60a926bbbffaeba8506430225e284187905d7df5f522c29b8507bdb334cf30ce88414d326ee4476782731f36f1b1a48f64f9fa208aef
 AUX cmake-3.18.0-filter_distcc_warning.patch 842 BLAKE2B 8c9b02a251d118f2ac31fe417e10750e3f4b911891723b0edacea83bf2b6220f121e02c299655cd49ae5a019af8a747218f81d6ece6cda41aeb57d24f9385277 SHA512 91b795225313270449d6da12baa818382da4f6937795303c5cc894f3f38f03cb88d8fb3b774fb0b8ab9cf5cd344ebeda3d83f48ef8474093a8a0268d8f342828
 AUX cmake-3.19.1-darwin-gcc.patch 433 BLAKE2B 72fb716af3d24d2723a06f0c2351d16af215cb64effa46bf404d8e00106ec80297b34b3d7f787b191e3fc08e1d35c515b6d2d527213285de91cb1f4b81272cb2 SHA512 a732f6f22e4eaab747cf80eaebb4fe5624aec893fc2bbb782f86d8377d3eda365568f091dd2505e18798fa8147f13adda0fa5cb0687c5c427a65bdc7cb957ff0
 AUX cmake-3.4.0_rc1-darwin-bundle.patch 1043 BLAKE2B 99fc8061352b6a503f472e11045f9a99c2b980f08e9c1406722eacdd438617dccc394f53bdcaa4d93c4aa499b4615185c3ec99ccad8be3504972001498b02c48 SHA512 8c6297bf824d5a911e14004ac4c4e62d1a1528e44199d8860ca885bb1b8dd3d66a73c3db32664b830c3c635bdb498abbd5196be92ed2571cb22828d7186ff9f9
@@ -17,13 +16,13 @@ AUX cmake-3.5.2-FindQt4.patch 1585 BLAKE2B 8cfda84c419515be57f65be7b4b22d7937b65
 AUX cmake-3.9.0_rc2-FindPythonInterp.patch 1458 BLAKE2B a70945921738f00952b40a73d9ea26ecc86614aa3f12c94226aac4710dd0b9723c365b6f5def965069a54919bab13a33490facc6c5e64fad69d2e05a97d2812f SHA512 8adcb75cc035f64521e85229eb8dfa1e627326f8e189f66b707b3a0448ed3ae6acf306643026f7cbc7b924edcef73cad7a107d83162b4ca46bd6bbdc7a58af12
 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.17.4.tar.gz 9473549 BLAKE2B 2ce29415525b5292ae9e06d73570ed0af2173d8d15612f4d645f22d4f55cb99018663c374c4282731e09f8c6e4ffd59316d65f38aef9db5c34d874ca8992382b SHA512 6af879502e52388f3be02a4edfb006274840ad1afa8f28ffd6ec69b0310c7f718812b2272e5f77ffa422717f61407a6d482deb95941555c21c73fc5f62356a4e
 DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343
-DIST cmake-3.19.4.tar.gz 9266976 BLAKE2B b5ac44fa426a47031e37fca990130d9289909a5f21eed2ebb0987da9202db16f654a1f3eeaca2465693b2fca09de05b9bb452dd71df9a65ffd27c02da577a1c5 SHA512 e2781479d2185f8f927439b795120a0f4957e9da7730804ff8ec06d6bbe75a0069e49d95e642706179520a7229ae82e53bab891fa8cfd859913c0cb5fd4e843f
 DIST cmake-3.19.5.tar.gz 9270284 BLAKE2B 4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a SHA512 de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
+DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B 5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946 SHA512 556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9
+DIST cmake-3.20.0-rc2.tar.gz 9429671 BLAKE2B cf7d6f4df3f00f3dbc13fa3358f3adde0f63990d310e5a563e012d613bbbf5c26827795e0d3639cbbf481df4db674e15c63f0717f7cfec700ee0d610dc1f8cc9 SHA512 2002fd688e19eb9a67c3c50a021aa9cb0af42c4eb63dc0c1ffb4e3f33d362c4f71623d014612899ca57da17a9ba783f3c5a8430bda4ab9d2ef9af88d62f880ef
 EBUILD cmake-3.13.5.ebuild 6239 BLAKE2B 5e3b289af5d341e73fbdfe6162330e9e39dac40276991f08df670fcff6e40438995b608704e535545c4538cedb7ed789c2cc2ae0b38a1fd0f3a2e9627c95a494 SHA512 e75ea6defa00993410ed865329b450f38f9ad418c59bfe345880bae25d2f19e4463a407d744527d3f5c6c59fe8cf732cad5ac6274901cfcf3809d29573be7ad1
-EBUILD cmake-3.17.4-r1.ebuild 6124 BLAKE2B e5e3ae707d53e486d2fc594a3376138067b1e2e0041e04354e1ac3a1f7ae40f2d87b4eb404e457967a3cb62ba437b0b9dcd916cce50e8d6d30c0c0da3ecece28 SHA512 145b100bd219c50de18d94066c5d73cc77051b054ea5822e0fcb86f53c3d381a29e0026c25e115320df3c324a96519ffa670ecf73e8dc24527043dafb51fe443
-EBUILD cmake-3.18.5.ebuild 6077 BLAKE2B 09bb5432f455b53cf232dd57a11a5ea755af02860923ba4a4b9b9b2a86824b71b72fdd89b86ac2afc02b414aad1a0f4460b17185942db0f4591f23a394ebba8c SHA512 e4f51821a1b966ccc716115bbf8a5ee325272cf03f4011a2b04e2e5f882fa3804b6af0776bd2922cfe48946501de1de1dfbe00b7f17c6543902bdbe6223a42f7
-EBUILD cmake-3.19.4.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
-EBUILD cmake-3.19.5.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
+EBUILD cmake-3.18.5.ebuild 6069 BLAKE2B 05856767d2ed7a4ba1f8c2fb38523b6e38f36da66866cf64ac2e6cc60c78aa8cd5dc8b9c3a19826e92c7c0343f9101901a401d1795a411bdbf245f3411a7e92f SHA512 f56fb725619b71f5451b5c5fa0a48e744c03ccd94213c85c965b7666b1cb14ec78eef6a4d9a21702299434a7f402077779b725d42c226b3eb5f5d3a8d2112e31
+EBUILD cmake-3.19.5.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
+EBUILD cmake-3.19.6.ebuild 6990 BLAKE2B f382eff3d258673c34e7642ec088f708281a6a65bed568b2094344fbd966eca22128dd93e382a88da16132291bd0f7c644362eaee0b34545c4d3df8ef512c832 SHA512 27af2c67d4a06e0cc3f0d86f003738a8def88a274dc3eda6da32de0b5f015a8e13f315ae93efbcec07cd9b95fc9f046786336f2a1b9ac9f5478610a440cb9964
+EBUILD cmake-3.20.0_rc2.ebuild 6846 BLAKE2B 563f68ac5e2ef974604ae3c130b6e049f180340d54e48fef71b779bbb85cf132741f50fc6b09cadca29d6f533a40ab26da88eb99dfc98fe5fa637eaf7c42e565 SHA512 7a7177869712e7e9f1217b5992d50e2cc0d560cc3ce97ac9e5f95469bce5a6b883baca033b9a2c9e859abdf978a6ea3ee66e69cafcc1b3b609de955249a0147c
 MISC metadata.xml 460 BLAKE2B f1a7e1709a6b9975ffbc377c8b4d1ea8a01f52ccc139693c8e427150b7559ecc867b3e55fb4bc95fe342a2335fe5e13c69f4bd74ffbbf302c83872c65963e73e SHA512 fc562cd5f336101d16ca30a5b3e9b99a6e51ec9d7aa503f20ce278f44d5810286fcd6b46b18073cd88ba88ee5ab4f8a0bfccaa567df09ebb722a68ab721aa340
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index a8a036ebaeec..021bf938c8d9 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.19.5.ebuild b/dev-util/cmake/cmake-3.19.5.ebuild
index 99b8eab6c2f1..3d40c53f2157 100644
--- a/dev-util/cmake/cmake-3.19.5.ebuild
+++ b/dev-util/cmake/cmake-3.19.5.ebuild
@@ -149,6 +149,8 @@ src_prepare() {
 			Source/cmStandardLexer.h \
 			Source/cmSystemTools.cxx \
 			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
 	fi
 
 	# Add gcc libs to the default link paths
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.19.6.ebuild
index 45b0de57b6ce..3d40c53f2157 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.19.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
 CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
@@ -17,7 +17,7 @@ SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
 LICENSE="CMake"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
@@ -44,6 +44,7 @@ BDEPEND="
 		dev-python/requests
 		dev-python/sphinx
 	)
+	test? ( app-arch/libarchive[zstd] )
 "
 
 S="${WORKDIR}/${MY_P}"
@@ -54,20 +55,21 @@ PATCHES=(
 	# prefix
 	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
 	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	# Next patch requires new work from prefix people
-	#"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
+	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
 
 	# handle gentoo packaging in find modules
 	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
+	# Next patch needs to be reworked
+	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
 	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
 
 	# respect python eclasses
 	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
 	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
 
+	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
+
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-uv-check-return.patch # bug 726962
 )
 
 cmake_src_bootstrap() {
@@ -82,10 +84,8 @@ cmake_src_bootstrap() {
 			Source/kwsys/CMakeLists.txt || die
 	fi
 
-	tc-export CC CXX LD
-
 	# bootstrap script isn't exactly /bin/sh compatible
-	${CONFIG_SHELL:-sh} ./bootstrap \
+	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
 		--prefix="${T}/cmakestrap/" \
 		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
 		|| die "Bootstrap failed"
@@ -109,7 +109,6 @@ cmake_src_test() {
 	#    CMakeOnly.AllFindModules: pthread issues
 	#    CTest.updatecvs: fails to commit as root
 	#    Fortran: requires fortran
-	#    RunCMake.CommandLineTar: whatever...
 	#    RunCMake.CompilerLauncher: also requires fortran
 	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
 	#        debugedit binary is not in the expected location
@@ -121,7 +120,7 @@ cmake_src_test() {
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
@@ -130,10 +129,28 @@ cmake_src_test() {
 src_prepare() {
 	cmake_src_prepare
 
-	# disable Xcode hooks, bug #652134
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \
-			Source/cmGlobalXCodeGenerator.cxx || die
+		# disable Xcode hooks, bug #652134
+		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
+			Source/CMakeLists.txt || die
+		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
+			-e '/cmGlobalXCodeGenerator.h/d' \
+			Source/cmake.cxx || die
+		# disable isysroot usage with GCC, we've properly instructed
+		# where things are via GCC configuration and ldwrapper
+		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
+			Modules/Platform/Apple-GNU-*.cmake || die
+		# disable isysroot usage with clang as well
+		sed -i -e '/_SYSROOT_FLAG/d' \
+			Modules/Platform/Apple-Clang.cmake || die
+		# don't set a POSIX standard, system headers don't like that, #757426
+		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmLoadCommandCommand.cxx \
+			Source/cmStandardLexer.h \
+			Source/cmSystemTools.cxx \
+			Source/cmTimestamp.cxx
+		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
+			Source/cmStandardLexer.h
 	fi
 
 	# Add gcc libs to the default link paths
@@ -142,7 +159,7 @@ src_prepare() {
 		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
 		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
 		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-	if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then
+	if ! has_version -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; then
 		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
 		cmake_src_bootstrap
 	fi
@@ -162,13 +179,7 @@ src_configure() {
 		-DBUILD_CursesDialog="$(usex ncurses)"
 		-DBUILD_TESTING=$(usex test)
 	)
-
-	if use qt5 ; then
-		mycmakeargs+=(
-			-DBUILD_QtDialog=ON
-			$(cmake_use_find_package qt5 Qt5Widgets)
-		)
-	fi
+	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
 
 	cmake_src_configure
 }
@@ -200,8 +211,6 @@ src_install() {
 	doins "${FILESDIR}/${PN}.vim"
 
 	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-
-	rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
 }
 
 pkg_postinst() {
diff --git a/dev-util/cmake/cmake-3.19.4.ebuild b/dev-util/cmake/cmake-3.20.0_rc2.ebuild
index 99b8eab6c2f1..99b8eab6c2f1 100644
--- a/dev-util/cmake/cmake-3.19.4.ebuild
+++ b/dev-util/cmake/cmake-3.20.0_rc2.ebuild
diff --git a/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
deleted file mode 100644
index ab4a45a3ec1e..000000000000
--- a/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0fddcc1e5bd8e4672b09e2478edb72e5c0338f1b Mon Sep 17 00:00:00 2001
-From: Brad King <brad.king@kitware.com>
-Date: Wed, 1 Jul 2020 16:23:56 -0400
-Subject: [PATCH] cmake: Tolerate nullptr from uv_default_loop
-
-`uv_default_loop()` can return `nullptr` when running on a Linux kernel
-configured without `CONFIG_EVENTFD`.
-
-Fixes: #20899
----
- Source/cmSystemTools.cxx | 4 +++-
- Source/cmakemain.cxx     | 4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
-index be799b0402..2f08b840cd 100644
---- a/Source/cmSystemTools.cxx
-+++ b/Source/cmSystemTools.cxx
-@@ -823,7 +823,9 @@ void cmSystemTools::InitializeLibUV()
-   // Perform libuv one-time initialization now, and then un-do its
-   // global _fmode setting so that using libuv does not change the
-   // default file text/binary mode.  See libuv issue 840.
--  uv_loop_close(uv_default_loop());
-+  if (uv_loop_t* loop = uv_default_loop()) {
-+    uv_loop_close(loop);
-+  }
- #  ifdef _MSC_VER
-   _set_fmode(_O_TEXT);
- #  else
-diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
-index 75280fb8a5..e0c17f8d54 100644
---- a/Source/cmakemain.cxx
-+++ b/Source/cmakemain.cxx
-@@ -717,6 +717,8 @@ int main(int ac, char const* const* av)
- #ifndef CMAKE_BOOTSTRAP
-   cmDynamicLoader::FlushCache();
- #endif
--  uv_loop_close(uv_default_loop());
-+  if (uv_loop_t* loop = uv_default_loop()) {
-+    uv_loop_close(loop);
-+  }
-   return ret;
- }
--- 
-GitLab
-