summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2019-07-04 20:05:17 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2019-07-04 21:36:06 +0200
commitfa03db0def068f4d4f3485b3e479909e6e479a1c (patch)
tree01db672c10c3d81c3cc2ce97ae7cbe8d46e1f4e2 /dev-util/cmake
parentdev-util/cmake: Restore 3.13.4 for prefix (diff)
downloadgentoo-fa03db0def068f4d4f3485b3e479909e6e479a1c.tar.gz
gentoo-fa03db0def068f4d4f3485b3e479909e6e479a1c.tar.bz2
gentoo-fa03db0def068f4d4f3485b3e479909e6e479a1c.zip
dev-util/cmake: 3.13.5 version bump, EAPI-7 bump
Bug: https://bugs.gentoo.org/689234 Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-util/cmake')
-rw-r--r--dev-util/cmake/Manifest2
-rw-r--r--dev-util/cmake/cmake-3.13.5.ebuild (renamed from dev-util/cmake/cmake-3.13.4.ebuild)25
2 files changed, 12 insertions, 15 deletions
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index fa988872699c..437e60fbd8cd 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,4 +1,4 @@
-DIST cmake-3.13.4.tar.gz 8617881 BLAKE2B c6bc47c79ea16f975def31ee4a85b795fc2adf96f9af1d99f702519f0bae6adf531fb5abe3e1e23a6b00226c6cb22719d3d58e8caa5b178acfa4de8d01b42b8a SHA512 5a2cc092109652ced5a3a6ae00fe0c7d134efa7d90d59f376368408bb684343db9e144ee53b184f3437f8a86cf9976a130a1e1676c993d56b278a6640a418c93
+DIST cmake-3.13.5.tar.gz 8618821 BLAKE2B 765678bc92821207c53bfb4ac995a791b938f20236c3a6fda873b8edd11cd1401b4f4c05f170b8f600f38bde5f1227c715499eee072a8de3bb29d4f5cd230226 SHA512 99e3a8f5bc147dd90b9cab11f06892d87f289aa1354ad323711fe96ebc9c32b1e887e8f9d3575a37831c4d2153a070ff9115c5e27a185d54170bad9dbbaabc26
DIST cmake-3.14.3.tar.gz 8851085 BLAKE2B 92da2c563f7ddc3b12457f63eead850eb99b123298632b5a9e8f80f3e32db20e2b25bc60778855400261d13d4ef42600162248f4a92907a0c581e202fc6620eb SHA512 e257a96334f21f2b2f17e8d43aa32c2b069d13194604393c5ac9d3da193000d5328181c6cf861696186d022aba57679ee2d08073d8a7112727746b2b145a47e2
DIST cmake-3.14.5.tar.gz 8854929 BLAKE2B 3e783de1ce541039c80228a56fed4fd28e9ef2ea48f274995f6f26f8b149f1684aab6da518f27106f364a4f0a6f370334f3a85dd61f1bcce22c34337ef4afdaa SHA512 9acd2de17db86052801194cac570bfc104320c249b83058aa59554b42c3d5af9c9293d1c069f3fe8512a80103d511186d840168cbc190ce9584ca99cb9b11e46
DIST cmake-3.15.0-rc3.tar.gz 9255508 BLAKE2B d6d2a46f5d639e290913d1af0f353baf144003c9c3159fa1be900318fd935b2e89fe09ae78db0df291782ef7ff54e64017ea8ab4ee330dfb0e36e14d82ad20e6 SHA512 0a5403e3d13560800fec3b0a932d7d165e5a133fa5c45235f605a761c69aac399164ee4fb79ab4045914c351b9460dcdb3aaad5a0fd1eb8b0153d0fcdddb7f10
diff --git a/dev-util/cmake/cmake-3.13.4.ebuild b/dev-util/cmake/cmake-3.13.5.ebuild
index 9acfa35ba61d..87519fed19c4 100644
--- a/dev-util/cmake/cmake-3.13.4.ebuild
+++ b/dev-util/cmake/cmake-3.13.5.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
CMAKE_MAKEFILE_GENERATOR="emake"
CMAKE_REMOVE_MODULES="no"
-inherit bash-completion-r1 elisp-common flag-o-matic gnome2-utils toolchain-funcs eapi7-ver virtualx xdg-utils cmake-utils
+inherit bash-completion-r1 elisp-common flag-o-matic toolchain-funcs virtualx xdg cmake-utils
MY_P="${P/_/-}"
@@ -36,7 +36,8 @@ RDEPEND="
)
system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
doc? (
dev-python/requests
dev-python/sphinx
@@ -206,23 +207,19 @@ src_install() {
dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
- rm -r "${ED%/}"/usr/share/cmake/{completions,editors} || die
+ rm -r "${ED}"/usr/share/cmake/{completions,editors} || die
+}
+
+pkg_preinst() {
+ use qt5 && xdg_pkg_preinst
}
pkg_postinst() {
use emacs && elisp-site-regen
- if use qt5; then
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- fi
+ use qt5 && xdg_pkg_postinst
}
pkg_postrm() {
use emacs && elisp-site-regen
- if use qt5; then
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
- fi
+ use qt5 && xdg_pkg_postrm
}