commit: 91f88a3f621e203f630b876c7b13962148277945
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 5 01:24:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug 5 01:24:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91f88a3f
dev-util/cmake: add 3.24.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-util/cmake/Manifest | 3 +++
.../{cmake-9999.ebuild => cmake-3.24.0.ebuild} | 26 +++++++++++++---------
dev-util/cmake/cmake-9999.ebuild | 26 +++++++++++++---------
3 files changed, 33 insertions(+), 22 deletions(-)
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index f9f903c32580..8cb1725e3ef8 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -10,3 +10,6 @@ DIST cmake-3.23.2.tar.gz 9987716 BLAKE2B
6930deab4849eeb4451297006d7ace37483c4b9
DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B
aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e
SHA512
22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B
10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d
SHA512
75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B
55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224
SHA512
75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
+DIST cmake-3.24.0-SHA-256.txt 1646 BLAKE2B
f41c0e2f280258c79c0d269a8249dc2a5e6615f50277f452f0b5b71f106f1cbcbb272bce4f28580f422cd8f294d040135abcd0d0a1e00cec3c3d3ceaef99286d
SHA512
c1a0d16ba46dad95aacdf5e0985df1b75294e2fa664d15a8eabeae126b7e1517ce303c44746a58d339d2622d4dc8be263bd332af5b804ac614e64a2e633f6ec9
+DIST cmake-3.24.0-SHA-256.txt.asc 833 BLAKE2B
828f1130930635ad78b6829d8cb1780d9fb9a45edf1650e19a2869d18fd3225d869c664d28775a9b29934f1e3958dae542de3a37e5e3aa965b1704c512b2ee86
SHA512
dc0c495892716643f6ce1015240c373c6145ef070b35f7229d8f109a9bf4c771b49da6672ba765f69c293ed438e26afcab4bb6fa8a3c36f8b4ac91b49b6782bb
+DIST cmake-3.24.0.tar.gz 10395167 BLAKE2B
72b75e3fa4ae1710f5e5d1ac4e356a723ec1b197c9121cd73273f079f7eb31e61fbd5acab228e9b5696c4f8ab85213da4a6cf8e35068f3ca776082742084ae6d
SHA512
91507fc0643f2de20e37cd8d6a539d8cb38a80b604bf77de8e88c8446b6d7b6d02b7329d58966dc2412c6c75edcb9dfbdae02fe84965fefeb7ca47f87631fe17
diff --git a/dev-util/cmake/cmake-9999.ebuild
b/dev-util/cmake/cmake-3.24.0.ebuild
similarity index 95%
copy from dev-util/cmake/cmake-9999.ebuild
copy to dev-util/cmake/cmake-3.24.0.ebuild
index 1f441d341fb6..1a912f345994 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-3.24.0.ebuild
@@ -16,10 +16,11 @@ MY_P="${P/_/-}"
DESCRIPTION="Cross platform Make"
HOMEPAGE="https://cmake.org/";
if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git";
+ inherit git-r3
else
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
if [[ ${PV} != *_rc* ]] ; then
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
inherit verify-sig
@@ -35,6 +36,8 @@ else
fi
fi
+S="${WORKDIR}/${MY_P}"
+
LICENSE="CMake"
SLOT="0"
IUSE="doc emacs ncurses qt5 test"
@@ -66,23 +69,21 @@ BDEPEND+="
test? ( app-arch/libarchive[zstd] )
"
-S="${WORKDIR}/${MY_P}"
-
SITEFILE="50${PN}-gentoo.el"
PATCHES=(
- # prefix
+ # Prefix
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
- # handle gentoo packaging in find modules
+ # Handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
# Next patch needs to be reworked
#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
- # respect python eclasses
+ # Respect python eclasses
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
@@ -132,20 +133,21 @@ src_prepare() {
cmake_src_prepare
if [[ ${CHOST} == *-darwin* ]] ; then
- # disable Xcode hooks, bug #652134
+ # Disable Xcode hooks, bug #652134
sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
Source/CMakeLists.txt || die
sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-e '/cmGlobalXCodeGenerator.h/d' \
Source/cmake.cxx || die
- # disable isysroot usage with GCC, we've properly instructed
+
+ # Disable isysroot usage with GCC, we've properly instructed
# where things are via GCC configuration and ldwrapper
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
Modules/Platform/Apple-GNU-*.cmake || die
- # disable isysroot usage with clang as well
+ # Disable isysroot usage with clang as well
sed -i -e '/_SYSROOT_FLAG/d' \
Modules/Platform/Apple-Clang.cmake || die
- # don't set a POSIX standard, system headers don't like that,
#757426
+ # Don't set a POSIX standard, system headers don't like that,
#757426
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\&
!defined(__APPLE__)/' \
Source/cmLoadCommandCommand.cxx \
Source/cmStandardLexer.h \
@@ -193,7 +195,7 @@ src_compile() {
}
src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
+ # Fix OutDir and SelectLibraryConfigurations tests
# these are altered thanks to our eclass
sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
@@ -244,6 +246,7 @@ src_install() {
pkg_postinst() {
use emacs && elisp-site-regen
+
if use qt5; then
xdg_icon_cache_update
xdg_desktop_database_update
@@ -253,6 +256,7 @@ pkg_postinst() {
pkg_postrm() {
use emacs && elisp-site-regen
+
if use qt5; then
xdg_icon_cache_update
xdg_desktop_database_update
diff --git a/dev-util/cmake/cmake-9999.ebuild b/dev-util/cmake/cmake-9999.ebuild
index 1f441d341fb6..1a912f345994 100644
--- a/dev-util/cmake/cmake-9999.ebuild
+++ b/dev-util/cmake/cmake-9999.ebuild
@@ -16,10 +16,11 @@ MY_P="${P/_/-}"
DESCRIPTION="Cross platform Make"
HOMEPAGE="https://cmake.org/";
if [[ ${PV} == 9999 ]] ; then
- inherit git-r3
EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git";
+ inherit git-r3
else
SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
+
if [[ ${PV} != *_rc* ]] ; then
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
inherit verify-sig
@@ -35,6 +36,8 @@ else
fi
fi
+S="${WORKDIR}/${MY_P}"
+
LICENSE="CMake"
SLOT="0"
IUSE="doc emacs ncurses qt5 test"
@@ -66,23 +69,21 @@ BDEPEND+="
test? ( app-arch/libarchive[zstd] )
"
-S="${WORKDIR}/${MY_P}"
-
SITEFILE="50${PN}-gentoo.el"
PATCHES=(
- # prefix
+ # Prefix
"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
- # handle gentoo packaging in find modules
+ # Handle gentoo packaging in find modules
"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
# Next patch needs to be reworked
#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
- # respect python eclasses
+ # Respect python eclasses
"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
@@ -132,20 +133,21 @@ src_prepare() {
cmake_src_prepare
if [[ ${CHOST} == *-darwin* ]] ; then
- # disable Xcode hooks, bug #652134
+ # Disable Xcode hooks, bug #652134
sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
Source/CMakeLists.txt || die
sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-e '/cmGlobalXCodeGenerator.h/d' \
Source/cmake.cxx || die
- # disable isysroot usage with GCC, we've properly instructed
+
+ # Disable isysroot usage with GCC, we've properly instructed
# where things are via GCC configuration and ldwrapper
sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
Modules/Platform/Apple-GNU-*.cmake || die
- # disable isysroot usage with clang as well
+ # Disable isysroot usage with clang as well
sed -i -e '/_SYSROOT_FLAG/d' \
Modules/Platform/Apple-Clang.cmake || die
- # don't set a POSIX standard, system headers don't like that,
#757426
+ # Don't set a POSIX standard, system headers don't like that,
#757426
sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\&
!defined(__APPLE__)/' \
Source/cmLoadCommandCommand.cxx \
Source/cmStandardLexer.h \
@@ -193,7 +195,7 @@ src_compile() {
}
src_test() {
- # fix OutDir and SelectLibraryConfigurations tests
+ # Fix OutDir and SelectLibraryConfigurations tests
# these are altered thanks to our eclass
sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
@@ -244,6 +246,7 @@ src_install() {
pkg_postinst() {
use emacs && elisp-site-regen
+
if use qt5; then
xdg_icon_cache_update
xdg_desktop_database_update
@@ -253,6 +256,7 @@ pkg_postinst() {
pkg_postrm() {
use emacs && elisp-site-regen
+
if use qt5; then
xdg_icon_cache_update
xdg_desktop_database_update
