Updating liguros repo21.1.2

11 files changed, 57 insertions, 374 deletions

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index b0e5181cbd21..7a303af742e7 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,5 @@
 DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
-DIST cmake-3.16.5.tar.gz 9111262 BLAKE2B 5f996113a4979563d7b9f298b4b1a32d6f91eebaa79af42e1cbf247884e443de47e30030fd0f16c7755c4086e2bff0c0741911753ea7c889b68c393c0b98c876 SHA512 204ce83501c8068ff660c30a68641a354764135e1600a9a95b39476d072876e400961377e19bbe03a7b18412b36dcf21a693946a2a81cff5985e637e9f193671
 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.1.tar.gz 9256956 BLAKE2B 00874fa3099fe55e7a8c16f5225d30c56e05aaaa69930e0f10d1829bb373f83c17cb11ba538918089bd94162dbb4cc736b2024bd0e1e7102f3d8c462bfe71c1b SHA512 1a1c9a8546c80f8602babffc7fd398cea5d9163512ef74333f87e26a97ca35358bd0e90423768cfc971ebfed185e19d775737e557e0e982403b77a2ccbcd063a
+DIST cmake-3.19.2.tar.gz 9264414 BLAKE2B f45727fd6b6e0e324f618577abbc7fb1830f05f01a9afea4f8713f5f62ede3a612a020ef97385cdd6ede4b575a3b6f63deb57123a222b71e2906a42cba3b3d7f SHA512 d811122af89d46174b8fdb2a26e8553200d9dc7eb6385ece4e4b3e7584880f73a799813d5a81e64e956fd2574b63264fa8944d862c74a076e9d61f5e6521e91a
+DIST cmake-3.19.3.tar.gz 9265831 BLAKE2B 133ca8b12c0ccff0f9d833543c66cac597d72898d6e8602c74ef2875c90059b0a19d059b8801e407a7d5931b8aa50b253aef970330454789e13e2e63a7bb6d97 SHA512 54c91fa76882152d3933b696d7e547bc4edf6f97f3810e8dd57ca28c98e9fcaf757eac7c77e1e7fab88aced10937ed354917aeac3997edef406313dcf76ba0c5
diff --git a/dev-util/cmake/cmake-3.13.5.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 1c5774d1e717..2b496b439633 100644
--- a/dev-util/cmake/cmake-3.13.5.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="doc emacs system-jsoncpp ncurses qt5"
 
 RDEPEND="
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild b/dev-util/cmake/cmake-3.17.4-r1.ebuild
index 27718c8a18dd..45b0de57b6ce 100644
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ b/dev-util/cmake/cmake-3.17.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+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"
 IUSE="doc emacs ncurses qt5 test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild
index 7334e72c320d..4c0006310904 100644
--- a/dev-util/cmake/cmake-3.18.5.ebuild
+++ b/dev-util/cmake/cmake-3.18.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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.1-r1.ebuild b/dev-util/cmake/cmake-3.19.2.ebuild
index 2726694149e4..3dbd001d5376 100644
--- a/dev-util/cmake/cmake-3.19.1-r1.ebuild
+++ b/dev-util/cmake/cmake-3.19.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~x86-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 )"
 
@@ -69,8 +69,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
 
 	# upstream fixes (can usually be removed with a version bump)
