| 1 |
commit: 7ef46e83b6c3dd441932f418d96fa946e6ba2144 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 30 17:52:46 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 30 17:52:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef46e83 |
| 7 |
|
| 8 |
dev-util/cmake: Remove 3.6.1 (r1) |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.2 |
| 11 |
|
| 12 |
dev-util/cmake/Manifest | 1 - |
| 13 |
dev-util/cmake/cmake-3.6.1-r1.ebuild | 199 ----------------------------------- |
| 14 |
2 files changed, 200 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 17 |
index ed5c834..4a576d9 100644 |
| 18 |
--- a/dev-util/cmake/Manifest |
| 19 |
+++ b/dev-util/cmake/Manifest |
| 20 |
@@ -3,6 +3,5 @@ DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a |
| 21 |
DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f |
| 22 |
DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b |
| 23 |
DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84 |
| 24 |
-DIST cmake-3.6.1.tar.gz 6895262 SHA256 28ee98ec40427d41a45673847db7a905b59ce9243bb866eaf59dce0f58aaef11 SHA512 69f20df70c58f7a09da7511a92a1e4492d89fecf30b11744aaf29a129f62384ff57ed7ed2d9dbb8b102abdc72d5722e744583161cb0ae71a01423473f36c8b1d WHIRLPOOL 82853de51dff610a769700f1063aecb83b7cb02308e7c05e0726b8a068cb3adbe764f717b8649709d629b28dcd38f38b2b53bc4bc0ba13657aeb7969dd7d758b |
| 25 |
DIST cmake-3.6.2.tar.gz 6920069 SHA256 189ae32a6ac398bb2f523ae77f70d463a6549926cde1544cd9cc7c6609f8b346 SHA512 50b217d3205cc65c2b55ece4ba050b1aa80dfa8a7e22ee0ec16c741cd99a639847d197a2e8448d7710c2a6ea7ba7bbcd6e3f12810f65dcc74bd27bcdb02f844a WHIRLPOOL 86ad3ff5edd071fdf46e3fc1b2d9af7cd420c93e5cb744ef0f490e6ce07c3f156384bdfb6d5246ac2caa6a563138c18e0d9208561715458343d135878223aab6 |
| 26 |
DIST cmake-3.7.0-rc2.tar.gz 7359639 SHA256 798e7a48f42a383da767c482810afe9ed6e3f91c99cb27719fd0407b3bf1e96d SHA512 059bfe26230fc1806097943e89755c4ac8d00ecb507f3a1eb816caa08d5310526b541c82af2826f94377f3774a818e73ff36b71f1e99c03052c2503443d0f5a1 WHIRLPOOL 7dc9d14528806a6b19dd8ccb3c12be3f49a6afd9ed91dd0a25259c295eb8eaaa5a34f308aa9f76c4b207d725dc58a3df25ec4713a2dfc3dffdb6bad5248d1ab1 |
| 27 |
|
| 28 |
diff --git a/dev-util/cmake/cmake-3.6.1-r1.ebuild b/dev-util/cmake/cmake-3.6.1-r1.ebuild |
| 29 |
deleted file mode 100644 |
| 30 |
index aded1dc..00000000 |
| 31 |
--- a/dev-util/cmake/cmake-3.6.1-r1.ebuild |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,199 +0,0 @@ |
| 34 |
-# Copyright 1999-2016 Gentoo Foundation |
| 35 |
-# Distributed under the terms of the GNU General Public License v2 |
| 36 |
-# $Id$ |
| 37 |
- |
| 38 |
-EAPI=6 |
| 39 |
- |
| 40 |
-CMAKE_REMOVE_MODULES="no" |
| 41 |
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
| 42 |
- |
| 43 |
-MY_P="${P/_/-}" |
| 44 |
- |
| 45 |
-DESCRIPTION="Cross platform Make" |
| 46 |
-HOMEPAGE="http://www.cmake.org/" |
| 47 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" |
| 48 |
- |
| 49 |
-LICENSE="CMake" |
| 50 |
-SLOT="0" |
| 51 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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" |
| 52 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 53 |
- |
| 54 |
-RDEPEND=" |
| 55 |
- >=app-arch/libarchive-3.0.0:= |
| 56 |
- >=dev-libs/expat-2.0.1 |
| 57 |
- >=net-misc/curl-7.21.5[ssl] |
| 58 |
- sys-libs/zlib |
| 59 |
- virtual/pkgconfig |
| 60 |
- emacs? ( virtual/emacs ) |
| 61 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 62 |
- qt4? ( |
| 63 |
- dev-qt/qtcore:4 |
| 64 |
- dev-qt/qtgui:4 |
| 65 |
- ) |
| 66 |
- qt5? ( |
| 67 |
- dev-qt/qtcore:5 |
| 68 |
- dev-qt/qtgui:5 |
| 69 |
- dev-qt/qtwidgets:5 |
| 70 |
- ) |
| 71 |
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) |
| 72 |
-" |
| 73 |
-DEPEND="${RDEPEND} |
| 74 |
- doc? ( dev-python/sphinx ) |
| 75 |
-" |
| 76 |
- |
| 77 |
-S="${WORKDIR}/${MY_P}" |
| 78 |
- |
| 79 |
-SITEFILE="50${PN}-gentoo.el" |
| 80 |
- |
| 81 |
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 82 |
- |
| 83 |
-PATCHES=( |
| 84 |
- # prefix |
| 85 |
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch |
| 86 |
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
| 87 |
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
| 88 |
- |
| 89 |
- # handle gentoo packaging in find modules |
| 90 |
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
| 91 |
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
| 92 |
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
| 93 |
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch |
| 94 |
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
| 95 |
- |
| 96 |
- # respect python eclasses |
| 97 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 98 |
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
| 99 |
- |
| 100 |
- # upstream fixes (can usually be removed with a version bump) |
| 101 |
- "${FILESDIR}"/${PN}-3.6.1-find_library-lib32.patch |
| 102 |
-) |
| 103 |
- |
| 104 |
-cmake_src_bootstrap() { |
| 105 |
- # Cleanup args to extract only JOBS. |
| 106 |
- # Because bootstrap does not know anything else. |
| 107 |
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
| 108 |
- if [ $? -eq 0 ]; then |
| 109 |
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
| 110 |
- par_arg="--parallel=${par_arg}" |
| 111 |
- else |
| 112 |
- par_arg="--parallel=1" |
| 113 |
- fi |
| 114 |
- |
| 115 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
| 116 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 117 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
| 118 |
- fi |
| 119 |
- |
| 120 |
- tc-export CC CXX LD |
| 121 |
- |
| 122 |
- # bootstrap script isn't exactly /bin/sh compatible |
| 123 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
| 124 |
- --prefix="${T}/cmakestrap/" \ |
| 125 |
- ${par_arg} \ |
| 126 |
- || die "Bootstrap failed" |
| 127 |
-} |
| 128 |
- |
| 129 |
-cmake_src_test() { |
| 130 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 131 |
- # these are altered thanks to our eclass |
| 132 |
- sed -i -e 's:#IGNORE ::g' \ |
| 133 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 134 |
- || die |
| 135 |
- |
| 136 |
- pushd "${BUILD_DIR}" > /dev/null |
| 137 |
- |
| 138 |
- local ctestargs |
| 139 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
| 140 |
- |
| 141 |
- # Excluded tests: |
| 142 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
| 143 |
- # BundleUtilities: bundle creation broken |
| 144 |
- # CTest.updatecvs: which fails to commit as root |
| 145 |
- # Fortran: requires fortran |
| 146 |
- # Qt4Deploy, which tries to break sandbox and ignores prefix |
| 147 |
- # TestUpload, which requires network access |
| 148 |
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
| 149 |
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ |
| 150 |
- || die "Tests failed" |
| 151 |
- |
| 152 |
- popd > /dev/null |
| 153 |
-} |
| 154 |
- |
| 155 |
-src_prepare() { |
| 156 |
- cmake-utils_src_prepare |
| 157 |
- |
| 158 |
- # disable running of cmake in boostrap command |
| 159 |
- sed -i \ |
| 160 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
| 161 |
- bootstrap || die "sed failed" |
| 162 |
- |
| 163 |
- # Add gcc libs to the default link paths |
| 164 |
- sed -i \ |
| 165 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 166 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
| 167 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
| 168 |
- |
| 169 |
- cmake_src_bootstrap |
| 170 |
-} |
| 171 |
- |
| 172 |
-src_configure() { |
| 173 |
- local mycmakeargs=( |
| 174 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
| 175 |
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) |
| 176 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
| 177 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
| 178 |
- -DCMAKE_MAN_DIR=/share/man |
| 179 |
- -DCMAKE_DATA_DIR=/share/${PN} |
| 180 |
- -DSPHINX_MAN=$(usex doc) |
| 181 |
- -DSPHINX_HTML=$(usex doc) |
| 182 |
- -DBUILD_CursesDialog="$(usex ncurses)" |
| 183 |
- ) |
| 184 |
- |
| 185 |
- if use qt4 || use qt5 ; then |
| 186 |
- mycmakeargs+=( |
| 187 |
- -DBUILD_QtDialog=ON |
| 188 |
- $(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 189 |
- ) |
| 190 |
- fi |
| 191 |
- |
| 192 |
- cmake-utils_src_configure |
| 193 |
-} |
| 194 |
- |
| 195 |
-src_compile() { |
| 196 |
- cmake-utils_src_compile |
| 197 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
| 198 |
-} |
| 199 |
- |
| 200 |
-src_test() { |
| 201 |
- virtx cmake_src_test |
| 202 |
-} |
| 203 |
- |
| 204 |
-src_install() { |
| 205 |
- cmake-utils_src_install |
| 206 |
- |
| 207 |
- if use emacs; then |
| 208 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 209 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 210 |
- fi |
| 211 |
- |
| 212 |
- insinto /usr/share/vim/vimfiles/syntax |
| 213 |
- doins Auxiliary/cmake-syntax.vim |
| 214 |
- |
| 215 |
- insinto /usr/share/vim/vimfiles/indent |
| 216 |
- doins Auxiliary/cmake-indent.vim |
| 217 |
- |
| 218 |
- insinto /usr/share/vim/vimfiles/ftdetect |
| 219 |
- doins "${FILESDIR}/${PN}.vim" |
| 220 |
- |
| 221 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
| 222 |
- |
| 223 |
- rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die |
| 224 |
-} |
| 225 |
- |
| 226 |
-pkg_postinst() { |
| 227 |
- use emacs && elisp-site-regen |
| 228 |
-} |
| 229 |
- |
| 230 |
-pkg_postrm() { |
| 231 |
- use emacs && elisp-site-regen |
| 232 |
-} |
Archives