| 1 |
commit: e4dd630a3c4c10a7367c35342b9a429ce2c861f4 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Apr 3 09:49:25 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Apr 3 12:02:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dd630a |
| 7 |
|
| 8 |
dev-util/cmake: Drop 3.14.0 |
| 9 |
|
| 10 |
Incompatible FindFontconfig.cmake module that was fixed in 3.14.1. |
| 11 |
|
| 12 |
See also: |
| 13 |
https://mail.kde.org/pipermail/kde-distro-packagers/2019-March/000375.html |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 16 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 17 |
|
| 18 |
dev-util/cmake/Manifest | 1 - |
| 19 |
dev-util/cmake/cmake-3.14.0.ebuild | 229 ------------------------------------- |
| 20 |
2 files changed, 230 deletions(-) |
| 21 |
|
| 22 |
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest |
| 23 |
index 29ccb6090e5..c6bbd065562 100644 |
| 24 |
--- a/dev-util/cmake/Manifest |
| 25 |
+++ b/dev-util/cmake/Manifest |
| 26 |
@@ -2,6 +2,5 @@ DIST cmake-3.10.3.tar.gz 7825559 BLAKE2B 1db8c21abdcfac2612fa914d49f9edcf199240b |
| 27 |
DIST cmake-3.11.4.tar.gz 7955301 BLAKE2B 2bad70e9e8b1a4081daf79fbec46d7389f685920d3158d05eae51fb24a0ecaad722c3e8a2eab1bcc75d599bee7a8202d432176e6ac1d87ed8815c84a7a8bb925 SHA512 c5d03ad66a004292038e49e391c390ebc328fbb089ea699742a9b75f0ada9398c3dc971b868f75d8438bf437ecbeaa62541beb53cae14a699bf244ad101a2290 |
| 28 |
DIST cmake-3.12.3.tar.gz 8388552 BLAKE2B 3e4150461f0d03ddaec790c7aa701bdb84b7f22b9e948262214d363d8457a9e2986470e7a0237f46e8a72109b61dc05d657516bb19c42d63c951af92055dd4d9 SHA512 2b5b006bd0fa09431eb525a7f419c64b811afbe1cc81d34e6167e04112966d9f48f28652b21b5a04c889de6227315db57dd2099a17ea6329e27f3e97eac9051c |
| 29 |
DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93 |
| 30 |
-DIST cmake-3.14.0.tar.gz 8846626 BLAKE2B 1bedae3909880c71bba6cc91459a58daf98287ba76c527669d227f0540283f3902d99fca2f6db2d0bde271ee274f7ce6612da2bcead611a00319996e382b0674 SHA512 a3b47f2b8d3436860e8cc06a8c0288124289560853d24f68dfbb49a2ff3f861ee385463376ad1dafa6d4a618c06d2e9049b20fcac1d2c147b29bb93479a8d400 |
| 31 |
DIST cmake-3.14.1.tar.gz 8849712 BLAKE2B a4f917507a7ba354889606f17b9ce2c37e69d80a4ee86e75f23e214c9db11bd7947f8abc879a23c7fe76bdda32ab49360eb53f00eb1c4c4e74a8f80a7221d41d SHA512 2f0c0fb1559f71c5c2bf1a77f6fb2ecdaf078e47b5ab8ce997c6877f5d165619bc7a101b1566a8a40f8883ffef6ee690f93f2652855825019ec153aa4543ffb5 |
| 32 |
DIST cmake-3.9.6.tar.gz 7705400 BLAKE2B e0a5307af0a34863c50ea6aa9323025ef588b27e648107c3a81c362ee7ae4a1d2a07cc335d816b286ce4ddb249f9c6c08c3e8cf99856c7113f3724f47c62da43 SHA512 9fda2c9ac054ef8fb1bf3885fbdec02c518da89ade220eba06b5502ac3ff300f635ec0922e61f3b2d090644fb743b8f71a04c532ab66b2d890a180cc7da54e6c |
| 33 |
|
| 34 |
diff --git a/dev-util/cmake/cmake-3.14.0.ebuild b/dev-util/cmake/cmake-3.14.0.ebuild |
| 35 |
deleted file mode 100644 |
| 36 |
index ce96349c214..00000000000 |
| 37 |
--- a/dev-util/cmake/cmake-3.14.0.ebuild |
| 38 |
+++ /dev/null |
| 39 |
@@ -1,229 +0,0 @@ |
| 40 |
-# Copyright 1999-2019 Gentoo Authors |
| 41 |
-# Distributed under the terms of the GNU General Public License v2 |
| 42 |
- |
| 43 |
-EAPI=6 |
| 44 |
- |
| 45 |
-CMAKE_MAKEFILE_GENERATOR="emake" |
| 46 |
-CMAKE_REMOVE_MODULES="no" |
| 47 |
-inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils |
| 48 |
- |
| 49 |
-MY_P="${P/_/-}" |
| 50 |
- |
| 51 |
-DESCRIPTION="Cross platform Make" |
| 52 |
-HOMEPAGE="https://cmake.org/" |
| 53 |
-SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz" |
| 54 |
- |
| 55 |
-LICENSE="CMake" |
| 56 |
-SLOT="0" |
| 57 |
-[[ "${PV}" = *_rc* ]] || \ |
| 58 |
-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" |
| 59 |
-IUSE="doc emacs system-jsoncpp ncurses qt5" |
| 60 |
- |
| 61 |
-RDEPEND=" |
| 62 |
- app-crypt/rhash |
| 63 |
- >=app-arch/libarchive-3.0.0:= |
| 64 |
- >=dev-libs/expat-2.0.1 |
| 65 |
- >=dev-libs/libuv-1.10.0:= |
| 66 |
- >=net-misc/curl-7.21.5[ssl] |
| 67 |
- sys-libs/zlib |
| 68 |
- virtual/pkgconfig |
| 69 |
- emacs? ( virtual/emacs ) |
| 70 |
- ncurses? ( sys-libs/ncurses:0= ) |
| 71 |
- qt5? ( |
| 72 |
- dev-qt/qtcore:5 |
| 73 |
- dev-qt/qtgui:5 |
| 74 |
- dev-qt/qtwidgets:5 |
| 75 |
- ) |
| 76 |
- system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= ) |
| 77 |
-" |
| 78 |
-DEPEND="${RDEPEND} |
| 79 |
- doc? ( |
| 80 |
- dev-python/requests |
| 81 |
- dev-python/sphinx |
| 82 |
- ) |
| 83 |
-" |
| 84 |
- |
| 85 |
-S="${WORKDIR}/${MY_P}" |
| 86 |
- |
| 87 |
-SITEFILE="50${PN}-gentoo.el" |
| 88 |
- |
| 89 |
-PATCHES=( |
| 90 |
- # prefix |
| 91 |
- "${FILESDIR}"/${PN}-3.4.0_rc1-darwin-bundle.patch |
| 92 |
- "${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch |
| 93 |
- # Next patch requires new work from prefix people |
| 94 |
- #"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch |
| 95 |
- |
| 96 |
- # handle gentoo packaging in find modules |
| 97 |
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindBLAS.patch |
| 98 |
- "${FILESDIR}"/${PN}-3.14.0_rc1-FindLAPACK.patch |
| 99 |
- "${FILESDIR}"/${PN}-3.5.2-FindQt4.patch |
| 100 |
- |
| 101 |
- # respect python eclasses |
| 102 |
- "${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch |
| 103 |
- "${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch |
| 104 |
- |
| 105 |
- # boost (#660980) |
| 106 |
- "${FILESDIR}"/${PN}-3.11.4-fix-boost-detection.patch |
| 107 |
- |
| 108 |
- # upstream fixes (can usually be removed with a version bump) |
| 109 |
-) |
| 110 |
- |
| 111 |
-cmake_src_bootstrap() { |
| 112 |
- # Cleanup args to extract only JOBS. |
| 113 |
- # Because bootstrap does not know anything else. |
| 114 |
- grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" > /dev/null |
| 115 |
- if [[ $? -eq 0 ]] ; then |
| 116 |
- par_arg=$(grep -Eo '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' <<< "${MAKEOPTS}" | tail -n1 | grep -o '[[:digit:]]+') |
| 117 |
- par_arg="--parallel=${par_arg}" |
| 118 |
- else |
| 119 |
- par_arg="--parallel=1" |
| 120 |
- fi |
| 121 |
- |
| 122 |
- # disable running of cmake in boostrap command |
| 123 |
- sed -i \ |
| 124 |
- -e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \ |
| 125 |
- bootstrap || die "sed failed" |
| 126 |
- |
| 127 |
- # execinfo.h on Solaris isn't quite what it is on Darwin |
| 128 |
- if [[ ${CHOST} == *-solaris* ]] ; then |
| 129 |
- sed -i -e 's/execinfo\.h/blablabla.h/' \ |
| 130 |
- Source/kwsys/CMakeLists.txt || die |
| 131 |
- fi |
| 132 |
- |
| 133 |
- tc-export CC CXX LD |
| 134 |
- |
| 135 |
- # bootstrap script isn't exactly /bin/sh compatible |
| 136 |
- ${CONFIG_SHELL:-sh} ./bootstrap \ |
| 137 |
- --prefix="${T}/cmakestrap/" \ |
| 138 |
- ${par_arg} \ |
| 139 |
- || die "Bootstrap failed" |
| 140 |
-} |
| 141 |
- |
| 142 |
-cmake_src_test() { |
| 143 |
- # fix OutDir and SelectLibraryConfigurations tests |
| 144 |
- # these are altered thanks to our eclass |
| 145 |
- sed -i -e 's:#IGNORE ::g' \ |
| 146 |
- "${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \ |
| 147 |
- || die |
| 148 |
- |
| 149 |
- pushd "${BUILD_DIR}" > /dev/null |
| 150 |
- |
| 151 |
- local ctestargs |
| 152 |
- [[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure" |
| 153 |
- |
| 154 |
- # Excluded tests: |
| 155 |
- # BootstrapTest: we actualy bootstrap it every time so why test it. |
| 156 |
- # BundleUtilities: bundle creation broken |
| 157 |
- # CMakeOnly.AllFindModules: pthread issues |
| 158 |
- # CTest.updatecvs: which fails to commit as root |
| 159 |
- # Fortran: requires fortran |
| 160 |
- # RunCMake.CompilerLauncher: also requires fortran |
| 161 |
- # RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because |
| 162 |
- # debugedit binary is not in the expected location |
| 163 |
- # TestUpload, which requires network access |
| 164 |
- "${BUILD_DIR}"/bin/ctest \ |
| 165 |
- -j "$(makeopts_jobs)" \ |
| 166 |
- --test-load "$(makeopts_loadavg)" \ |
| 167 |
- ${ctestargs} \ |
| 168 |
- -E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_RPM|TestUpload)" \ |
| 169 |
- || die "Tests failed" |
| 170 |
- |
| 171 |
- popd > /dev/null |
| 172 |
-} |
| 173 |
- |
| 174 |
-src_prepare() { |
| 175 |
- cmake-utils_src_prepare |
| 176 |
- |
| 177 |
- # disable Xcode hooks, bug #652134 |
| 178 |
- if [[ ${CHOST} == *-darwin* ]] ; then |
| 179 |
- sed -i -e 's/__APPLE__/__DISABLED_APPLE__/' \ |
| 180 |
- Source/cmGlobalXCodeGenerator.cxx || die |
| 181 |
- fi |
| 182 |
- |
| 183 |
- # Add gcc libs to the default link paths |
| 184 |
- sed -i \ |
| 185 |
- -e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \ |
| 186 |
- -e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \ |
| 187 |
- -e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \ |
| 188 |
- Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed" |
| 189 |
- if ! has_version \>=${CATEGORY}/${PN}-3.4.0_rc1 ; then |
| 190 |
- CMAKE_BINARY="${S}/Bootstrap.cmk/cmake" |
| 191 |
- cmake_src_bootstrap |
| 192 |
- fi |
| 193 |
-} |
| 194 |
- |
| 195 |
-src_configure() { |
| 196 |
- # Fix linking on Solaris |
| 197 |
- [[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl |
| 198 |
- |
| 199 |
- local mycmakeargs=( |
| 200 |
- -DCMAKE_USE_SYSTEM_LIBRARIES=ON |
| 201 |
- -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp) |
| 202 |
- -DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr |
| 203 |
- -DCMAKE_DOC_DIR=/share/doc/${PF} |
| 204 |
- -DCMAKE_MAN_DIR=/share/man |
| 205 |
- -DCMAKE_DATA_DIR=/share/${PN} |
| 206 |
- -DSPHINX_MAN=$(usex doc) |
| 207 |
- -DSPHINX_HTML=$(usex doc) |
| 208 |
- -DBUILD_CursesDialog="$(usex ncurses)" |
| 209 |
- ) |
| 210 |
- |
| 211 |
- if use qt5 ; then |
| 212 |
- mycmakeargs+=( |
| 213 |
- -DBUILD_QtDialog=ON |
| 214 |
- $(cmake-utils_use_find_package qt5 Qt5Widgets) |
| 215 |
- ) |
| 216 |
- fi |
| 217 |
- |
| 218 |
- cmake-utils_src_configure |
| 219 |
-} |
| 220 |
- |
| 221 |
-src_compile() { |
| 222 |
- cmake-utils_src_compile |
| 223 |
- use emacs && elisp-compile Auxiliary/cmake-mode.el |
| 224 |
-} |
| 225 |
- |
| 226 |
-src_test() { |
| 227 |
- virtx cmake_src_test |
| 228 |
-} |
| 229 |
- |
| 230 |
-src_install() { |
| 231 |
- cmake-utils_src_install |
| 232 |
- |
| 233 |
- if use emacs; then |
| 234 |
- elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc |
| 235 |
- elisp-site-file-install "${FILESDIR}/${SITEFILE}" |
| 236 |
- fi |
| 237 |
- |
| 238 |
- insinto /usr/share/vim/vimfiles/syntax |
| 239 |
- doins Auxiliary/vim/syntax/cmake.vim |
| 240 |
- |
| 241 |
- insinto /usr/share/vim/vimfiles/indent |
| 242 |
- doins Auxiliary/vim/indent/cmake.vim |
| 243 |
- |
| 244 |
- insinto /usr/share/vim/vimfiles/ftdetect |
| 245 |
- doins "${FILESDIR}/${PN}.vim" |
| 246 |
- |
| 247 |
- dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack} |
| 248 |
- |
| 249 |
- rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die |
| 250 |
-} |
| 251 |
- |
| 252 |
-pkg_postinst() { |
| 253 |
- use emacs && elisp-site-regen |
| 254 |
- if use qt5; then |
| 255 |
- gnome2_icon_cache_update |
| 256 |
- xdg_desktop_database_update |
| 257 |
- xdg_mimeinfo_database_update |
| 258 |
- fi |
| 259 |
-} |
| 260 |
- |
| 261 |
-pkg_postrm() { |
| 262 |
- use emacs && elisp-site-regen |
| 263 |
- if use qt5; then |
| 264 |
- gnome2_icon_cache_update |
| 265 |
- xdg_desktop_database_update |
| 266 |
- xdg_mimeinfo_database_update |
| 267 |
- fi |
| 268 |
-} |
Archives