commit: 6b3170b4b49c98c4fd39edf942b2a9710278abd4 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Dec 17 10:14:37 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Dec 17 10:23:25 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b3170b4
dev-util/cmake: Drop 3.16.5 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-util/cmake/Manifest | 1 - dev-util/cmake/cmake-3.16.5.ebuild | 220 --------------------- .../cmake/files/cmake-3.14.0_rc1-FindLAPACK.patch | 55 ------ .../cmake/files/cmake-3.15.0_rc2-FindBLAS.patch | 37 ---- 4 files changed, 313 deletions(-) diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index b0e5181cbd2..39f64e22405 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,5 +1,4 @@ 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 diff --git a/dev-util/cmake/cmake-3.16.5.ebuild b/dev-util/cmake/cmake-3.16.5.ebuild deleted file mode 100644 index f53ac8c1d18..00000000000 --- a/dev-util/cmake/cmake-3.16.5.ebuild +++ /dev/null @@ -1,220 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES_LIST=( none ) -inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \ - toolchain-funcs virtualx xdg-utils - -MY_P="${P/_/-}" - -DESCRIPTION="Cross platform Make" -HOMEPAGE="https://cmake.org/" -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" -IUSE="doc emacs ncurses qt5 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - app-crypt/rhash - >=app-arch/libarchive-3.3.3:= - >=dev-libs/expat-2.0.1 - >=dev-libs/jsoncpp-1.9.2-r2:0= - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( >=app-editors/emacs-23.1:* ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - doc? ( - dev-python/requests - dev-python/sphinx - ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -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 - - # 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.5.2-FindQt4.patch - - # respect python eclasses - "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # disable running of cmake in boostrap command - sed -i \ - -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ - bootstrap || die "sed failed" - - # execinfo.h on Solaris isn't quite what it is on Darwin - if [[ ${CHOST} == *-solaris* ]] ; then - sed -i -e 's/execinfo\.h/blablabla.h/' \ - Source/kwsys/CMakeLists.txt || die - fi - - tc-export CC CXX LD - - # bootstrap script isn't exactly /bin/sh compatible - ${CONFIG_SHELL:-sh} ./bootstrap \ - --prefix="${T}/cmakestrap/" \ - --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:^#_cmake_modify_IGNORE ::g' \ - "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ - || die - - pushd "${BUILD_DIR}" > /dev/null - - local ctestargs - [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" - - # Excluded tests: - # BootstrapTest: we actualy bootstrap it every time so why test it. - # BundleUtilities: bundle creation broken - # CMakeOnly.AllFindModules: pthread issues - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # 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 - "${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)" \ - || die "Tests failed" - - popd > /dev/null -} - -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 - fi - - # Add gcc libs to the default link paths - sed -i \ - -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ - -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 - CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" - cmake_src_bootstrap - fi -} - -src_configure() { - # Fix linking on Solaris - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl - - local mycmakeargs=( - -DCMAKE_USE_SYSTEM_LIBRARIES=ON - -DCMAKE_DOC_DIR=/share/doc/${PF} - -DCMAKE_MAN_DIR=/share/man - -DCMAKE_DATA_DIR=/share/${PN} - -DSPHINX_MAN=$(usex doc) - -DSPHINX_HTML=$(usex doc) - -DBUILD_CursesDialog="$(usex ncurses)" - -DBUILD_TESTING=$(usex test) - ) - - if use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake_src_install - - if use emacs; then - elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc - elisp-site-file-install "${FILESDIR}/${SITEFILE}" - fi - - insinto /usr/share/vim/vimfiles/syntax - doins Auxiliary/vim/syntax/cmake.vim - - insinto /usr/share/vim/vimfiles/indent - doins Auxiliary/vim/indent/cmake.vim - - insinto /usr/share/vim/vimfiles/ftdetect - doins "${FILESDIR}/${PN}.vim" - - dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} - - rm -r "${ED}"/usr/share/cmake/{completions,editors} || die -} - -pkg_postinst() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - if use qt5; then - xdg_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} 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 ebd83f38d18..00000000000 --- 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 <polynomia...@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.15.0_rc2-FindBLAS.patch b/dev-util/cmake/files/cmake-3.15.0_rc2-FindBLAS.patch deleted file mode 100644 index 64ab5612b86..00000000000 --- 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 <polynomia...@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 -