commit:     354a33d62f6d2ac03901d76c77a27fc75b88a340
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  1 04:01:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Aug  1 07:05:48 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=354a33d6

dev-util/cmake: add 3.22.6

Signed-off-by: Sam James <sam <AT> gentoo.org>

 dev-util/cmake/Manifest            |   1 +
 dev-util/cmake/cmake-3.22.6.ebuild | 227 +++++++++++++++++++++++++++++++++++++
 2 files changed, 228 insertions(+)

diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index de23d1e71ad5..f9f903c32580 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,6 @@
 DIST cmake-3.22.2.tar.gz 9779456 BLAKE2B 
5f1c76344fe2d6fba012b0d745dc990ec1ed4bf32c99beac1e538f4b83c1d695aee757d2780e635b67c0a185935a6a70b344a733259e3a91d01c4b83e94e2730
 SHA512 
86e95f9ce773bcc7513a1c3901561a1b09d06830936b8b1d44e075fe3bac55cfa636eccdedfa94a9939f5e12eb965224559fac30a17c64314ee023acb2a3e53f
 DIST cmake-3.22.4.tar.gz 9781548 BLAKE2B 
d07172091c8ff695f9af398321e4bf7b64643e9186c4e882c5fb15ae1026a306bce61b6f410a858ab580c5d8ea7b9d03c901e2c3ac1e6cf841b6ad969261b96f
 SHA512 
4fc04ec3077b261fe252d26d18e81271975db0bb237686c0e0e774d180e6c7fdfb0275092c21569674ad0ca53218a8c6c5638a5fe5c46a988362b0083e3d40c4
+DIST cmake-3.22.6.tar.gz 9785574 BLAKE2B 
7098bd32e6e5297ad27822a5e8358e0af2d916047af2e6e6bdb0b1c8e8b461c3588b8d174d6f7722a51748d47a761893108cfada9b7c19667f3143cdc5618cd3
 SHA512 
097e04c6f106c6020b8f145c822727a4cc79aaa234c77a9550208b5fe7787b68488dc18e5fcae0f111e20f8492294766ff396933bee687ee8ddb7bb94b71dcf8
 DIST cmake-3.23.1-SHA-256.txt 1452 BLAKE2B 
8cce350435aeffdb7b903d87be611ed0362f601f7cfcff96f444859e40227b46e03baac6427587cafec79e9e1c8ab7ac4ee3dc915131c13badf2bcac99e1e8b7
 SHA512 
fd2dec42f51344a15d1a8e6afd35e96399765c5283925c4708aed5fa84117d0415ef014652cc740600bf75265baadac0559b6b8b1a0e60342a6e88eb61cbb4e5
 DIST cmake-3.23.1-SHA-256.txt.asc 833 BLAKE2B 
28ce9f5c99b263895ad19f9df43050156ad399846daf03be96b9c4439c41d57e9c26244ab872692e98db321ba919639881d68b81237a9f443316cfa0aea1b8af
 SHA512 
55b1808668b17a3bee0055e3736b6312e3260297ee02137e6bd90ba7a75d2a3e094e06fbe16cd299325f0c191a5f5924fadd075e5edbe3275933356df7b11b12
 DIST cmake-3.23.1.tar.gz 9982020 BLAKE2B 
a51eedeb78657caf86409ea8bdf4e61b09c66c6a0f3102c9b9ed42976a239f9c4561d7168b4bb24152b80cd773505166ca87e241dad3b36919b5e26573fb149e
 SHA512 
94893f888c0cbfc58e54a0bd65d6c0697fe4a0e95c678b7cb35e7dc8854d57eb360bfc952750f97983348817f847f6df85903f21a5857b1a3880b2a7eb6cc029

diff --git a/dev-util/cmake/cmake-3.22.6.ebuild 
b/dev-util/cmake/cmake-3.22.6.ebuild
new file mode 100644
index 000000000000..0d8e28da59fd
--- /dev/null
+++ b/dev-util/cmake/cmake-3.22.6.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
+# ... but seems fine as of 3.22.3?
+# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
+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 ~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 )"
+
+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
+       )
+       test? ( app-arch/libarchive[zstd] )
+"
+
+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
+       "${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
+
+       # handle gentoo packaging in find modules
+       "${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 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
+
+       # bootstrap script isn't exactly /bin/sh compatible
+       tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
+               --prefix="${T}/cmakestrap/" \
+               --parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
+               || die "Bootstrap failed"
+}
+
+src_prepare() {
+       cmake_src_prepare
+
+       if [[ ${CHOST} == *-darwin* ]] ; then
+               # 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
+       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() {
+       # 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 || die
+
+       # 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
+       #    RunCMake.CMP0125, known failure reported upstream (bug #829414)
+       local myctestargs=(
+               --output-on-failure
+               -E 
"(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)"
 \
+       )
+
+       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
+}

Reply via email to