commit: 50718920c31ffd682eeac840c4a4ff42bc971114
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 5 08:46:25 2017 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Oct 5 08:46:41 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50718920
dev-util/cmake: Removed old.
Package-Manager: Portage-2.3.11, Repoman-2.3.3
dev-util/cmake/Manifest | 1 -
dev-util/cmake/cmake-3.9.2.ebuild | 215 ---------------------
.../cmake/files/cmake-3.9.1-boost-1.65.0.patch | 74 -------
3 files changed, 290 deletions(-)
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index 021161714cb..423fafaa539 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,5 +1,4 @@
DIST cmake-3.7.2.tar.gz 7361593 SHA256
dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0 SHA512
b2ed0192e12267de19eb178c2dedc69d06fc33dfadd47efbe0ccf6969ad72d290fa4bff02861c379a8752337d67d2485d7e1ba947cb219f2e4041a53a195e88d
WHIRLPOOL
1861fe2887f4483856e1964ff1492e196624d3072ad1e21910fba29d0c0d654e7d5035571648386a77cd6cbe895f8cdfbb1f4cc1ad60d14015a01a22494456f7
DIST cmake-3.8.2.tar.gz 7504706 SHA256
da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d SHA512
49ea6f74a81dfa8ed8336c94ed50e0a483b796132c260f4bef159f9c389d99cc7b26ecfcccdd8b0a8f5b52fddd277c17c547d2a2e8848da9912c464ada1cbe3f
WHIRLPOOL
8768bffb365852414eda0349d71e59517c8047689303d7873a5889cb8b28c72cd636982a18b039f26daae33023f7e0ad91c3a9ab2d30c30e4b3a9b3cc525b78e
-DIST cmake-3.9.2.tar.gz 7703777 SHA256
954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1 SHA512
9528d9f39d00bb282cf36b4126c09f6884751ac68ab924893884eecbb77ea99b0e560b30e30d46faaa89417e7386f4b376e6c7c61ccf2f23948765f8607f943c
WHIRLPOOL
49d7ca2875c404b5783fda1785304ec04328a4cf8531bd8c2aefa85d485a20f287aeeba6533fd35d0d47057349322844e5ec980e19750da65f7b306931a74785
DIST cmake-3.9.3.tar.gz 7705238 SHA256
8eaf75e1e932159aae98ab5e7491499545554be62a08cbcbc7c75c84b999f28a SHA512
30058cf4c154221846d1cd22eaf44a297d2a2d020a443f3e6f40384dfb86ee9a639a1299aa9f187f230505b2a6ee0fe69fbf5e80410711a6ac3d7a07b37f8dfc
WHIRLPOOL
68d85783cf880984ce912e873f31500c87352cce69bad6da5a6086ce5bad2dd3d4a75ef2eae485649af7c380205aac9411f1dbdff155763d0e69d12d1eba4784
DIST cmake-3.9.4.tar.gz 7705052 SHA256
b5d86f12ae0072db520fdbdad67405f799eb728b610ed66043c20a92b4906ca1 SHA512
d9172f86df7ddefd0ecf1cd271add8b8af2d712a47ded530e9ff2c26e39087bc11a099125f17add6b563d176f27a68f4998bb53ae390b3f12894d658dfc8eee5
WHIRLPOOL
c1cc16977ce1c1a4ac58692694a608bb5996c19db677bb6d25db1e017586ad1d676bb1f086af4016b8017cfe845ed7c6795fad7f1e7b5ab0b4d9b414452d661f
diff --git a/dev-util/cmake/cmake-3.9.2.ebuild
b/dev-util/cmake/cmake-3.9.2.ebuild
deleted file mode 100644
index 5ff11523d79..00000000000
--- a/dev-util/cmake/cmake-3.9.2.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2017 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 versionator virtualx xdg-utils cmake-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/";
-SRC_URI="https://cmake.org/files/v$(get_version_component_range
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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux
~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
~x86-solaris"
-IUSE="doc emacs server system-jsoncpp ncurses qt5"
-
-RDEPEND="
- app-crypt/rhash
- >=app-arch/libarchive-3.0.0:=
- >=dev-libs/expat-2.0.1
- >=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
- )
- server? ( >=dev-libs/libuv-1.0.0:= )
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
-"
-DEPEND="${RDEPEND}
- doc? ( 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.9.0_rc2-FindImageMagick.patch
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
- "${FILESDIR}"/${PN}-3.8.0_rc2-FindBoost-python.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
-
- # upstream fixes (can usually be removed with a version bump)
- "${FILESDIR}"/${PN}-3.9.1-boost-1.65.0.patch
-)
-
-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
-
- # 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)"
- -DCMake_ENABLE_SERVER_MODE="$(usex server)"
- -DCMAKE_USE_LIBUV="$(usex server)"
- )
-
- 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/files/cmake-3.9.1-boost-1.65.0.patch
b/dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch
deleted file mode 100644
index 098f5f70f3f..00000000000
--- a/dev-util/cmake/files/cmake-3.9.1-boost-1.65.0.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From fa114e7d708b76f33878f6f82a6c2a2e50c1c10f Mon Sep 17 00:00:00 2001
-From: Roger Leigh <[email protected]>
-Date: Tue, 22 Aug 2017 16:09:06 +0100
-Subject: [PATCH] FindBoost: Add Boost 1.65 dependencies
-
----
- Modules/FindBoost.cmake | 30 +++++++++++++++++++++++++++---
- 1 file changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
-index b4abf75..b28f2b8 100644
---- a/Modules/FindBoost.cmake
-+++ b/Modules/FindBoost.cmake
-@@ -554,7 +554,10 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- # The addition of a new release should only require it to be run
- # against the new release.
- set(_Boost_IMPORTED_TARGETS TRUE)
-- if(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS
103500)
-+ if(Boost_VERSION VERSION_LESS 103300)
-+ message(WARNING "Imported targets and dependency information not
available for Boost version ${Boost_VERSION} (all versions older than 1.33)")
-+ set(_Boost_IMPORTED_TARGETS FALSE)
-+ elseif(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS
103500)
- set(_Boost_IOSTREAMS_DEPENDENCIES regex thread)
- set(_Boost_REGEX_DEPENDENCIES thread)
- set(_Boost_WAVE_DEPENDENCIES filesystem thread)
-@@ -768,8 +771,27 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret)
- set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread
chrono date_time atomic)
- set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
- else()
-- message(WARNING "Imported targets not available for Boost version
${Boost_VERSION}")
-- set(_Boost_IMPORTED_TARGETS FALSE)
-+ if(NOT Boost_VERSION VERSION_LESS 106500)
-+ set(_Boost_CHRONO_DEPENDENCIES system)
-+ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time)
-+ set(_Boost_COROUTINE_DEPENDENCIES context system)
-+ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time)
-+ set(_Boost_FILESYSTEM_DEPENDENCIES system)
-+ set(_Boost_IOSTREAMS_DEPENDENCIES regex)
-+ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem
thread regex chrono atomic)
-+ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1
math_tr1f math_tr1l atomic)
-+ set(_Boost_MPI_DEPENDENCIES serialization)
-+ set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization)
-+ set(_Boost_NUMPY_DEPENDENCIES python)
-+ set(_Boost_RANDOM_DEPENDENCIES system)
-+ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic)
-+ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread
chrono date_time atomic)
-+ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization)
-+ endif()
-+ if(NOT Boost_VERSION VERSION_LESS 106600)
-+ message(WARNING "New Boost version may have incorrect or missing
dependencies and imported targets")
-+ set(_Boost_IMPORTED_TARGETS FALSE)
-+ endif()
- endif()
-
- string(TOUPPER ${component} uppercomponent)
-@@ -819,6 +841,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
- set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp")
- set(_Boost_MPI_HEADERS "boost/mpi.hpp")
- set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp")
-+ set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp")
- set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp")
- set(_Boost_PROGRAM_OPTIONS_HEADERS "boost/program_options.hpp")
- set(_Boost_PYTHON_HEADERS "boost/python.hpp")
-@@ -1000,6 +1023,7 @@ else()
- # _Boost_COMPONENT_HEADERS. See the instructions at the top of
- # _Boost_COMPONENT_DEPENDENCIES.
- set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-+ "1.65.0" "1.65"
- "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0"
"1.60"
- "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0"
"1.55"
- "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
---
-libgit2 0.26.0
-
