From 24bbcc13b55adc06848aa413247879668ae6ec91 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Wed, 1 Sep 2021 09:54:04 +0200 Subject: dev-util/cmake: Drop 3.18.5 Package-Manager: Portage-3.0.22, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner --- dev-util/cmake/Manifest | 1 - dev-util/cmake/cmake-3.18.5.ebuild | 214 --------------------- .../cmake/files/cmake-3.1.0-darwin-isysroot.patch | 48 ----- 3 files changed, 263 deletions(-) delete mode 100644 dev-util/cmake/cmake-3.18.5.ebuild delete mode 100644 dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 12801dd1c3c1..902fc967b3cc 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,4 +1,3 @@ -DIST cmake-3.18.5.tar.gz 8975784 BLAKE2B 62ea68b602e7e352c22ba6122aa010fb78fb5c4e484aa51bc336e750280d5fc03ffa439bd8005d2c43176f5a5db4ebfd419beca65cc59c5b8cd5666e38394fb8 SHA512 c15e0937a9c0ce0b6164c3d02a147e679ea57e1119cff4189a15de71429a7facb3c04eb8db467471876b5da5dbd4a25acb228efa7101fe78efd205f0d2c96343 DIST cmake-3.20.5.tar.gz 9441947 BLAKE2B f073d7c3968c714be315f5014076c785790ed47e9a746f2d16bc59769fb6862009f67c2e118038c6c9d8390b709f2b4ed4a4dfc41a93996fedd9d7d77111b84a SHA512 4ad7f194353be291e76d86d95928633daea653a0bd8d35369ac6ee2bb3f811c3a1aabe6a2bd51c6d5b07af2c6edc7e38d8b347ded32ab1ddcf331dbfce40c008 DIST cmake-3.21.1.tar.gz 9629567 BLAKE2B 1f33117f6fe3491923d053e4d025741340eff477a7a34ef26a6185d7e8f197d159a4cb45b0d79af3298939f8970c27e663a6011fcf479405d458b294fdf3dd72 SHA512 1453b1f5139950f501c570c305257e4e5dacb8224944de8ed1489aae162c6dd75fe1cd5188d619c47e4e53ca5b846f07318ffb3ab004a0547f2c8b13f60083b4 DIST cmake-3.21.2.tar.gz 9630492 BLAKE2B 7c73cad02ee9dbadd8cbf60994856ccb6fd3721cbb7a58d66638169cf99426d8ad732de912ee5c736466d64c145a68a102db93cb5d4d0dbde001681edbf7a200 SHA512 75649404564aaa6175a8c66ab19a10318066dbb667806c287e3cb125ac4c16c1629c160e355bcc50864a38d5488b1f7d1bc77acc602f5f3edd5f68691ae5080d diff --git a/dev-util/cmake/cmake-3.18.5.ebuild b/dev-util/cmake/cmake-3.18.5.ebuild deleted file mode 100644 index f3b612048616..000000000000 --- a/dev-util/cmake/cmake-3.18.5.ebuild +++ /dev/null @@ -1,214 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_MAKEFILE_GENERATOR="emake" # Fixed in 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 - -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 ~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-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/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.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.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 -b \>=${CATEGORY}/${PN}-3.4.0_rc1 || ! cmake --version &>/dev/null ; 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) - ) - use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON ) - - 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} -} - -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.1.0-darwin-isysroot.patch b/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch deleted file mode 100644 index 1f3599bcc828..000000000000 --- a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch +++ /dev/null @@ -1,48 +0,0 @@ -Do not detect Xcode and set -isysroot for its SDK, since that messes up -our toolchain, and hence makes any compilation fail, bug #445308 - ---- a/Modules/Platform/Darwin-Initialize.cmake -+++ b/Modules/Platform/Darwin-Initialize.cmake -@@ -1,16 +1,16 @@ - # Ask xcode-select where to find /Developer or fall back to ancient location. --execute_process(COMMAND xcode-select -print-path -- OUTPUT_VARIABLE _stdout -- OUTPUT_STRIP_TRAILING_WHITESPACE -- ERROR_VARIABLE _stderr -- RESULT_VARIABLE _failed) --if(NOT _failed AND IS_DIRECTORY ${_stdout}) -- set(OSX_DEVELOPER_ROOT ${_stdout}) --elseif(IS_DIRECTORY "/Developer") -- set(OSX_DEVELOPER_ROOT "/Developer") --else() -+#execute_process(COMMAND xcode-select -print-path -+# OUTPUT_VARIABLE _stdout -+# OUTPUT_STRIP_TRAILING_WHITESPACE -+# ERROR_VARIABLE _stderr -+# RESULT_VARIABLE _failed) -+#if(NOT _failed AND IS_DIRECTORY ${_stdout}) -+# set(OSX_DEVELOPER_ROOT ${_stdout}) -+#elseif(IS_DIRECTORY "/Developer") -+# set(OSX_DEVELOPER_ROOT "/Developer") -+#else() - set(OSX_DEVELOPER_ROOT "") --endif() -+#endif() - - execute_process(COMMAND sw_vers -productVersion - OUTPUT_VARIABLE CURRENT_OSX_VERSION -@@ -91,10 +91,10 @@ - # CMAKE_OSX_DEPLOYMENT_TARGET - - # Set cache variable - end user may change this during ccmake or cmake-gui configure. --if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -- "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") --endif() -+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3) -+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING -+# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.") -+#endif() - - #---------------------------------------------------------------------------- - # CMAKE_OSX_SYSROOT -- cgit v1.2.3-65-gdbad