| 1 |
commit: f966538219d8d85fa903bec626e122b5f8cdbceb |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 15 05:40:48 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 15 05:41:08 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9665382 |
| 7 |
|
| 8 |
dev-util/cmake: Remove 3.3.2, 3.4.3 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.0 |
| 11 |
|
| 12 |
dev-util/cmake/Manifest | 2 - |
| 13 |
dev-util/cmake/cmake-3.3.2-r1.ebuild | 200 ------------------------- |
| 14 |
dev-util/cmake/cmake-3.4.3.ebuild | 198 ------------------------ |
| 15 |
dev-util/cmake/files/cmake-3.3.2-FindQt4.patch | 45 ------ |
| 16 |
4 files changed, 445 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 19 |
index 7206d93..36997d8 100644 |
| 20 |
--- a/dev-util/cmake/Manifest |
| 21 |
+++ b/dev-util/cmake/Manifest |
| 22 |
@@ -2,7 +2,5 @@ DIST cmake-2.8.12.2.tar.gz 6068231 SHA256 8c6574e9afabcb9fc66f463bb1f2f051958d86 |
| 23 |
DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2 |
| 24 |
DIST cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch 1583 SHA256 22e6672bd9356a98a0eaf667e66d926f52c4e80e53e38cb8e5cd489993e5668f SHA512 306cf4498cbad9f9c49a63c1870e04f33b5a91032508654a691fe116ec4821da98e9a1e35b6cb186bf9367ebdd9c42ac919e6fc44d2ba6938ad3bc1131b80655 WHIRLPOOL 1d30dd99ea6dc085f64c1b02ab0708f0c033e8d98f69ca431016da17eecc29f01489e5e253446bd542a4a9b770bcaee7b7a7bfa71e7520e7900094a9350c7f8f |
| 25 |
DIST cmake-3.3.1.tar.gz 6577869 SHA256 cd65022c6a0707f1c7112f99e9c981677fdd5518f7ddfa0f778d4cee7113e3d6 SHA512 bc60dd58f884467d7426f73c8e3e78b7ea0a0089f2577c596f34bcfc6d38dfd5d4034589c82dd9cadf138d619dbc4f0c4519faeeeef0672b4578180de21b33f1 WHIRLPOOL 631b925dc8b60f57c573d7c220aaaf4193cb7a5fbd3537e96db6e17bbe537fa89398349763fce867b0e72af591cfcbab9b8cd570a613e7933a31788cfb771f2b |
| 26 |
-DIST cmake-3.3.2.tar.gz 6578184 SHA256 e75a178d6ebf182b048ebfe6e0657c49f0dc109779170bad7ffcb17463f2fc22 SHA512 01bc0e6ca52a6836ef57360fb38dd92a4575bfa37bfe9625645db77fefd0c170383cfb07b61c6283bde96738ce1a5e18cb7569e7e0b7c98d4b99e86305c50180 WHIRLPOOL 7951dc18d695ca4554b287f91becd8ecb05324e10f9e2c9e34427d26db0d664ee7ab8a226eabed87d93087e41635059f96b1aaea503480f46a555cf3baae3ce7 |
| 27 |
-DIST cmake-3.4.3.tar.gz 6722311 SHA256 b73f8c1029611df7ed81796bf5ca8ba0ef41c6761132340c73ffe42704f980fa SHA512 a326c39cfe9f5408b4586ddd291cabfa400a2442947fb46d94dd6c44db3087c48c84a9a22ca5ed38707467448150383935ed59c669fbbfb20a968d4031eaaa11 WHIRLPOOL fdb3b47a242523919a56a63bf8e778e875f5721c997cdc1a6098f24eec57dadecc44d13b35d74ef1276aebf6f5299c89d4c91ce03c282d081b03ebba29c1ddad |
| 28 |
DIST cmake-3.5.2.tar.gz 6863498 SHA256 92d8410d3d981bb881dfff2aed466da55a58d34c7390d50449aa59b32bb5e62a SHA512 7b08eb9f1b37993553f89c03eceedc465dc52b787dec99b78c74ebff2817d0aac9764e82ad835e8fc39f61cd2d2c0a3544d3f5ae299234ed52e9a940edf30b81 WHIRLPOOL c255825aa024ba9feb51540ed2a36cfa73c6397356d18c5ff8f49258a4c30906c8ed5d7553e7d56f3c373ffff418697f056f218f30aa409debab2303b0f9fa84 |
| 29 |
DIST cmake-3.6.0.tar.gz 6897636 SHA256 fd05ed40cc40ef9ef99fac7b0ece2e0b871858a82feade48546f5d2940147670 SHA512 4e519fa30a6fee2fb0ef8df667504dfaba1f965c263fd4f42d17348c45cff33777de9a8c552b13da0bb4b9f1300a142f204a844eac03bdf431e826e8d7ba3505 WHIRLPOOL 4d2842efa7ae6bdfe5d1e0b773f8649a6dec7d23364f89570d442db2f4da033acd0023dd5cf80004a024b5c1ec142db284357a21c993bc84d0a07d8e0fb76c77 |
| 30 |
|
| 31 |
diff --git a/dev-util/cmake/cmake-3.3.2-r1.ebuild b/dev-util/cmake/cmake-3.3.2-r1.ebuild |
| 32 |
deleted file mode 100644 |
| 33 |
index 90cc7bd..0000000 |
| 34 |
--- a/dev-util/cmake/cmake-3.3.2-r1.ebuild |
| 35 |
+++ /dev/null |
| 36 |
@@ -1,200 +0,0 @@ |
| 37 |
-# Copyright 1999-2015 Gentoo Foundation |
| 38 |
-# Distributed under the terms of the GNU General Public License v2 |
| 39 |
-# $Id$ |
| 40 |
- |
| 41 |
-EAPI=5 |
| 42 |
- |
| 43 |
-CMAKE_REMOVE_MODULES="no" |
| 44 |
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
| 45 |
- |
| 46 |
-MY_P="${P/_/-}" |
| 47 |
- |
| 48 |
-DESCRIPTION="Cross platform Make" |
| 49 |
-HOMEPAGE="http://www.cmake.org/" |
| 50 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz |
| 51 |
- http://www.cmake.org/gitweb?p=cmake.git;a=patch;h=b9ec9392da21a3421e48c6961976060d872faffb -> ${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch" |
| 52 |
- |
| 53 |
-LICENSE="CMake" |
| 54 |
-SLOT="0" |
| 55 |
-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" |
| 56 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 57 |
- |
| 58 |
-RDEPEND=" |
| 59 |
- >=app-arch/libarchive-3.0.0:= |
| 60 |
- >=dev-libs/expat-2.0.1 |
| 61 |
- >=net-misc/curl-7.20.0-r1[ssl] |
| 62 |
- sys-libs/zlib |
| 63 |
- virtual/pkgconfig |
| 64 |
- emacs? ( virtual/emacs ) |
| 65 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 66 |
- qt4? ( |
| 67 |
- dev-qt/qtcore:4 |
| 68 |
- dev-qt/qtgui:4 |
| 69 |
- ) |
| 70 |
- qt5? ( |
| 71 |
- dev-qt/qtcore:5 |
| 72 |
- dev-qt/qtgui:5 |
| 73 |
- dev-qt/qtwidgets:5 |
| 74 |
- ) |
| 75 |
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) |
| 76 |
-" |
| 77 |
-DEPEND="${RDEPEND} |
| 78 |
- doc? ( dev-python/sphinx ) |
| 79 |
-" |
| 80 |
- |
| 81 |
-S="${WORKDIR}/${MY_P}" |
| 82 |
- |
| 83 |
-SITEFILE="50${PN}-gentoo.el" |
| 84 |
- |
| 85 |
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 86 |
- |
| 87 |
-PATCHES=( |
| 88 |
- # prefix |
| 89 |
- "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch |
| 90 |
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
| 91 |
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
| 92 |
- |
| 93 |
- # handle gentoo packaging in find modules |
| 94 |
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
| 95 |
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
| 96 |
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
| 97 |
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch |
| 98 |
- "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch |
| 99 |
- |
| 100 |
- # respect python eclasses |
| 101 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 102 |
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
| 103 |
- |
| 104 |
- # upstream fixes (can usually be removed with a version bump) |
| 105 |
- "${DISTDIR}"/${PN}-3.3.1-FindPkgConfig_remove_variable_dereference.patch |
| 106 |
-) |
| 107 |
- |
| 108 |
-cmake_src_bootstrap() { |
| 109 |
- # Cleanup args to extract only JOBS. |
| 110 |
- # Because bootstrap does not know anything else. |
| 111 |
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
| 112 |
- if [ $? -eq 0 ]; then |
| 113 |
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
| 114 |
- par_arg="--parallel=${par_arg}" |
| 115 |
- else |
| 116 |
- par_arg="--parallel=1" |
| 117 |
- fi |
| 118 |
- |
| 119 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
| 120 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 121 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
| 122 |
- fi |
| 123 |
- |
| 124 |
- tc-export CC CXX LD |
| 125 |
- |
| 126 |
- # bootstrap script isn't exactly /bin/sh compatible |
| 127 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
| 128 |
- --prefix="${T}/cmakestrap/" \ |
| 129 |
- ${par_arg} \ |
| 130 |
- || die "Bootstrap failed" |
| 131 |
-} |
| 132 |
- |
| 133 |
-cmake_src_test() { |
| 134 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 135 |
- # these are altered thanks to our eclass |
| 136 |
- sed -i -e 's:#IGNORE ::g' \ |
| 137 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 138 |
- || die |
| 139 |
- |
| 140 |
- pushd "${BUILD_DIR}" > /dev/null |
| 141 |
- |
| 142 |
- local ctestargs |
| 143 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
| 144 |
- |
| 145 |
- # Excluded tests: |
| 146 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
| 147 |
- # BundleUtilities: bundle creation broken |
| 148 |
- # CTest.updatecvs: which fails to commit as root |
| 149 |
- # Fortran: requires fortran |
| 150 |
- # Qt4Deploy, which tries to break sandbox and ignores prefix |
| 151 |
- # TestUpload, which requires network access |
| 152 |
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
| 153 |
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ |
| 154 |
- || die "Tests failed" |
| 155 |
- |
| 156 |
- popd > /dev/null |
| 157 |
-} |
| 158 |
- |
| 159 |
-src_prepare() { |
| 160 |
- cmake-utils_src_prepare |
| 161 |
- |
| 162 |
- # disable running of cmake in boostrap command |
| 163 |
- sed -i \ |
| 164 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
| 165 |
- bootstrap || die "sed failed" |
| 166 |
- |
| 167 |
- # Add gcc libs to the default link paths |
| 168 |
- sed -i \ |
| 169 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 170 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
| 171 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
| 172 |
- |
| 173 |
- cmake_src_bootstrap |
| 174 |
-} |
| 175 |
- |
| 176 |
-src_configure() { |
| 177 |
- local mycmakeargs=( |
| 178 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
| 179 |
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) |
| 180 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
| 181 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
| 182 |
- -DCMAKE_MAN_DIR=/share/man |
| 183 |
- -DCMAKE_DATA_DIR=/share/${PN} |
| 184 |
- -DSPHINX_MAN=$(usex doc) |
| 185 |
- -DSPHINX_HTML=$(usex doc) |
| 186 |
- $(cmake-utils_use_build ncurses CursesDialog) |
| 187 |
- ) |
| 188 |
- |
| 189 |
- if use qt4 || use qt5 ; then |
| 190 |
- mycmakeargs+=( |
| 191 |
- -DBUILD_QtDialog=ON |
| 192 |
- $(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 193 |
- ) |
| 194 |
- fi |
| 195 |
- |
| 196 |
- cmake-utils_src_configure |
| 197 |
-} |
| 198 |
- |
| 199 |
-src_compile() { |
| 200 |
- cmake-utils_src_compile |
| 201 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
| 202 |
-} |
| 203 |
- |
| 204 |
-src_test() { |
| 205 |
- VIRTUALX_COMMAND="cmake_src_test" virtualmake |
| 206 |
-} |
| 207 |
- |
| 208 |
-src_install() { |
| 209 |
- cmake-utils_src_install |
| 210 |
- |
| 211 |
- if use emacs; then |
| 212 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 213 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 214 |
- fi |
| 215 |
- |
| 216 |
- insinto /usr/share/vim/vimfiles/syntax |
| 217 |
- doins Auxiliary/cmake-syntax.vim |
| 218 |
- |
| 219 |
- insinto /usr/share/vim/vimfiles/indent |
| 220 |
- doins Auxiliary/cmake-indent.vim |
| 221 |
- |
| 222 |
- insinto /usr/share/vim/vimfiles/ftdetect |
| 223 |
- doins "${FILESDIR}/${PN}.vim" |
| 224 |
- |
| 225 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
| 226 |
- |
| 227 |
- rm -rf "${D}"/usr/share/cmake/{completions,editors} || die |
| 228 |
-} |
| 229 |
- |
| 230 |
-pkg_postinst() { |
| 231 |
- use emacs && elisp-site-regen |
| 232 |
-} |
| 233 |
- |
| 234 |
-pkg_postrm() { |
| 235 |
- use emacs && elisp-site-regen |
| 236 |
-} |
| 237 |
|
| 238 |
diff --git a/dev-util/cmake/cmake-3.4.3.ebuild b/dev-util/cmake/cmake-3.4.3.ebuild |
| 239 |
deleted file mode 100644 |
| 240 |
index bd2db16..0000000 |
| 241 |
--- a/dev-util/cmake/cmake-3.4.3.ebuild |
| 242 |
+++ /dev/null |
| 243 |
@@ -1,198 +0,0 @@ |
| 244 |
-# Copyright 1999-2016 Gentoo Foundation |
| 245 |
-# Distributed under the terms of the GNU General Public License v2 |
| 246 |
-# $Id$ |
| 247 |
- |
| 248 |
-EAPI=5 |
| 249 |
- |
| 250 |
-CMAKE_REMOVE_MODULES="no" |
| 251 |
-inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx |
| 252 |
- |
| 253 |
-MY_P="${P/_/-}" |
| 254 |
- |
| 255 |
-DESCRIPTION="Cross platform Make" |
| 256 |
-HOMEPAGE="http://www.cmake.org/" |
| 257 |
-SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${MY_P}.tar.gz" |
| 258 |
- |
| 259 |
-LICENSE="CMake" |
| 260 |
-SLOT="0" |
| 261 |
-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" |
| 262 |
-IUSE="doc emacs system-jsoncpp ncurses qt4 qt5" |
| 263 |
- |
| 264 |
-RDEPEND=" |
| 265 |
- >=app-arch/libarchive-3.0.0:= |
| 266 |
- >=dev-libs/expat-2.0.1 |
| 267 |
- >=net-misc/curl-7.21.5[ssl] |
| 268 |
- sys-libs/zlib |
| 269 |
- virtual/pkgconfig |
| 270 |
- emacs? ( virtual/emacs ) |
| 271 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 272 |
- qt4? ( |
| 273 |
- dev-qt/qtcore:4 |
| 274 |
- dev-qt/qtgui:4 |
| 275 |
- ) |
| 276 |
- qt5? ( |
| 277 |
- dev-qt/qtcore:5 |
| 278 |
- dev-qt/qtgui:5 |
| 279 |
- dev-qt/qtwidgets:5 |
| 280 |
- ) |
| 281 |
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) |
| 282 |
-" |
| 283 |
-DEPEND="${RDEPEND} |
| 284 |
- doc? ( dev-python/sphinx ) |
| 285 |
-" |
| 286 |
- |
| 287 |
-S="${WORKDIR}/${MY_P}" |
| 288 |
- |
| 289 |
-SITEFILE="50${PN}-gentoo.el" |
| 290 |
- |
| 291 |
-CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 292 |
- |
| 293 |
-PATCHES=( |
| 294 |
- # prefix |
| 295 |
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch |
| 296 |
- "${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch |
| 297 |
- "${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
| 298 |
- |
| 299 |
- # handle gentoo packaging in find modules |
| 300 |
- "${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch |
| 301 |
- "${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch |
| 302 |
- "${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch |
| 303 |
- "${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch |
| 304 |
- "${FILESDIR}"/${PN}-3.3.2-FindQt4.patch |
| 305 |
- |
| 306 |
- # respect python eclasses |
| 307 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 308 |
- "${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch |
| 309 |
- |
| 310 |
- # upstream fixes (can usually be removed with a version bump) |
| 311 |
-) |
| 312 |
- |
| 313 |
-cmake_src_bootstrap() { |
| 314 |
- # Cleanup args to extract only JOBS. |
| 315 |
- # Because bootstrap does not know anything else. |
| 316 |
- echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null |
| 317 |
- if [ $? -eq 0 ]; then |
| 318 |
- par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+') |
| 319 |
- par_arg="--parallel=${par_arg}" |
| 320 |
- else |
| 321 |
- par_arg="--parallel=1" |
| 322 |
- fi |
| 323 |
- |
| 324 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
| 325 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 326 |
- sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die |
| 327 |
- fi |
| 328 |
- |
| 329 |
- tc-export CC CXX LD |
| 330 |
- |
| 331 |
- # bootstrap script isn't exactly /bin/sh compatible |
| 332 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
| 333 |
- --prefix="${T}/cmakestrap/" \ |
| 334 |
- ${par_arg} \ |
| 335 |
- || die "Bootstrap failed" |
| 336 |
-} |
| 337 |
- |
| 338 |
-cmake_src_test() { |
| 339 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 340 |
- # these are altered thanks to our eclass |
| 341 |
- sed -i -e 's:#IGNORE ::g' \ |
| 342 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 343 |
- || die |
| 344 |
- |
| 345 |
- pushd "${BUILD_DIR}" > /dev/null |
| 346 |
- |
| 347 |
- local ctestargs |
| 348 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
| 349 |
- |
| 350 |
- # Excluded tests: |
| 351 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
| 352 |
- # BundleUtilities: bundle creation broken |
| 353 |
- # CTest.updatecvs: which fails to commit as root |
| 354 |
- # Fortran: requires fortran |
| 355 |
- # Qt4Deploy, which tries to break sandbox and ignores prefix |
| 356 |
- # TestUpload, which requires network access |
| 357 |
- "${BUILD_DIR}"/bin/ctest ${ctestargs} \ |
| 358 |
- -E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \ |
| 359 |
- || die "Tests failed" |
| 360 |
- |
| 361 |
- popd > /dev/null |
| 362 |
-} |
| 363 |
- |
| 364 |
-src_prepare() { |
| 365 |
- cmake-utils_src_prepare |
| 366 |
- |
| 367 |
- # disable running of cmake in boostrap command |
| 368 |
- sed -i \ |
| 369 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
| 370 |
- bootstrap || die "sed failed" |
| 371 |
- |
| 372 |
- # Add gcc libs to the default link paths |
| 373 |
- sed -i \ |
| 374 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 375 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
| 376 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
| 377 |
- |
| 378 |
- cmake_src_bootstrap |
| 379 |
-} |
| 380 |
- |
| 381 |
-src_configure() { |
| 382 |
- local mycmakeargs=( |
| 383 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
| 384 |
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) |
| 385 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
| 386 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
| 387 |
- -DCMAKE_MAN_DIR=/share/man |
| 388 |
- -DCMAKE_DATA_DIR=/share/${PN} |
| 389 |
- -DSPHINX_MAN=$(usex doc) |
| 390 |
- -DSPHINX_HTML=$(usex doc) |
| 391 |
- $(cmake-utils_use_build ncurses CursesDialog) |
| 392 |
- ) |
| 393 |
- |
| 394 |
- if use qt4 || use qt5 ; then |
| 395 |
- mycmakeargs+=( |
| 396 |
- -DBUILD_QtDialog=ON |
| 397 |
- $(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 398 |
- ) |
| 399 |
- fi |
| 400 |
- |
| 401 |
- cmake-utils_src_configure |
| 402 |
-} |
| 403 |
- |
| 404 |
-src_compile() { |
| 405 |
- cmake-utils_src_compile |
| 406 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
| 407 |
-} |
| 408 |
- |
| 409 |
-src_test() { |
| 410 |
- VIRTUALX_COMMAND="cmake_src_test" virtualmake |
| 411 |
-} |
| 412 |
- |
| 413 |
-src_install() { |
| 414 |
- cmake-utils_src_install |
| 415 |
- |
| 416 |
- if use emacs; then |
| 417 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 418 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 419 |
- fi |
| 420 |
- |
| 421 |
- insinto /usr/share/vim/vimfiles/syntax |
| 422 |
- doins Auxiliary/cmake-syntax.vim |
| 423 |
- |
| 424 |
- insinto /usr/share/vim/vimfiles/indent |
| 425 |
- doins Auxiliary/cmake-indent.vim |
| 426 |
- |
| 427 |
- insinto /usr/share/vim/vimfiles/ftdetect |
| 428 |
- doins "${FILESDIR}/${PN}.vim" |
| 429 |
- |
| 430 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
| 431 |
- |
| 432 |
- rm -rf "${ED}"/usr/share/cmake/{completions,editors} || die |
| 433 |
-} |
| 434 |
- |
| 435 |
-pkg_postinst() { |
| 436 |
- use emacs && elisp-site-regen |
| 437 |
-} |
| 438 |
- |
| 439 |
-pkg_postrm() { |
| 440 |
- use emacs && elisp-site-regen |
| 441 |
-} |
| 442 |
|
| 443 |
diff --git a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch b/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch |
| 444 |
deleted file mode 100644 |
| 445 |
index 31e4db3..0000000 |
| 446 |
--- a/dev-util/cmake/files/cmake-3.3.2-FindQt4.patch |
| 447 |
+++ /dev/null |
| 448 |
@@ -1,45 +0,0 @@ |
| 449 |
-Ensure that the correct version of Qt is always used. |
| 450 |
- |
| 451 |
-With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to |
| 452 |
-/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser. |
| 453 |
- |
| 454 |
-There is no guarantee to which version of Qt these symlinks might point, so it |
| 455 |
-is necessary to find the correct version explicitly. |
| 456 |
- |
| 457 |
-Once qmake is found, it is queried for the correct location of all other items. |
| 458 |
- |
| 459 |
-Gentoo-bug: 547222 |
| 460 |
- |
| 461 |
---- a/Modules/FindQt4.cmake |
| 462 |
-+++ b/Modules/FindQt4.cmake |
| 463 |
-@@ -482,13 +482,23 @@ |
| 464 |
- |
| 465 |
- get_filename_component(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME) |
| 466 |
- |
| 467 |
-- find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} |
| 468 |
-- PATHS |
| 469 |
-- ENV QTDIR |
| 470 |
-- "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" |
| 471 |
-- PATH_SUFFIXES bin |
| 472 |
-- DOC "The qmake executable for the Qt installation to use" |
| 473 |
-- ) |
| 474 |
-+ if(CMAKE_BUILD_TYPE STREQUAL Gentoo) |
| 475 |
-+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} |
| 476 |
-+ PATHS |
| 477 |
-+ /usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin |
| 478 |
-+ /usr/bin |
| 479 |
-+ NO_DEFAULT_PATH |
| 480 |
-+ DOC "The qmake executable for the Qt installation to use" |
| 481 |
-+ ) |
| 482 |
-+ else() |
| 483 |
-+ find_program(QT_QMAKE_EXECUTABLE NAMES ${QMAKE_NAME} |
| 484 |
-+ PATHS |
| 485 |
-+ ENV QTDIR |
| 486 |
-+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]" |
| 487 |
-+ PATH_SUFFIXES bin |
| 488 |
-+ DOC "The qmake executable for the Qt installation to use" |
| 489 |
-+ ) |
| 490 |
-+ endif() |
| 491 |
- |
| 492 |
- set(major 0) |
| 493 |
- if (QT_QMAKE_EXECUTABLE) |
Archives