diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /dev-util/cmake | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'dev-util/cmake')
-rw-r--r-- | dev-util/cmake/Manifest | 12 | ||||
-rw-r--r-- | dev-util/cmake/cmake-3.11.4-r1.ebuild | 4 | ||||
-rw-r--r-- | dev-util/cmake/cmake-3.12.2.ebuild | 223 | ||||
-rw-r--r-- | dev-util/cmake/cmake-3.13.1.ebuild (renamed from dev-util/cmake/cmake-3.13.0_rc3.ebuild) | 0 | ||||
-rw-r--r-- | dev-util/cmake/cmake-3.13.2.ebuild (renamed from dev-util/cmake/cmake-3.12.1.ebuild) | 7 |
5 files changed, 12 insertions, 234 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index 824b4218ff65..deb5c7e353b8 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -15,16 +15,14 @@ AUX cmake-3.9.0_rc2-prefix-dirs.patch 4030 BLAKE2B e2cb3f630e4178ea93d5fcc7e14b5 AUX cmake.vim 217 BLAKE2B 5d2cf8b4101a7204fd27a9f21d82fea4d86fc4eeed54e062b543452dc574e73d1c80167c83eb482d9eec310950ac811ba35d3eeb97b51958f12f3adf575ddbe7 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b714104dba1d470c8e1e487d8e6cc5d486febae88d4a71eb9419064bcf94f9bb2c779771323221c1f117baa693 SHA512 1ba6381321cb34c3c050548a1346d3b92d590a196d8aff7435c079cd485d01f7a6cd650ad97d00931aff424fcdc195bbaa6d9d7db679bf02f72f586c7b528ae4 DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 -DIST cmake-3.12.1.tar.gz 8090272 BLAKE2B 081935b05bca26a0e4d515da9e76b62781d7bdbe00dc37c170b4905e5d3b1cffcb81d7a4ae1d1226034ffae927dc678a718e684a286cefae7278e988db284507 SHA512 7a0a769ef060785a8dc8c6aa272435a90a07cc8079f6c83c916da0b79d8bcdefca0d7be21f55f408ab4dfa6a57caa9ff8dec4be993145f4e3337ff392481b692 -DIST cmake-3.12.2.tar.gz 8388114 BLAKE2B 2bb28991527287da62d5416dfde3a9ff072534d52b124d1f73a555d7defb16f05300c78e4c258ba2d09d11cef285fe799c3d132cd1bd4e573aea67cb86beb2af SHA512 a2f44b2d77d9a3aa62273dbdeb94ad336c7430f41a31f48b4b395d170577b2b296d598ed9d1d548df95758b3fbf3ced193e1398fd701bc99792580798ec2a99d DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c -DIST cmake-3.13.0-rc3.tar.gz 8614538 BLAKE2B 5c1c8424f1328beba862dc642ab5db4cbbd63122c97cfd19089520610e890326537f5bc4869e61e2013571583556d0042ae15e6df84cd514e534b3ff9c065665 SHA512 8285d46545b05e0fe65d3d713ce42b2e771fdb17dbcdefabf270c272bc7a52e6a7fe437e06a28ca406910d3fdb190778558b1298622fd2ddcb87cfb8eb20f496 +DIST cmake-3.13.1.tar.gz 8614663 BLAKE2B d05012a1b13de78388f96da1b28a28538d14e9851abee79618c10f7c126574c4c8cca3f3197970ec1acf4361f70f30baf7ef4f377e507e054dde20f2d5d48c82 SHA512 693520e53fa21e81f5f15e6f8979e5264e3bf7e194e4c19b884a44767b3b6d6535dee674f355440e7dcac480372882152c0523ac3c2f1c12d51b43540bcffa59 +DIST cmake-3.13.2.tar.gz 8614687 BLAKE2B 2917116870bf6248865502d093e7974da5e22b053fb7eb1fc93581ee8bc6bdc719f7250619ca5657baff9d5e8e796a62964503b32e199a57e5f44ece25331037 SHA512 da095d483326ed379bfc8fa54e95db3426149ab923479a757149a4aed5c90693c0244bc2c9550cf4b64385f5003ee2060fea1698d989ed13bd0198e718c40903 DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c EBUILD cmake-3.10.3.ebuild 5850 BLAKE2B ac06e0efaf6b8cf93617c2690ee19313df282e7707c1b313eb69b5a0e0d40d2e1431cb62fca9539281fa15cd63268e84d0f5bece3d9217334724cb9689f98bbe SHA512 721359c13d244b30fa47a9b9c30a91225fe25eab866a5d3b9b7230f4127be30b77749a90bcbbef768ad709ef3bf5b0f13c4ddb862c293207bb534a7f4ba3e87f -EBUILD cmake-3.11.4-r1.ebuild 6227 BLAKE2B 1ff1b9195e39fda2b03e5dc5d2148a53b959469b19fd7d423d5502e41c72a6791dba00302dab6d241fca639bbe80711d3c0ad77eaea2ff5aea7b621cb72d77e6 SHA512 7896c37bceb3300d554ec654b4500abc2c8d4a08af8b11bc488351e39652aa6b54d02e563f4de01c6d2d73f59b3545810221f3e35ab16883d50574b1bbff0af8 -EBUILD cmake-3.12.1.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0 -EBUILD cmake-3.12.2.ebuild 6003 BLAKE2B e16c5457ad5fb9a8ff562258dd6d42426001cbf579a00b7d9af982f43663358c418cf28165836382d63e6a1ddeae7346c7a012501f288c42de67ef2e48a31fc1 SHA512 a6e8eef0d87ddf880ea0c19058f16dd544ded44f198a14fc9dbca05802e5f7d2ec728289424fd498fed63578919c1d8bc5c31c14afd11134ab65abb60f63e6c0 +EBUILD cmake-3.11.4-r1.ebuild 6220 BLAKE2B 0490388c4d5a698062592e86cb6fd3b83468f4822964459a8b7d540817b0b0863264e1c0b565f8de8b820f142d1e976b8a67d4e2ccb6c04f920cb06cd2ae4fda SHA512 14a6655444822ad8099b259bf9082042eafb4fb3fcfee83ead4677f22b7ff1a2b916ed38b6e691daae17467f45b0b468b82c35febdf9118853fe3faf999d58c0 EBUILD cmake-3.12.3.ebuild 6000 BLAKE2B d62e6c9766e7acbe5f8b080489c3d543ed257c1c06d87ea0f2ae0d5c033860622777cf1c4a2849c26a8f630158c78f47b531752eb32723379111f19533b0e3d1 SHA512 f50e7eca076cb7f8e4ae8214a404fb885cfc9a617456a1f6c7fd79a0a91323b7501ab2e03234210305a77f3d86cd52a6edef5b52d16c98160aab1fce6d726947 -EBUILD cmake-3.13.0_rc3.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978 +EBUILD cmake-3.13.1.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978 +EBUILD cmake-3.13.2.ebuild 6068 BLAKE2B 7297979a288a9b748567d8680748c75d4dd45fc8013d7b206ff56efc0b0806675af7328d90173937c08650a71abb29e81470d1db2177fce3d6fb99093c2679b7 SHA512 e4e83d3910b2f249ffe57e3e2ed175f87d75fdcaae48a7d48e0d647747adae666a808fda9cf4cb172af6b5604a73183bc0d5caeac1d21e10c4044fc78a30b978 EBUILD cmake-3.9.6.ebuild 5941 BLAKE2B 6fb4f6d9adae179fae54b1e5745db1b584464c19483ea450b04f3dbf47e8d5ef45800fcc8a33f1dce1c139e0acf302aaa4fb190e097e521cec14540aa8ae9c49 SHA512 cb45d92c42aaf89ac39fd786442c2cd5d8f1316d591323fe7ea23bf6c4a27fe18424d55a02093333abf851cbae7f965c0c2c899118464b51a567738a5d6cfd25 MISC metadata.xml 430 BLAKE2B af8a9e9fbd898224f970f38c42b07ab2a3f31da674056af30a8059d4378c80d201d9fa98fceffed15a5f2130767a782ea72fce642e9c4f6b5709ecf1533455e6 SHA512 9a71665c1654c038746d4cdd8217382d38493a7064cf4b6a6b12aef632b05e40e530ceb923fc389b182e1b513cbe4c149921d8036565ad8247b948640d5fa015 diff --git a/dev-util/cmake/cmake-3.11.4-r1.ebuild b/dev-util/cmake/cmake-3.11.4-r1.ebuild index c6d6affe7043..9df56641cf19 100644 --- a/dev-util/cmake/cmake-3.11.4-r1.ebuild +++ b/dev-util/cmake/cmake-3.11.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -62,7 +62,7 @@ PATCHES=( # boost (#660980) "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch - # upstream fixes (can usually be removed with a version bump) + # upstream fixes (can usually be removed with a version bump) "${FILESDIR}"/${P}-libuv-1.21.patch ) diff --git a/dev-util/cmake/cmake-3.12.2.ebuild b/dev-util/cmake/cmake-3.12.2.ebuild deleted file mode 100644 index 1d2802087662..000000000000 --- a/dev-util/cmake/cmake-3.12.2.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_REMOVE_MODULES="no" -inherit bash-completion-r1 elisp-common eutils flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="doc emacs system-jsoncpp ncurses qt5" - -RDEPEND=" - app-crypt/rhash - >=app-arch/libarchive-3.0.0:= - >=dev-libs/expat-2.0.1 - >=dev-libs/libuv-1.10.0:= - >=net-misc/curl-7.21.5[ssl] - sys-libs/zlib - virtual/pkgconfig - emacs? ( virtual/emacs ) - ncurses? ( sys-libs/ncurses:0= ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - ) - system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) -" -DEPEND="${RDEPEND} - doc? ( - dev-python/requests - dev-python/sphinx - ) -" - -S="${WORKDIR}/${MY_P}" - -SITEFILE="50${PN}-gentoo.el" - -PATCHES=( - # prefix - "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch - "${FILESDIR}"/${PN}-3.9.0_rc2-prefix-dirs.patch - "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch - - # handle gentoo packaging in find modules - "${FILESDIR}"/${PN}-3.11.0_rc2-FindBLAS.patch - "${FILESDIR}"/${PN}-3.0.2-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 - - # boost (#660980) - "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch - - # upstream fixes (can usually be removed with a version bump) -) - -cmake_src_bootstrap() { - # Cleanup args to extract only JOBS. - # Because bootstrap does not know anything else. - echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null - if [ $? -eq 0 ]; then - par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') - par_arg="--parallel=${par_arg}" - else - par_arg="--parallel=1" - fi - - # 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/" \ - ${par_arg} \ - || die "Bootstrap failed" -} - -cmake_src_test() { - # fix OutDir and SelectLibraryConfigurations tests - # these are altered thanks to our eclass - sed -i -e 's:#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 - # CTest.updatecvs: which fails to commit as root - # Fortran: requires fortran - # Qt4Deploy, which tries to break sandbox and ignores prefix - # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because - # debugedit binary is not in the expected location - # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ - -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ - || die "Tests failed" - - popd > /dev/null -} - -src_prepare() { - cmake-utils_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 "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_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) - -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr - -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)" - ) - - if use qt5 ; then - mycmakeargs+=( - -DBUILD_QtDialog=ON - $(cmake-utils_use_find_package qt5 Qt5Widgets) - ) - fi - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use emacs && elisp-compile Auxiliary/cmake-mode.el -} - -src_test() { - virtx cmake_src_test -} - -src_install() { - cmake-utils_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 - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} - -pkg_postrm() { - use emacs && elisp-site-regen - if use qt5; then - gnome2_icon_cache_update - xdg_desktop_database_update - xdg_mimeinfo_database_update - fi -} diff --git a/dev-util/cmake/cmake-3.13.0_rc3.ebuild b/dev-util/cmake/cmake-3.13.1.ebuild index 73aee46de553..73aee46de553 100644 --- a/dev-util/cmake/cmake-3.13.0_rc3.ebuild +++ b/dev-util/cmake/cmake-3.13.1.ebuild diff --git a/dev-util/cmake/cmake-3.12.1.ebuild b/dev-util/cmake/cmake-3.13.2.ebuild index 1d2802087662..73aee46de553 100644 --- a/dev-util/cmake/cmake-3.12.1.ebuild +++ b/dev-util/cmake/cmake-3.13.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -120,7 +120,10 @@ cmake_src_test() { # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because # debugedit binary is not in the expected location # TestUpload, which requires network access - "${BUILD_DIR}"/bin/ctest ${ctestargs} \ + "${BUILD_DIR}"/bin/ctest \ + -j "$(makeopts_jobs)" \ + --test-load "$(makeopts_loadavg)" \ + ${ctestargs} \ -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|RunCMake.CPack_RPM|TestUpload)" \ || die "Tests failed" |