-	"${FILESDIR}"/${P}-fix-spurious-include-target.patch # bug 759271
-	"${FILESDIR}"/${P}-use-FPHSA-outside-find_package.patch # bug 755743
 )
 
 cmake_src_bootstrap() {
@@ -139,6 +137,9 @@ src_prepare() {
 		# 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 \
diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.19.3.ebuild
index f53ac8c1d184..930417171292 100644
--- a/dev-util/cmake/cmake-3.16.5.ebuild
+++ b/dev-util/cmake/cmake-3.19.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-CMAKE_MAKEFILE_GENERATOR="emake"
+CMAKE_MAKEFILE_GENERATOR="emake" # TODO: Re-check with 3.19, see commit 491dddfb; bug #596460
 CMAKE_REMOVE_MODULES_LIST=( none )
 inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
 	toolchain-funcs virtualx xdg-utils
@@ -17,13 +17,13 @@ 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 ~x86-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 )"
 
 RDEPEND="
-	app-crypt/rhash
 	>=app-arch/libarchive-3.3.3:=
+	app-crypt/rhash
 	>=dev-libs/expat-2.0.1
 	>=dev-libs/jsoncpp-1.9.2-r2:0=
 	>=dev-libs/libuv-1.10.0:=
@@ -54,23 +54,25 @@ 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.15.0_rc2-FindBLAS.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch
+	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.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)
 )
 
 cmake_src_bootstrap() {
-	# disable running of cmake in boostrap command
+	# disable running of cmake in bootstrap command
 	sed -i \
 		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
 		bootstrap || die "sed failed"
@@ -81,10 +83,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"
@@ -103,22 +103,24 @@ cmake_src_test() {
 	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
 
 	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
+	#    BootstrapTest: we actually bootstrap it every time so why test it.
 	#    BundleUtilities: bundle creation broken
 	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
+	#    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
 	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
 	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
+	#    RunCMake.{IncompatibleQt,ObsoleteQtMacros}: Require Qt4
+	#    TestUpload: requires network access
 	"${BUILD_DIR}"/bin/ctest \
 		-j "$(makeopts_jobs)" \
 		--test-load "$(makeopts_loadavg)" \
 		${ctestargs} \
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
+		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|DependencyGraph|Fortran|RunCMake.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|RunCMake.PrecompileHeaders|RunCMake.CPack_(DEB|RPM)|TestUpload)" \
 		|| die "Tests failed"
 
 	popd > /dev/null
@@ -127,10 +129,26 @@ 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
 	fi
 
 	# Add gcc libs to the default link paths
@@ -139,7 +157,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
@@ -159,13 +177,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
 }
