commit: d7167e80d683cbb5420930113daefdd3eb93c909
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 26 15:30:59 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 26 21:19:24 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7167e80
dev-util/cmake: Drop 3.17.4-r1
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
dev-util/cmake/Manifest | 1 -
dev-util/cmake/cmake-3.17.4-r1.ebuild | 223 ---------------------
.../cmake/files/cmake-3.17.4-uv-check-return.patch | 46 -----
3 files changed, 270 deletions(-)
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 43be67cfb53..0da9dc3439e 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.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.5.tar.gz 9270284 BLAKE2B
4620f5f2a08e16a90350559e539a701606a0e8b4ee358ae5d1668c1f1d43674ac75a06ae335e52363fad9750bde430938faa2497108c2db6038479058412969a
SHA512
de8645c7c03bd48987f6eefc19bc2856c2a939e537cf204e1c9749d5a3e21c71695080bee246e94871f82996ede9d1a8771972266434549b48df9924fbb4c6f2
DIST cmake-3.19.6.tar.gz 9270931 BLAKE2B
5480ea3f3d159cd6471623ec73dfd73ab20ceb21744b2acc8bdbd27b8be7338e2ab8ae81366bbc3af474be49723567421450dfd6b7c51c65f36494c04fe13946
SHA512
556655c0fd17d5c70d5c1725f49ccad0d8088e6cbb3370d48d5a548d49d0e066d21c69978ed9b49d786fbb8eb79e086e719882245c9261c692b9457ba23b76f9
diff --git a/dev-util/cmake/cmake-3.17.4-r1.ebuild
b/dev-util/cmake/cmake-3.17.4-r1.ebuild
deleted file mode 100644
index 45b0de57b6c..00000000000
--- a/dev-util/cmake/cmake-3.17.4-r1.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2021 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 ~sparc-solaris ~x64-solaris
~x86-solaris"
-IUSE="doc emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=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:=
- >=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.17.0_rc1-FindBLAS.patch
- "${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
-
- # upstream fixes (can usually be removed with a version bump)
- "${FILESDIR}"/${P}-uv-check-return.patch # bug 726962
-)
-
-cmake_src_bootstrap() {
- # disable running of cmake in bootstrap 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 actually bootstrap it every time so why test it.
- # BundleUtilities: bundle creation broken
- # 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
- # RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
- # it can't find a deb package that owns libc
- # 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.CommandLineTar|RunCMake.CompilerLauncher|RunCMake.IncompatibleQt|RunCMake.ObsoleteQtMacros|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.17.4-uv-check-return.patch
b/dev-util/cmake/files/cmake-3.17.4-uv-check-return.patch
deleted file mode 100644
index ab4a45a3ec1..00000000000
--- 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.k...@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
-
