dev-util/cmake: Remove 3.7.0 (r1)
authorJohannes Huber <johu@gentoo.org>
Sat, 17 Dec 2016 07:07:34 +0000 (08:07 +0100)
committerJohannes Huber <johu@gentoo.org>
Sat, 17 Dec 2016 07:08:28 +0000 (08:08 +0100)
Package-Manager: Portage-2.3.3, Repoman-2.3.1

dev-util/cmake/Manifest
dev-util/cmake/cmake-3.7.0-r1.ebuild [deleted file]
dev-util/cmake/files/cmake-2.8.10-libform.patch [deleted file]

index 30f021a6e91174c4be66f176d288c9c7e848d433..f2556fd0d23ea8d79a2315dcf11031a275bb5587 100644 (file)
@@ -3,5 +3,4 @@ DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e
 DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b
 DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84
 DIST cmake-3.6.3.tar.gz 6919949 SHA256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe SHA512 bfcb51bc01f64a6ae5fb9401c037a529e4b2c0216eef68cf862a7495560dfc80589b34af94450baf4561d217dfb8075b14fbf63e3a668943a65e36ea61c5df48 WHIRLPOOL ecf79bb1a4b18df07d15ed5cdeb513420a0b8d46f90154dbdf9a78d3294e202ade040e832f3479fca0889c4af3b3b50e0d9391120191bae390927888e6487b4a
-DIST cmake-3.7.0.tar.gz 7359368 SHA256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 SHA512 badeb81ea5b2a765d0ae222d6c7612eba570f46b3645ac8a22e1cf5ea52648239c707e80d51c1d31f8e5b15167e37e6b4d9f6308280560b11feddc3d2fa745cd WHIRLPOOL 38bf6f2861544024282e6d1fc97824c32ebb824256ebc2513ad4b4698f66803354de75d1692a63515b2b0f587cadc52d3c9e6a1b367360b561f34f1452495566
 DIST cmake-3.7.1.tar.gz 7361172 SHA256 449a5bce64dbd4d5b9517ebd1a1248ed197add6ad27934478976fd5f1f9330e1 SHA512 0539d70ce3ac77042a45d638443b09fbf368e253622db980bc6fb15988743eacd031ab850a45c821ec3e9f0f5f886b9c9cb0668aeda184cd457b78abbfe7b629 WHIRLPOOL 8b632b4a3f44a7b56952926ad43db45ecd9f26f434816fe29a52c89542edfc2dfea72f4ec814d4faaf990ee535ad80e6238ba2e6d9ffa2ff94cfccd665b1d930
diff --git a/dev-util/cmake/cmake-3.7.0-r1.ebuild b/dev-util/cmake/cmake-3.7.0-r1.ebuild
deleted file mode 100644 (file)
index 7bda50d..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="http://www.cmake.org/"
-SRC_URI="http://www.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs system-jsoncpp ncurses qt5"
-
-RDEPEND="
-       >=app-arch/libarchive-3.0.0:=
-       >=dev-libs/expat-2.0.1
-       >=dev-libs/libuv-1.0.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/sphinx )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-       # prefix
-       "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch
-       "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
-       "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
-
-       # handle gentoo packaging in find modules
-       "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
-       "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
-       "${FILESDIR}"/${PN}-3.0.0-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.1.0-FindPythonInterp.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
-       #    Qt5Autogen, which breaks for unknown reason
-       #    TestUpload, which requires network access
-       "${BUILD_DIR}"/bin/ctest ${ctestargs} \
-               -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|Qt5Autogen|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() {
-       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
-}
-
-pkg_postrm() {
-       use emacs && elisp-site-regen
-}
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch
deleted file mode 100644 (file)
index 052cc30..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ea1c033..ae479ce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
-   else ()
-     set(BUILD_CursesDialog 0)
-   endif ()
--  if(BUILD_CursesDialog)
--    add_subdirectory(Source/CursesDialog/form)
--  endif()
- endmacro ()
- #-----------------------------------------------------------------------
-diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
-index 96e28b4..4102379 100644
---- a/Source/CursesDialog/CMakeLists.txt
-+++ b/Source/CursesDialog/CMakeLists.txt
-@@ -25,13 +25,16 @@ set( CURSES_SRCS
-               CursesDialog/ccmake
-    )
--include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
--                    ${CMake_BINARY_DIR}/Source/CursesDialog/form)
- include_directories(${CURSES_INCLUDE_PATH})
- add_executable(ccmake ${CURSES_SRCS} )
- target_link_libraries(ccmake CMakeLib)
--target_link_libraries(ccmake cmForm)
-+TARGET_LINK_LIBRARIES(ccmake form)
-+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
-+IF(CURSES_EXTRA_LIBRARY)
-+  TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
-+ENDIF(CURSES_EXTRA_LIBRARY)
-+
- install_targets(/bin ccmake)
-diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
-index b157a28..f131ea4 100644
---- a/Source/CursesDialog/cmCursesStandardIncludes.h
-+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
-@@ -15,8 +15,6 @@
-  #define _MSE_INT_H
- #endif
--#include <cmFormConfigure.h>
--
- #if defined(__hpux)
- # define _BOOL_DEFINED
- # include <sys/time.h>