@@ -197,8 +209,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/files/cmake-3.14.0_rc1-FindLAPACK.patch b/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
deleted file mode 100644
index ebd83f38d187..000000000000
--- a/dev-util/cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 6d4d97b328f48862923bb55c1c0976b1d532dcc3 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sun, 10 Feb 2019 23:01:53 +0100
-Subject: [PATCH] Prefer pkgconfig in FindLAPACK
-
----
- Modules/FindLAPACK.cmake | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/Modules/FindLAPACK.cmake b/Modules/FindLAPACK.cmake
-index d6646eaacf..ef5f324670 100644
---- a/Modules/FindLAPACK.cmake
-+++ b/Modules/FindLAPACK.cmake
-@@ -7,6 +7,10 @@ FindLAPACK
- 
- Find LAPACK library
- 
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed fortran library that implements the
- LAPACK linear-algebra interface (see http://www.netlib.org/lapack/).
- 
-@@ -181,6 +185,21 @@ endif()
- 
- endmacro()
- 
-+# first, try PkgConfig
-+find_package(PkgConfig REQUIRED)
-+pkg_check_modules(PC_LAPACK lapack)
-+if(PC_LAPACK_FOUND)
-+  foreach(PC_LIB ${PC_LAPACK_LIBRARIES})
-+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_LAPACK_LIBRARY_DIRS} )
-+    if (NOT ${PC_LIB}_LIBRARY)
-+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_LAPACK_LIBRARY_DIRS}")
-+    endif (NOT ${PC_LIB}_LIBRARY)
-+    list(APPEND LAPACK_LIBRARIES ${${PC_LIB}_LIBRARY})
-+  endforeach(PC_LIB)
-+  find_package_handle_standard_args(LAPACK DEFAULT_MSG LAPACK_LIBRARIES)
-+  mark_as_advanced(LAPACK_LIBRARIES)
-+else(PC_LAPACK_FOUND)
-+message(STATUS "No PkgConfig configuration for LAPACK found; starting more extensive search.")
- 
- set(LAPACK_LINKER_FLAGS)
- set(LAPACK_LIBRARIES)
-@@ -428,3 +447,5 @@ endif()
- 
- cmake_pop_check_state()
- set(CMAKE_FIND_LIBRARY_SUFFIXES ${_lapack_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
-+
-+endif(PC_LAPACK_FOUND)
--- 
-2.20.1
-
diff --git a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
index d03b17551f0b..9a6054e9557f 100644
--- a/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
+++ b/dev-util/cmake/files/cmake-3.14.0_rc3-prefix-dirs.patch
@@ -17,7 +17,8 @@ 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)
-Updated by Lars Wendler (cmake-3.14.0_rc3
+Updated by Lars Wendler (cmake-3.14.0_rc3)
+Updated by Jacob Floyd (cmake-3.19.2)
 ---
  Modules/Platform/Darwin.cmake    | 12 +++++++----
  Modules/Platform/UnixPaths.cmake | 35 ++++++++++++++++++++++++--------
@@ -39,16 +40,17 @@ index 5590433a3b..b04383e51d 100644
  endif()
  
  # Older OS X linkers do not report their framework search path
-@@ -140,6 +140,8 @@ endif()
+@@ -140,6 +140,9 @@ endif()
  
  # set up the default search directories for frameworks
  set(CMAKE_SYSTEM_FRAMEWORK_PATH
++  @GENTOO_PORTAGE_EPREFIX@MacOSX.sdk/System/Library/Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@Frameworks
 +  @GENTOO_PORTAGE_EPREFIX@usr/lib
    ~/Library/Frameworks
    )
  if(_CMAKE_OSX_SYSROOT_PATH)
-@@ -186,13 +188,15 @@ if(CMAKE_OSX_SYSROOT)
+@@ -186,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
    endif()
  endif()
  
diff --git a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
deleted file mode 100644
index 64ab5612b868..000000000000
--- a/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 4de8287ce3b098ea579a28155d442eb589db8617 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Sat, 22 Jun 2019 16:09:05 +0200
-Subject: [PATCH] Prefer pkgconfig in FindBLAS
-
----
- Modules/FindBLAS.cmake | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake
-index 77f9d0e40c..bbe155caa9 100644
---- a/Modules/FindBLAS.cmake
-+++ b/Modules/FindBLAS.cmake
-@@ -7,6 +7,10 @@ FindBLAS
- 
- Find Basic Linear Algebra Subprograms (BLAS) library
- 
-+Version modified for Gentoo Linux.
-+If a valid PkgConfig configuration is found, this overrides and cancels
-+all further checks.
-+
- This module finds an installed Fortran library that implements the
- BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
- list of libraries searched for is taken from the ``autoconf`` macro file,
-@@ -92,6 +96,9 @@ installation.
- 
- #]=======================================================================]
- 
-+# first, try PkgConfig
-+set(BLA_PREFER_PKGCONFIG On)
-+
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
- include(${CMAKE_CURRENT_LIST_DIR}/CMakePushCheckState.cmake)
--- 
-2.22.0
-
diff --git a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch b/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
deleted file mode 100644
index 1b51cf013fe5..000000000000
--- a/dev-util/cmake/files/cmake-3.19.1-fix-spurious-include-target.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 38bcb5c0a3accd2dd29fb7632c6b3bf31b990d82 Mon Sep 17 00:00:00 2001
-From: Deniz Bahadir <dbahadir@benocs.com>
-Date: Tue, 1 Dec 2020 00:25:39 +0100
-Subject: [PATCH] export: Do not fail generation for separate namelink only
- case
-
-Update the change from commit 64690f6df0 (export: Do not fail generation
-for namelink-only case, 2020-10-09, v3.19.0-rc1~7^2) to also handle
-separate namelink-only and namelink-skip calls.
-
-Fixes: #21529
----
- Source/cmExportBuildFileGenerator.cxx         |  3 +++
- Source/cmExportInstallFileGenerator.cxx       |  3 +++
- Source/cmInstallCommand.cxx                   | 19 +++++++++++--------
- Source/cmTargetExport.h                       |  2 ++
- Tests/RunCMake/export/RunCMakeTest.cmake      |  1 +
- .../export/SeparateNamelinkExport.cmake       | 16 ++++++++++++++++
- .../install/EXPORT-SeparateNamelink.cmake     | 19 +++++++++++++++++++
- Tests/RunCMake/install/RunCMakeTest.cmake     |  1 +
- 8 files changed, 56 insertions(+), 8 deletions(-)
- create mode 100644 Tests/RunCMake/export/SeparateNamelinkExport.cmake
- create mode 100644 Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-
-diff --git a/Source/cmExportBuildFileGenerator.cxx b/Source/cmExportBuildFileGenerator.cxx
-index dd700c5edf..1a31ae4afd 100644
---- a/Source/cmExportBuildFileGenerator.cxx
-+++ b/Source/cmExportBuildFileGenerator.cxx
-@@ -288,6 +288,9 @@ void cmExportBuildFileGenerator::GetTargets(
-   if (this->ExportSet) {
-     for (std::unique_ptr<cmTargetExport> const& te :
-          this->ExportSet->GetTargetExports()) {
-+      if (te->NamelinkOnly) {
-+        continue;
-+      }
-       targets.push_back(te->TargetName);
-     }
-     return;
-diff --git a/Source/cmExportInstallFileGenerator.cxx b/Source/cmExportInstallFileGenerator.cxx
-index 987ec9ea7b..0b9b183d54 100644
---- a/Source/cmExportInstallFileGenerator.cxx
-+++ b/Source/cmExportInstallFileGenerator.cxx
-@@ -42,6 +42,9 @@ bool cmExportInstallFileGenerator::GenerateMainFile(std::ostream& os)
-     std::string sep;
-     for (std::unique_ptr<cmTargetExport> const& te :
-          this->IEGen->GetExportSet()->GetTargetExports()) {
-+      if (te->NamelinkOnly) {
-+        continue;
-+      }
-       expectedTargets += sep + this->Namespace + te->Target->GetExportName();
-       sep = " ";
-       if (this->ExportedTargets.insert(te->Target).second) {
-diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
-index b99e6a3c6c..ff08ee41ef 100644
---- a/Source/cmInstallCommand.cxx
-+++ b/Source/cmInstallCommand.cxx
-@@ -461,6 +461,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-     std::unique_ptr<cmInstallFilesGenerator> publicHeaderGenerator;
-     std::unique_ptr<cmInstallFilesGenerator> resourceGenerator;
- 
-+    // Avoid selecting default destinations for PUBLIC_HEADER and
-+    // PRIVATE_HEADER if any artifacts are specified.
-+    bool artifactsSpecified = false;
-+
-+    // Track whether this is a namelink-only rule.
-+    bool namelinkOnly = false;
-+
-     auto addTargetExport = [&]() {
-       // Add this install rule to an export if one was specified.
-       if (!exports.empty()) {
-@@ -475,20 +482,13 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-         te->ObjectsGenerator = objectGenerator.get();
-         te->InterfaceIncludeDirectories =
-           cmJoin(includesArgs.GetIncludeDirs(), ";");
--
-+        te->NamelinkOnly = namelinkOnly;
-         helper.Makefile->GetGlobalGenerator()
-           ->GetExportSets()[exports]
-           .AddTargetExport(std::move(te));
-       }
-     };
- 
--    // Avoid selecting default destinations for PUBLIC_HEADER and
--    // PRIVATE_HEADER if any artifacts are specified.
--    bool artifactsSpecified = false;
--
--    // Track whether this is a namelink-only rule.
--    bool namelinkOnly = false;
--
-     switch (target.GetType()) {
-       case cmStateEnums::SHARED_LIBRARY: {
-         // Shared libraries are handled differently on DLL and non-DLL
-@@ -497,6 +497,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-         if (target.IsDLLPlatform()) {
-           // When in namelink only mode skip all libraries on Windows.
-           if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+            namelinkOnly = true;
-             addTargetExport();
-             continue;
-           }
-@@ -529,6 +530,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-           if (target.IsFrameworkOnApple()) {
-             // When in namelink only mode skip frameworks.
-             if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+              namelinkOnly = true;
-               addTargetExport();
-               continue;
-             }
-@@ -574,6 +576,7 @@ bool HandleTargetsMode(std::vector<std::string> const& args,
-         if (target.IsFrameworkOnApple()) {
-           // When in namelink only mode skip frameworks.
-           if (namelinkMode == cmInstallTargetGenerator::NamelinkModeOnly) {
-+            namelinkOnly = true;
-             addTargetExport();
-             continue;
-           }
-diff --git a/Source/cmTargetExport.h b/Source/cmTargetExport.h
-index cb4d8dae44..1e38d84923 100644
---- a/Source/cmTargetExport.h
-+++ b/Source/cmTargetExport.h
-@@ -31,4 +31,6 @@ public:
-   cmInstallFilesGenerator* HeaderGenerator;
-   std::string InterfaceIncludeDirectories;
-   ///@}
-+
-+  bool NamelinkOnly = false;
- };
-diff --git a/Tests/RunCMake/export/RunCMakeTest.cmake b/Tests/RunCMake/export/RunCMakeTest.cmake
-index 95c8d5cf45..0e6020f0f4 100644
---- a/Tests/RunCMake/export/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/export/RunCMakeTest.cmake
-@@ -17,3 +17,4 @@ run_cmake(DependOnNotExport)
- run_cmake(DependOnDoubleExport)
- run_cmake(UnknownExport)
- run_cmake(NamelinkOnlyExport)
-+run_cmake(SeparateNamelinkExport)
-diff --git a/Tests/RunCMake/export/SeparateNamelinkExport.cmake b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
-new file mode 100644
-index 0000000000..b006aea128
---- /dev/null
-+++ b/Tests/RunCMake/export/SeparateNamelinkExport.cmake
-@@ -0,0 +1,16 @@
-+enable_language(CXX)
-+add_library(foo SHARED empty.cpp)
-+install(TARGETS foo EXPORT fooExport
-+  RUNTIME DESTINATION bin
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT runtime
-+     NAMELINK_SKIP
-+)
-+install(TARGETS foo EXPORT fooExport
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT development
-+     NAMELINK_ONLY
-+)
-+export(EXPORT fooExport FILE "${CMAKE_CURRENT_BINARY_DIR}/foo.cmake")
-diff --git a/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-new file mode 100644
-index 0000000000..5c6fa10d18
---- /dev/null
-+++ b/Tests/RunCMake/install/EXPORT-SeparateNamelink.cmake
-@@ -0,0 +1,19 @@
-+enable_language(C)
-+add_library(foo SHARED empty.c)
-+install(TARGETS foo EXPORT fooExport
-+  RUNTIME DESTINATION bin
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT runtime
-+     NAMELINK_SKIP
-+)
-+install(TARGETS foo EXPORT fooExport
-+  LIBRARY
-+     DESTINATION lib
-+     COMPONENT development
-+     NAMELINK_ONLY
-+)
-+install(EXPORT fooExport
-+    DESTINATION "lib/cmake/"
-+    FILE "foo.cmake"
-+)
-diff --git a/Tests/RunCMake/install/RunCMakeTest.cmake b/Tests/RunCMake/install/RunCMakeTest.cmake
-index 5aab88ca80..d64d88b770 100644
---- a/Tests/RunCMake/install/RunCMakeTest.cmake
-+++ b/Tests/RunCMake/install/RunCMakeTest.cmake
-@@ -78,6 +78,7 @@ run_cmake(TARGETS-DESTINATION-bad)
- run_cmake(EXPORT-OldIFace)
- run_cmake(EXPORT-UnknownExport)
- run_cmake(EXPORT-NamelinkOnly)
-+run_cmake(EXPORT-SeparateNamelink)
- run_cmake(CMP0062-OLD)
- run_cmake(CMP0062-NEW)
- run_cmake(CMP0062-WARN)
--- 
-GitLab
-
diff --git a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch b/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
deleted file mode 100644
index 8cde769ce8f8..000000000000
--- a/dev-util/cmake/files/cmake-3.19.1-use-FPHSA-outside-find_package.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 14ecf9c2f6edfae4033d9311f79d79d0d07fc1cf Mon Sep 17 00:00:00 2001
-From: Marc Chevrier <marc.chevrier@gmail.com>
-Date: Wed, 25 Nov 2020 16:36:12 +0100
-Subject: [PATCH] FPHSA: ensure it can be used outside 'find_package'
-
-Fixes: #21505
----
- Modules/FindPackageHandleStandardArgs.cmake | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPackageHandleStandardArgs.cmake b/Modules/FindPackageHandleStandardArgs.cmake
-index 7af017136d..7e172779e4 100644
---- a/Modules/FindPackageHandleStandardArgs.cmake
-+++ b/Modules/FindPackageHandleStandardArgs.cmake
-@@ -275,8 +275,10 @@ function(FIND_PACKAGE_CHECK_VERSION version result)
-     unset (${FPCV_RESULT_MESSAGE_VARIABLE} PARENT_SCOPE)
-   endif()
- 
--  if (CMAKE_FIND_PACKAGE_NAME)
--    set (package ${CMAKE_FIND_PACKAGE_NAME})
-+  if (_CMAKE_FPHSA_PACKAGE_NAME)
-+    set (package "${_CMAKE_FPHSA_PACKAGE_NAME}")
-+  elseif (CMAKE_FIND_PACKAGE_NAME)
-+    set (package "${CMAKE_FIND_PACKAGE_NAME}")
-   else()
-     message (FATAL_ERROR "find_package_check_version(): Cannot be used outside a 'Find Module'")
-   endif()
-@@ -436,6 +438,9 @@ function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-       "will be used.")
-   endif()
- 
-+  # to propagate package name to FIND_PACKAGE_CHECK_VERSION
-+  set(_CMAKE_FPHSA_PACKAGE_NAME "${_NAME}")
-+
-   # now that we collected all arguments, process them
- 
-   if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
--- 
-GitLab
-